diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.h b/Source/Project64/N64 System/Interpreter/Interpreter CPU.h
index 752a08429..e7acbe93f 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.h	
@@ -10,13 +10,15 @@
 ****************************************************************************/
 #pragma once
 
+#include <Project64\N64 System\Interpreter\Interpreter Ops.h>
+
 class CInterpreterCPU :
     private R4300iOp
 {
 public:
     static void BuildCPU();
     static void ExecuteCPU();
-    static void ExecuteOps(int Cycles);
+    static void ExecuteOps(int32_t Cycles);
     static void InPermLoop();
 
 private:
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
index 60586c971..edc1c8608 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
@@ -26,7 +26,7 @@ bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2);
     m_NextInstruction = JUMP;\
     m_JumpToLocation = (*_PROGRAM_COUNTER);\
     return;\
-                }
+    }
 
 #define TLB_READ_EXCEPTION(Address) \
     g_Reg->DoTLBReadMiss(m_NextInstruction == JUMP,Address);\
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h
index ef520c17c..ba247a337 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h	
@@ -10,6 +10,8 @@
 ****************************************************************************/
 #pragma once
 
+#include "Interpreter Ops.h"
+
 class R4300iOp32 :
     public R4300iOp
 {
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.h b/Source/Project64/N64 System/Interpreter/Interpreter Ops.h
index 6f607150b..2d94888e6 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.h	
@@ -10,6 +10,10 @@
 ****************************************************************************/
 #pragma once
 
+#include <Project64\Settings\Debug Settings.h>
+#include <Project64\N64 System\Mips\Register Class.h>
+#include <Project64\N64 System\Mips\OpCode.h>
+
 class R4300iOp :
     public CLogging,
     protected CDebugSettings,