From 3e198c53b217c1e066a2e0b985e11a1d91c4d8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 18 Dec 2024 10:36:14 +0100 Subject: [PATCH] More include cleanup --- Common/StringUtils.cpp | 3 --- Common/UI/IconCache.cpp | 1 + Common/UI/IconCache.h | 2 -- Core/Core.cpp | 7 ------- Core/Core.h | 4 +--- Core/Debugger/Breakpoints.cpp | 1 - Core/Debugger/DebugInterface.h | 3 --- Core/Debugger/MemBlockInfo.cpp | 2 -- Core/Debugger/MemBlockInfo.h | 1 - Core/Debugger/SymbolMap.cpp | 1 - Core/Debugger/SymbolMap.h | 1 - Core/Debugger/WebSocket.cpp | 2 -- Core/Debugger/WebSocket/CPUCoreSubscriber.cpp | 1 + Core/Debugger/WebSocket/HLESubscriber.cpp | 1 + Core/Dialog/PSPGamedataInstallDialog.cpp | 1 - Core/Dialog/PSPMsgDialog.cpp | 1 - Core/Dialog/PSPNetconfDialog.cpp | 1 - Core/Dialog/PSPNpSigninDialog.cpp | 4 ---- Core/Dialog/PSPOskDialog.cpp | 3 --- Core/Dialog/PSPSaveDialog.cpp | 2 -- Core/Dialog/SavedataParam.cpp | 2 -- Core/ELF/ElfReader.cpp | 1 - Core/ELF/PBPReader.cpp | 1 - Core/ELF/ParamSFO.cpp | 3 ++- Core/FileLoaders/CachingFileLoader.cpp | 1 - Core/FileLoaders/DiskCachingFileLoader.cpp | 1 - Core/FileLoaders/LocalFileLoader.cpp | 2 -- Core/FileLoaders/RamCachingFileLoader.cpp | 4 ---- Core/FileSystems/BlobFileSystem.cpp | 1 - Core/FileSystems/BlockDevices.cpp | 3 --- Core/FileSystems/BlockDevices.h | 1 - Core/FileSystems/DirectoryFileSystem.cpp | 1 - Core/FileSystems/ISOFileSystem.cpp | 2 -- Core/FileSystems/ISOFileSystem.h | 1 - Core/FileSystems/MetaFileSystem.cpp | 3 --- Core/FileSystems/VirtualDiscFileSystem.cpp | 1 - Core/Font/PGF.cpp | 3 --- Core/FrameTiming.cpp | 1 + Core/HLE/HLE.cpp | 3 --- Core/HLE/HLEHelperThread.cpp | 1 - Core/HLE/KernelWaitHelpers.h | 1 + Core/HLE/Plugins.h | 2 +- Core/HLE/ReplaceTables.cpp | 1 - Core/HLE/sceFont.cpp | 1 + Core/HLE/sceMpeg.cpp | 4 +--- Core/HLE/scePower.cpp | 2 +- Core/HW/Display.cpp | 2 +- Core/HW/MediaEngine.cpp | 5 +---- Core/HW/MemoryStick.cpp | 6 ------ Core/HW/SasAudio.cpp | 2 +- Core/HW/SimpleAudioDec.cpp | 1 - Core/HW/StereoResampler.cpp | 3 --- Core/Loaders.cpp | 4 +--- Core/MIPS/MIPS.cpp | 2 +- Core/MIPS/MIPSAnalyst.cpp | 3 --- Core/MIPS/MIPSAsm.cpp | 2 -- Core/MIPS/MIPSDebugInterface.cpp | 2 +- Core/MIPS/MIPSDebugInterface.h | 3 ++- Core/MIPS/MIPSDis.cpp | 1 - Core/MIPS/MIPSDisVFPU.cpp | 1 - Core/MIPS/MIPSInt.cpp | 1 - Core/MIPS/MIPSInt.h | 1 + Core/MIPS/MIPSIntVFPU.h | 1 + Core/MIPS/MIPSTables.cpp | 1 - Core/MIPS/MIPSTables.h | 1 - Core/MIPS/MIPSVFPUUtils.cpp | 3 --- Core/MemMap.cpp | 9 ++------- Core/PSPLoaders.cpp | 10 +--------- Core/RetroAchievements.cpp | 13 +------------ Core/RetroAchievements.h | 6 ------ Core/Screenshot.cpp | 5 +---- Core/System.cpp | 11 ----------- Core/Util/PortManager.cpp | 4 +--- GPU/GPUCommon.h | 1 - GPU/Software/BinManager.cpp | 1 - GPU/Software/Clipper.cpp | 2 -- GPU/Software/DrawPixel.cpp | 1 - GPU/Software/Rasterizer.cpp | 6 +----- GPU/Software/RasterizerRectangle.cpp | 17 +---------------- GPU/Software/Sampler.cpp | 15 +-------------- GPU/Software/SoftGpu.cpp | 5 +---- GPU/Software/TransformUnit.cpp | 8 -------- UI/CwCheatScreen.cpp | 2 +- UI/EmuScreen.cpp | 5 +---- UI/ImDebugger/ImDebugger.h | 2 ++ UI/ImDebugger/ImDisasmView.cpp | 3 +-- UI/ImDebugger/ImMemView.cpp | 6 ------ UI/OnScreenDisplay.cpp | 3 +-- UI/RetroAchievementScreens.cpp | 1 + Windows/Debugger/CtrlDisAsmView.cpp | 4 ---- Windows/Debugger/CtrlDisAsmView.h | 2 +- Windows/Debugger/CtrlMemView.cpp | 3 +-- Windows/Debugger/DumpMemoryWindow.cpp | 2 +- Windows/GPU/WindowsGLContext.cpp | 2 +- Windows/XinputDevice.cpp | 2 +- unittest/JitHarness.cpp | 1 + 96 files changed, 45 insertions(+), 241 deletions(-) diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp index ca468d3211..a84a21ca39 100644 --- a/Common/StringUtils.cpp +++ b/Common/StringUtils.cpp @@ -30,11 +30,8 @@ #include -#include - #include #include -#include #include #include diff --git a/Common/UI/IconCache.cpp b/Common/UI/IconCache.cpp index 5af81d6638..bf41fe689b 100644 --- a/Common/UI/IconCache.cpp +++ b/Common/UI/IconCache.cpp @@ -5,6 +5,7 @@ #include "Common/TimeUtil.h" #include "Common/Data/Format/PNGLoad.h" #include "Common/Log.h" +#include "Common/GPU/thin3d.h" #define ICON_CACHE_VERSION 1 #define MK_FOURCC(str) (str[0] | ((uint8_t)str[1] << 8) | ((uint8_t)str[2] << 16) | ((uint8_t)str[3] << 24)) diff --git a/Common/UI/IconCache.h b/Common/UI/IconCache.h index a3646c5257..20f69c13c6 100644 --- a/Common/UI/IconCache.h +++ b/Common/UI/IconCache.h @@ -3,11 +3,9 @@ #include #include #include -#include #include #include -#include "Common/GPU/thin3d.h" class UIContext; diff --git a/Core/Core.cpp b/Core/Core.cpp index 1b875d6736..5a87a26609 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -17,17 +17,10 @@ #include "ppsspp_config.h" -#include -#include #include #include -#include -#include "Common/System/NativeApp.h" #include "Common/System/System.h" -#include "Common/System/Display.h" -#include "Common/TimeUtil.h" -#include "Common/Thread/ThreadUtil.h" #include "Common/Profiler/Profiler.h" #include "Common/GraphicsContext.h" diff --git a/Core/Core.h b/Core/Core.h index d867e8b439..88b9f282b3 100644 --- a/Core/Core.h +++ b/Core/Core.h @@ -20,9 +20,7 @@ #include #include -#include "Core/System.h" -#include "Core/CoreParameter.h" -#include "GPU/GPUDefinitions.h" +#include "Common/CommonTypes.h" class GraphicsContext; diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp index b8ae35013c..14572c7b0e 100644 --- a/Core/Debugger/Breakpoints.cpp +++ b/Core/Debugger/Breakpoints.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include #include diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h index a209c8fdeb..319ef013b2 100644 --- a/Core/Debugger/DebugInterface.h +++ b/Core/Debugger/DebugInterface.h @@ -16,11 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #pragma once -#include -#include #include "Common/CommonTypes.h" -#include "Common/Math/expression_parser.h" struct MemMap; diff --git a/Core/Debugger/MemBlockInfo.cpp b/Core/Debugger/MemBlockInfo.cpp index 087a8fba5b..b13762b9e4 100644 --- a/Core/Debugger/MemBlockInfo.cpp +++ b/Core/Debugger/MemBlockInfo.cpp @@ -15,9 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include -#include #include #include #include diff --git a/Core/Debugger/MemBlockInfo.h b/Core/Debugger/MemBlockInfo.h index b07c326f82..5a7ccafd4c 100644 --- a/Core/Debugger/MemBlockInfo.h +++ b/Core/Debugger/MemBlockInfo.h @@ -18,7 +18,6 @@ #pragma once #include -#include #include #include #include "Common/Common.h" diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index c95982e44b..ab526ed662 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -39,7 +39,6 @@ #include "zlib.h" #include "Common/CommonTypes.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" #include "Common/File/FileUtil.h" #include "Common/StringUtils.h" diff --git a/Core/Debugger/SymbolMap.h b/Core/Debugger/SymbolMap.h index d888539027..94f9a41b81 100644 --- a/Core/Debugger/SymbolMap.h +++ b/Core/Debugger/SymbolMap.h @@ -18,7 +18,6 @@ #pragma once #include -#include #include #include #include diff --git a/Core/Debugger/WebSocket.cpp b/Core/Debugger/WebSocket.cpp index 7f1f1aac69..77377613da 100644 --- a/Core/Debugger/WebSocket.cpp +++ b/Core/Debugger/WebSocket.cpp @@ -16,11 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include #include "Common/Thread/ThreadUtil.h" #include "Core/Debugger/WebSocket.h" #include "Core/Debugger/WebSocket/WebSocketUtils.h" -#include "Core/MemMap.h" // This WebSocket (connected through the same port as disc sharing) allows API/debugger access to PPSSPP. // Currently, the only subprotocol "debugger.ppsspp.org" uses a simple JSON based interface. diff --git a/Core/Debugger/WebSocket/CPUCoreSubscriber.cpp b/Core/Debugger/WebSocket/CPUCoreSubscriber.cpp index 26ba747b31..3884121fbc 100644 --- a/Core/Debugger/WebSocket/CPUCoreSubscriber.cpp +++ b/Core/Debugger/WebSocket/CPUCoreSubscriber.cpp @@ -17,6 +17,7 @@ #include "Common/StringUtils.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/CoreTiming.h" #include "Core/Debugger/Breakpoints.h" #include "Core/Debugger/WebSocket/CPUCoreSubscriber.h" diff --git a/Core/Debugger/WebSocket/HLESubscriber.cpp b/Core/Debugger/WebSocket/HLESubscriber.cpp index 110483ed3e..7d83314859 100644 --- a/Core/Debugger/WebSocket/HLESubscriber.cpp +++ b/Core/Debugger/WebSocket/HLESubscriber.cpp @@ -18,6 +18,7 @@ #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/Debugger/DisassemblyManager.h" #include "Core/Debugger/SymbolMap.h" #include "Core/Debugger/WebSocket/HLESubscriber.h" diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index f03e3bb5c6..19443e56d9 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/CommonTypes.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 2e7a8efe4c..d93be5ac2a 100755 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index a5c4c2e8c4..59ec57bff7 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/CommonWindows.h" #include "Common/TimeUtil.h" #include "Common/Data/Text/I18n.h" diff --git a/Core/Dialog/PSPNpSigninDialog.cpp b/Core/Dialog/PSPNpSigninDialog.cpp index 0770a0a90e..e2190787b0 100644 --- a/Core/Dialog/PSPNpSigninDialog.cpp +++ b/Core/Dialog/PSPNpSigninDialog.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #if defined(_WIN32) #include "Common/CommonWindows.h" #endif @@ -23,14 +22,11 @@ #include "Common/Data/Text/I18n.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Core/Config.h" #include "Core/MemMapHelpers.h" #include "Core/Util/PPGeDraw.h" #include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceCtrl.h" #include "Core/HLE/sceUtility.h" -#include "Core/HLE/sceNet.h" -#include "Core/HLE/sceNetAdhoc.h" #include "Core/HLE/sceNp.h" #include "Core/Dialog/PSPNpSigninDialog.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 67ddd5453a..d4c81fa4ff 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -16,8 +16,6 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" -#include - #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" #include "Common/Data/Encoding/Utf8.h" @@ -32,7 +30,6 @@ #include "Core/HW/Display.h" #include "Core/Config.h" #include "Core/Reporting.h" -#include "GPU/GPUState.h" #ifndef _WIN32 #include diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 37a98b9f57..00856112c9 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -22,8 +22,6 @@ #endif #endif -#include -#include #include #include "Common/Data/Encoding/Utf8.h" diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index d624cb7fef..63bbd370ca 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -15,11 +15,9 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include #include "Common/Log.h" #include "Common/Data/Text/I18n.h" -#include "Common/Data/Format/ZIMLoad.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/System/OSD.h" diff --git a/Core/ELF/ElfReader.cpp b/Core/ELF/ElfReader.cpp index 614f43a5ab..73512185d4 100644 --- a/Core/ELF/ElfReader.cpp +++ b/Core/ELF/ElfReader.cpp @@ -22,7 +22,6 @@ #include "Core/MemMap.h" #include "Core/Reporting.h" -#include "Core/ThreadPools.h" #include "Core/MIPS/MIPSTables.h" #include "Core/ELF/ElfReader.h" #include "Core/Debugger/MemBlockInfo.h" diff --git a/Core/ELF/PBPReader.cpp b/Core/ELF/PBPReader.cpp index 3dfed9b584..baca705045 100644 --- a/Core/ELF/PBPReader.cpp +++ b/Core/ELF/PBPReader.cpp @@ -19,7 +19,6 @@ #include #include "Common/Log.h" -#include "Common/File/FileUtil.h" #include "Core/Loaders.h" #include "Core/ELF/PBPReader.h" diff --git a/Core/ELF/ParamSFO.cpp b/Core/ELF/ParamSFO.cpp index 6711c8678c..fe732d5cfe 100644 --- a/Core/ELF/ParamSFO.cpp +++ b/Core/ELF/ParamSFO.cpp @@ -22,8 +22,9 @@ #include "Common/Log.h" #include "Common/StringUtils.h" #include "Common/Swap.h" +#include "Common/File/Path.h" #include "Core/ELF/ParamSFO.h" -#include "Core/Core.h" +#include "Core/System.h" struct Header { diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp index 034dc0eb32..8c79f2795a 100644 --- a/Core/FileLoaders/CachingFileLoader.cpp +++ b/Core/FileLoaders/CachingFileLoader.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "Common/Thread/ThreadUtil.h" #include "Common/TimeUtil.h" diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index 12b715072c..b0400ce661 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -17,7 +17,6 @@ #include "ppsspp_config.h" -#include #include #include #include diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index f15b9399b6..89b0fe4ce9 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -15,11 +15,9 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "ppsspp_config.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" #include "Common/File/FileUtil.h" #include "Common/File/DirListing.h" diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp index d4e947de79..11de0391bb 100644 --- a/Core/FileLoaders/RamCachingFileLoader.cpp +++ b/Core/FileLoaders/RamCachingFileLoader.cpp @@ -15,17 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include #include -#include #include "Common/Thread/ThreadUtil.h" #include "Common/TimeUtil.h" #include "Core/FileLoaders/RamCachingFileLoader.h" -#include "Common/Log.h" - // Takes ownership of backend. RamCachingFileLoader::RamCachingFileLoader(FileLoader *backend) : ProxiedFileLoader(backend) { diff --git a/Core/FileSystems/BlobFileSystem.cpp b/Core/FileSystems/BlobFileSystem.cpp index ddcb20cc41..76ca05a206 100644 --- a/Core/FileSystems/BlobFileSystem.cpp +++ b/Core/FileSystems/BlobFileSystem.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Core/FileSystems/BlobFileSystem.h" BlobFileSystem::BlobFileSystem(IHandleAllocator *hAlloc, FileLoader *fileLoader, std::string alias) diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index 8a7f55be88..d1dadf9443 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -15,12 +15,9 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include -#include #include "Common/Data/Text/I18n.h" -#include "Common/File/FileUtil.h" #include "Common/System/OSD.h" #include "Common/Log.h" #include "Common/Swap.h" diff --git a/Core/FileSystems/BlockDevices.h b/Core/FileSystems/BlockDevices.h index 27f4b9ddbf..54f23d4efb 100644 --- a/Core/FileSystems/BlockDevices.h +++ b/Core/FileSystems/BlockDevices.h @@ -26,7 +26,6 @@ #include #include "Common/CommonTypes.h" -#include "Core/ELF/PBPReader.h" class FileLoader; diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index ec9e83b92f..851650439f 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -39,7 +39,6 @@ #include "Common/File/VFS/VFS.h" #include "Common/SysError.h" #include "Core/FileSystems/DirectoryFileSystem.h" -#include "Core/FileSystems/ISOFileSystem.h" #include "Core/HLE/sceKernel.h" #include "Core/HW/MemoryStick.h" #include "Core/CoreTiming.h" diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp index 7acbd7372a..820612b5c3 100644 --- a/Core/FileSystems/ISOFileSystem.cpp +++ b/Core/FileSystems/ISOFileSystem.cpp @@ -17,8 +17,6 @@ #include #include -#include -#include #include "Common/CommonTypes.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/FileSystems/ISOFileSystem.h b/Core/FileSystems/ISOFileSystem.h index 4a47ba957b..8514ebdc5b 100644 --- a/Core/FileSystems/ISOFileSystem.h +++ b/Core/FileSystems/ISOFileSystem.h @@ -18,7 +18,6 @@ #pragma once #include -#include #include #include "FileSystem.h" diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp index 03e211392e..015e52197a 100644 --- a/Core/FileSystems/MetaFileSystem.cpp +++ b/Core/FileSystems/MetaFileSystem.cpp @@ -15,9 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include - #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeMap.h" diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index ad5a2ec604..6abc31efb7 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -26,7 +26,6 @@ #include "Common/File/FileUtil.h" #include "Common/File/DirListing.h" -#include "Common/StringUtils.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/SysError.h" diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp index c01a1b6d37..db6f44c9ce 100644 --- a/Core/Font/PGF.cpp +++ b/Core/Font/PGF.cpp @@ -20,16 +20,13 @@ // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code. // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3. -#include #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/Font/PGF.h" -#include "Core/HLE/HLE.h" #include "GPU/GPUCommon.h" -#include "GPU/GPUState.h" // These fonts, created by ttf2pgf, don't have complete glyph info and need to be identified. static bool isJPCSPFont(const char *fontName) { diff --git a/Core/FrameTiming.cpp b/Core/FrameTiming.cpp index efc6690e4c..0c75f41c62 100644 --- a/Core/FrameTiming.cpp +++ b/Core/FrameTiming.cpp @@ -26,6 +26,7 @@ #include "Core/RetroAchievements.h" #include "Core/CoreParameter.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/Config.h" #include "Core/HW/Display.h" #include "Core/FrameTiming.h" diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index a6809cc592..c77802aea6 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -34,9 +34,6 @@ #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/HLE/HLETables.h" -#include "Core/HLE/sceIo.h" -#include "Core/HLE/sceAudio.h" -#include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelInterrupt.h" #include "Core/HLE/HLE.h" diff --git a/Core/HLE/HLEHelperThread.cpp b/Core/HLE/HLEHelperThread.cpp index f37868c17f..cfeba98f92 100644 --- a/Core/HLE/HLEHelperThread.cpp +++ b/Core/HLE/HLEHelperThread.cpp @@ -17,7 +17,6 @@ #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Core/CoreTiming.h" #include "Core/MemMapHelpers.h" #include "Core/HLE/HLE.h" #include "Core/HLE/HLEHelperThread.h" diff --git a/Core/HLE/KernelWaitHelpers.h b/Core/HLE/KernelWaitHelpers.h index 499d340edb..f2abe17c2d 100644 --- a/Core/HLE/KernelWaitHelpers.h +++ b/Core/HLE/KernelWaitHelpers.h @@ -22,6 +22,7 @@ #include #include "Common/CommonTypes.h" +#include "Core/CoreTiming.h" #include "Core/HLE/sceKernelThread.h" namespace HLEKernel diff --git a/Core/HLE/Plugins.h b/Core/HLE/Plugins.h index 4c179fcf56..cfb8d15ffb 100644 --- a/Core/HLE/Plugins.h +++ b/Core/HLE/Plugins.h @@ -19,7 +19,7 @@ #include #include -#include "Input/KeyCodes.h" +#include "Common/Input/KeyCodes.h" class PointerWrap; diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index 50f4cd8e5c..2ea4ae5511 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -37,7 +37,6 @@ #include "GPU/Math3D.h" #include "GPU/GPU.h" #include "GPU/GPUCommon.h" -#include "GPU/GPUState.h" #include "Common/Math/CrossSIMD.h" enum class GPUReplacementSkip { diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 3d39d02bd0..2433e65fac 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -21,6 +21,7 @@ #include "Core/MemMapHelpers.h" #include "Core/Reporting.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/Font/PGF.h" enum { diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index 2de25ca7fb..492ba9811b 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -17,7 +17,6 @@ // This code is part shamelessly "inspired" from JPSCP. #include -#include #include #include "Common/Serialize/SerializeFuncs.h" @@ -33,8 +32,7 @@ #include "Core/Reporting.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" -#include "Core/HLE/sceKernelMemory.h" -#include "Core/Core.h" +#include "Core/System.h" // MPEG AVC elementary stream. static const int MPEG_AVC_ES_SIZE = 2048; // MPEG packet size. diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp index 95c9d19c6f..14c8c7ff04 100644 --- a/Core/HLE/scePower.cpp +++ b/Core/HLE/scePower.cpp @@ -21,11 +21,11 @@ #include "Common/Serialize/SerializeFuncs.h" #include "Core/HLE/HLE.h" #include "Core/HLE/FunctionWrappers.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/Config.h" +#include "Core/System.h" #include "Core/Compatibility.h" #include "Core/HLE/scePower.h" diff --git a/Core/HW/Display.cpp b/Core/HW/Display.cpp index 3048f98e35..182769eabf 100644 --- a/Core/HW/Display.cpp +++ b/Core/HW/Display.cpp @@ -24,7 +24,7 @@ #include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Core/Config.h" -#include "Core/Core.h" +#include "Core/System.h" #include "Core/CoreTiming.h" #include "Core/HLE/sceKernel.h" #include "Core/HW/Display.h" diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index 5370f881c8..81ba147e25 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -17,16 +17,13 @@ #include "Common/Serialize/SerializeFuncs.h" #include "Common/Math/CrossSIMD.h" -#include "Core/Config.h" -#include "Core/Core.h" +#include "Core/System.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/HW/MediaEngine.h" #include "Core/MemMap.h" -#include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "GPU/GPUState.h" // Used by TextureDecoder.h when templates get instanced #include "GPU/Common/TextureDecoder.h" -#include "GPU/GPUCommon.h" #include "Core/HW/SimpleAudioDec.h" #include diff --git a/Core/HW/MemoryStick.cpp b/Core/HW/MemoryStick.cpp index b99e47a753..e4632b5571 100644 --- a/Core/HW/MemoryStick.cpp +++ b/Core/HW/MemoryStick.cpp @@ -15,14 +15,8 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include -#include -#include - #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Common/Thread/ThreadUtil.h" #include "Common/File/DiskFree.h" #include "Common/File/FileUtil.h" #include "Common/File/DirListing.h" diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index dea13c6933..81b9132b8f 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -25,7 +25,7 @@ #include "Core/Config.h" #include "Core/Reporting.h" #include "Core/Util/AudioFormat.h" -#include "Core/Core.h" +#include "Core/System.h" #include "SasAudio.h" static const u8 f[16][2] = { diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 61324125c8..144db032c8 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -19,7 +19,6 @@ #include #include "Common/Serialize/SerializeFuncs.h" -#include "Core/Config.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/HLE/FunctionWrappers.h" #include "Core/HW/SimpleAudioDec.h" diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp index f074251c5d..c727334168 100644 --- a/Core/HW/StereoResampler.cpp +++ b/Core/HW/StereoResampler.cpp @@ -38,14 +38,11 @@ #include "Common/Common.h" #include "Common/System/System.h" -#include "Common/Math/math_util.h" -#include "Common/Serialize/Serializer.h" #include "Common/Log.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/HW/StereoResampler.h" -#include "Core/HLE/__sceAudio.h" #include "Core/Util/AudioFormat.h" // for clamp_u8 #include "Core/System.h" diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index f4b906d0e8..132d4e7cf1 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -15,9 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include - #include "Common/File/AndroidContentURI.h" #include "Common/File/FileUtil.h" #include "Common/File/Path.h" @@ -32,6 +29,7 @@ #include "Core/MemMap.h" #include "Core/Loaders.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/ELF/PBPReader.h" #include "Core/ELF/ParamSFO.h" diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index 55a78fc086..a4a201532f 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -20,7 +20,6 @@ #include #include -#include "Common/Math/math_util.h" #include "Common/CommonTypes.h" #include "Common/Serialize/Serializer.h" @@ -34,6 +33,7 @@ #include "Core/MIPS/IR/IRJit.h" #include "Core/Reporting.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/CoreTiming.h" diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index a85f01a262..a11ac03917 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -17,8 +17,6 @@ #include "ppsspp_config.h" #include -#include -#include #include #include #include @@ -35,7 +33,6 @@ #include "Core/System.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSVFPUUtils.h" -#include "Core/MIPS/MIPSDebugInterface.h" #include "Core/MIPS/MIPSTables.h" #include "Core/MIPS/MIPSAnalyst.h" #include "Core/MIPS/MIPSCodeUtils.h" diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp index 1aceba23e2..971549e9e9 100644 --- a/Core/MIPS/MIPSAsm.cpp +++ b/Core/MIPS/MIPSAsm.cpp @@ -12,10 +12,8 @@ #include "ext/armips/Core/FileManager.h" #endif -#include "Common/Data/Encoding/Utf8.h" #include "Core/Debugger/SymbolMap.h" #include "Core/MemMapHelpers.h" -#include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/MIPS/MIPSAsm.h" namespace MIPSAsm diff --git a/Core/MIPS/MIPSDebugInterface.cpp b/Core/MIPS/MIPSDebugInterface.cpp index 129b4cabfb..b06049ba75 100644 --- a/Core/MIPS/MIPSDebugInterface.cpp +++ b/Core/MIPS/MIPSDebugInterface.cpp @@ -32,8 +32,8 @@ #include "Core/HLE/sceKernelThread.h" #include "Core/MemMap.h" #include "Core/MIPS/MIPSTables.h" -#include "Core/MIPS/MIPS.h" #include "Core/Core.h" +#include "Core/System.h" enum ReferenceIndexType { REF_INDEX_PC = 32, diff --git a/Core/MIPS/MIPSDebugInterface.h b/Core/MIPS/MIPSDebugInterface.h index f71687316b..4dae39a517 100644 --- a/Core/MIPS/MIPSDebugInterface.h +++ b/Core/MIPS/MIPSDebugInterface.h @@ -18,11 +18,12 @@ #pragma once #include -#include #include +#include "Common/Math/expression_parser.h" #include "Core/MIPS/MIPS.h" #include "Core/Debugger/DebugInterface.h" + class MIPSDebugInterface : public DebugInterface { MIPSState *cpu; diff --git a/Core/MIPS/MIPSDis.cpp b/Core/MIPS/MIPSDis.cpp index a9784635d5..a6b9d59145 100644 --- a/Core/MIPS/MIPSDis.cpp +++ b/Core/MIPS/MIPSDis.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/StringUtils.h" #include "Core/HLE/HLE.h" #include "Core/MemMap.h" diff --git a/Core/MIPS/MIPSDisVFPU.cpp b/Core/MIPS/MIPSDisVFPU.cpp index 24b998d33f..d8ac82c247 100644 --- a/Core/MIPS/MIPSDisVFPU.cpp +++ b/Core/MIPS/MIPSDisVFPU.cpp @@ -15,7 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/StringUtils.h" #include "Core/MIPS/MIPS.h" diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp index c80d7ebaae..9ac535b1b8 100644 --- a/Core/MIPS/MIPSInt.cpp +++ b/Core/MIPS/MIPSInt.cpp @@ -34,7 +34,6 @@ #include "Core/HLE/HLE.h" #include "Core/HLE/HLETables.h" #include "Core/HLE/ReplaceTables.h" -#include "Core/System.h" #define R(i) (currentMIPS->r[i]) #define F(i) (currentMIPS->f[i]) diff --git a/Core/MIPS/MIPSInt.h b/Core/MIPS/MIPSInt.h index 039a5f597f..4de0bba488 100644 --- a/Core/MIPS/MIPSInt.h +++ b/Core/MIPS/MIPSInt.h @@ -18,6 +18,7 @@ #pragma once #include "Common/CommonTypes.h" +#include "Core/MIPS/MIPS.h" int MIPS_SingleStep(); diff --git a/Core/MIPS/MIPSIntVFPU.h b/Core/MIPS/MIPSIntVFPU.h index fdd7954aa3..e703a57f7b 100644 --- a/Core/MIPS/MIPSIntVFPU.h +++ b/Core/MIPS/MIPSIntVFPU.h @@ -18,6 +18,7 @@ #pragma once #include "Common/CommonTypes.h" +#include "Core/MIPS/MIPS.h" int MIPS_SingleStep(); diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp index 362ecc0b02..fc9c0303ae 100644 --- a/Core/MIPS/MIPSTables.cpp +++ b/Core/MIPS/MIPSTables.cpp @@ -18,7 +18,6 @@ #include "Common/StringUtils.h" #include "Core/Core.h" -#include "Core/System.h" #include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSDis.h" diff --git a/Core/MIPS/MIPSTables.h b/Core/MIPS/MIPSTables.h index 905c69d6be..5eb0630bf2 100644 --- a/Core/MIPS/MIPSTables.h +++ b/Core/MIPS/MIPSTables.h @@ -18,7 +18,6 @@ #pragma once #include -#include #include "Common/CommonTypes.h" #include "Core/MIPS/MIPS.h" diff --git a/Core/MIPS/MIPSVFPUUtils.cpp b/Core/MIPS/MIPSVFPUUtils.cpp index 850278e650..ef89f89352 100644 --- a/Core/MIPS/MIPSVFPUUtils.cpp +++ b/Core/MIPS/MIPSVFPUUtils.cpp @@ -16,12 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include -#include #include #include "Common/BitScan.h" -#include "Common/CommonFuncs.h" #include "Common/File/VFS/VFS.h" #include "Common/StringUtils.h" #include "Core/Reporting.h" diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 26182005f5..32483fb0fc 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -21,27 +21,22 @@ #include "Common/CommonWindows.h" #endif -#include #include -#include "Common/Common.h" -#include "Common/MemoryUtil.h" +#include "Common/CommonTypes.h" #include "Common/MemArena.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" +#include "Core/System.h" #include "Core/Core.h" -#include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Debugger/SymbolMap.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/HDRemaster.h" -#include "Core/HLE/HLE.h" #include "Core/HLE/ReplaceTables.h" #include "Core/MemMap.h" #include "Core/MemFault.h" #include "Core/MIPS/MIPS.h" -#include "Core/MIPS/JitCommon/JitBlockCache.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Common/Thread/ParallelLoop.h" diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index fc948fccba..298206c65a 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -18,7 +18,6 @@ #include #include "Core/Core.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/Thread/ThreadUtil.h" #include "Common/System/Request.h" @@ -29,8 +28,8 @@ #include "Common/CommonWindows.h" #endif -#include "Core/ELF/ElfReader.h" #include "Core/ELF/ParamSFO.h" +#include "Core/ELF/PBPReader.h" #include "Core/FileSystems/BlockDevices.h" #include "Core/FileSystems/BlobFileSystem.h" @@ -43,19 +42,12 @@ #include "Core/MemMap.h" #include "Core/HDRemaster.h" -#include "Core/MIPS/MIPS.h" -#include "Core/MIPS/MIPSAnalyst.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" #include "Core/PSPLoaders.h" -#include "GPU/Debugger/Playback.h" -#include "Core/HLE/HLE.h" -#include "Core/HLE/sceKernel.h" -#include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelModule.h" -#include "Core/HLE/sceKernelMemory.h" static std::thread g_loadingThread; diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 921838cf30..a4a510be7d 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -12,16 +12,10 @@ // md5_hash(PSP_GAME/EBOOT.BIN) // hash = md5_finalize() -#include -#include -#include -#include -#include #include #include #include #include -#include #include "ext/rcheevos/include/rcheevos.h" #include "ext/rcheevos/include/rc_client.h" @@ -38,8 +32,7 @@ #include "Common/Crypto/md5.h" #include "Common/Log.h" #include "Common/File/Path.h" -#include "Common/File/FileUtil.h" -#include "Common/Net/HTTPClient.h" +#include "Common/Net/HTTPRequest.h" #include "Common/System/OSD.h" #include "Common/System/System.h" #include "Common/System/NativeApp.h" @@ -53,13 +46,9 @@ #include "Core/MemMap.h" #include "Core/Config.h" -#include "Core/CoreParameter.h" #include "Core/Core.h" #include "Core/System.h" -#include "Core/FileLoaders/LocalFileLoader.h" #include "Core/FileSystems/BlockDevices.h" -#include "Core/ELF/ParamSFO.h" -#include "Core/FileSystems/MetaFileSystem.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/RetroAchievements.h" diff --git a/Core/RetroAchievements.h b/Core/RetroAchievements.h index 2a09036828..85034abea2 100644 --- a/Core/RetroAchievements.h +++ b/Core/RetroAchievements.h @@ -9,15 +9,9 @@ #pragma once -#include -#include #include -#include -#include #include -#include -#include "Common/StringUtils.h" #include "Common/CommonTypes.h" #include "Core/Loaders.h" // for IdentifiedFileType diff --git a/Core/Screenshot.cpp b/Core/Screenshot.cpp index d30a99aa4f..5f85441e2e 100644 --- a/Core/Screenshot.cpp +++ b/Core/Screenshot.cpp @@ -17,7 +17,6 @@ #include "ppsspp_config.h" -#include #include #include "ext/jpge/jpge.h" @@ -26,13 +25,11 @@ #include "Common/File/Path.h" #include "Common/Log.h" #include "Common/System/Display.h" -#include "Core/Config.h" #include "Core/Screenshot.h" -#include "Core/Core.h" +#include "Core/System.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/GPUCommon.h" -#include "GPU/GPUState.h" // This is used to make non-ASCII paths work for filename. // Technically only needed on Windows. diff --git a/Core/System.cpp b/Core/System.cpp index f2549495a1..ff3f88ef0b 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -22,15 +22,12 @@ #include "Common/CommonWindows.h" #include #include -#include #if !PPSSPP_PLATFORM(UWP) #include "Windows/W32Util/ShellUtil.h" #endif #endif -#include #include -#include #include "ext/lua/lapi.h" @@ -39,9 +36,6 @@ #include "Common/File/Path.h" #include "Common/File/FileUtil.h" #include "Common/File/DirListing.h" -#include "Common/Math/math_util.h" -#include "Common/Thread/ThreadUtil.h" -#include "Common/Data/Encoding/Utf8.h" #include "Common/TimeUtil.h" #include "Common/GraphicsContext.h" @@ -57,8 +51,6 @@ #include "Core/HLE/Plugins.h" #include "Core/HLE/ReplaceTables.h" #include "Core/HLE/sceKernel.h" -#include "Core/HLE/sceKernelMemory.h" -#include "Core/HLE/sceAudio.h" #include "Core/Config.h" #include "Core/Core.h" #include "Core/CoreTiming.h" @@ -70,10 +62,7 @@ #include "Core/ELF/ParamSFO.h" #include "Core/SaveState.h" #include "Common/ExceptionHandlerSetup.h" -#include "Core/HLE/sceAudiocodec.h" -#include "GPU/GPUState.h" #include "GPU/GPUCommon.h" -#include "GPU/Debugger/Stepping.h" #include "GPU/Debugger/RecordFormat.h" #include "Core/RetroAchievements.h" diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp index 623dd2f320..77143280d1 100644 --- a/Core/Util/PortManager.cpp +++ b/Core/Util/PortManager.cpp @@ -25,20 +25,18 @@ // All credit goes to him and the official miniupnp project! http://miniupnp.free.fr/ -#include -#include #include #include #include #include "Common/TimeUtil.h" #include "Common/Data/Text/I18n.h" -#include "Common/Net/Resolve.h" #include "Common/Thread/ThreadUtil.h" #include "Common/System/OSD.h" #include "Common/Log.h" #include "Core/Config.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/ELF/ParamSFO.h" #include "Core/Util/PortManager.h" diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h index 8993e61139..68bfcfe9ef 100644 --- a/GPU/GPUCommon.h +++ b/GPU/GPUCommon.h @@ -14,7 +14,6 @@ #include "GPU/GPUState.h" #include "GPU/Debugger/Record.h" #include "GPU/Debugger/Breakpoints.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Common/ShaderCommon.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/GPUDefinitions.h" diff --git a/GPU/Software/BinManager.cpp b/GPU/Software/BinManager.cpp index 68d95a156c..ba66476e1c 100644 --- a/GPU/Software/BinManager.cpp +++ b/GPU/Software/BinManager.cpp @@ -16,7 +16,6 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include #include #include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadManager.h" diff --git a/GPU/Software/Clipper.cpp b/GPU/Software/Clipper.cpp index ad07285992..13544071a7 100644 --- a/GPU/Software/Clipper.cpp +++ b/GPU/Software/Clipper.cpp @@ -15,8 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include - #include "GPU/GPUState.h" #include "GPU/Software/BinManager.h" diff --git a/GPU/Software/DrawPixel.cpp b/GPU/Software/DrawPixel.cpp index ec5b3b707c..2620683469 100644 --- a/GPU/Software/DrawPixel.cpp +++ b/GPU/Software/DrawPixel.cpp @@ -20,7 +20,6 @@ #include "Common/Common.h" #include "Common/Data/Convert/ColorConv.h" #include "Core/Config.h" -#include "GPU/GPUState.h" #include "GPU/Software/BinManager.h" #include "GPU/Software/DrawPixel.h" #include "GPU/Software/FuncId.h" diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index 51c6979b97..87d0210e2e 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -16,7 +16,6 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ppsspp_config.h" -#include #include #include "Common/Common.h" @@ -37,10 +36,7 @@ #include "GPU/Software/SoftGpu.h" #include "GPU/Software/TransformUnit.h" -#if defined(_M_SSE) -#include -#include -#endif +#include "Common/Math/CrossSIMD.h" namespace Rasterizer { diff --git a/GPU/Software/RasterizerRectangle.cpp b/GPU/Software/RasterizerRectangle.cpp index dc87a8b80d..d5d1ca6b4f 100644 --- a/GPU/Software/RasterizerRectangle.cpp +++ b/GPU/Software/RasterizerRectangle.cpp @@ -1,38 +1,23 @@ // See comment in header for the purpose of the code in this file. #include "ppsspp_config.h" -#include #include #include "Common/Common.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Profiler/Profiler.h" -#include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Debugger/MemBlockInfo.h" -#include "Core/MemMap.h" #include "Core/System.h" #include "GPU/GPUState.h" -#include "GPU/Common/TextureCacheCommon.h" #include "GPU/Software/BinManager.h" #include "GPU/Software/DrawPixel.h" #include "GPU/Software/Rasterizer.h" #include "GPU/Software/Sampler.h" #include "GPU/Software/SoftGpu.h" - -#if defined(_M_SSE) -#include -#endif - -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif +#include "Common/Math/CrossSIMD.h" extern DSStretch g_DarkStalkerStretch; // For Darkstalkers hack. Ugh. diff --git a/GPU/Software/Sampler.cpp b/GPU/Software/Sampler.cpp index dae2c93118..631f15edb8 100644 --- a/GPU/Software/Sampler.cpp +++ b/GPU/Software/Sampler.cpp @@ -21,27 +21,14 @@ #include "Common/Common.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/LogReporting.h" -#include "Common/StringUtils.h" +#include "Common/Math/CrossSIMD.h" #include "Core/Config.h" #include "GPU/Common/TextureDecoder.h" -#include "GPU/GPUState.h" #include "GPU/Software/BinManager.h" #include "GPU/Software/Rasterizer.h" #include "GPU/Software/RasterizerRegCache.h" #include "GPU/Software/Sampler.h" -#if defined(_M_SSE) -#include -#endif - -#if PPSSPP_ARCH(ARM_NEON) -#if defined(_MSC_VER) && PPSSPP_ARCH(ARM64) -#include -#else -#include -#endif -#endif - using namespace Math3D; using namespace Rasterizer; diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index 24815f867e..9c82bef5cb 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -28,11 +28,9 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/MemMap.h" -#include "Core/MemMapHelpers.h" -#include "Core/HLE/sceKernelInterrupt.h" -#include "Core/HLE/sceGe.h" #include "Core/MIPS/MIPS.h" #include "Core/Util/PPGeDraw.h" #include "Common/Profiler/Profiler.h" @@ -47,7 +45,6 @@ #include "GPU/Common/PresentationCommon.h" #include "Common/GPU/ShaderTranslation.h" #include "GPU/Common/SplineCommon.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Debugger/Record.h" const int FB_WIDTH = 480; diff --git a/GPU/Software/TransformUnit.cpp b/GPU/Software/TransformUnit.cpp index 18ff0572f9..d6dde859e1 100644 --- a/GPU/Software/TransformUnit.cpp +++ b/GPU/Software/TransformUnit.cpp @@ -16,26 +16,18 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include - #include "Common/Common.h" #include "Common/CPUDetect.h" #include "Common/Math/math_util.h" #include "Common/MemoryUtil.h" #include "Common/Profiler/Profiler.h" -#include "Core/Config.h" #include "GPU/GPUState.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/SoftwareTransformCommon.h" -#include "GPU/Common/SplineCommon.h" -#include "GPU/Common/TextureDecoder.h" -#include "GPU/Debugger/Debugger.h" #include "GPU/Software/BinManager.h" #include "GPU/Software/Clipper.h" -#include "GPU/Software/FuncId.h" #include "GPU/Software/Lighting.h" -#include "GPU/Software/Rasterizer.h" #include "GPU/Software/RasterizerRectangle.h" #include "GPU/Software/TransformUnit.h" diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index 2cf3225600..cc27eaaefc 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -25,7 +25,7 @@ #include "Common/StringUtils.h" #include "Common/System/System.h" #include "Common/System/Request.h" -#include "Core/Core.h" +#include "Core/System.h" #include "Core/Config.h" #include "Core/CwCheat.h" #include "Core/MIPS/JitCommon/JitCommon.h" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index f0c6b015cb..6468a7def2 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -17,16 +17,13 @@ #include "ppsspp_config.h" -#include #include using namespace std::placeholders; #include "Common/Render/TextureAtlas.h" #include "Common/GPU/OpenGL/GLFeatures.h" -#include "Common/Render/Text/draw_text.h" #include "Common/File/FileUtil.h" -#include "Common/Battery/Battery.h" #include "Common/File/VFS/VFS.h" #include "Common/UI/Root.h" #include "Common/UI/UI.h" @@ -41,11 +38,11 @@ using namespace std::placeholders; #include "Common/Log.h" #include "Common/System/Display.h" #include "Common/System/System.h" -#include "Common/System/NativeApp.h" #include "Common/System/Request.h" #include "Common/System/OSD.h" #include "Common/Profiler/Profiler.h" #include "Common/Math/curves.h" +#include "Common/StringUtils.h" #include "Common/TimeUtil.h" #ifndef MOBILE_DEVICE diff --git a/UI/ImDebugger/ImDebugger.h b/UI/ImDebugger/ImDebugger.h index 01901fb931..f1363d6a0f 100644 --- a/UI/ImDebugger/ImDebugger.h +++ b/UI/ImDebugger/ImDebugger.h @@ -110,6 +110,8 @@ struct ImSnapshotState { u32 ll; }; +class IniFile; + struct ImConfig { // Defaults for saved settings are set in SyncConfig. diff --git a/UI/ImDebugger/ImDisasmView.cpp b/UI/ImDebugger/ImDisasmView.cpp index b5209e10df..49b5901682 100644 --- a/UI/ImDebugger/ImDisasmView.cpp +++ b/UI/ImDebugger/ImDisasmView.cpp @@ -14,8 +14,7 @@ #include "Core/MemMap.h" #include "Common/System/Request.h" -#include "Core/Core.h" -#include "Core/CoreParameter.h" +#include "Core/System.h" #include "UI/ImDebugger/ImDisasmView.h" #include "UI/ImDebugger/ImDebugger.h" diff --git a/UI/ImDebugger/ImMemView.cpp b/UI/ImDebugger/ImMemView.cpp index e871876729..6a42948306 100644 --- a/UI/ImDebugger/ImMemView.cpp +++ b/UI/ImDebugger/ImMemView.cpp @@ -302,9 +302,6 @@ void ImMemView::ProcessKeyboardShortcuts(bool focused) { } void ImMemView::onChar(int c) { - if (!PSP_IsInited()) - return; - ImGuiIO& io = ImGui::GetIO(); if (io.KeyMods & ImGuiMod_Ctrl) { @@ -703,9 +700,6 @@ bool ImMemView::ParseSearchString(const std::string &query, bool asHex, std::vec std::vector ImMemView::searchString(const std::string &searchQuery) { std::vector searchResAddrs; - if (!PSP_IsInited()) - return searchResAddrs; - std::vector searchData; if (!ParseSearchString(searchQuery, false, searchData)) return searchResAddrs; diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index c537ac89b1..893bdb80a3 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -9,15 +9,14 @@ #include "Common/Render/DrawBuffer.h" #include "Common/Math/math_util.h" #include "Common/UI/IconCache.h" +#include "Common/StringUtils.h" #include "UI/RetroAchievementScreens.h" #include "UI/DebugOverlay.h" -#include "UI/Root.h" #include "Common/UI/Context.h" #include "Common/System/OSD.h" #include "Common/TimeUtil.h" -#include "Common/Net/HTTPClient.h" #include "Core/Config.h" static inline const char *DeNull(const char *ptr) { diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index 9e5170c44f..8cd08072ce 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -5,6 +5,7 @@ #include "Common/UI/Context.h" #include "Common/Data/Text/I18n.h" #include "Common/UI/IconCache.h" +#include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/RetroAchievements.h" diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp index 71d05e81d6..dc8bfba1af 100644 --- a/Windows/Debugger/CtrlDisAsmView.cpp +++ b/Windows/Debugger/CtrlDisAsmView.cpp @@ -1,6 +1,5 @@ #include "Windows/resource.h" #include "Core/MemMap.h" -#include "Core/MIPS/JitCommon/JitCommon.h" #include "Windows/W32Util/ContextMenu.h" #include "Windows/W32Util/Misc.h" #include "Windows/W32Util/ShellUtil.h" @@ -15,7 +14,6 @@ #include "Core/Reporting.h" #include "Common/StringUtils.h" #include "Windows/Debugger/CtrlDisAsmView.h" -#include "Windows/Debugger/Debugger_MemoryDlg.h" #include "Windows/Debugger/DebuggerShared.h" #include "Windows/Debugger/BreakpointWindow.h" #include "Windows/Debugger/EditSymbolsWindow.h" @@ -24,10 +22,8 @@ #include "Common/CommonWindows.h" #include "Common/Data/Encoding/Utf8.h" -#include "ext/xxhash.h" #include "Common/System/Display.h" -#include #include #include diff --git a/Windows/Debugger/CtrlDisAsmView.h b/Windows/Debugger/CtrlDisAsmView.h index aa8541349c..c9c980a33f 100644 --- a/Windows/Debugger/CtrlDisAsmView.h +++ b/Windows/Debugger/CtrlDisAsmView.h @@ -15,7 +15,7 @@ // CtrlDisAsmView::getFrom(GetDlgItem(yourdialog, IDC_yourid)). #include -#include +#include #include "Common/CommonWindows.h" #include "Common/Log.h" diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp index 413dbc3fe0..bd378cc8a7 100644 --- a/Windows/Debugger/CtrlMemView.cpp +++ b/Windows/Debugger/CtrlMemView.cpp @@ -1,12 +1,11 @@ #include -#include #include -#include #include #include "ext/xxhash.h" #include "Common/StringUtils.h" #include "Core/Config.h" +#include "Core/System.h" #include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/RetroAchievements.h" diff --git a/Windows/Debugger/DumpMemoryWindow.cpp b/Windows/Debugger/DumpMemoryWindow.cpp index 2100add7fe..3837d5d34d 100644 --- a/Windows/Debugger/DumpMemoryWindow.cpp +++ b/Windows/Debugger/DumpMemoryWindow.cpp @@ -3,9 +3,9 @@ #include #include "Common/Data/Encoding/Utf8.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/HLE/ReplaceTables.h" #include "Core/MemMap.h" -#include "Core/MIPS/JitCommon/JitBlockCache.h" #include "Core/MIPS/MIPSDebugInterface.h" #include "Windows/Debugger/DumpMemoryWindow.h" #include "Windows/resource.h" diff --git a/Windows/GPU/WindowsGLContext.cpp b/Windows/GPU/WindowsGLContext.cpp index b61d26ad89..d0a649f18b 100644 --- a/Windows/GPU/WindowsGLContext.cpp +++ b/Windows/GPU/WindowsGLContext.cpp @@ -28,9 +28,9 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Core.h" +#include "Core/System.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Data/Text/I18n.h" -#include "UI/OnScreenDisplay.h" #include "ext/glslang/glslang/Public/ShaderLang.h" #include "Windows/W32Util/Misc.h" diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index e6a19b4c42..8700e9c973 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -13,6 +13,7 @@ #include "XinputDevice.h" #include "Core/Config.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/KeyMap.h" #include "Core/HLE/sceCtrl.h" @@ -253,7 +254,6 @@ void XinputDevice::ApplyButtons(int pad, const XINPUT_STATE &state) { } } - void XinputDevice::ApplyVibration(int pad, XINPUT_VIBRATION &vibration) { if (PSP_IsInited()) { newVibrationTime_ = time_now_d(); diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp index 108f877e33..22bc6df980 100644 --- a/unittest/JitHarness.cpp +++ b/unittest/JitHarness.cpp @@ -33,6 +33,7 @@ #include "Core/MIPS/MIPSVFPUUtils.h" #include "Core/MemMap.h" #include "Core/Core.h" +#include "Core/System.h" #include "Core/CoreTiming.h" #include "Core/Config.h" #include "Core/HLE/HLE.h"