diff --git a/Source/Project64-rsp-core/Project64-rsp-core.vcxproj b/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
index f52253f6b..4f9af9da3 100644
--- a/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
+++ b/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
@@ -66,7 +66,7 @@
     <ClCompile Include="Recompiler\Mmx.cpp" />
     <ClCompile Include="Recompiler\RspProfiling.cpp" />
     <ClCompile Include="Recompiler\RspRecompilerAnalysis.cpp" />
-    <ClCompile Include="Recompiler\RspRecompilerCPU.cpp" />
+    <ClCompile Include="Recompiler\RspRecompilerCPU-x86.cpp" />
     <ClCompile Include="Recompiler\RspRecompilerOps-x86.cpp" />
     <ClCompile Include="Recompiler\RspRecompilerSections.cpp" />
     <ClCompile Include="Recompiler\Sse.cpp" />
@@ -97,7 +97,7 @@
     <ClInclude Include="Hle\mem.h" />
     <ClInclude Include="Hle\ucodes.h" />
     <ClInclude Include="Recompiler\RspProfiling.h" />
-    <ClInclude Include="Recompiler\RspRecompilerCPU.h" />
+    <ClInclude Include="Recompiler\RspRecompilerCPU-x86.h" />
     <ClInclude Include="Recompiler\RspRecompilerOps-x86.h" />
     <ClInclude Include="Recompiler\X86.h" />
     <ClInclude Include="RSPDebugger.h" />
diff --git a/Source/Project64-rsp-core/RSPInfo.cpp b/Source/Project64-rsp-core/RSPInfo.cpp
index 7d4fc0447..506f54ad3 100644
--- a/Source/Project64-rsp-core/RSPInfo.cpp
+++ b/Source/Project64-rsp-core/RSPInfo.cpp
@@ -1,6 +1,6 @@
 #include "RSPInfo.h"
 #include <Project64-rsp-core/Recompiler/RspProfiling.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
 #include <Project64-rsp-core/Settings/RspSettingsID.h>
 #include <Project64-rsp-core/cpu/RSPCpu.h>
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerAnalysis.cpp b/Source/Project64-rsp-core/Recompiler/RspRecompilerAnalysis.cpp
index b6b55796f..b5738c163 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerAnalysis.cpp
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerAnalysis.cpp
@@ -1,6 +1,6 @@
 #if defined(__i386__) || defined(_M_IX86)
 
-#include "RspRecompilerCPU.h"
+#include "RspRecompilerCPU-x86.h"
 #include <Common/StdString.h>
 #include <Project64-rsp-core/RSPInfo.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.cpp b/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.cpp
similarity index 99%
rename from Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.cpp
rename to Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.cpp
index 54abf04c0..5f9d0841b 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.cpp
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.cpp
@@ -1,6 +1,6 @@
 #if defined(__i386__) || defined(_M_IX86)
 
-#include "RspRecompilerCPU.h"
+#include "RspRecompilerCPU-x86.h"
 #include "RspProfiling.h"
 #include "RspRecompilerOps-x86.h"
 #include "X86.h"
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.h b/Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h
similarity index 100%
rename from Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.h
rename to Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.cpp b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.cpp
index 2d121b948..5b1c73763 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.cpp
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.cpp
@@ -1,8 +1,7 @@
 #if defined(__i386__) || defined(_M_IX86)
 
-#include "Project64-rsp-core/Recompiler/RspRecompilerCPU.h"
 #include "RspProfiling.h"
-#include "RspRecompilerCPU.h"
+#include "RspRecompilerCPU-x86.h"
 #include "X86.h"
 #include <Common/StdString.h>
 #include <Project64-rsp-core/RSPInfo.h>
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.h b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.h
index 99d592a3c..a890e2074 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.h
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps-x86.h
@@ -1,4 +1,6 @@
 #pragma once
+#if defined(__i386__) || defined(_M_IX86)
+
 #include <Project64-rsp-core/cpu/RSPInterpreterOps.h>
 
 class CRSPSystem;
@@ -232,4 +234,6 @@ private:
     RSPVector * m_Vect;
 };
 
-typedef void (CRSPRecompilerOps::*p_Recompfunc)(void);
\ No newline at end of file
+typedef void (CRSPRecompilerOps::*p_Recompfunc)(void);
+
+#endif
diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerSections.cpp b/Source/Project64-rsp-core/Recompiler/RspRecompilerSections.cpp
index 9ca313853..9656dca43 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerSections.cpp
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerSections.cpp
@@ -1,6 +1,6 @@
 #if defined(__i386__) || defined(_M_IX86)
 
-#include "RspRecompilerCPU.h"
+#include "RspRecompilerCPU-x86.h"
 #include "X86.h"
 #include <Project64-rsp-core/Recompiler/RspRecompilerOps-x86.h>
 #include <Project64-rsp-core/cpu/RSPCpu.h>
