Jit: Get rid of indirect includes

Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp

@@ -3,9 +3,18 @@
 // Refer to the license.txt file included.
 
 #include <cinttypes>
+#include <string>
 
 #include "disasm.h"
 
+#include "Common/Assert.h"
+#include "Common/BitSet.h"
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 using namespace Gen;

Source/Core/Core/PowerPC/JitCommon/JitBase.cpp

@@ -10,7 +10,10 @@
 #include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 JitBase *jit;

Source/Core/Core/PowerPC/JitCommon/JitBase.h

@@ -10,20 +10,12 @@
 
 #include <unordered_set>
 
-#include "Common/x64ABI.h"
-#include "Common/x64Analyzer.h"
+#include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
-
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/CoreTiming.h"
 #include "Core/MachineContext.h"
-#include "Core/HW/GPFifo.h"
-#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/CPUCoreBase.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
-#include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
 #include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"

Source/Core/Core/PowerPC/JitCommon/JitCache.cpp

@@ -18,6 +18,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 #ifdef _WIN32

Source/Core/Core/PowerPC/JitCommon/JitCache.h

@@ -10,8 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/PPCAnalyst.h"
+#include "Common/CommonTypes.h"
 
 static const u32 JIT_ICACHE_SIZE = 0x2000000;
 static const u32 JIT_ICACHE_MASK = 0x1ffffff;

Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp

@@ -2,11 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"
 #include "Common/MathUtil.h"
-
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+#include "Core/HW/Memmap.h"
 #include "Core/HW/MMIO.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 

Source/Core/Core/PowerPC/JitCommon/Jit_Util.h

@@ -9,6 +9,7 @@
 #include "Common/BitSet.h"
 #include "Common/CPUDetect.h"
 #include "Common/x64Emitter.h"
+#include "Core/PowerPC/PowerPC.h"
 
 namespace MMIO { class Mapping; }
 

Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp

@@ -5,11 +5,14 @@
 #include <cinttypes>
 #include <string>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/JitRegister.h"
-#include "Common/StringUtil.h"
 #include "Common/x64ABI.h"
-#include "Core/HW/Memmap.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/TrampolineCache.h"
 

Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h

@@ -4,13 +4,12 @@
 
 #pragma once
 
-#include <unordered_map>
-
 #include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
-#include "Common/x64Analyzer.h"
 #include "Common/x64Emitter.h"
 
+struct InstructionInfo;
+
 // We need at least this many bytes for backpatching.
 const int BACKPATCH_SIZE = 5;