diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index 6deb0a2441..e8ee180a4e 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "scmrev.h"
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 #ifdef _DEBUG
 	#define BUILD_TYPE_STR "Debug "
diff --git a/Source/Core/Core/DSP/DSPAccelerator.h b/Source/Core/Core/DSP/DSPAccelerator.h
index e9a88aeeb7..ce809bb71e 100644
--- a/Source/Core/Core/DSP/DSPAccelerator.h
+++ b/Source/Core/Core/DSP/DSPAccelerator.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 u16 dsp_read_accelerator();
 
 u16 dsp_read_aram_d3();
diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h
index 79d0f66ca1..6f07679a5a 100644
--- a/Source/Core/Core/DSP/DSPBreakpoints.h
+++ b/Source/Core/Core/DSP/DSPBreakpoints.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 // super fast breakpoints for a limited range.
 // To be used interchangeably with the BreakPoints class.
diff --git a/Source/Core/Core/DSP/DSPHost.h b/Source/Core/Core/DSP/DSPHost.h
index 611f1af77a..6b729f621a 100644
--- a/Source/Core/Core/DSP/DSPHost.h
+++ b/Source/Core/Core/DSP/DSPHost.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <string>
+
+#include "Common/CommonTypes.h"
+
 // The user of the DSPCore library must supply a few functions so that the
 // emulation core can access the environment it runs in. If the emulation
 // core isn't used, for example in an asm/disasm tool, then most of these
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
index 95c7ad328f..ee0de1623d 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 struct PBMixer
 {
 	u16 left;
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.h b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h
index 4cbfc993d6..81525d3209 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLETools.h
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h
@@ -4,5 +4,7 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc);
 bool DumpCWCode(u32 _Address, u32 _Length);
diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI_DeviceAD16.h
index fa35490e31..d4b722db6f 100644
--- a/Source/Core/Core/HW/EXI_DeviceAD16.h
+++ b/Source/Core/Core/HW/EXI_DeviceAD16.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 class CEXIAD16 : public IEXIDevice
 {
 public:
diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
index a12b650bf7..59a99caa13 100644
--- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 class CEXIAMBaseboard : public IEXIDevice
 {
 public:
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h
index af0866ef8d..4d1f0dfb00 100644
--- a/Source/Core/Core/HW/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h
@@ -9,6 +9,7 @@
 #endif
 
 #include "Common/Thread.h"
+#include "Core/HW/EXI_Device.h"
 
 // Network Control Register A
 enum NCRA
diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI_DeviceGecko.h
index 4a24c4d9bd..1b80b844ed 100644
--- a/Source/Core/Core/HW/EXI_DeviceGecko.h
+++ b/Source/Core/Core/HW/EXI_DeviceGecko.h
@@ -11,6 +11,8 @@
 
 #include "Common/Thread.h"
 
+#include "Core/HW/EXI_Device.h"
+
 class GeckoSockServer
 	: public sf::SocketTCP
 {
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
index a500f39d1a..91e4c1d84e 100644
--- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
+++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
@@ -4,6 +4,7 @@
 
 #pragma once
 #include "Common/StdMakeUnique.h"
+#include "Core/HW/EXI_Device.h"
 
 class MemoryCardBase;
 class CEXIMemoryCard : public IEXIDevice
diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h
index 81b12ad3bc..883dc7feda 100644
--- a/Source/Core/Core/HW/EXI_DeviceMic.h
+++ b/Source/Core/Core/HW/EXI_DeviceMic.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 #if HAVE_PORTAUDIO
 
 #include <mutex>
diff --git a/Source/Core/Core/HW/GCMemcardDirectory.h b/Source/Core/Core/HW/GCMemcardDirectory.h
index 7d2154ac43..699d70d5cc 100644
--- a/Source/Core/Core/HW/GCMemcardDirectory.h
+++ b/Source/Core/Core/HW/GCMemcardDirectory.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "Core/HW/GCMemcard.h"
+#include "DiscIO/Volume.h"
 
 // Uncomment this to write the system data of the memorycard from directory to disc
 //#define _WRITE_MC_HEADER 1
diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h
index 3a9e53e98c..4e9a2f4242 100644
--- a/Source/Core/Core/HW/MMIOHandlers.h
+++ b/Source/Core/Core/HW/MMIOHandlers.h
@@ -7,7 +7,7 @@
 #include <functional>
 #include <memory>
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 // All the templated and very repetitive MMIO-related code is isolated in this
 // file for easier reading. It mostly contains code related to handling methods
diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h
index b90eab3cd1..93494487f9 100644
--- a/Source/Core/Core/HW/Memmap.h
+++ b/Source/Core/Core/HW/Memmap.h
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 
 // Enable memory checks in the Debug/DebugFast builds, but NOT in release
diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
index 0344e46edb..d6e5b1e011 100644
--- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/SI_Device.h"
+
 // triforce (GC-AM) baseboard
 class CSIDevice_AMBaseboard : public ISIDevice
 {
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI_DeviceGBA.h
index 9611c50d21..46a8dc5e9b 100644
--- a/Source/Core/Core/HW/SI_DeviceGBA.h
+++ b/Source/Core/Core/HW/SI_DeviceGBA.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/SI_Device.h"
+
 #include "SFML/Network.hpp"
 
 // GameBoy Advance "Link Cable"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.h b/Source/Core/Core/HW/WiimoteEmu/Encryption.h
index 3b111e2f95..af4324cf4d 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Encryption.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 // The key structure to use with WiimoteGenerateKey()
 struct wiimote_key
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
index ae48ad150f..59fd1a077f 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <string>
+
+#include "Common/CommonTypes.h"
+
 class IWII_IPC_HLE_Device;
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
index 14d0cc22f2..6a38856e95 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
 class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device
 {
 public:
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
index 00caddacdc..8e7a10305b 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
@@ -6,6 +6,8 @@
 
 #include <map>
 #include <string>
+
+#include "Common/Common.h"
 #include "Core/IPC_HLE/hci.h"
 
 class CWII_IPC_HLE_Device_usb_oh1_57e_305;
diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
index 13633aaf01..1c29addda8 100644
--- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
+++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 #if 0
 struct SAttrib
 {
diff --git a/Source/Core/Core/IPC_HLE/hci.h b/Source/Core/Core/IPC_HLE/hci.h
index 41f145a8ed..6654f71eb0 100644
--- a/Source/Core/Core/IPC_HLE/hci.h
+++ b/Source/Core/Core/IPC_HLE/hci.h
@@ -2388,6 +2388,7 @@ struct btreq {
 //////////////////////////////////////////////////////////////////////////
 // Dolphin-custom structs (to kill)
 //////////////////////////////////////////////////////////////////////////
+#include "Common/CommonTypes.h"
 struct SCommandMessage
 {
 	u16 Opcode;
diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
index 59b1a5abe6..244ac1be59 100644
--- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
+++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
@@ -8,6 +8,7 @@
 #include <cinttypes>
 
 #include "Common/x64Emitter.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 
 enum FlushMode
 {
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
index 41aa82cf79..6cc0bcdf42 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
@@ -37,6 +37,10 @@
 		#error No context definition for OS
 	#endif
 #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
+	// for modules:
+	#define _XOPEN_SOURCE
+	#include <ucontext.h>
+
 	#include <mach/mach.h>
 	#include <mach/message.h>
 	#if _M_X86_64
diff --git a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h
index bf7109d6d9..cb9fee2978 100644
--- a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h
+++ b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <unordered_map>
+
 #include "Common/CommonTypes.h"
 #include "Common/x64Analyzer.h"
 #include "Common/x64Emitter.h"
diff --git a/Source/Core/Core/PowerPC/Profiler.h b/Source/Core/Core/PowerPC/Profiler.h
index 34f6560d6a..83c323ad9d 100644
--- a/Source/Core/Core/PowerPC/Profiler.h
+++ b/Source/Core/Core/PowerPC/Profiler.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 #ifdef _WIN32
 
 #define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \
diff --git a/Source/Core/Core/State.h b/Source/Core/Core/State.h
index 166e4dcf98..a9ce361ffb 100644
--- a/Source/Core/Core/State.h
+++ b/Source/Core/Core/State.h
@@ -10,6 +10,8 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonTypes.h"
+
 namespace State
 {
 
diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h
index 51176f93b5..51226e02da 100644
--- a/Source/Core/Core/ec_wii.h
+++ b/Source/Core/Core/ec_wii.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
 void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id);
diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h
index 66d070d5e3..d56f3412b8 100644
--- a/Source/Core/DolphinWX/ISOFile.h
+++ b/Source/Core/DolphinWX/ISOFile.h
@@ -7,11 +7,12 @@
 #include <string>
 #include <vector>
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 #include "DiscIO/Volume.h"
 
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/image.h>
+#include <wx/bitmap.h>
 #endif
 
 class PointerWrap;
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp
index 6fcdbff8e7..4adc8f7e17 100644
--- a/Source/Core/DolphinWX/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@@ -305,3 +305,4 @@ void LogConfigWindow::OnLogCheck(wxCommandEvent& event)
 	int i = event.GetInt();
 	ToggleLog(i, m_checks->IsChecked(i));
 }
+
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
index f64f880616..3811c008fd 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -12,10 +12,13 @@
 
 #pragma once
 
+#include <atomic>
+
 typedef LONG* LPLONG; // Missing type for ForceFeedback.h
 #include <CoreFoundation/CoreFoundation.h>
 #include <ForceFeedback/ForceFeedback.h>
 #include "DirectInputConstants.h" // Not stricty necessary
+#include "Common/CommonTypes.h" // for LONG
 
 namespace ciface
 {
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
index b7cacd7650..ccc835eae6 100644
--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
@@ -4,6 +4,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 #include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h
index 8cb54f04e8..ae1e5ddf59 100644
--- a/Source/Core/VideoBackends/OGL/PerfQuery.h
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <array>
+
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/PerfQueryBase.h"
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.h b/Source/Core/VideoBackends/OGL/PostProcessing.h
index 6aa93cc9a5..c78371976c 100644
--- a/Source/Core/VideoBackends/OGL/PostProcessing.h
+++ b/Source/Core/VideoBackends/OGL/PostProcessing.h
@@ -8,6 +8,7 @@
 #include <unordered_map>
 
 #include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
 
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/VideoCommon.h"
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.h b/Source/Core/VideoBackends/OGL/RasterFont.h
index f612539c50..ddf6884913 100644
--- a/Source/Core/VideoBackends/OGL/RasterFont.h
+++ b/Source/Core/VideoBackends/OGL/RasterFont.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 namespace OGL
 {
 
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h
index 24df0c2b4f..1f527fd9c0 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.h
+++ b/Source/Core/VideoBackends/OGL/VertexManager.h
@@ -4,7 +4,9 @@
 
 #pragma once
 
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/CPMemory.h"
+#include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h
index 6234e14702..aab8887bbc 100644
--- a/Source/Core/VideoBackends/Software/DebugUtil.h
+++ b/Source/Core/VideoBackends/Software/DebugUtil.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/Common.h"
+
 namespace DebugUtil
 {
 	void Init();
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
index e4848ceb34..c712115282 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -6,6 +6,7 @@
 #include "Common/CommonTypes.h"
 
 #include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
 #include "VideoBackends/Software/SetupUnit.h"
 #include "VideoBackends/Software/SWStatistics.h"
 #include "VideoBackends/Software/SWVertexLoader.h"
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp
index 72b72531d6..79358b62a4 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "Common/CommonFuncs.h"
+#include "Common/Common.h"
 #include "Core/HW/Memmap.h"
 #include "VideoBackends/Software/BPMemLoader.h"
 #include "VideoBackends/Software/TextureSampler.h"
diff --git a/Source/Core/VideoCommon/ConstantManager.h b/Source/Core/VideoCommon/ConstantManager.h
index 7a487b7ee7..3e52640ca9 100644
--- a/Source/Core/VideoCommon/ConstantManager.h
+++ b/Source/Core/VideoCommon/ConstantManager.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 // all constant buffer attributes must be 16 bytes aligned, so this are the only allowed components:
 typedef float float4[4];
 typedef u32 uint4[4];
diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h
index fcb89d36e4..5b6247c9b3 100644
--- a/Source/Core/VideoCommon/DataReader.h
+++ b/Source/Core/VideoCommon/DataReader.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/Common.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 extern u8* g_video_buffer_read_ptr;
diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h
index 8778423d3f..612f671f5d 100644
--- a/Source/Core/VideoCommon/NativeVertexFormat.h
+++ b/Source/Core/VideoCommon/NativeVertexFormat.h
@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <functional> // for hash
+
+#include "Common/Common.h"
 #include "Common/Hash.h"
 
 // m_components
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.h b/Source/Core/VideoCommon/OnScreenDisplay.h
index fec5193cfc..eb7302c57f 100644
--- a/Source/Core/VideoCommon/OnScreenDisplay.h
+++ b/Source/Core/VideoCommon/OnScreenDisplay.h
@@ -7,6 +7,8 @@
 #include <functional>
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 namespace OSD
 {
 // On-screen message display
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h
index e5b1b23e89..c454590f24 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.h
+++ b/Source/Core/VideoCommon/OpcodeDecoding.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 #define GX_NOP                      0x00
 
 #define GX_LOAD_BP_REG              0x61
diff --git a/Source/Core/VideoCommon/TextureDecoder.h b/Source/Core/VideoCommon/TextureDecoder.h
index be566fcf16..5e2d9a5609 100644
--- a/Source/Core/VideoCommon/TextureDecoder.h
+++ b/Source/Core/VideoCommon/TextureDecoder.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/Common.h"
 #include "Common/Hash.h"
 
 enum
diff --git a/Source/Core/VideoCommon/VertexLoader_Color.h b/Source/Core/VideoCommon/VertexLoader_Color.h
index 03b8f7a401..90b267064e 100644
--- a/Source/Core/VideoCommon/VertexLoader_Color.h
+++ b/Source/Core/VideoCommon/VertexLoader_Color.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "VideoCommon/NativeVertexFormat.h"
+
 void LOADERDECL Color_ReadDirect_24b_888();
 void LOADERDECL Color_ReadDirect_32b_888x();
 void LOADERDECL Color_ReadDirect_16b_565();
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
index 778915db9f..c9db089680 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "VideoCommon/NativeVertexFormat.h"
 
 class VertexLoader_Normal
 {
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.h b/Source/Core/VideoCommon/VertexLoader_Position.h
index 3b231b12da..42af450bee 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/VertexLoader_Position.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "VideoCommon/NativeVertexFormat.h"
+
 class VertexLoader_Position {
 public:
 
diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h
index 7852e61f34..a363d0d336 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.h
+++ b/Source/Core/VideoCommon/VertexManagerBase.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 
 class NativeVertexFormat;