diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
index 5b1fda3560..f5d455dd09 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
@@ -2,6 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_Tables.h"
 
 struct GekkoOPTemplate
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h
index 4368d5b643..595ef038d1 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h
@@ -4,10 +4,6 @@
 
 #pragma once
 
-#include "../Gekko.h"
-#include "../PPCTables.h"
-#include "Core/PowerPC/Interpreter/Interpreter.h"
-
 namespace InterpreterTables
 {
 	void InitTables();
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
index 0ffd09d09b..e7cbb7d3c8 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/Jit64_Tables.h"
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h
index fd8a6a8030..012d335ffe 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h
+++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h
@@ -4,12 +4,10 @@
 
 #pragma once
 
-#include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/PPCTables.h"
-#include "Core/PowerPC/Jit64/Jit.h"
+namespace PPCAnalyst { struct CodeOp; }
 
 namespace Jit64Tables
 {
-	void CompileInstruction(PPCAnalyst::CodeOp & op);
+	void CompileInstruction(PPCAnalyst::CodeOp& op);
 	void InitTables();
 }
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
index 8a3a1446e7..ec721d19d4 100644
--- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
@@ -2,6 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64IL/JitIL.h"
 #include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
 
 static JitIL::Instruction dynaOpTable[64];
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
index 25d58ae377..79cf143a69 100644
--- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
@@ -4,12 +4,10 @@
 
 #pragma once
 
-#include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/PPCTables.h"
-#include "Core/PowerPC/Jit64IL/JitIL.h"
+namespace PPCAnalyst { struct CodeOp; }
 
 namespace JitILTables
 {
-	void CompileInstruction(PPCAnalyst::CodeOp & op);
+	void CompileInstruction(PPCAnalyst::CodeOp& op);
 	void InitTables();
 }