Global: Reduce includes of common headers.

In many places, string, map, or Common.h were included but not needed.

Common/ABI.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include "ppsspp_config.h"
-#include "Common.h"
 
 // x86/x64 ABI:s, and helpers to help follow them when JIT-ing code.
 // All convensions return values in EAX (+ possibly EDX).

Common/Arm64Emitter.h

@@ -9,7 +9,7 @@
 #include "Common/ArmCommon.h"
 #include "Common/BitSet.h"
 #include "Common/CodeBlock.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 
 #define DYNA_REC JIT

Common/ArmCPUDetect.cpp

@@ -28,7 +28,7 @@
 
 #include <ctype.h>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/StringUtils.h"
 #include "Common/File/FileUtil.h"

Common/ArmEmitter.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include <cstdint>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/ArmCommon.h"
 #include "Common/CodeBlock.h"

Common/ConsoleListener.cpp

@@ -34,7 +34,7 @@
 #include "ppsspp_config.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/Data/Encoding/Utf8.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/ConsoleListener.h"
 #include "Common/StringUtils.h"
 

Common/Data/Collections/ConstMap.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <map>
+
 template <typename T, typename U>
 class InitConstMap
 {

Common/Data/Convert/ColorConvNEON.cpp

@@ -24,7 +24,7 @@
 #include <arm_neon.h>
 #endif
 #include "Common/Data/Convert/ColorConvNEON.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 
 // TODO: More NEON color conversion funcs.

Common/Data/Format/JSONReader.cpp

@@ -1,7 +1,8 @@
+#include "Common/Data/Format/JSONReader.h"
 #include "Common/File/VFS/VFS.h"
 #include "Common/File/Path.h"
 #include "Common/File/FileUtil.h"
-#include "Common/Data/Format/JSONReader.h"
+#include "Common/Log.h"
 
 namespace json {
 
@@ -21,6 +22,17 @@ JsonReader::JsonReader(const std::string &filename) {
 	}
 }
 
+bool JsonReader::parse() {
+	char *error_pos;
+	int status = jsonParse(buffer_, &error_pos, &root_, alloc_);
+	if (status != JSON_OK) {
+		ERROR_LOG(IO, "Error at (%i): %s\n%s\n\n", (int)(error_pos - buffer_), jsonStrError(status), error_pos);
+		return false;
+	}
+	ok_ = true;
+	return true;
+}
+
 int JsonGet::numChildren() const {
 	int count = 0;
 	if (value_.getTag() == JSON_OBJECT || value_.getTag() == JSON_ARRAY) {

Common/Data/Format/JSONReader.h

@@ -4,7 +4,6 @@
 
 #include "ext/gason/gason.h"
 #include "Common/Common.h"
-#include "Common/Log.h"
 
 namespace json {
 
@@ -69,16 +68,7 @@ public:
 	const JsonValue rootValue() const { return root_; }
 
 private:
-	bool parse() {
+	bool parse();
-		char *error_pos;
-		int status = jsonParse(buffer_, &error_pos, &root_, alloc_);
-		if (status != JSON_OK) {
-			ERROR_LOG(IO, "Error at (%i): %s\n%s\n\n", (int)(error_pos - buffer_), jsonStrError(status), error_pos);
-			return false;
-		}
-		ok_ = true;
-		return true;
-	}
 
 	char *buffer_ = nullptr;
 	JsonAllocator alloc_;

Common/Data/Format/RIFF.h

@@ -9,7 +9,6 @@
 // OR it contains ONLY other chunks
 // otherwise the scheme breaks.
 
-#include <string>
 #include <cstdint>
 
 class RIFFReader {

Common/Data/Text/I18n.h

@@ -12,7 +12,6 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <vector>
 
 #include "Common/Common.h"
 #include "Common/File/Path.h"

Common/FakeCPUDetect.cpp

@@ -31,7 +31,7 @@
 #include <cstring>
 #include <memory>
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 #include "CPUDetect.h"
 #include "StringUtils.h"
 

Common/FakeEmitter.h

@@ -20,10 +20,9 @@
 #ifndef _DOLPHIN_FAKE_CODEGEN_
 #define _DOLPHIN_FAKE_CODEGEN_
 
-#include <vector>
 #include <stdint.h>
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CodeBlock.h"
 
 // VCVT flags

Common/File/FileDescriptor.cpp

@@ -17,7 +17,7 @@
 #endif
 #include <fcntl.h>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/File/FileDescriptor.h"
 #include "Common/Log.h"

Common/File/FileUtil.h

@@ -20,11 +20,9 @@
 #include <fstream>
 #include <cstdio>
 #include <string>
-#include <vector>
 #include <time.h>
 #include <cstdint>
 
-#include "Common/Common.h"
 #include "Common/File/Path.h"
 
 // Some functions here support Android content URIs. These are marked as such.

Common/File/PathBrowser.cpp

@@ -15,6 +15,7 @@
 #include "Common/Log.h"
 #include "Common/Thread/ThreadUtil.h"
 
+#include "Core/Config.h"
 #include "Core/System.h"
 
 #if PPSSPP_PLATFORM(ANDROID)

Common/GPU/OpenGL/GLSLProgram.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <map>
 #include <string>
 #include <time.h>
 

Common/GPU/ShaderWriter.cpp

@@ -4,6 +4,7 @@
 
 #include "Common/GPU/Shader.h"
 #include "Common/GPU/ShaderWriter.h"
+#include "Common/Log.h"
 
 const char *vulkan_glsl_preamble_fs =
 "#version 450\n"

Common/GPU/ShaderWriter.h

@@ -2,7 +2,6 @@
 
 #include <cstring>
 
-#include "Common/Log.h"
 #include "Common/GPU/Shader.h"
 #include "GPU/ge_constants.h"
 #include "GPU/GPUCommon.h"

Common/GPU/Vulkan/VulkanMemory.h

@@ -5,7 +5,6 @@
 #include <vector>
 #include <unordered_map>
 
-#include "Common/Log.h"
 #include "Common/GPU/Vulkan/VulkanContext.h"
 
 // Forward declaration

Common/GPU/Vulkan/VulkanProfiler.h

@@ -3,7 +3,6 @@
 #include <vector>
 #include <string>
 
-#include "Common/Log.h"
 #include "VulkanLoader.h"
 
 // Simple scoped based profiler, initially meant for instant one-time tasks like texture uploads

Common/Input/GestureDetector.h

@@ -1,3 +1,4 @@
+#include <cstdint>
 #include "Common/Input/InputState.h"
 #include "Common/Math/geom2d.h"
 

Common/Input/InputState.h

@@ -3,8 +3,6 @@
 // For more detailed and configurable input, implement NativeTouch, NativeKey and NativeAxis and do your
 // own mapping. Might later move the mapping system from PPSSPP to native.
 
-#include <map>
-#include <mutex>
 #include <unordered_map>
 #include <vector>
 

Common/Log.cpp

@@ -19,7 +19,7 @@
 
 #include "ppsspp_config.h"
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "StringUtils.h"
 #include "Common/Data/Encoding/Utf8.h"

Common/Math/curves.cpp

@@ -4,8 +4,6 @@
 #include "Common/Math/math_util.h"
 #include "curves.h"
 
-#include "Common/Common.h"
-
 float linearInOut(int t, int fadeInLength, int solidLength, int fadeOutLength) {
 	if (t < 0) return 0;
 	if (t < fadeInLength) {

Common/MemArena.h

@@ -25,7 +25,7 @@
 #include <mach/mach.h>
 #endif
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
 // Multiple views can mirror the same section of the block, which makes it very convient for emulating

Common/MemArenaDarwin.cpp

@@ -19,7 +19,6 @@
 
 #if defined(__APPLE__)
 
-#include <string>
 #include <cstdint>
 #include <sys/stat.h>
 #include <fcntl.h>

Common/MemoryUtil.cpp

@@ -20,7 +20,7 @@
 #include <cstring>
 #include <cstdlib>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
 #include "Common/StringUtils.h"

Common/MipsCPUDetect.cpp

@@ -18,7 +18,7 @@
 #include "ppsspp_config.h"
 #if PPSSPP_ARCH(MIPS) || PPSSPP_ARCH(MIPS64)
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/StringUtils.h"
 #include "Common/File/FileUtil.h"

Common/MipsEmitter.h

@@ -18,11 +18,10 @@
 #pragma once
 
 #include <functional>
-#include <vector>
 #include <stdint.h>
 
 #include "Common/CodeBlock.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace MIPSGen {
 

Common/Profiler/Profiler.cpp

@@ -2,8 +2,6 @@
 
 #include <algorithm>
 #include <mutex>
-#include <map>
-#include <string>
 #include <vector>
 #include <cstring>
 

Common/StringUtils.cpp

@@ -41,7 +41,6 @@
 #include <algorithm>
 #include <iomanip>
 
-#include "Common/Common.h"
 #include "Common/Buffer.h"
 #include "Common/StringUtils.h"
 

Common/StringUtils.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "Common.h"
+#include <cstdarg>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 

Common/Thread/Promise.h

@@ -4,7 +4,6 @@
 
 #include "Common/Thread/Channel.h"
 #include "Common/Thread/ThreadManager.h"
-#include "Common/Log.h"
 
 template<class T>
 class PromiseTask : public Task {

Common/Thunk.h

@@ -19,8 +19,8 @@
 
 #include <map>
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
-#include "x64Emitter.h"
+#include "Common/x64Emitter.h"
 
 // This simple class creates a wrapper around a C/C++ function that saves all fp state
 // before entering it, and restores it upon exit. This is required to be able to selectively

Common/UI/UI.cpp

@@ -1,14 +1,10 @@
 // See header for documentation.
 
-#include <string>
-#include <vector>
 #include <cmath>
 #include <cstring>
 
-#include "Common/Data/Color/RGBAUtil.h"
 #include "Common/UI/UI.h"
 #include "Common/UI/Context.h"
-#include "Common/Render/TextureAtlas.h"
 #include "Common/Render/DrawBuffer.h"
 
 // TODO: UI should probably not own these.

Common/x64Analyzer.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 struct LSInstructionInfo
 {

Common/x64Emitter.h

@@ -22,7 +22,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/CodeBlock.h"
 

Core/CoreParameter.h

@@ -20,7 +20,6 @@
 #include <string>
 
 #include "Core/Compatibility.h"
-#include "Core/Config.h"
 
 enum GPUCore {
 	GPUCORE_GLES,

Core/CoreTiming.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <atomic>
+#include <climits>
 #include <cstdio>
 #include <cstring>
 #include <mutex>

Core/Debugger/WebSocket/GameSubscriber.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "Core/Config.h"
 #include "Core/Debugger/WebSocket/GameSubscriber.h"
 #include "Core/Debugger/WebSocket/WebSocketUtils.h"
 #include "Core/ELF/ParamSFO.h"

Core/Dialog/PSPDialog.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Render/TextureAtlas.h"
 #include "Common/Swap.h"

Core/Dialog/PSPGamedataInstallDialog.cpp

@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/ELF/ParamSFO.h"

Core/Dialog/PSPNetconfDialog.cpp

@@ -15,10 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#if defined(_WIN32)
+#include <algorithm>
 #include "Common/CommonWindows.h"
-#endif
+#include "Common/TimeUtil.h"
-#include <TimeUtil.h>
 #include "Common/Data/Text/I18n.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"

Core/ELF/ElfTypes.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 
 ///////////////////////

Core/ELF/PBPReader.h

@@ -18,7 +18,8 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include <vector>
+#include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 
 enum PBPSubFile {

Core/FileLoaders/DiskCachingFileLoader.h

@@ -21,7 +21,7 @@
 #include <map>
 #include <mutex>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/File/Path.h"
 #include "Common/Swap.h"
 #include "Core/Loaders.h"

Core/FileLoaders/HTTPFileLoader.cpp

@@ -17,7 +17,6 @@
 
 #include <algorithm>
 
-#include "Common/Common.h"
 #include "Common/Log.h"
 #include "Common/StringUtils.h"
 #include "Core/Config.h"

Core/FileSystems/ISOFileSystem.cpp

@@ -20,7 +20,6 @@
 #include <ctype.h>
 #include <algorithm>
 
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"

Core/HDRemaster.cpp

@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common.h"
+#include "Common/CommonFuncs.h"
 #include "Core/HDRemaster.h"
 
 bool g_RemasterMode;

Core/HLE/ReplaceTables.cpp

@@ -20,7 +20,7 @@
 #include <map>
 #include <unordered_map>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Log.h"
 #include "Common/Swap.h"

Core/HLE/__sceAudio.cpp

@@ -18,7 +18,7 @@
 #include <atomic>
 #include <mutex>
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 #include "Common/File/Path.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"

Core/HLE/proAdhoc.cpp

@@ -51,6 +51,7 @@
 #define TCP_MAXSEG 2
 #endif // defined(HAVE_LIBNX) || PPSSPP_PLATFORM(SWITCH)
 
+#include <algorithm>
 #include <mutex>
 #include <cstring>
 
@@ -60,6 +61,7 @@
 
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/TimeUtil.h"
+#include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/sceKernelInterrupt.h"

Core/HLE/proAdhoc.h

@@ -38,14 +38,14 @@
 #define PACK __attribute__((packed))
 #endif
 
-#include <thread>
-#include <mutex>
 #include <atomic>
+#include <climits>
+#include <mutex>
+#include <thread>
 
 #include "Common/Net/Resolve.h"
 #include "Common/Serialize/Serializer.h"
 
-#include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMap.h"
 #include "Core/HLE/HLE.h"

Core/HLE/sceIo.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <string>
-
 class PointerWrap;
 class KernelObject;
 
@@ -27,6 +25,7 @@ void __IoDoState(PointerWrap &p);
 void __IoShutdown();
 
 struct ScePspDateTime;
+struct tm;
 
 u32 sceIoIoctl(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u32 outlen);
 

Core/HLE/sceJpeg.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include "ext/jpge/jpgd.h"
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"

Core/HLE/sceKernel.h

@@ -20,7 +20,7 @@
 #include <map>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/Swap.h"
 

Core/HLE/sceMpeg.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 
 class PointerWrap;

Core/HLE/sceNetAdhoc.cpp

@@ -35,6 +35,7 @@
 
 // This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
 // All credit goes to him!
+#include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/Reporting.h"

Core/HLE/sceRtc.h

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
 
 class PointerWrap;
 

Core/HLE/sceUtility.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <map>
-
 class PointerWrap;
 
 // Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE

Core/HW/Camera.h

@@ -19,7 +19,6 @@
 
 #include "ppsspp_config.h"
 #include "Core/HLE/sceUsbCam.h"
-#include "Log.h"
 
 #include "ext/jpge/jpgd.h"
 #include "ext/jpge/jpge.h"

Core/HW/Display.cpp

@@ -19,7 +19,7 @@
 #include <cmath>
 #include <mutex>
 #include <vector>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/System/System.h"
 #include "Common/TimeUtil.h"

Core/HW/MemoryStick.cpp

@@ -21,6 +21,7 @@
 #include <thread>
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/Compatibility.h"
 #include "Core/FileSystems/MetaFileSystem.h"

Core/HW/StereoResampler.cpp

@@ -36,6 +36,7 @@
 #include <cstring>
 #include <atomic>
 
+#include "Common/Common.h"
 #include "Common/System/System.h"
 #include "Common/Math/math_util.h"
 #include "Common/Serialize/Serializer.h"

Core/MIPS/IR/IRJit.cpp

@@ -24,6 +24,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/StringUtils.h"
 
+#include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/sceKernelMemory.h"

Core/MIPS/IR/IRJit.h

@@ -20,7 +20,7 @@
 #include <cstring>
 #include <unordered_map>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Core/MIPS/JitCommon/JitBlockCache.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"

Core/MIPS/JitCommon/JitBlockCache.cpp

@@ -20,7 +20,7 @@
 #include <algorithm>
 
 #include "ext/xxhash.h"
-#include "Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Profiler/Profiler.h"
 
 #ifdef _WIN32

Core/MIPS/JitCommon/JitCommon.h

@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Core/MIPS/MIPS.h"
 

Core/MIPS/JitCommon/JitState.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Core/MIPS/MIPS.h"
 

Core/MIPS/MIPS.cpp

@@ -21,7 +21,7 @@
 
 #include "Common/Math/math_util.h"
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/ConfigValues.h"

Core/MIPS/MIPS.h

@@ -22,9 +22,7 @@
 #include <cstddef>
 
 #include "Common/Data/Random/Rng.h"
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
-// #include "Core/CoreParameter.h"
 #include "Core/Opcode.h"
 
 class PointerWrap;

Core/MIPS/MIPSInt.cpp

@@ -22,7 +22,7 @@
 
 #include "Common/BitSet.h"
 #include "Common/BitScan.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/Host.h"

Core/MIPS/x86/CompALU.cpp

@@ -21,7 +21,7 @@
 #include <algorithm>
 
 #include "Common/BitSet.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/x86/Jit.h"
 #include "Core/MIPS/x86/RegCache.h"

Core/MIPS/x86/CompFPU.cpp

@@ -20,7 +20,7 @@
 
 #include "Core/Config.h"
 #include "Core/MemMap.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/x86/Jit.h"

Core/MemFault.cpp

@@ -33,6 +33,7 @@
 #endif
 
 #include "Common/Log.h"
+#include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/MemFault.h"
 #include "Core/MemMap.h"

Core/MemMap.h

@@ -25,8 +25,6 @@
 #include <stddef.h>
 #endif
 
-// Includes
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 #include "Core/Opcode.h"

Core/MemMapFunctions.cpp

@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 #include "Core/Core.h"
 #include "Core/MemMap.h"

Core/Replay.cpp

@@ -26,7 +26,7 @@
 #include <ctime>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/File/FileUtil.h"
 #include "Common/StringUtils.h"

Core/Replay.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <cstdint>
-#include <string>
 #include <vector>
 
 #include "Common/File/Path.h"

Core/TextureReplacer.h

@@ -17,12 +17,11 @@
 
 #pragma once
 
-#include <map>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/MemoryUtil.h"
 #include "Common/File/Path.h"
 

Core/Util/AudioFormatNEON.cpp

@@ -23,7 +23,7 @@
 #else
 #include <arm_neon.h>
 #endif
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/Util/AudioFormat.h"
 #include "Core/Util/AudioFormatNEON.h"
 

Core/Util/PPGeDraw.cpp

@@ -28,6 +28,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
+#include "Core/Config.h"
 #include "Core/HDRemaster.h"
 #include "Core/Host.h"
 #include "GPU/ge_constants.h"

Core/Util/PPGeDraw.h

@@ -22,7 +22,7 @@
 
 #include "Common/Render/TextureAtlas.h"
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 class PointerWrap;
 

Core/Util/PortManager.cpp

@@ -35,6 +35,7 @@
 #include "Common/Net/Resolve.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/Log.h"
+#include "Core/Config.h"
 #include "Core/System.h"
 #include "Core/Host.h"
 #include "Core/ELF/ParamSFO.h"

Core/WaveFile.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <string>
-
 #include "Core/WaveFile.h"
 #include "Common/Log.h"
 #include "Core/Config.h"

Core/WaveFile.h

@@ -13,7 +13,6 @@
 #pragma once
 
 #include <array>
-#include <string>
 #include <cstdint>
 
 #include "Common/File/FileUtil.h"

GPU/Common/FramebufferManagerCommon.cpp

@@ -23,7 +23,7 @@
 #include "Common/GPU/OpenGL/GLFeatures.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/Data/Text/I18n.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Core.h"

GPU/Common/ReinterpretFramebuffer.cpp

@@ -2,6 +2,7 @@
 
 #include "Common/GPU/Shader.h"
 #include "Common/GPU/ShaderWriter.h"
+#include "Common/Log.h"
 #include "GPU/Common/ReinterpretFramebuffer.h"
 
 static const VaryingDef varyings[1] = {

GPU/Common/ReinterpretFramebuffer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Log.h"
 #include "GPU/ge_constants.h"
 #include "GPU/GPUCommon.h"
 #include "Common/GPU/ShaderWriter.h"

GPU/Common/ShaderCommon.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
 
 namespace Draw {
 	class DrawContext;

GPU/Common/ShaderId.h

@@ -4,7 +4,7 @@
 #include <cstring>
 #include <cstdint>
 
-#include "Common/Common.h"
+#include "Common/CommonFuncs.h"
 
 // TODO: There will be additional bits, indicating that groups of these will be
 // sent to the shader and processed there. This will cut down the number of shaders ("ubershader approach")

GPU/Common/SplineCommon.cpp

@@ -18,10 +18,9 @@
 #include <string.h>
 #include <algorithm>
 
-#include "Common/Profiler/Profiler.h"
+#include "Common/Common.h"
-
 #include "Common/CPUDetect.h"
-
+#include "Common/Profiler/Profiler.h"
 #include "GPU/Common/GPUStateUtils.h"
 #include "GPU/Common/SplineCommon.h"
 #include "GPU/Common/DrawEngineCommon.h"

GPU/Common/TextureCacheCommon.cpp

@@ -18,6 +18,7 @@
 #include <algorithm>
 
 #include "ppsspp_config.h"
+#include "Common/Common.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/Profiler/Profiler.h"
 #include "Common/MemoryUtil.h"

GPU/Common/TextureDecoder.cpp

@@ -17,6 +17,7 @@
 
 #include "ppsspp_config.h"
 #include "ext/xxhash.h"
+#include "Common/Common.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/CPUDetect.h"
 #include "Common/Log.h"

GPU/Common/TextureScalerCommon.h

@@ -20,8 +20,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/MemoryUtil.h"
 
-#include <vector>
-
 static const int MIN_TEXSCALE_LINES_PER_THREAD = 4;
 
 class TextureScalerCommon {

GPU/Common/VertexDecoderCommon.cpp

@@ -20,7 +20,7 @@
 
 #include "ppsspp_config.h"
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/Log.h"

GPU/Common/VertexDecoderCommon.h

@@ -21,7 +21,7 @@
 
 #include "ppsspp_config.h"
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Data/Collections/Hashmaps.h"
 #include "Common/Log.h"
 #include "Core/Reporting.h"

GPU/D3D11/DepalettizeShaderD3D11.cpp

@@ -18,7 +18,7 @@
 #include <map>
 #include <d3d11.h>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/Log.h"
 #include "Common/StringUtils.h"

GPU/D3D11/DrawEngineD3D11.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <map>
 #include <d3d11.h>
 #include <d3d11_1.h>