diff --git a/Source/Project64-rsp-core/Settings/RspSettings.cpp b/Source/Project64-rsp-core/Settings/RspSettings.cpp
index 6b295e5f8..e4cf0bfeb 100644
--- a/Source/Project64-rsp-core/Settings/RspSettings.cpp
+++ b/Source/Project64-rsp-core/Settings/RspSettings.cpp
@@ -1,6 +1,6 @@
 #include "RspSettings.h"
 #include "RspSettingsID.h"
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/cpu/RSPCpu.h>
 #include <Settings/Settings.h>
 
diff --git a/Source/Project64-rsp-core/cpu/RSPCpu.cpp b/Source/Project64-rsp-core/cpu/RSPCpu.cpp
index f7c51ad38..9af19e5a9 100644
--- a/Source/Project64-rsp-core/cpu/RSPCpu.cpp
+++ b/Source/Project64-rsp-core/cpu/RSPCpu.cpp
@@ -2,7 +2,7 @@
 #include <Common/CriticalSection.h>
 #include <Project64-rsp-core/RSPDebugger.h>
 #include <Project64-rsp-core/RSPInfo.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
 #include <Project64-rsp-core/cpu/RSPRegisters.h>
 #include <Project64-rsp-core/cpu/RspSystem.h>
diff --git a/Source/Project64-rsp-core/cpu/RSPRegisterHandlerPlugin.cpp b/Source/Project64-rsp-core/cpu/RSPRegisterHandlerPlugin.cpp
index 6fed7a89d..6e7f3e814 100644
--- a/Source/Project64-rsp-core/cpu/RSPRegisterHandlerPlugin.cpp
+++ b/Source/Project64-rsp-core/cpu/RSPRegisterHandlerPlugin.cpp
@@ -2,7 +2,7 @@
 #include "RSPCpu.h"
 #include "RSPRegisters.h"
 #include <Project64-rsp-core/RSPInfo.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/cpu/RspMemory.h>
 #include <Project64-rsp-core/cpu/RspSystem.h>
 
diff --git a/Source/Project64-rsp-core/cpu/RspSystem.cpp b/Source/Project64-rsp-core/cpu/RspSystem.cpp
index b7f244dac..8a7a0ddb0 100644
--- a/Source/Project64-rsp-core/cpu/RspSystem.cpp
+++ b/Source/Project64-rsp-core/cpu/RspSystem.cpp
@@ -1,6 +1,6 @@
 #include <Project64-rsp-core/RSPDebugger.h>
 #include <Project64-rsp-core/RSPInfo.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
 #include <Project64-rsp-core/cpu/RSPCpu.h>
 #include <Project64-rsp-core/cpu/RSPRegisters.h>
diff --git a/Source/Project64-rsp-core/cpu/RspSystem.h b/Source/Project64-rsp-core/cpu/RspSystem.h
index 76e0f7d86..19712bb71 100644
--- a/Source/Project64-rsp-core/cpu/RspSystem.h
+++ b/Source/Project64-rsp-core/cpu/RspSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Project64-rsp-core/Hle/HleTask.h>
 #include <Project64-rsp-core/RSPInfo.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/cpu/RSPInterpreterOps.h>
 #include <Project64-rsp-core/cpu/RSPRegisters.h>
 #include <Project64-rsp-core/cpu/RspPipelineStage.h>
diff --git a/Source/Project64-rsp/Debugger/RSPDebuggerUI.cpp b/Source/Project64-rsp/Debugger/RSPDebuggerUI.cpp
index c137e5da0..4a7441789 100644
--- a/Source/Project64-rsp/Debugger/RSPDebuggerUI.cpp
+++ b/Source/Project64-rsp/Debugger/RSPDebuggerUI.cpp
@@ -1,7 +1,7 @@
 #include "RSPDebuggerUI.h"
 #include <Project64-rsp-core/RSPInfo.h>
 #include <Project64-rsp-core/Recompiler/RspProfiling.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
 #include <Project64-rsp-core/cpu/RSPCpu.h>
 #include <Project64-rsp-core/cpu/RSPInstruction.h>
diff --git a/Source/Project64-rsp/Main.cpp b/Source/Project64-rsp/Main.cpp
index e85dd98c0..09d1581d6 100644
--- a/Source/Project64-rsp/Main.cpp
+++ b/Source/Project64-rsp/Main.cpp
@@ -23,7 +23,7 @@
 #include "resource.h"
 #include <Project64-rsp-core/RSPInfo.h>
 #include <Project64-rsp-core/Recompiler/RspProfiling.h>
-#include <Project64-rsp-core/Recompiler/RspRecompilerCPU.h>
+#include <Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h>
 #include <Project64-rsp-core/Settings/RspSettings.h>
 #include <Project64-rsp-core/Settings/RspSettingsID.h>
 #include <Project64-rsp-core/Version.h>