diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index d4d9c2fa17..6541f4776e 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -5,10 +5,8 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="CommonFuncs.h" />
     <ClInclude Include="CommonTypes.h" />
-    <ClInclude Include="ConsoleListener.h" />
     <ClInclude Include="CPUDetect.h" />
     <ClInclude Include="Log.h" />
-    <ClInclude Include="Log\LogManager.h" />
     <ClInclude Include="MemArena.h" />
     <ClInclude Include="MemoryUtil.h" />
     <ClInclude Include="StringUtils.h" />
@@ -560,15 +558,20 @@
     <ClInclude Include="Render\Text\draw_text_cocoa.h">
       <Filter>Render\Text</Filter>
     </ClInclude>
+    <ClInclude Include="Log\StdioListener.h" />
+    <ClInclude Include="Log\ConsoleListener.h">
+      <Filter>Log</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogManager.h">
+      <Filter>Log</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
-    <ClCompile Include="Log\ConsoleListener.cpp" />
     <ClCompile Include="Log\StdioListener.cpp" />
     <ClCompile Include="CPUDetect.cpp" />
     <ClCompile Include="FakeCPUDetect.cpp" />
     <ClCompile Include="MipsCPUDetect.cpp" />
-    <ClCompile Include="Log\LogManager.cpp" />
     <ClCompile Include="MemoryUtil.cpp" />
     <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="Thunk.cpp" />
@@ -1045,6 +1048,12 @@
     <ClCompile Include="..\ext\at3_standalone\compat.cpp">
       <Filter>ext\at3_standalone</Filter>
     </ClCompile>
+    <ClCompile Include="Log\ConsoleListener.cpp">
+      <Filter>Log</Filter>
+    </ClCompile>
+    <ClCompile Include="Log\LogManager.cpp">
+      <Filter>Log</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -1161,6 +1170,9 @@
     <Filter Include="ext\at3_standalone">
       <UniqueIdentifier>{586da66e-922a-4479-9dac-9d608a1b9183}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Log">
+      <UniqueIdentifier>{cb2c7c09-1177-4a1e-962c-5cc7bcb56789}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">
@@ -1208,4 +1220,4 @@
       <Filter>Render\Text</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index eda054c6a4..28dfbb43d9 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -62,7 +62,17 @@
 
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/TimeUtil.h"
+
+#include "Core/HLE/sceKernelThread.h"
+#include "Core/HLE/sceKernel.h"
+#include "Core/HLE/sceKernelMutex.h"
+#include "Core/HLE/sceUtility.h"
+
+#include "Core/MemMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/HLEHelperThread.h"
 #include "Core/Config.h"
+#include "Core/CoreTiming.h"
 #include "Core/Core.h"
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
index ac34ea7fdf..170e64e5a6 100644
--- a/Core/HLE/proAdhoc.h
+++ b/Core/HLE/proAdhoc.h
@@ -39,17 +39,11 @@
 #endif
 
 #include <atomic>
-#include <climits>
 #include <mutex>
-#include <thread>
 
 #include "Common/Net/Resolve.h"
 #include "Common/Serialize/Serializer.h"
-
-#include "Core/CoreTiming.h"
 #include "Core/MemMap.h"
-#include "Core/HLE/HLE.h"
-#include "Core/HLE/HLEHelperThread.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelMutex.h"
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
index 1c3b8f6566..ed8bf37833 100644
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -29,7 +29,6 @@
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HW/MediaEngine.h"
-#include "Core/Config.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
 #include "GPU/GPUInterface.h"
diff --git a/Core/HLE/sceMt19937.cpp b/Core/HLE/sceMt19937.cpp
index baec983eb9..511b00c9da 100644
--- a/Core/HLE/sceMt19937.cpp
+++ b/Core/HLE/sceMt19937.cpp
@@ -20,7 +20,6 @@
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceMt19937.h"
 #include "Core/MemMap.h"
-#include "Core/Reporting.h"
 
 #ifdef USE_CRT_DBG
 #undef new
diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp
index 2318641511..be5c8d795f 100644
--- a/Core/HLE/sceNet.cpp
+++ b/Core/HLE/sceNet.cpp
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 #endif
 
-#include "Common/Net/Resolve.h"
 #include "Common/Data/Text/Parsers.h"
 
 #include "Common/Serialize/Serializer.h"
@@ -34,18 +33,18 @@
 #include "Core/MIPS/MIPS.h"
 #include "Core/Config.h"
 #include "Core/MemMapHelpers.h"
+#include "Core/Reporting.h"
 #include "Core/Util/PortManager.h"
 
 #include "sceKernel.h"
 #include "sceKernelThread.h"
-#include "sceKernelMutex.h"
 #include "sceUtility.h"
 
 #include "Core/HLE/proAdhoc.h"
 #include "Core/HLE/sceNetAdhoc.h"
 #include "Core/HLE/sceNet.h"
 #include "Core/HLE/sceNp.h"
-#include "Core/Reporting.h"
+#include "Core/CoreTiming.h"
 #include "Core/Instance.h"
 
 #if PPSSPP_PLATFORM(SWITCH) && !defined(INADDR_NONE)
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index 207382dfa0..9e6d45900a 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -46,6 +46,7 @@
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/Util/PortManager.h"
 #include "Core/Config.h"
+#include "Core/CoreTiming.h"
 #include "Core/Core.h"
 #include "Core/Reporting.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp
index 96799e3ca3..b7ec039512 100644
--- a/Core/Loaders.cpp
+++ b/Core/Loaders.cpp
@@ -35,12 +35,6 @@
 #include "Core/ELF/PBPReader.h"
 #include "Core/ELF/ParamSFO.h"
 
-static std::map<std::string, std::unique_ptr<FileLoaderFactory>> factories;
-
-void RegisterFileLoaderFactory(const std::string &prefix, std::unique_ptr<FileLoaderFactory> factory) {
-	factories[prefix] = std::move(factory);
-}
-
 FileLoader *ConstructFileLoader(const Path &filename) {
 	if (filename.Type() == PathType::HTTP) {
 		FileLoader *baseLoader = new RetryingFileLoader(new HTTPFileLoader(filename));
@@ -50,12 +44,6 @@ FileLoader *ConstructFileLoader(const Path &filename) {
 		}
 		return new CachingFileLoader(baseLoader);
 	}
-
-	for (auto &iter : factories) {
-		if (startsWith(filename.ToString(), iter.first)) {
-			return iter.second->ConstructFileLoader(filename);
-		}
-	}
 	return new LocalFileLoader(filename);
 }
 
diff --git a/Core/Loaders.h b/Core/Loaders.h
index 3eeb301fc3..7cb0c1938e 100644
--- a/Core/Loaders.h
+++ b/Core/Loaders.h
@@ -147,13 +147,6 @@ Path ResolvePBPFile(const Path &filename);
 
 IdentifiedFileType Identify_File(FileLoader *fileLoader, std::string *errorString);
 
-class FileLoaderFactory {
-public:
-	virtual ~FileLoaderFactory() {}
-	virtual FileLoader *ConstructFileLoader(const Path &filename) = 0;
-};
-void RegisterFileLoaderFactory(const std::string &prefix, std::unique_ptr<FileLoaderFactory> factory);
-
 // Can modify the string filename, as it calls IdentifyFile above.
 bool LoadFile(FileLoader **fileLoaderPtr, std::string *error_string);
 
diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp
index aef97fb98c..2d0a3a9801 100644
--- a/Core/MIPS/MIPS.cpp
+++ b/Core/MIPS/MIPS.cpp
@@ -45,7 +45,6 @@ MIPSDebugInterface *currentDebugMIPS = &debugr4k;
 u8 voffset[128];
 u8 fromvoffset[128];
 
-
 #ifndef M_LOG2E
 #define M_E        2.71828182845904523536f
 #define M_LOG2E    1.44269504088896340736f
@@ -89,7 +88,6 @@ const float cst_constants[32] = {
 	sqrtf(3.0f)/2.0f,
 };
 
