From 97cd42f5c3e57470af253b405a953d8074e367c1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Oct 2013 00:32:18 -0400 Subject: [PATCH] Remove some unnecessary includes as well as simplifying exisiting ones if possible. --- Source/Core/AudioCommon/Src/NullSoundStream.cpp | 2 +- Source/Core/AudioCommon/Src/NullSoundStream.h | 2 +- Source/Core/AudioCommon/Src/OpenALStream.h | 2 +- Source/Core/Common/Src/BreakPoints.h | 6 +++--- Source/Core/Common/Src/CDUtils.h | 2 -- Source/Core/Common/Src/ConsoleListener.cpp | 5 +---- Source/Core/Common/Src/DebugInterface.h | 1 - Source/Core/Common/Src/ExtendedTrace.h | 1 - Source/Core/Common/Src/FPURoundMode.h | 2 +- Source/Core/Common/Src/SDCardUtil.h | 2 +- Source/Core/Common/Src/Timer.h | 2 +- Source/Core/Core/Src/ARDecrypt.h | 3 --- Source/Core/Core/Src/Boot/Boot.cpp | 3 --- Source/Core/Core/Src/Boot/Boot.h | 2 +- Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp | 1 - Source/Core/Core/Src/Boot/Boot_DOL.h | 2 +- Source/Core/Core/Src/Core.cpp | 1 - Source/Core/Core/Src/Core.h | 2 +- Source/Core/Core/Src/DSP/DSPEmitter.cpp | 1 - Source/Core/Core/Src/DSP/DSPInterpreter.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp | 3 --- Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp | 1 - Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp | 3 --- Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp | 1 - Source/Core/Core/Src/HLE/HLE.h | 2 +- Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h | 1 + Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h | 1 - Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp | 2 -- Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h | 2 -- Source/Core/Core/Src/HW/DVDInterface.h | 2 +- Source/Core/Core/Src/HW/EXI.h | 2 +- Source/Core/Core/Src/HW/EXI_Channel.h | 2 +- Source/Core/Core/Src/HW/EXI_Device.h | 2 +- Source/Core/Core/Src/HW/GCPad.cpp | 1 - Source/Core/Core/Src/HW/ProcessorInterface.h | 2 +- Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp | 3 --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 3 --- Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 3 --- Source/Core/Core/Src/HW/Sram.h | 2 +- Source/Core/Core/Src/HW/SystemTimers.h | 2 +- Source/Core/Core/Src/HW/VideoInterface.h | 2 +- Source/Core/Core/Src/MemTools.h | 2 +- .../Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp | 1 - .../Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp | 1 - Source/Core/Core/Src/PowerPC/PPCAnalyst.h | 6 +++--- Source/Core/Core/Src/PowerPC/PPCCache.h | 2 +- Source/Core/Core/Src/PowerPC/PPCSymbolDB.h | 2 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 2 -- Source/Core/Core/Src/PowerPC/SignatureDB.h | 2 +- Source/Core/Core/Src/ec_wii.cpp | 1 - Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp | 1 - Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | 1 - Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp | 1 - Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp | 1 - Source/Core/InputCommon/Src/GCPadStatus.h | 2 -- Source/Core/InputCommon/Src/InputConfig.h | 2 -- Source/Core/VideoBackends/OGL/Src/GLUtil.cpp | 1 - Source/Core/VideoBackends/OGL/Src/Render.cpp | 2 -- Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp | 2 -- Source/Core/VideoBackends/OGL/Src/VertexManager.cpp | 1 - Source/Core/VideoBackends/Software/Src/SWRenderer.cpp | 1 - Source/Core/VideoCommon/Src/BPStructs.cpp | 1 - Source/Core/VideoCommon/Src/CommandProcessor.cpp | 1 - Source/Core/VideoCommon/Src/VertexLoader.cpp | 2 -- Source/Core/VideoCommon/Src/VertexShaderGen.h | 1 - 69 files changed, 30 insertions(+), 98 deletions(-) diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.cpp b/Source/Core/AudioCommon/Src/NullSoundStream.cpp index 95a9da4349..fd8be94511 100644 --- a/Source/Core/AudioCommon/Src/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/NullSoundStream.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "AudioCommon.h" +#include "CommonTypes.h" #include "NullSoundStream.h" #include "../../Core/Src/HW/SystemTimers.h" #include "../../Core/Src/HW/AudioInterface.h" diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.h b/Source/Core/AudioCommon/Src/NullSoundStream.h index a20c1e0d12..b82a584cde 100644 --- a/Source/Core/AudioCommon/Src/NullSoundStream.h +++ b/Source/Core/AudioCommon/Src/NullSoundStream.h @@ -5,8 +5,8 @@ #ifndef _NULLSOUNDSTREAM_H_ #define _NULLSOUNDSTREAM_H_ +#include #include "SoundStream.h" -#include "Thread.h" #define BUF_SIZE (48000 * 4 / 32) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index 24217169bd..0fd8f933a7 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -5,7 +5,7 @@ #ifndef _OPENALSTREAM_H_ #define _OPENALSTREAM_H_ -#include "Common.h" +#include "CommonTypes.h" #include "SoundStream.h" #include "Thread.h" diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h index cc4f1fcbfb..a17cce5341 100644 --- a/Source/Core/Common/Src/BreakPoints.h +++ b/Source/Core/Common/Src/BreakPoints.h @@ -8,7 +8,7 @@ #include #include -#include "Common.h" +#include "CommonTypes.h" class DebugInterface; @@ -67,7 +67,7 @@ public: void Remove(u32 _iAddress); void Clear(); - void DeleteByAddress(u32 _Address); + void DeleteByAddress(u32 _Address); private: TBreakPoints m_BreakPoints; @@ -93,7 +93,7 @@ public: // memory breakpoint TMemCheck *GetMemCheck(u32 address); - void Remove(u32 _Address); + void Remove(u32 _Address); void Clear() { m_MemChecks.clear(); }; }; diff --git a/Source/Core/Common/Src/CDUtils.h b/Source/Core/Common/Src/CDUtils.h index 34b41a0d4f..a458477fef 100644 --- a/Source/Core/Common/Src/CDUtils.h +++ b/Source/Core/Common/Src/CDUtils.h @@ -1,10 +1,8 @@ #ifndef _CDUTILS_H_ #define _CDUTILS_H_ -#include #include #include -#include // Returns a pointer to an array of strings with the device names std::vector cdio_get_devices(); diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp index 9a924d4beb..d793f7261b 100644 --- a/Source/Core/Common/Src/ConsoleListener.cpp +++ b/Source/Core/Common/Src/ConsoleListener.cpp @@ -3,18 +3,15 @@ // Refer to the license.txt file included. #include // min +#include #include // System: To be able to add strings with "+" #include #include #ifdef _WIN32 #include #include -#else -#include #endif -#include "Common.h" -#include "LogManager.h" // Common #include "ConsoleListener.h" // Common ConsoleListener::ConsoleListener() diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h index 317cd0bb43..81b2d0852b 100644 --- a/Source/Core/Common/Src/DebugInterface.h +++ b/Source/Core/Common/Src/DebugInterface.h @@ -2,7 +2,6 @@ #define _DEBUGINTERFACE_H #include -#include class DebugInterface { diff --git a/Source/Core/Common/Src/ExtendedTrace.h b/Source/Core/Common/Src/ExtendedTrace.h index 6d33eb632d..d4da486fd3 100644 --- a/Source/Core/Common/Src/ExtendedTrace.h +++ b/Source/Core/Common/Src/ExtendedTrace.h @@ -18,7 +18,6 @@ #if defined(WIN32) #include -#include #include diff --git a/Source/Core/Common/Src/FPURoundMode.h b/Source/Core/Common/Src/FPURoundMode.h index 2e26047689..4dc18012dd 100644 --- a/Source/Core/Common/Src/FPURoundMode.h +++ b/Source/Core/Common/Src/FPURoundMode.h @@ -16,7 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #ifndef FPU_ROUND_MODE_H_ #define FPU_ROUND_MODE_H_ -#include "Common.h" +#include "CommonTypes.h" namespace FPURoundMode { diff --git a/Source/Core/Common/Src/SDCardUtil.h b/Source/Core/Common/Src/SDCardUtil.h index 4c88c0b30b..3497b4a91d 100644 --- a/Source/Core/Common/Src/SDCardUtil.h +++ b/Source/Core/Common/Src/SDCardUtil.h @@ -15,6 +15,6 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" +#include "CommonTypes.h" bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename); diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h index 920a001282..3055246f8e 100644 --- a/Source/Core/Common/Src/Timer.h +++ b/Source/Core/Common/Src/Timer.h @@ -5,7 +5,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#include "Common.h" +#include "CommonTypes.h" #include namespace Common diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h index 45004edfa3..c42cf8dc3e 100644 --- a/Source/Core/Core/Src/ARDecrypt.h +++ b/Source/Core/Core/Src/ARDecrypt.h @@ -5,9 +5,6 @@ #ifndef _ARDECRYPT_H_ #define _ARDECRYPT_H_ -#include -#include -#include #include #include "Common.h" #include "ActionReplay.h" diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 1d53f9814b..dc4daec2a9 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -12,13 +12,11 @@ #include "../PowerPC/PowerPC.h" #include "../PowerPC/PPCAnalyst.h" #include "../Core.h" -#include "../HW/HW.h" #include "../HW/EXI_DeviceIPL.h" #include "../HW/Memmap.h" #include "../HW/ProcessorInterface.h" #include "../HW/DVDInterface.h" #include "../HW/VideoInterface.h" -#include "../HW/CPU.h" #include "../IPC_HLE/WII_IPC_HLE.h" #include "../Debugger/Debugger_SymbolMap.h" // Debugger @@ -30,7 +28,6 @@ #include "../PatchEngine.h" #include "../PowerPC/SignatureDB.h" #include "../PowerPC/PPCSymbolDB.h" -#include "../MemTools.h" #include "../ConfigManager.h" #include "VolumeCreator.h" // DiscIO diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h index 94b26273a8..da24177865 100644 --- a/Source/Core/Core/Src/Boot/Boot.h +++ b/Source/Core/Core/Src/Boot/Boot.h @@ -5,9 +5,9 @@ #ifndef _BOOT_H #define _BOOT_H +#include #include -#include "Common.h" #include "../CoreParameter.h" class CBoot diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index f06dd5bcb0..c7b8483b25 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -14,7 +14,6 @@ #include "../HW/DVDInterface.h" #include "../HW/CPU.h" -#include "../Host.h" #include "../VolumeHandler.h" #include "../PatchEngine.h" #include "../MemTools.h" diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.h b/Source/Core/Core/Src/Boot/Boot_DOL.h index 690a58eefd..1ac886e0f3 100644 --- a/Source/Core/Core/Src/Boot/Boot_DOL.h +++ b/Source/Core/Core/Src/Boot/Boot_DOL.h @@ -5,7 +5,7 @@ #ifndef _BOOT_DOL_H #define _BOOT_DOL_H -#include "Common.h" +#include "CommonTypes.h" class CDolLoader { diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index a47af4bd05..09375b9736 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -16,7 +16,6 @@ #include "MathUtil.h" #include "MemoryUtil.h" -#include "Console.h" #include "Core.h" #include "CPUDetect.h" #include "CoreTiming.h" diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h index 0fe904ffc1..8de14caa7f 100644 --- a/Source/Core/Core/Src/Core.h +++ b/Source/Core/Core/Src/Core.h @@ -15,7 +15,7 @@ #include #include -#include "Common.h" +#include "CommonTypes.h" #include "CoreParameter.h" namespace Core diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp index a63d17628b..c20feca9ac 100644 --- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp @@ -10,7 +10,6 @@ #include "DSPHost.h" #include "DSPInterpreter.h" #include "DSPAnalyzer.h" -#include "Jit/DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp index 4a841b41e5..d7a4eb1be4 100644 --- a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp @@ -24,7 +24,6 @@ ====================================================================*/ #include "DSPTables.h" -#include "DSPHost.h" #include "DSPCore.h" #include "DSPAnalyzer.h" diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp index dbb185844e..f362c00d3f 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp @@ -8,9 +8,6 @@ #include "../DSPIntUtil.h" #include "../DSPEmitter.h" #include "../DSPAnalyzer.h" -#ifdef _M_X64 -#include "DSPJitUtil.h" -#endif #include "x64Emitter.h" #include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp index 70bb3618e6..8af884dee0 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp @@ -6,7 +6,6 @@ #include "../DSPEmitter.h" #include "../DSPStacks.h" #include "../DSPAnalyzer.h" -#include "DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp index ff3180e92c..4ca285037b 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp @@ -9,7 +9,6 @@ #include "../DSPIntUtil.h" #include "../DSPEmitter.h" -#include "DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp index 149387db6d..d5b426e629 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp @@ -4,7 +4,6 @@ #include "../DSPMemoryMap.h" #include "../DSPEmitter.h" -#include "DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp index 9197659aaf..730ab60d7f 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp @@ -7,7 +7,6 @@ #include "../DSPIntCCUtil.h" #include "../DSPIntUtil.h" #include "../DSPEmitter.h" -#include "DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp index 09b87be54a..9a93daa626 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp @@ -4,7 +4,6 @@ #include "../DSPIntUtil.h" #include "../DSPEmitter.h" -#include "DSPJitUtil.h" #include "x64Emitter.h" #include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp index bfdba2ed7e..0de992742f 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp @@ -10,9 +10,6 @@ #include "../DSPIntUtil.h" #include "../DSPEmitter.h" #include "../DSPAnalyzer.h" -#ifdef _M_X64 -#include "DSPJitUtil.h" -#endif #include "x64Emitter.h" #include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp index 2b84297832..dc8f0d9adf 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp @@ -10,7 +10,6 @@ #include "../PowerPC/PowerPC.h" #include "../PowerPC/PPCAnalyst.h" #include "../PowerPC/PPCSymbolDB.h" -#include "PowerPCDisasm.h" namespace Dolphin_Debugger { diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h index 32b79268b7..6c4c46ff4b 100644 --- a/Source/Core/Core/Src/HLE/HLE.h +++ b/Source/Core/Core/Src/HLE/HLE.h @@ -6,7 +6,7 @@ #define _HLE_H #include -#include "Common.h" +#include "CommonTypes.h" namespace HLE { diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h index d1d204c9bb..2773b86870 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h @@ -6,6 +6,7 @@ #define _DSPDEBUGINTERFACE_H #include +#include #include "DebugInterface.h" #include "Common.h" diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h index eca1e8a245..281402297e 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h @@ -7,7 +7,6 @@ #include "Common.h" #include "AudioCommon.h" -#include // TODO: Get rid of this file. diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp index a813d3c019..a0afc516dd 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include - #include #include #include diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h index 003475b956..d4d8cdd242 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h @@ -8,8 +8,6 @@ #include "Common.h" #include "SymbolDB.h" -#include - namespace DSPSymbols { class DSPSymbolDB : public SymbolDB diff --git a/Source/Core/Core/Src/HW/DVDInterface.h b/Source/Core/Core/Src/HW/DVDInterface.h index 2eb3b7e377..8d9648510b 100644 --- a/Source/Core/Core/Src/HW/DVDInterface.h +++ b/Source/Core/Core/Src/HW/DVDInterface.h @@ -5,7 +5,7 @@ #ifndef _DVDINTERFACE_H #define _DVDINTERFACE_H -#include "Common.h" +#include "CommonTypes.h" class PointerWrap; namespace DVDInterface diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h index 013a049010..5043526d24 100644 --- a/Source/Core/Core/Src/HW/EXI.h +++ b/Source/Core/Core/Src/HW/EXI.h @@ -5,7 +5,7 @@ #ifndef _EXIINTERFACE_H #define _EXIINTERFACE_H -#include "Common.h" +#include "CommonTypes.h" #include "EXI_Channel.h" #include "Thread.h" class PointerWrap; diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h index ca6cb1e176..403dbfe0dc 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.h +++ b/Source/Core/Core/Src/HW/EXI_Channel.h @@ -5,7 +5,7 @@ #ifndef _EXICHANNEL_H #define _EXICHANNEL_H -#include "Common.h" +#include "CommonTypes.h" #include "EXI_Device.h" diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h index e2a39154f5..0b48405033 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.h +++ b/Source/Core/Core/Src/HW/EXI_Device.h @@ -5,7 +5,7 @@ #ifndef _EXIDEVICE_H #define _EXIDEVICE_H -#include "Common.h" +#include "CommonTypes.h" #include "ChunkFile.h" enum TEXIDevices diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 9862c1b347..1a8ec37ea4 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -10,7 +10,6 @@ #include "../ConfigManager.h" #include "../../InputCommon/Src/InputConfig.h" -#include "Host.h" namespace Pad { diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.h b/Source/Core/Core/Src/HW/ProcessorInterface.h index 2ca2d74219..ce81cb35ef 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.h +++ b/Source/Core/Core/Src/HW/ProcessorInterface.h @@ -5,7 +5,7 @@ #ifndef _PROCESSORINTERFACE_H #define _PROCESSORINTERFACE_H -#include "Common.h" +#include "CommonTypes.h" class PointerWrap; // Holds statuses of things like the write gatherer used for fifos, and interrupts from various sources diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp index d21371fe36..8a21591b94 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include - #include "SI.h" #include "SI_Device.h" #include "SI_DeviceDanceMat.h" diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 0c4bf48dcb..b1a1bbeafa 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include - #include "SI.h" #include "SI_Device.h" #include "SI_DeviceGCController.h" diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 4102d29193..3540db325f 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include - #include "SI.h" #include "SI_Device.h" #include "SI_DeviceGCSteeringWheel.h" diff --git a/Source/Core/Core/Src/HW/Sram.h b/Source/Core/Core/Src/HW/Sram.h index 91e8b2a8b9..30d535a5b8 100644 --- a/Source/Core/Core/Src/HW/Sram.h +++ b/Source/Core/Core/Src/HW/Sram.h @@ -36,7 +36,7 @@ distribution. #ifndef __SRAM_h__ #define __SRAM_h__ -#include "Common.h" +#include "CommonTypes.h" #pragma pack(push,1) union SRAM diff --git a/Source/Core/Core/Src/HW/SystemTimers.h b/Source/Core/Core/Src/HW/SystemTimers.h index 331dbf8c85..ef69f6e65a 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.h +++ b/Source/Core/Core/Src/HW/SystemTimers.h @@ -18,7 +18,7 @@ #ifndef _SYSTEMTIMERS_H #define _SYSTEMTIMERS_H -#include "Common.h" +#include "CommonTypes.h" namespace SystemTimers { diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h index 59f21a6b82..9004360b18 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.h +++ b/Source/Core/Core/Src/HW/VideoInterface.h @@ -5,7 +5,7 @@ #ifndef _VIDEOINTERFACE_H #define _VIDEOINTERFACE_H -#include "Common.h" +#include "CommonTypes.h" class PointerWrap; namespace VideoInterface diff --git a/Source/Core/Core/Src/MemTools.h b/Source/Core/Core/Src/MemTools.h index a791684c41..2bdd088377 100644 --- a/Source/Core/Core/Src/MemTools.h +++ b/Source/Core/Core/Src/MemTools.h @@ -5,7 +5,7 @@ #ifndef _MEMTOOLS_H #define _MEMTOOLS_H -#include "Common.h" +#include "CommonTypes.h" namespace EMM diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index caaff00373..7e636af267 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include "Interpreter.h" #include "../../HW/Memmap.h" diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index b55cbd6b45..294210678a 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #ifdef _WIN32 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set #define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h index e184486f3e..2497e00494 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h @@ -8,10 +8,10 @@ #include #include +#include #include #include "Common.h" -#include "Gekko.h" #include "PPCTables.h" class PPCSymbolDB; @@ -62,8 +62,8 @@ struct BlockRegStats int GetTotalNumAccesses(int reg) {return numReads[reg] + numWrites[reg];} int GetUseRange(int reg) { - return max(lastRead[reg], lastWrite[reg]) - - min(firstRead[reg], firstWrite[reg]);} + return std::max(lastRead[reg], lastWrite[reg]) - + std::min(firstRead[reg], firstWrite[reg]);} inline void SetInputRegister(int reg, short opindex) { if (firstRead[reg] == -1) diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h index 21ff0f64d5..b2ff2471e3 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.h +++ b/Source/Core/Core/Src/PowerPC/PPCCache.h @@ -5,7 +5,7 @@ #ifndef _PPCCACHE_H #define _PPCCACHE_H -#include "Common.h" +#include "CommonTypes.h" #define FAST_ICACHE diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h index 40d606ae97..d77dac9a1e 100644 --- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h +++ b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "CommonTypes.h" #include #include diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 82ae74ee15..39bbf37d90 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include - #include "Common.h" #include "Atomic.h" #include "MathUtil.h" diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.h b/Source/Core/Core/Src/PowerPC/SignatureDB.h index 181a76ce38..937dc3d540 100644 --- a/Source/Core/Core/Src/PowerPC/SignatureDB.h +++ b/Source/Core/Core/Src/PowerPC/SignatureDB.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common.h" +#include "CommonTypes.h" #include #include diff --git a/Source/Core/Core/Src/ec_wii.cpp b/Source/Core/Core/Src/ec_wii.cpp index 5a68cc6fb5..1cd82657a8 100644 --- a/Source/Core/Core/Src/ec_wii.cpp +++ b/Source/Core/Core/Src/ec_wii.cpp @@ -10,7 +10,6 @@ #include #include #include "Common.h" -#include "Crypto/aes.h" #include "polarssl/sha1.h" #include "Crypto/tools.h" #include "FileUtil.h" diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp index a39196697c..0dfd614853 100644 --- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp @@ -8,7 +8,6 @@ #include "HW/Memmap.h" #include "BreakpointDlg.h" #include "MemoryCheckDlg.h" -#include "Host.h" #include "PowerPC/PowerPC.h" #include "FileUtil.h" diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 4853e0396b..17e66337d2 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -30,7 +30,6 @@ #include "Debugger/PPCDebugInterface.h" #include "Debugger/Debugger_SymbolMap.h" #include "PowerPC/PPCAnalyst.h" -#include "PowerPC/Profiler.h" #include "PowerPC/PPCSymbolDB.h" #include "PowerPC/SignatureDB.h" #include "PowerPC/PPCTables.h" diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp index a1df440b0f..b323f794f2 100644 --- a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp @@ -15,7 +15,6 @@ #include "PowerPC/JitCommon/JitCache.h" #include "PowerPC/PPCAnalyst.h" #include "PowerPCDisasm.h" -#include "Host.h" #include "disasm.h" #include "Debugger/PPCDebugInterface.h" diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp index e32d9b447d..99f80e0936 100644 --- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp @@ -12,7 +12,6 @@ #include "MemoryWindow.h" #include "HW/CPU.h" #include "PowerPC/PowerPC.h" -#include "Host.h" #include "FileUtil.h" #include "Debugger/PPCDebugInterface.h" diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h index c94f0b7fe8..94abef01e2 100644 --- a/Source/Core/InputCommon/Src/GCPadStatus.h +++ b/Source/Core/InputCommon/Src/GCPadStatus.h @@ -5,8 +5,6 @@ #ifndef _GCPAD_H_INCLUDED__ #define _GCPAD_H_INCLUDED__ -#include "CommonTypes.h" - #define PAD_ERR_NONE 0 #define PAD_ERR_NO_CONTROLLER -1 #define PAD_ERR_NOT_READY -2 diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h index 0d14f325d1..f6d563fa11 100644 --- a/Source/Core/InputCommon/Src/InputConfig.h +++ b/Source/Core/InputCommon/Src/InputConfig.h @@ -12,10 +12,8 @@ #include "ControllerInterface/ControllerInterface.h" #include "ControllerEmu.h" -#include #include #include -#include // InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote // which are not even plugins anymore. diff --git a/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp index d5299e4c3e..256b30ace8 100644 --- a/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp @@ -6,7 +6,6 @@ #include "VideoConfig.h" #include "IniFile.h" #include "Core.h" -#include "Host.h" #include "VideoBackend.h" #include "ConfigManager.h" diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp index 82aeabd30a..4dca112031 100644 --- a/Source/Core/VideoBackends/OGL/Src/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Src/Render.cpp @@ -28,7 +28,6 @@ #include "ImageWrite.h" #include "PixelEngine.h" #include "Render.h" -#include "OpcodeDecoding.h" #include "BPStructs.h" #include "TextureCache.h" #include "RasterFont.h" @@ -49,7 +48,6 @@ #include "Debugger.h" #include "Core.h" #include "Movie.h" -#include "Host.h" #include "BPFunctions.h" #include "FPSCounter.h" #include "ConfigManager.h" diff --git a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp index b2104af66a..d4ce2eb5bb 100644 --- a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp @@ -5,8 +5,6 @@ // Fast image conversion using OpenGL shaders. // This kind of stuff would be a LOT nicer with OpenCL. -#include - #include "TextureConverter.h" #include "TextureConversionShader.h" #include "TextureCache.h" diff --git a/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp b/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp index 5df9602af9..620df0c161 100644 --- a/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp @@ -24,7 +24,6 @@ #include "VertexLoader.h" #include "VertexManager.h" #include "IndexGenerator.h" -#include "OpcodeDecoding.h" #include "FileUtil.h" #include "Debugger.h" #include "StreamBuffer.h" diff --git a/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp b/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp index d9715481fc..57557c1ee8 100644 --- a/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "Common.h" -#include #include "../../OGL/Src/GLUtil.h" #include "RasterFont.h" diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index cc169ffe8f..ab5789a078 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -13,7 +13,6 @@ #include "BPFunctions.h" #include "BPStructs.h" #include "TextureDecoder.h" -#include "OpcodeDecoding.h" #include "VertexLoader.h" #include "VertexShaderManager.h" #include "Thread.h" diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index fc2d8b4f13..d0645c31ea 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -8,7 +8,6 @@ #include "MathUtil.h" #include "Thread.h" #include "Atomic.h" -#include "OpcodeDecoding.h" #include "Fifo.h" #include "ChunkFile.h" #include "CommandProcessor.h" diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index 825e9c6558..697db81338 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -2,8 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include - #include "Common.h" #include "VideoCommon.h" #include "VideoConfig.h" diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h index 9664e92359..1143867a25 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.h +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h @@ -5,7 +5,6 @@ #ifndef GCOGL_VERTEXSHADER_H #define GCOGL_VERTEXSHADER_H -#include #include "XFMemory.h" #include "VideoCommon.h" #include "ShaderGenCommon.h"