diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp
index 8294525246..03be1407fc 100644
--- a/Core/Font/PGF.cpp
+++ b/Core/Font/PGF.cpp
@@ -20,6 +20,7 @@
 // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code.
 // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3.
 
+#include "Common/ChunkFile.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Font/PGF.h"
diff --git a/Core/Font/PGF.h b/Core/Font/PGF.h
index 3d79c107d6..b5b30c1dd9 100644
--- a/Core/Font/PGF.h
+++ b/Core/Font/PGF.h
@@ -23,9 +23,10 @@
 #include <vector>
 
 #include "Common/Log.h"
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 
+class PointerWrap;
+
 enum {
 	FONT_FILETYPE_PGF = 0x00,
 	FONT_FILETYPE_BWFON = 0x01,
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
index 955464164d..305603b83a 100644
--- a/Core/HLE/proAdhoc.h
+++ b/Core/HLE/proAdhoc.h
@@ -5,7 +5,6 @@
 #include "thread/thread.h"
 #include "net/resolve.h"
 
-#include "Common/ChunkFile.h" 
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
@@ -15,6 +14,8 @@
 #include "Core/HLE/sceKernelMutex.h"
 #include "Core/HLE/sceUtility.h"
 
+class PointerWrap;
+
 // Net stuff
 #ifdef _XBOX
 #include <winsockx.h>
diff --git a/Core/HLE/sceNet.h b/Core/HLE/sceNet.h
index ae729911a3..48ca49f296 100644
--- a/Core/HLE/sceNet.h
+++ b/Core/HLE/sceNet.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
+class PointerWrap;
 
 void Register_sceNet();
 void Register_sceWlanDrv();
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index f28972ca5b..8e57445d6c 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -20,6 +20,7 @@
 
 // This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
 // All credit goes to him!
+#include "Common/ChunkFile.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/proAdhoc.h"
 #include "Core/MemMap.h"
diff --git a/Core/HLE/sceNetAdhoc.h b/Core/HLE/sceNetAdhoc.h
index 1529557593..e276af119f 100644
--- a/Core/HLE/sceNetAdhoc.h
+++ b/Core/HLE/sceNetAdhoc.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
+class PointerWrap;
 
 void Register_sceNetAdhoc();
 
diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h
index 5ff3f2e0d8..ece2a32efc 100644
--- a/Core/HW/MediaEngine.h
+++ b/Core/HW/MediaEngine.h
@@ -26,10 +26,10 @@
 
 #include <map>
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
 #include "Core/HLE/sceMpeg.h"
 #include "Core/HW/MpegDemux.h"
 
+class PointerWrap;
 struct SimpleAT3;
 
 #ifdef USE_FFMPEG
diff --git a/Core/HW/MemoryStick.h b/Core/HW/MemoryStick.h
index 3f74c984a4..c574ca85fe 100644
--- a/Core/HW/MemoryStick.h
+++ b/Core/HW/MemoryStick.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
 
 class PointerWrap;
 
diff --git a/Core/HW/MpegDemux.h b/Core/HW/MpegDemux.h
index 28dfbbe762..bc7d31b7e8 100644
--- a/Core/HW/MpegDemux.h
+++ b/Core/HW/MpegDemux.h
@@ -4,9 +4,10 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
 #include "Core/HW/BufferQueue.h"
 
+class PointerWrap;
+
 class MpegDemux
 {
 public:
diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h
index d0045394e6..f7e9b83f72 100644
--- a/Core/HW/SasAudio.h
+++ b/Core/HW/SasAudio.h
@@ -22,10 +22,11 @@
 
 #pragma once
 
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Core/HW/BufferQueue.h"
 
+class PointerWrap;
+
 enum {
 	PSP_SAS_VOICES_MAX = 32,
 
diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h
index 4640289715..003c40455f 100644
--- a/Core/MIPS/x86/Jit.h
+++ b/Core/MIPS/x86/Jit.h
@@ -19,7 +19,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Thunk.h"
-#include "Common/ChunkFile.h"
 #include "Core/MIPS/x86/Asm.h"
 
 #if defined(ARM)
@@ -32,6 +31,8 @@
 #include "Core/MIPS/x86/RegCache.h"
 #include "Core/MIPS/x86/RegCacheFPU.h"
 
+class PointerWrap;
+
 namespace MIPSComp
 {