-
 MIPSState::MIPSState() {
 	MIPSComp::jit = nullptr;
 
diff --git a/Core/MIPS/MIPS.h b/Core/MIPS/MIPS.h
index dad324609a..b2949465f4 100644
--- a/Core/MIPS/MIPS.h
+++ b/Core/MIPS/MIPS.h
@@ -219,7 +219,7 @@ public:
 	};
 
 	u32 nextPC;
-	int downcount;  // This really doesn't belong here, it belongs in CoreTiming. But you gotta do what you gotta do, this needs to be reachable in the ARM JIT.
+	int downcount;  // This really doesn't belong here, it belongs in CoreTiming. But you gotta do what you gotta do, this needs to be reachable in the JITs without additional pointers.
 
 	bool inDelaySlot;
 	int llBit;  // ll/sc
@@ -261,7 +261,6 @@ public:
 	int RunLoopUntil(u64 globalTicks);
 	// To clear jit caches, etc.
 	void InvalidateICache(u32 address, int length = 4);
-
 	void ClearJitCache();
 
 	void ProcessPendingClears();
@@ -271,7 +270,6 @@ public:
 	volatile bool hasPendingClears = false;
 };
 
-
 class MIPSDebugInterface;
 
 //The one we are compiling or running currently
diff --git a/Core/MemMap.h b/Core/MemMap.h
index 8c2d6f2dda..001e6d1feb 100644
--- a/Core/MemMap.h
+++ b/Core/MemMap.h
@@ -521,7 +521,6 @@ struct PSPPointer
 	}
 };
 
-
 constexpr u32 PSP_GetScratchpadMemoryBase() { return 0x00010000;}
 constexpr u32 PSP_GetScratchpadMemoryEnd() { return 0x00014000;}
 
diff --git a/GPU/Common/ReinterpretFramebuffer.h b/GPU/Common/ReinterpretFramebuffer.h
index ac97e46a9e..f1a78a9b88 100644
--- a/GPU/Common/ReinterpretFramebuffer.h
+++ b/GPU/Common/ReinterpretFramebuffer.h
@@ -1,9 +1,7 @@
 #pragma once
 
 #include "Common/GPU/ShaderWriter.h"
-
 #include "GPU/ge_constants.h"
-#include "GPU/GPUCommon.h"
 #include "GPU/Common/Draw2D.h"
 
 Draw2DPipelineInfo GenerateReinterpretFragmentShader(ShaderWriter &writer, GEBufferFormat from, GEBufferFormat to);
diff --git a/GPU/Common/TextureDecoder.h b/GPU/Common/TextureDecoder.h
index 4976bbd958..5f1d38aa2a 100644
--- a/GPU/Common/TextureDecoder.h
+++ b/GPU/Common/TextureDecoder.h
@@ -22,7 +22,6 @@
 #include "Common/Common.h"
 #include "Common/Swap.h"
 #include "Core/MemMap.h"
-#include "Core/ConfigValues.h"
 #include "GPU/ge_constants.h"
 #include "GPU/GPUState.h"
 
diff --git a/GPU/Common/TextureShaderCommon.h b/GPU/Common/TextureShaderCommon.h
index b029c739a6..37d2c32a52 100644
--- a/GPU/Common/TextureShaderCommon.h
+++ b/GPU/Common/TextureShaderCommon.h
@@ -22,12 +22,10 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/GPU/Shader.h"
 #include "Common/GPU/thin3d.h"
 #include "GPU/ge_constants.h"
 #include "GPU/Common/Draw2D.h"
 #include "GPU/Common/ShaderCommon.h"
-#include "GPU/Common/DepalettizeShaderCommon.h"
 
 
 class ClutTexture {
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 7348fd3089..bb352c8b81 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -67,6 +67,7 @@ using namespace std::placeholders;
 #if !PPSSPP_PLATFORM(UWP)
 #include "GPU/Vulkan/DebugVisVulkan.h"
 #endif
+#include "Core/MIPS/MIPS.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceSas.h"
 #include "Core/Debugger/SymbolMap.h"