From b003108b8bf5b6e4be9e42690d1a35f757e6eba5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 8 Jun 2017 01:55:01 -0400 Subject: [PATCH 1/2] Core: Add WiimoteCommon headers to the VS project --- Source/Core/Core/Core.vcxproj | 3 +++ Source/Core/Core/Core.vcxproj.filters | 12 ++++++++++++ Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h | 6 +++++- Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h | 9 +++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 2b3023c830..cedd34890a 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -415,6 +415,9 @@ + + + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 37e0d70794..c6e22c76af 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -160,6 +160,9 @@ {f0b52c84-49f4-470a-b037-edeea5634b9e} + + {ee6645da-3ad9-4fe7-809f-e4646d0b0ca5} + @@ -1526,6 +1529,15 @@ IOS\Network\NCD + + HW %28Flipper/Hollywood%29\WiimoteCommon + + + HW %28Flipper/Hollywood%29\WiimoteCommon + + + HW %28Flipper/Hollywood%29\WiimoteCommon + diff --git a/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h b/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h index 2812ef5427..09673b5f8a 100644 --- a/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h +++ b/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h @@ -6,8 +6,8 @@ #include "Common/CommonTypes.h" -// what is this ? #ifdef _MSC_VER +#pragma warning(push) #pragma warning(disable : 4200) #endif @@ -32,3 +32,7 @@ constexpr u8 HID_PARAM_INPUT = 1; constexpr u8 HID_PARAM_OUTPUT = 2; #pragma pack(pop) + +#ifdef _MSC_VER +#pragma warning(pop) +#endif diff --git a/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h b/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h index 64044046af..3a7da9188a 100644 --- a/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h +++ b/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h @@ -8,6 +8,11 @@ #include "Common/CommonTypes.h" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4200) +#endif + typedef std::vector Report; // Report defines @@ -498,3 +503,7 @@ struct wm_speaker_data }; static_assert(sizeof(wm_speaker_data) == 21, "Wrong size"); #pragma pack(pop) + +#ifdef _MSC_VER +#pragma warning(pop) +#endif From dd4203bec87a4e89320765900049b74454f27c43 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 8 Jun 2017 00:53:59 -0400 Subject: [PATCH 2/2] Core: Remove unnecessary includes Also moves a cpp file's related header file to the top of the inclusions if it isn't already there. --- Source/Core/Core/ActionReplay.cpp | 4 ++-- Source/Core/Core/Boot/Boot.cpp | 3 --- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 1 - Source/Core/Core/Boot/Boot_WiiWAD.cpp | 1 - Source/Core/Core/Config/Config.cpp | 4 ++-- Source/Core/Core/Config/GraphicsSettings.cpp | 3 ++- Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp | 4 ++-- Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp | 3 ++- Source/Core/Core/ConfigLoaders/GameConfigLoader.h | 1 + Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 3 ++- Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp | 5 ++--- Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp | 8 ++------ Source/Core/Core/ConfigManager.cpp | 4 ++-- Source/Core/Core/CoreTiming.cpp | 3 ++- Source/Core/Core/DSP/DSPCaptureLogger.cpp | 4 ++-- Source/Core/Core/DSP/DSPCodeUtil.cpp | 3 ++- Source/Core/Core/DSPEmulator.cpp | 4 ++-- Source/Core/Core/Debugger/Debugger_SymbolMap.cpp | 3 ++- Source/Core/Core/Debugger/Dump.cpp | 4 ++-- Source/Core/Core/Debugger/PPCDebugInterface.cpp | 1 - Source/Core/Core/FifoPlayer/FifoDataFile.cpp | 4 ++-- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 4 ++-- Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp | 4 ++-- Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 4 ++-- Source/Core/Core/GeckoCode.cpp | 3 ++- Source/Core/Core/HLE/HLE.cpp | 5 ++--- Source/Core/Core/HLE/HLE_Misc.cpp | 1 + Source/Core/Core/HLE/HLE_OS.cpp | 4 ++-- Source/Core/Core/HW/AudioInterface.cpp | 3 ++- Source/Core/Core/HW/CPU.cpp | 6 ++---- Source/Core/Core/HW/DSP.cpp | 5 +++-- Source/Core/Core/HW/DSPHLE/DSPHLE.cpp | 9 ++++----- Source/Core/Core/HW/DSPHLE/DSPHLE.h | 1 + Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp | 3 --- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 3 --- Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp | 3 ++- Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp | 4 +++- Source/Core/Core/HW/DVD/DVDInterface.cpp | 3 ++- Source/Core/Core/HW/DVD/DVDInterface.h | 1 + Source/Core/Core/HW/DVD/DVDThread.cpp | 3 ++- Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp | 4 ++-- Source/Core/Core/HW/EXI/EXI_DeviceMic.h | 3 ++- Source/Core/Core/HW/HW.cpp | 5 ++--- Source/Core/Core/HW/MMIO.cpp | 3 ++- Source/Core/Core/HW/Memmap.cpp | 3 ++- Source/Core/Core/HW/MemoryInterface.cpp | 1 + Source/Core/Core/HW/ProcessorInterface.cpp | 3 ++- Source/Core/Core/HW/ProcessorInterface.h | 1 + Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp | 2 -- Source/Core/Core/HW/StreamADPCM.cpp | 1 + Source/Core/Core/HW/SystemTimers.cpp | 1 + Source/Core/Core/HW/WII_IPC.cpp | 1 + Source/Core/Core/HW/WiimoteEmu/Encryption.cpp | 3 ++- Source/Core/Core/HotkeyManager.cpp | 1 - Source/Core/Core/IOS/DI/DI.cpp | 3 ++- Source/Core/Core/IOS/Device.cpp | 3 ++- Source/Core/Core/IOS/DeviceStub.cpp | 1 + Source/Core/Core/IOS/ES/Identity.cpp | 1 - Source/Core/Core/IOS/ES/TitleInformation.cpp | 4 ---- Source/Core/Core/IOS/FS/FS.cpp | 4 ++-- Source/Core/Core/IOS/FS/FileIO.cpp | 3 ++- Source/Core/Core/IOS/IOSC.cpp | 3 ++- Source/Core/Core/IOS/MIOS.cpp | 4 ++-- Source/Core/Core/IOS/Network/SSL.cpp | 3 ++- Source/Core/Core/IOS/Network/Socket.cpp | 4 +++- Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp | 3 ++- Source/Core/Core/IOS/STM/STM.cpp | 1 - Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp | 4 ++-- Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp | 4 ++-- Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp | 3 ++- Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp | 1 + Source/Core/Core/IOS/USB/Host.cpp | 3 ++- Source/Core/Core/IOS/USB/LibusbDevice.cpp | 4 ++-- Source/Core/Core/IOS/USB/OH0/OH0Device.cpp | 3 ++- Source/Core/Core/IOS/USB/USBV5.cpp | 3 ++- Source/Core/Core/Movie.cpp | 3 --- Source/Core/Core/NetPlayServer.cpp | 2 -- Source/Core/Core/PatchEngine.cpp | 3 ++- .../Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp | 1 + .../PowerPC/CachedInterpreter/InterpreterBlockCache.cpp | 1 + Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp | 3 ++- Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 1 + Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp | 3 ++- Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp | 3 ++- Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp | 1 - Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp | 1 - Source/Core/Core/PowerPC/MMU.cpp | 1 - Source/Core/Core/PowerPC/PPCAnalyst.cpp | 4 ++-- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 4 ++-- Source/Core/Core/PowerPC/PPCTables.cpp | 1 - Source/Core/Core/PowerPC/Profiler.cpp | 1 + Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp | 4 ++-- Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp | 4 ++-- Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp | 4 ++-- Source/Core/Core/State.cpp | 3 ++- Source/Core/Core/TitleDatabase.cpp | 4 ++-- 97 files changed, 148 insertions(+), 138 deletions(-) diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index 1b5bac61b9..dde8130704 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -19,6 +19,8 @@ // copy, etc // ------------------------------------------------------------------------------------------------------------- +#include "Core/ActionReplay.h" + #include #include #include @@ -36,9 +38,7 @@ #include "Common/StringUtil.h" #include "Core/ARDecrypt.h" -#include "Core/ActionReplay.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/PowerPC/PowerPC.h" namespace ActionReplay diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 7e09f45e1f..aedd11c417 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -26,8 +26,6 @@ #include "Core/Boot/DolReader.h" #include "Core/Boot/ElfReader.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/FifoPlayer/FifoPlayer.h" #include "Core/HLE/HLE.h" #include "Core/HW/DVD/DVDInterface.h" @@ -40,7 +38,6 @@ #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/SignatureDB/SignatureDB.h" #include "DiscIO/Enums.h" #include "DiscIO/NANDContentLoader.h" diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 3e56831470..0692a31f33 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -25,7 +25,6 @@ #include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/Formats.h" #include "Core/IOS/IOS.h" -#include "Core/PatchEngine.h" #include "Core/PowerPC/PowerPC.h" #include "DiscIO/Enums.h" diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index 3a7cb62e8d..b13a4e0e10 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -20,7 +20,6 @@ #include "Core/IOS/ES/Formats.h" #include "Core/IOS/FS/FileIO.h" #include "Core/IOS/IOS.h" -#include "Core/PatchEngine.h" #include "DiscIO/NANDContentLoader.h" diff --git a/Source/Core/Core/Config/Config.cpp b/Source/Core/Core/Config/Config.cpp index 2c6aecf96f..f4d5991c23 100644 --- a/Source/Core/Core/Config/Config.cpp +++ b/Source/Core/Core/Config/Config.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include - #include "Core/Config/Config.h" +#include + namespace Config { bool ConfigLocation::operator==(const ConfigLocation& other) const diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index 870fb1971c..7a24556d67 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/Config/GraphicsSettings.h" + #include #include "Core/Config/Config.h" -#include "Core/Config/GraphicsSettings.h" #include "VideoCommon/VideoConfig.h" namespace Config diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp index 189e69a28a..e19e868f7c 100644 --- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp @@ -2,13 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigLoaders/BaseConfigLoader.h" + #include #include #include #include #include -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" @@ -16,7 +17,6 @@ #include "Common/Logging/Log.h" #include "Core/Config/Config.h" -#include "Core/ConfigLoaders/BaseConfigLoader.h" #include "Core/ConfigLoaders/IsSettingSaveable.h" namespace ConfigLoaders diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp index 39af481ae1..d4275097d4 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigLoaders/GameConfigLoader.h" + #include #include #include @@ -22,7 +24,6 @@ #include "Core/Config/Config.h" #include "Core/Config/GraphicsSettings.h" -#include "Core/ConfigLoaders/GameConfigLoader.h" #include "Core/ConfigLoaders/IsSettingSaveable.h" namespace ConfigLoaders diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h index 174e4060a0..db1fe33409 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h @@ -6,6 +6,7 @@ #include #include +#include #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index 8bc491add8..22247c486f 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigLoaders/IsSettingSaveable.h" + #include #include #include "Core/Config/Config.h" #include "Core/Config/GraphicsSettings.h" -#include "Core/ConfigLoaders/IsSettingSaveable.h" namespace ConfigLoaders { diff --git a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp index 53e4d83399..5ce90d1673 100644 --- a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp @@ -2,18 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigLoaders/MovieConfigLoader.h" + #include #include #include #include "Common/CommonFuncs.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" -#include "Common/IniFile.h" -#include "Core/ConfigLoaders/MovieConfigLoader.h" #include "Core/Movie.h" namespace ConfigLoaders diff --git a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp index 5f01159b60..f64929239f 100644 --- a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp @@ -2,15 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigLoaders/NetPlayConfigLoader.h" + #include -#include "Common/CommonPaths.h" #include "Common/Config/Config.h" -#include "Common/FileUtil.h" -#include "Common/IniFile.h" -#include "Common/Logging/Log.h" - -#include "Core/ConfigLoaders/NetPlayConfigLoader.h" #include "Core/NetPlayProto.h" namespace ConfigLoaders diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index dcb34bacf4..7d10bf17c7 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/ConfigManager.h" + #include #include #include @@ -24,8 +26,6 @@ #include "Core/Analytics.h" #include "Core/Boot/Boot.h" -#include "Core/Config/Config.h" -#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/HLE/HLE.h" diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index 61f0d86e24..3da6bc12d3 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/CoreTiming.h" + #include #include #include @@ -18,7 +20,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/CoreTiming.h" #include "Core/PowerPC/PowerPC.h" #include "VideoCommon/Fifo.h" diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.cpp b/Source/Core/Core/DSP/DSPCaptureLogger.cpp index 84afed65b8..f3206505f6 100644 --- a/Source/Core/Core/DSP/DSPCaptureLogger.cpp +++ b/Source/Core/Core/DSP/DSPCaptureLogger.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPCaptureLogger.h" + #include #include #include @@ -10,8 +12,6 @@ #include "Common/File.h" #include "Common/PcapFile.h" -#include "Core/DSP/DSPCaptureLogger.h" - namespace DSP { // Definition of the packet structures stored in PCAP capture files. diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index b1ff9b7b8b..78a1611d9f 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPCodeUtil.h" + #include #include #include @@ -14,7 +16,6 @@ #include "Common/Swap.h" #include "Core/DSP/DSPAssembler.h" -#include "Core/DSP/DSPCodeUtil.h" #include "Core/DSP/DSPDisassembler.h" namespace DSP diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp index c4ed3c57c6..477fcb8774 100644 --- a/Source/Core/Core/DSPEmulator.cpp +++ b/Source/Core/Core/DSPEmulator.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSPEmulator.h" + #include -#include "Core/DSPEmulator.h" #include "Core/HW/DSPHLE/DSPHLE.h" -#include "Core/HW/DSPHLE/UCodes/UCodes.h" #include "Core/HW/DSPLLE/DSPLLE.h" std::unique_ptr CreateDSPEmulator(bool hle) diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index bd2a71a2bd..5099adb176 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/Debugger/Debugger_SymbolMap.h" + #include #include #include @@ -10,7 +12,6 @@ #include "Common/StringUtil.h" #include "Core/Core.h" -#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCSymbolDB.h" diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp index fc5adef2f7..7df86e05ce 100644 --- a/Source/Core/Core/Debugger/Dump.cpp +++ b/Source/Core/Core/Debugger/Dump.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/Debugger/Dump.h" + #include #include #include "Common/CommonTypes.h" #include "Common/File.h" -#include "Core/Debugger/Dump.h" - CDump::CDump(const std::string& filename) : m_pData(nullptr) { File::IOFile pStream(filename, "rb"); diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index a47fe9a33a..428ce694b1 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -12,7 +12,6 @@ #include "Core/Core.h" #include "Core/HW/DSP.h" -#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index e827ffda3a..af693688f8 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/FifoPlayer/FifoDataFile.h" + #include #include #include @@ -10,8 +12,6 @@ #include "Common/File.h" -#include "Core/FifoPlayer/FifoDataFile.h" - enum { FILE_ID = 0x0d01f1f0, diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index e4d4d34396..f84b783e68 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/FifoPlayer/FifoPlayer.h" + #include #include -#include "Core/FifoPlayer/FifoPlayer.h" - #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index 46019f7124..d57637076e 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/FifoPlayer/FifoRecordAnalyzer.h" + #include #include -#include "Core/FifoPlayer/FifoRecordAnalyzer.h" - #include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoRecorder.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index 3b6ac26446..8f08c6f158 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/FifoPlayer/FifoRecorder.h" + #include #include #include -#include "Core/FifoPlayer/FifoRecorder.h" - #include "Common/MsgHandler.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index bed9e3ea7a..66e5a0c8c6 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/GeckoCode.h" + #include #include #include @@ -13,7 +15,6 @@ #include "Common/FileUtil.h" #include "Core/ConfigManager.h" -#include "Core/GeckoCode.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index 5fb7fac59c..1573e292d8 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -2,16 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HLE/HLE.h" + #include #include #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/GeckoCode.h" -#include "Core/HLE/HLE.h" #include "Core/HLE/HLE_Misc.h" #include "Core/HLE/HLE_OS.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index ce1295e06f..7523836d00 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/HLE/HLE_Misc.h" + #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index 12a5ec1370..1d4af91ff8 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HLE/HLE_OS.h" + #include #include @@ -9,9 +11,7 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "Core/HLE/HLE_OS.h" #include "Core/HLE/HLE_VarArgs.h" -#include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" namespace HLE_OS diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp index a7397be4ac..f2e99eb9b9 100644 --- a/Source/Core/Core/HW/AudioInterface.cpp +++ b/Source/Core/Core/HW/AudioInterface.cpp @@ -37,13 +37,14 @@ This file mainly deals with the [Drive I/F], however [AIDFR] controls TODO maybe the files should be merged? */ +#include "Core/HW/AudioInterface.h" + #include #include "AudioCommon/AudioCommon.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/CoreTiming.h" -#include "Core/HW/AudioInterface.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index 14a8249829..93b768f6fd 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -2,17 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/CPU.h" + #include #include #include "AudioCommon/AudioCommon.h" #include "Common/CommonTypes.h" #include "Common/Event.h" -#include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Core/Core.h" -#include "Core/HW/CPU.h" -#include "Core/HW/Memmap.h" #include "Core/Host.h" #include "Core/PowerPC/PowerPC.h" #include "VideoCommon/Fifo.h" diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index 4795eb6b87..d1b96e4c11 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -22,6 +22,8 @@ // the just used buffer through the AXList (or whatever it might be called in // Nintendo games). +#include "Core/HW/DSP.h" + #include #include "AudioCommon/AudioCommon.h" @@ -31,11 +33,10 @@ #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/DSPEmulator.h" -#include "Core/HW/DSP.h" + #include "Core/HW/MMIO.h" #include "Core/HW/Memmap.h" #include "Core/HW/ProcessorInterface.h" -#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" namespace DSP diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index 8cd2fd1836..6784477ed7 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include "Core/HW/DSPHLE/DSPHLE.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Core/Core.h" -#include "Core/HW/DSPHLE/DSPHLE.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" #include "Core/HW/SystemTimers.h" @@ -16,9 +15,9 @@ namespace DSP { namespace HLE { -DSPHLE::DSPHLE() -{ -} +DSPHLE::DSPHLE() = default; + +DSPHLE::~DSPHLE() = default; bool DSPHLE::Initialize(bool wii, bool dsp_thread) { diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index 1a07d77786..e3da25b0fd 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -23,6 +23,7 @@ class DSPHLE : public DSPEmulator { public: DSPHLE(); + ~DSPHLE(); bool Initialize(bool wii, bool dsp_thread) override; void Shutdown() override; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp index 6154e885a1..5ac0473d45 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp @@ -12,11 +12,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" -#include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/DSP/DSPCodeUtil.h" #include "Core/HW/DSPHLE/DSPHLE.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index bc13291112..ced544be98 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -14,11 +14,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/File.h" -#include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/ConfigManager.h" #include "Core/DSP/DSPCodeUtil.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp index c3914e1772..7a7ffb0996 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp @@ -2,13 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/DSPLLE/DSPLLEGlobals.h" + #include #include "Common/CommonTypes.h" #include "Common/File.h" #include "Core/DSP/DSPCore.h" -#include "Core/HW/DSPLLE/DSPLLEGlobals.h" namespace DSP { diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp index abc2f4b0d2..844f24b6db 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp @@ -2,10 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/DSPLLE/DSPSymbols.h" + #include #include #include #include +#include #include "Common/CommonTypes.h" #include "Common/File.h" @@ -13,7 +16,6 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPDisassembler.h" -#include "Core/HW/DSPLLE/DSPSymbols.h" namespace DSP { diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index ee02b90533..4876ba6063 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/DVD/DVDInterface.h" + #include #include #include @@ -20,7 +22,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/HW/AudioInterface.h" -#include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/DVD/DVDMath.h" #include "Core/HW/DVD/DVDThread.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/HW/DVD/DVDInterface.h b/Source/Core/Core/HW/DVD/DVDInterface.h index e620eded85..cc29e76c25 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.h +++ b/Source/Core/Core/HW/DVD/DVDInterface.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include #include diff --git a/Source/Core/Core/HW/DVD/DVDThread.cpp b/Source/Core/Core/HW/DVD/DVDThread.cpp index 8d6c5479cf..33fdc279c4 100644 --- a/Source/Core/Core/HW/DVD/DVDThread.cpp +++ b/Source/Core/Core/HW/DVD/DVDThread.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/DVD/DVDThread.h" + #include #include #include @@ -25,7 +27,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/HW/DVD/DVDInterface.h" -#include "Core/HW/DVD/DVDThread.h" #include "Core/HW/DVD/FileMonitor.h" #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp index 8da1bd2c4d..15d8088267 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp @@ -31,7 +31,6 @@ #include "Core/HW/SystemTimers.h" #include "Core/Movie.h" #include "DiscIO/Enums.h" -#include "DiscIO/NANDContentLoader.h" namespace ExpansionInterface { diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp index eca7eb2637..4f7540c971 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/EXI/EXI_DeviceMic.h" + #include #include #include @@ -13,8 +15,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Core/HW/EXI/EXI_DeviceMic.h" - #include "Core/CoreTiming.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/GCPad.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI/EXI_DeviceMic.h index 7f43798538..6a37f3b91f 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMic.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.h @@ -5,7 +5,8 @@ #pragma once #include -#include "Common/Common.h" + +#include "Common/CommonTypes.h" #include "Core/HW/EXI/EXI_Device.h" struct cubeb; diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index 253883d9b1..988bf977a9 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/HW.h" + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/HW/AudioInterface.h" #include "Core/HW/CPU.h" @@ -14,7 +15,6 @@ #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/GPFifo.h" -#include "Core/HW/HW.h" #include "Core/HW/Memmap.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI/SI.h" @@ -22,7 +22,6 @@ #include "Core/HW/VideoInterface.h" #include "Core/HW/WII_IPC.h" #include "Core/IOS/IOS.h" -#include "Core/Movie.h" #include "Core/State.h" namespace HW diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index a6dcdeebd6..5f52ef3392 100644 --- a/Source/Core/Core/HW/MMIO.cpp +++ b/Source/Core/Core/HW/MMIO.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/MMIO.h" + #include #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Core/HW/MMIO.h" #include "Core/HW/MMIOHandlers.h" namespace MMIO diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index ac69e4cd6c..804cee9cb1 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -7,6 +7,8 @@ // However, if a JITed instruction (for example lwz) wants to access a bad memory area that call // may be redirected here (for example to Read_U32()). +#include "Core/HW/Memmap.h" + #include #include #include @@ -22,7 +24,6 @@ #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/MMIO.h" -#include "Core/HW/Memmap.h" #include "Core/HW/MemoryInterface.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI/SI.h" diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp index 313742be6b..c57c4f29f9 100644 --- a/Source/Core/Core/HW/MemoryInterface.cpp +++ b/Source/Core/Core/HW/MemoryInterface.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/HW/MemoryInterface.h" + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index 4f0d7e8c65..30b5fad71c 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/ProcessorInterface.h" + #include #include @@ -10,7 +12,6 @@ #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/HW/MMIO.h" -#include "Core/HW/ProcessorInterface.h" #include "Core/HW/SystemTimers.h" #include "Core/IOS/IOS.h" #include "Core/IOS/STM/STM.h" diff --git a/Source/Core/Core/HW/ProcessorInterface.h b/Source/Core/Core/HW/ProcessorInterface.h index 3f42105358..d487504719 100644 --- a/Source/Core/Core/HW/ProcessorInterface.h +++ b/Source/Core/Core/HW/ProcessorInterface.h @@ -5,6 +5,7 @@ #pragma once #include "Common/CommonTypes.h" + class PointerWrap; namespace MMIO diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp index ccc20a3e6d..a199e98a1b 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp @@ -7,8 +7,6 @@ #include #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/GCPad.h" diff --git a/Source/Core/Core/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp index be130adc84..d3e3dbf5a7 100644 --- a/Source/Core/Core/HW/StreamADPCM.cpp +++ b/Source/Core/Core/HW/StreamADPCM.cpp @@ -5,6 +5,7 @@ // Adapted from in_cube by hcs & destop #include "Core/HW/StreamADPCM.h" + #include "Common/CommonTypes.h" #include "Common/MathUtil.h" diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 935a65efad..a9198d64dd 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -44,6 +44,7 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule: */ #include "Core/HW/SystemTimers.h" + #include "Common/Atomic.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp index 870b251bae..1e190f9ac0 100644 --- a/Source/Core/Core/HW/WII_IPC.cpp +++ b/Source/Core/Core/HW/WII_IPC.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/HW/WII_IPC.h" + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp index 9d6bdc1fd9..8e19716108 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp @@ -4,10 +4,11 @@ // // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com) +#include "Core/HW/WiimoteEmu/Encryption.h" + #include #include "Common/CommonTypes.h" -#include "Core/HW/WiimoteEmu/Encryption.h" static const u8 ans_tbl[7][6] = { {0xA8, 0x77, 0xA6, 0xE0, 0xF7, 0x43}, {0x5A, 0x35, 0x85, 0xE2, 0x72, 0x97}, diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 5ea2b48619..b323845e5a 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -16,7 +16,6 @@ #include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/IOS/DI/DI.cpp b/Source/Core/Core/IOS/DI/DI.cpp index 4e3f258603..39311960fd 100644 --- a/Source/Core/Core/IOS/DI/DI.cpp +++ b/Source/Core/Core/IOS/DI/DI.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/DI/DI.h" + #include #include #include @@ -14,7 +16,6 @@ #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/DVD/DVDThread.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/DI/DI.h" #include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/Formats.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/Core/IOS/Device.cpp b/Source/Core/Core/IOS/Device.cpp index 917da1b8de..c5da4c662c 100644 --- a/Source/Core/Core/IOS/Device.cpp +++ b/Source/Core/Core/IOS/Device.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/Device.h" + #include #include @@ -9,7 +11,6 @@ #include "Common/StringUtil.h" #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" -#include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" namespace IOS diff --git a/Source/Core/Core/IOS/DeviceStub.cpp b/Source/Core/Core/IOS/DeviceStub.cpp index ea82d09cbc..7f3cf5106b 100644 --- a/Source/Core/Core/IOS/DeviceStub.cpp +++ b/Source/Core/Core/IOS/DeviceStub.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/IOS/DeviceStub.h" + #include "Common/Logging/Log.h" namespace IOS diff --git a/Source/Core/Core/IOS/ES/Identity.cpp b/Source/Core/Core/IOS/ES/Identity.cpp index 832bd302bc..eb58e9c656 100644 --- a/Source/Core/Core/IOS/ES/Identity.cpp +++ b/Source/Core/Core/IOS/ES/Identity.cpp @@ -7,7 +7,6 @@ #include #include -#include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" #include "Core/IOS/ES/Formats.h" diff --git a/Source/Core/Core/IOS/ES/TitleInformation.cpp b/Source/Core/Core/IOS/ES/TitleInformation.cpp index 583c9d5aca..4312c9d2c3 100644 --- a/Source/Core/Core/IOS/ES/TitleInformation.cpp +++ b/Source/Core/Core/IOS/ES/TitleInformation.cpp @@ -9,13 +9,9 @@ #include #include -#include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Common/NandPaths.h" -#include "Common/StringUtil.h" #include "Core/HW/Memmap.h" #include "Core/IOS/ES/Formats.h" -#include "DiscIO/NANDContentLoader.h" namespace IOS { diff --git a/Source/Core/Core/IOS/FS/FS.cpp b/Source/Core/Core/IOS/FS/FS.cpp index a34be31199..0dffca2e9d 100644 --- a/Source/Core/Core/IOS/FS/FS.cpp +++ b/Source/Core/Core/IOS/FS/FS.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/FS/FS.h" + #include #include #include @@ -17,10 +19,8 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/NandPaths.h" -#include "Common/StringUtil.h" #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" -#include "Core/IOS/FS/FS.h" #include "Core/IOS/FS/FileIO.h" namespace IOS diff --git a/Source/Core/Core/IOS/FS/FileIO.cpp b/Source/Core/Core/IOS/FS/FileIO.cpp index 0d8baa4c6f..71b41eec61 100644 --- a/Source/Core/Core/IOS/FS/FileIO.cpp +++ b/Source/Core/Core/IOS/FS/FileIO.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/FS/FileIO.h" + #include #include #include @@ -15,7 +17,6 @@ #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/FS/FileIO.h" #include "Core/IOS/IOS.h" namespace IOS diff --git a/Source/Core/Core/IOS/IOSC.cpp b/Source/Core/Core/IOS/IOSC.cpp index 17dbe4471d..16d1734a29 100644 --- a/Source/Core/Core/IOS/IOSC.cpp +++ b/Source/Core/Core/IOS/IOSC.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/IOSC.h" + #include #include #include @@ -21,7 +23,6 @@ #include "Common/ScopeGuard.h" #include "Common/Swap.h" #include "Core/IOS/Device.h" -#include "Core/IOS/IOSC.h" #include "Core/ec_wii.h" namespace IOS diff --git a/Source/Core/Core/IOS/MIOS.cpp b/Source/Core/Core/IOS/MIOS.cpp index 47a4fd5f6d..b2a2ab0918 100644 --- a/Source/Core/Core/IOS/MIOS.cpp +++ b/Source/Core/Core/IOS/MIOS.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/MIOS.h" + #include #include #include @@ -22,11 +24,9 @@ #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" #include "Core/IOS/ES/Formats.h" -#include "Core/IOS/MIOS.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #include "DiscIO/NANDContentLoader.h" -#include "DiscIO/Volume.h" namespace IOS { diff --git a/Source/Core/Core/IOS/Network/SSL.cpp b/Source/Core/Core/IOS/Network/SSL.cpp index f135b4938a..f7f175b8fe 100644 --- a/Source/Core/Core/IOS/Network/SSL.cpp +++ b/Source/Core/Core/IOS/Network/SSL.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/Network/SSL.h" + #include #include #include @@ -17,7 +19,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/Network/SSL.h" #include "Core/IOS/Network/Socket.h" namespace IOS diff --git a/Source/Core/Core/IOS/Network/Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp index 6b57a1ebb3..7422dd960b 100644 --- a/Source/Core/Core/IOS/Network/Socket.cpp +++ b/Source/Core/Core/IOS/Network/Socket.cpp @@ -2,6 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +// No Wii socket support while using NetPlay or TAS +#include "Core/IOS/Network/Socket.h" + #include #include #ifndef _WIN32 @@ -18,7 +21,6 @@ #include "Core/Core.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" -#include "Core/IOS/Network/Socket.h" // No Wii socket support while using NetPlay or TAS #ifdef _WIN32 #define ERRORCODE(name) WSA##name diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index 0b894b1edf..8e1689c9e6 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/SDIO/SDIOSlot0.h" + #include #include #include @@ -16,7 +18,6 @@ #include "Core/ConfigManager.h" #include "Core/HW/Memmap.h" #include "Core/IOS/IOS.h" -#include "Core/IOS/SDIO/SDIOSlot0.h" namespace IOS { diff --git a/Source/Core/Core/IOS/STM/STM.cpp b/Source/Core/Core/IOS/STM/STM.cpp index b9c02c1f79..e64c7757bd 100644 --- a/Source/Core/Core/IOS/STM/STM.cpp +++ b/Source/Core/Core/IOS/STM/STM.cpp @@ -7,7 +7,6 @@ #include #include -#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/Logging/Log.h" #include "Core/Core.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index 876bcdff0c..baaee5440b 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/Bluetooth/BTEmu.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include "Common/Assert.h" -#include "Common/CommonPaths.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/NandPaths.h" @@ -24,7 +25,6 @@ #include "Core/Host.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" -#include "Core/IOS/USB/Bluetooth/BTEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" namespace IOS diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp index a66a46a9fb..10dfa93596 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/Bluetooth/BTReal.h" + #include #include #include @@ -16,7 +18,6 @@ #include -#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" @@ -28,7 +29,6 @@ #include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/IOS/Device.h" -#include "Core/IOS/USB/Bluetooth/BTReal.h" #include "Core/IOS/USB/Bluetooth/hci.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index 4e8d935fcb..c140161372 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" + #include #include #include @@ -17,7 +19,6 @@ #include "Core/HW/Wiimote.h" #include "Core/Host.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h" -#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h" #include "Core/IOS/USB/Bluetooth/l2cap.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp index 7d25836560..c493131fb1 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h" + #include "Common/Assert.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/IOS/USB/Host.cpp b/Source/Core/Core/IOS/USB/Host.cpp index cba1cc4c95..e918d789ad 100644 --- a/Source/Core/Core/IOS/USB/Host.cpp +++ b/Source/Core/Core/IOS/USB/Host.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/Host.h" + #include #include #include @@ -21,7 +23,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/IOS/USB/Common.h" -#include "Core/IOS/USB/Host.h" #include "Core/IOS/USB/LibusbDevice.h" namespace IOS diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.cpp b/Source/Core/Core/IOS/USB/LibusbDevice.cpp index 3c8476174e..ca4cdfec33 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.cpp +++ b/Source/Core/Core/IOS/USB/LibusbDevice.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/LibusbDevice.h" + #include #include #include @@ -16,11 +18,9 @@ #include "Common/Assert.h" #include "Common/Logging/Log.h" -#include "Core/CoreTiming.h" #include "Core/HW/Memmap.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" -#include "Core/IOS/USB/LibusbDevice.h" namespace IOS { diff --git a/Source/Core/Core/IOS/USB/OH0/OH0Device.cpp b/Source/Core/Core/IOS/USB/OH0/OH0Device.cpp index 72e9908b38..ab1cafc25b 100644 --- a/Source/Core/Core/IOS/USB/OH0/OH0Device.cpp +++ b/Source/Core/Core/IOS/USB/OH0/OH0Device.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/OH0/OH0Device.h" + #include #include #include @@ -11,7 +13,6 @@ #include "Common/ChunkFile.h" #include "Core/IOS/IOS.h" #include "Core/IOS/USB/OH0/OH0.h" -#include "Core/IOS/USB/OH0/OH0Device.h" namespace IOS { diff --git a/Source/Core/Core/IOS/USB/USBV5.cpp b/Source/Core/Core/IOS/USB/USBV5.cpp index aa6d9bf98b..df81c11014 100644 --- a/Source/Core/Core/IOS/USB/USBV5.cpp +++ b/Source/Core/Core/IOS/USB/USBV5.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/IOS/USB/USBV5.h" + #include #include #include @@ -9,7 +11,6 @@ #include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "Core/IOS/Device.h" -#include "Core/IOS/USB/USBV5.h" namespace IOS { diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index b37386c1d8..7241becd47 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -39,20 +39,17 @@ #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI/SI.h" #include "Core/HW/Wiimote.h" -#include "Core/HW/WiimoteCommon/WiimoteHid.h" #include "Core/HW/WiimoteCommon/WiimoteReport.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/NetPlayProto.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/State.h" #include "DiscIO/Enums.h" #include "InputCommon/GCPadStatus.h" -#include "VideoCommon/Fifo.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 1e86cf0e2d..c961be5bc4 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -15,12 +15,10 @@ #include "Common/Common.h" #include "Common/ENetUtil.h" #include "Common/FileUtil.h" -#include "Common/IniFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "Core/HW/EXI/EXI_DeviceIPL.h" #include "Core/HW/Sram.h" #include "Core/NetPlayClient.h" //for NetPlayUI #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index e2bb9ce143..91975528ab 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -6,6 +6,8 @@ // Supports simple memory patches, and has a partial Action Replay implementation // in ActionReplay.cpp/h. +#include "Core/PatchEngine.h" + #include #include #include @@ -20,7 +22,6 @@ #include "Core/ConfigManager.h" #include "Core/GeckoCode.h" #include "Core/GeckoCodeConfig.h" -#include "Core/PatchEngine.h" #include "Core/PowerPC/PowerPC.h" namespace PatchEngine diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp index 214ce53a51..0067a7f3f4 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/PowerPC/CachedInterpreter/CachedInterpreter.h" + #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/InterpreterBlockCache.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/InterpreterBlockCache.cpp index f5ed742744..aa8b4706ed 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/InterpreterBlockCache.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/InterpreterBlockCache.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/PowerPC/CachedInterpreter/InterpreterBlockCache.h" + #include "Core/PowerPC/JitCommon/JitBase.h" BlockCache::BlockCache(JitBase& jit) : JitBaseBlockCache{jit} diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index f1e24b6113..8d2216aff7 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/Interpreter/Interpreter.h" + #include #include #include @@ -18,7 +20,6 @@ #include "Core/HLE/HLE.h" #include "Core/HW/CPU.h" #include "Core/Host.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index bcf0e801dd..68434f1789 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/PowerPC/Jit64/JitAsm.h" + #include "Common/CommonTypes.h" #include "Common/JitRegister.h" #include "Common/x64ABI.h" diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp index e9db74a0ad..b932db49b0 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/Jit64/JitRegCache.h" + #include #include #include @@ -13,7 +15,6 @@ #include "Common/MsgHandler.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/Jit.h" -#include "Core/PowerPC/Jit64/JitRegCache.h" #include "Core/PowerPC/PowerPC.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp index 24db1f12c4..72d11bcf85 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/Jit64Common/ConstantPool.h" + #include #include #include #include "Common/Assert.h" -#include "Core/PowerPC/Jit64Common/ConstantPool.h" ConstantPool::ConstantPool() = default; diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp index 57901bdb0f..1d8ce07be4 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp @@ -6,7 +6,6 @@ #include -#include "Common/Assert.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/JitRegister.h" diff --git a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp index 25848a1a24..bb9405daca 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp @@ -14,7 +14,6 @@ #include "Core/PowerPC/Jit64Common/Jit64Base.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/Jit64Common/TrampolineInfo.h" -#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index 9df3483223..b5e2448617 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -11,7 +11,6 @@ #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/HW/CPU.h" #include "Core/HW/GPFifo.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index c34cfd72fc..fd3aebf23f 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/PPCAnalyst.h" + #include #include #include @@ -13,8 +15,6 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "Core/PowerPC/JitCommon/JitCache.h" -#include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index 52408c6f62..dfdc79917e 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/PPCSymbolDB.h" + #include #include #include @@ -11,9 +13,7 @@ #include "Common/File.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Core/PowerPC/PPCAnalyst.h" -#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/SignatureDB/SignatureDB.h" diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index 26c10d0a69..0237d10786 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -19,7 +19,6 @@ #include "Common/StringUtil.h" #include "Core/PowerPC/Interpreter/Interpreter.h" -#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" std::array m_infoTable; diff --git a/Source/Core/Core/PowerPC/Profiler.cpp b/Source/Core/Core/PowerPC/Profiler.cpp index 72d0a3d0e1..25a31cf740 100644 --- a/Source/Core/Core/PowerPC/Profiler.cpp +++ b/Source/Core/Core/PowerPC/Profiler.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Core/PowerPC/Profiler.h" + #include #include "Core/PowerPC/JitInterface.h" diff --git a/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp index ee03ddeeb4..08373847be 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/SignatureDB/CSVSignatureDB.h" + #include #include #include @@ -10,8 +12,6 @@ #include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Core/PowerPC/SignatureDB/CSVSignatureDB.h" - // CSV separated with tabs // Checksum | Size | Symbol | [Object Location |] Object Name bool CSVSignatureDB::Load(const std::string& file_path) diff --git a/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp index 267d235738..db1b82d47b 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/SignatureDB/DSYSignatureDB.h" + #include #include #include @@ -10,8 +12,6 @@ #include "Common/File.h" #include "Common/Logging/Log.h" -#include "Core/PowerPC/SignatureDB/DSYSignatureDB.h" - namespace { // On-disk format for SignatureDB entries. diff --git a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp index fc9ab89f87..3b8e296ac8 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp @@ -2,16 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/SignatureDB/SignatureDB.h" + #include #include #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" -#include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/SignatureDB/SignatureDB.h" // Format Handlers #include "Core/PowerPC/SignatureDB/CSVSignatureDB.h" diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 931cad413e..92b7abb6ea 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/State.h" + #include #include #include @@ -31,7 +33,6 @@ #include "Core/Movie.h" #include "Core/NetPlayClient.h" #include "Core/PowerPC/PowerPC.h" -#include "Core/State.h" #include "VideoCommon/AVIDump.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/Core/TitleDatabase.cpp b/Source/Core/Core/TitleDatabase.cpp index fee6e13f68..bf5ce2fddf 100644 --- a/Source/Core/Core/TitleDatabase.cpp +++ b/Source/Core/Core/TitleDatabase.cpp @@ -2,14 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/TitleDatabase.h" + #include #include #include #include #include -#include "Core/TitleDatabase.h" - #include "Common/FileUtil.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h"