diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
index c20feca9ac..7113f420af 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp
+++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
@@ -10,8 +10,6 @@
 #include "DSPHost.h"
 #include "DSPInterpreter.h"
 #include "DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 
 #define MAX_BLOCK_SIZE 250
 #define DSP_IDLE_SKIP_CYCLES 0x1000
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.h b/Source/Core/Core/Src/DSP/DSPEmitter.h
index acf0ab0fd2..cf3331a339 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.h
+++ b/Source/Core/Core/Src/DSP/DSPEmitter.h
@@ -8,6 +8,7 @@
 #include <list>
 
 #include "DSPCommon.h"
+#include "x64ABI.h"
 #include "x64Emitter.h"
 #include "Jit/DSPJitRegCache.h"
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
index f362c00d3f..bc8b4bb843 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
@@ -4,12 +4,11 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
+#include "../DSPAnalyzer.h"
+#include "../DSPEmitter.h"
 #include "../DSPIntCCUtil.h"
 #include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+
 using namespace Gen;
 
 // CLR $acR
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
index 8af884dee0..f368560112 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPEmitter.h"
-#include "../DSPStacks.h"
 #include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPEmitter.h"
+#include "../DSPMemoryMap.h"
+#include "../DSPStacks.h"
 
 using namespace Gen;
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
index 4ca285037b..e8cd349d1c 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
@@ -4,13 +4,9 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-
-// HELPER FUNCTIONS
-
-#include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPIntUtil.h" // Helper functions
+
 using namespace Gen;
 
 // In: RAX: s64 _Value
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
index d5b426e629..c76daf250c 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
@@ -2,10 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPMemoryMap.h"
 
 using namespace Gen;
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
index 730ab60d7f..74e04b3e55 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
@@ -4,11 +4,10 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
+#include "../DSPEmitter.h"
 #include "../DSPIntCCUtil.h"
 #include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+
 using namespace Gen;
 
 // SRS @M, $(0x18+S)
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
index 9a93daa626..bfcb6a6e44 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPIntUtil.h"
+
 using namespace Gen;
 
 // MRR $D, $S
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
index 0de992742f..3cb86e38f9 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
@@ -7,11 +7,10 @@
 
 // Multiplier and product register control
 
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
 #include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPEmitter.h"
+#include "../DSPIntUtil.h"
+
 using namespace Gen;
 
 // Returns s64 in RAX
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
index 2eda9ee7e8..dd7e042169 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPHWInterface.h"
-#include "../DSPEmitter.h"
 #include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPEmitter.h"
+#include "../DSPHWInterface.h"
+#include "../DSPMemoryMap.h"
 
 using namespace Gen;