diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
index 01e6f171a3..309e70d71e 100644
--- a/Source/Core/Core/CoreTiming.cpp
+++ b/Source/Core/Core/CoreTiming.cpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include "Common/ChunkFile.h"
 #include "Common/FifoQueue.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h
index f7b5b3a70d..15a3a09d89 100644
--- a/Source/Core/Core/CoreTiming.h
+++ b/Source/Core/Core/CoreTiming.h
@@ -18,10 +18,10 @@
 //   ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
 
 #include <string>
-
-#include "Common/ChunkFile.h"
 #include "Common/Common.h"
 
+class PointerWrap;
+
 namespace CoreTiming
 {
 
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
index 5c2a4173c9..8e677ccdee 100644
--- a/Source/Core/Core/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
+#include "Common/IniFile.h"
 #include "Common/StringUtil.h"
-
 #include "Core/GeckoCodeConfig.h"
 
 namespace Gecko
diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
index 6131dacaee..e3e0538a91 100644
--- a/Source/Core/Core/GeckoCodeConfig.h
+++ b/Source/Core/Core/GeckoCodeConfig.h
@@ -4,10 +4,11 @@
 
 #pragma once
 
-#include "Common/IniFile.h"
-
+#include <vector>
 #include "Core/GeckoCode.h"
 
+class IniFile;
+
 namespace Gecko
 {
 
diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp
index 227831389c..731e9a4d96 100644
--- a/Source/Core/Core/HW/AudioInterface.cpp
+++ b/Source/Core/Core/HW/AudioInterface.cpp
@@ -52,6 +52,7 @@ This file mainly deals with the [Drive I/F], however [AIDFR] controls
 
 #include "AudioCommon/AudioCommon.h"
 
+#include "Common/ChunkFile.h"
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
index 9c1fb7670a..58c8717175 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
@@ -24,6 +24,7 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC
 #include <map>
 #include <string>
 
+#include "Common/ChunkFile.h"
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
index 224dfec4bd..ae48ad150f 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
-
 class IWII_IPC_HLE_Device;
+class PointerWrap;
 
 enum IPCCommandType : u32
 {
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 41f82864a8..a949627e93 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -4,6 +4,7 @@
 
 #include <polarssl/md5.h>
 
+#include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
@@ -11,7 +12,6 @@
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
 #include "Common/Timer.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
@@ -29,7 +29,7 @@
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
 #include "Core/PowerPC/PowerPC.h"
-
+#include "InputCommon/GCPadStatus.h"
 #include "VideoCommon/VideoConfig.h"
 
 // The chunk to allocate movie data in multiples of.
diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
index e761a9a313..4df8e00ea8 100644
--- a/Source/Core/Core/Movie.h
+++ b/Source/Core/Core/Movie.h
@@ -6,10 +6,10 @@
 
 #include <string>
 
-#include "Common/ChunkFile.h"
 #include "Common/Common.h"
 
-#include "InputCommon/GCPadStatus.h"
+struct GCPadStatus;
+class PointerWrap;
 
 namespace WiimoteEmu
 {
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
index 402c91ca18..e66e7ae2f1 100644
--- a/Source/Core/Core/PatchEngine.cpp
+++ b/Source/Core/Core/PatchEngine.cpp
@@ -22,6 +22,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 
 #include "Core/ActionReplay.h"
diff --git a/Source/Core/Core/PatchEngine.h b/Source/Core/Core/PatchEngine.h
index 4c36bca82e..8b35db8736 100644
--- a/Source/Core/Core/PatchEngine.h
+++ b/Source/Core/Core/PatchEngine.h
@@ -7,7 +7,9 @@
 #include <string>
 #include <vector>
 
-#include "Common/IniFile.h"
+#include "Common/CommonTypes.h"
+
+class IniFile;
 
 namespace PatchEngine
 {