From f2038b9e90cd34b65686158981384be24b607f75 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 12 Jan 2016 22:34:13 -0500 Subject: [PATCH] HW: Remove unnecessary header inclusions --- Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 1 + Source/Core/Core/HW/AudioInterface.cpp | 6 ++---- Source/Core/Core/HW/CPU.cpp | 4 ---- Source/Core/Core/HW/DSP.cpp | 4 +--- Source/Core/Core/HW/DSPHLE/DSPHLE.cpp | 9 ++------- Source/Core/Core/HW/DSPHLE/DSPHLE.h | 1 + Source/Core/Core/HW/DSPHLE/MailHandler.cpp | 3 +++ Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp | 5 ++++- Source/Core/Core/HW/DSPHLE/UCodes/AX.h | 2 +- Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp | 6 +++--- Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h | 2 ++ Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp | 3 ++- Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp | 4 +++- Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp | 3 ++- Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp | 8 ++++++-- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 7 ++++++- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h | 4 ++-- Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp | 6 ++++++ Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp | 2 +- Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 3 +-- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 10 ++-------- Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp | 4 +--- Source/Core/Core/HW/DVDInterface.cpp | 1 - Source/Core/Core/HW/EXI.cpp | 1 - Source/Core/Core/HW/EXI_Channel.cpp | 7 ++----- Source/Core/Core/HW/EXI_Device.cpp | 4 ++-- Source/Core/Core/HW/EXI_DeviceAD16.cpp | 4 ++-- Source/Core/Core/HW/EXI_DeviceAGP.cpp | 7 +++---- Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp | 3 +-- Source/Core/Core/HW/EXI_DeviceEthernet.cpp | 5 ++++- Source/Core/Core/HW/EXI_DeviceEthernet.h | 2 +- Source/Core/Core/HW/EXI_DeviceGecko.cpp | 7 ++++++- Source/Core/Core/HW/EXI_DeviceIPL.cpp | 3 +-- Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp | 6 +++++- Source/Core/Core/HW/EXI_DeviceMic.cpp | 7 ++++--- Source/Core/Core/HW/EXI_DeviceMic.h | 4 ++-- Source/Core/Core/HW/GCKeyboard.cpp | 3 ++- Source/Core/Core/HW/GCMemcard.cpp | 5 ++++- Source/Core/Core/HW/GCMemcard.h | 2 -- Source/Core/Core/HW/GCMemcardDirectory.cpp | 6 ++++++ Source/Core/Core/HW/GCMemcardRaw.cpp | 4 ++++ Source/Core/Core/HW/GCPad.cpp | 4 ++-- Source/Core/Core/HW/GCPadEmu.cpp | 1 + Source/Core/Core/HW/GPFifo.cpp | 4 ---- Source/Core/Core/HW/GPFifo.h | 1 - Source/Core/Core/HW/HW.cpp | 2 -- Source/Core/Core/HW/MMIO.cpp | 2 ++ Source/Core/Core/HW/Memmap.cpp | 11 ++--------- Source/Core/Core/HW/MemoryInterface.cpp | 2 -- Source/Core/Core/HW/ProcessorInterface.cpp | 5 ----- Source/Core/Core/HW/SI.cpp | 4 +--- Source/Core/Core/HW/SI_Device.cpp | 1 + Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp | 4 +--- Source/Core/Core/HW/SI_DeviceDanceMat.cpp | 1 + Source/Core/Core/HW/SI_DeviceDanceMat.h | 1 + Source/Core/Core/HW/SI_DeviceGBA.cpp | 5 ++--- Source/Core/Core/HW/SI_DeviceGBA.h | 4 ++-- Source/Core/Core/HW/SI_DeviceGCAdapter.cpp | 5 ++++- Source/Core/Core/HW/SI_DeviceGCAdapter.h | 1 - Source/Core/Core/HW/SI_DeviceGCController.cpp | 7 +++---- Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp | 3 +-- Source/Core/Core/HW/SI_DeviceKeyboard.cpp | 2 ++ Source/Core/Core/HW/Sram.cpp | 1 + Source/Core/Core/HW/StreamADPCM.cpp | 1 + Source/Core/Core/HW/SystemTimers.cpp | 4 +--- Source/Core/Core/HW/VideoInterface.cpp | 7 +------ Source/Core/Core/HW/WII_IPC.cpp | 8 +------- Source/Core/Core/HW/Wiimote.cpp | 4 +--- Source/Core/Core/HW/Wiimote.h | 3 ++- .../Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp | 2 ++ Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp | 3 +++ Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp | 3 +++ Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp | 3 +++ Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp | 3 +++ .../Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp | 3 +++ Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp | 7 +++++-- Source/Core/Core/HW/WiimoteEmu/Speaker.cpp | 4 ++++ Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 4 +++- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 2 -- Source/Core/Core/HW/WiimoteReal/IOWin.cpp | 5 +++-- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 1 + Source/Core/DolphinWX/TASInputDlg.cpp | 4 ++++ Source/Core/InputCommon/GCAdapter.h | 2 ++ Source/Core/InputCommon/GCAdapter_Null.cpp | 3 +++ 84 files changed, 177 insertions(+), 148 deletions(-) diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index 7116dbd5e8..ac970bb9e6 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include "Common/Assert.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp index f810a85fc5..faecfdeb73 100644 --- a/Source/Core/Core/HW/AudioInterface.cpp +++ b/Source/Core/Core/HW/AudioInterface.cpp @@ -37,15 +37,13 @@ This file mainly deals with the [Drive I/F], however [AIDFR] controls TODO maybe the files should be merged? */ -#include "AudioCommon/AudioCommon.h" +#include +#include "AudioCommon/AudioCommon.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/MathUtil.h" - #include "Core/CoreTiming.h" #include "Core/HW/AudioInterface.h" -#include "Core/HW/CPU.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 2ed01bfde4..a853fdbd73 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -8,15 +8,11 @@ #include "Common/CommonTypes.h" #include "Common/Event.h" #include "Core/Core.h" -#include "Core/DSPEmulator.h" #include "Core/Host.h" -#include "Core/Movie.h" #include "Core/HW/CPU.h" -#include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" #include "VideoCommon/Fifo.h" -#include "VideoCommon/VideoBackendBase.h" namespace { diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index 8935139cef..0956952fa6 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -25,14 +25,12 @@ #include "AudioCommon/AudioCommon.h" +#include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/DSPEmulator.h" -#include "Core/HW/AudioInterface.h" -#include "Core/HW/CPU.h" #include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index 1ff255f7d4..510b76b5da 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -5,15 +5,10 @@ #include #include "Common/ChunkFile.h" -#include "Common/IniFile.h" -#include "Common/StringUtil.h" -#include "Common/Logging/LogManager.h" - -#include "Core/ConfigManager.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Core/Core.h" -#include "Core/HW/AudioInterface.h" #include "Core/HW/SystemTimers.h" -#include "Core/HW/VideoInterface.h" #include "Core/HW/DSPHLE/DSPHLE.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index fe59e52f6a..08371c3898 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -4,6 +4,7 @@ #pragma once +#include "Common/CommonTypes.h" #include "Core/DSPEmulator.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/MailHandler.h" diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp index 18ab8ee4c2..fffb1653f1 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp @@ -3,6 +3,9 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/MailHandler.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp index b9b6616eff..76969027d5 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp @@ -2,13 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/UCodes/AX.h" +#include "Core/HW/DSPHLE/UCodes/AXStructs.h" #define AX_GC #include "Core/HW/DSPHLE/UCodes/AXVoice.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h index ce76dc6906..962857cdbc 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h @@ -12,7 +12,7 @@ #pragma once -#include "Core/HW/DSPHLE/UCodes/AXStructs.h" +#include "Common/CommonTypes.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" // We can't directly use the mixer_control field from the PB because it does diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp index 2bfcf56e36..78df3e56fd 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp @@ -4,12 +4,12 @@ // #define AX_WII // Used in AXVoice. +#include "Common/ChunkFile.h" #include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Common/StringUtil.h" - -#include "Core/HW/DSPHLE/MailHandler.h" - +#include "Common/Logging/Log.h" #include "Core/HW/DSPHLE/UCodes/AXStructs.h" #include "Core/HW/DSPHLE/UCodes/AXVoice.h" #include "Core/HW/DSPHLE/UCodes/AXWii.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h index e952139efd..f3cb27f8e7 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h @@ -6,6 +6,8 @@ #include "Core/HW/DSPHLE/UCodes/AX.h" +struct AXPBWii; + class AXWiiUCode : public AXUCode { public: diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp index 89692f1683..5ec02707d7 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp @@ -2,7 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/ConfigManager.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/DSPHLE.h" #include "Core/HW/DSPHLE/UCodes/CARD.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp index 20ff8d0b2f..df364b27a7 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/ConfigManager.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/UCodes/GBA.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp index 932e1d6b87..c96308eecb 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp @@ -2,7 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/ConfigManager.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/DSPHLE/UCodes/INIT.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp index bcb0a59c47..a9f48d67d0 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp @@ -2,15 +2,19 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #ifdef _WIN32 #include #endif +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/HW/Memmap.h" #include "Core/HW/DSPHLE/UCodes/ROM.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index 1b8c533a96..a74d4db256 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -2,13 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #ifdef _WIN32 #include #endif +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/HW/DSPHLE/UCodes/AX.h" #include "Core/HW/DSPHLE/UCodes/AXWii.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h index 34cb6378d4..527ed767b2 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -5,9 +5,8 @@ #pragma once #include -#include "Common/ChunkFile.h" + #include "Common/CommonTypes.h" -#include "Common/Thread.h" #include "Core/HW/Memmap.h" #include "Core/HW/DSPHLE/DSPHLE.h" @@ -16,6 +15,7 @@ #define UCODE_NULL 0xFFFFFFFF class CMailHandler; +class PointerWrap; constexpr bool ExramRead(u32 address) { diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp index 15a09c09e3..0d601efebf 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp @@ -2,6 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + +#include "Common/ChunkFile.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/HW/DSPHLE/MailHandler.h" #include "Core/HW/DSPHLE/UCodes/GBA.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp index 1570d68a97..7fe5ed7d38 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp @@ -4,8 +4,8 @@ #include +#include "Common/MsgHandler.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPDisassembler.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/HW/DSPLLE/DSPDebugInterface.h" #include "Core/HW/DSPLLE/DSPSymbols.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index 213f5875b2..fc5ad5c1fe 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -4,7 +4,7 @@ #include "Common/CommonTypes.h" #include "Common/Hash.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Host.h" #include "Core/DSP/DSPAnalyzer.h" @@ -13,7 +13,6 @@ #include "Core/HW/DSP.h" #include "Core/HW/DSPLLE/DSPLLETools.h" #include "Core/HW/DSPLLE/DSPSymbols.h" -#include "Core/PowerPC/PowerPC.h" #include "VideoCommon/OnScreenDisplay.h" // The user of the DSPCore library must supply a few functions so that the diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index d8e04a8a3b..9d8365ffb2 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -3,18 +3,16 @@ // Refer to the license.txt file included. #include +#include #include #include "Common/Atomic.h" #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/CPUDetect.h" #include "Common/Event.h" -#include "Common/IniFile.h" #include "Common/Thread.h" -#include "Common/Logging/LogManager.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Host.h" @@ -22,17 +20,13 @@ #include "Core/NetPlayProto.h" #include "Core/DSP/DSPCaptureLogger.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPDisassembler.h" #include "Core/DSP/DSPHost.h" #include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" -#include "Core/HW/AudioInterface.h" #include "Core/HW/Memmap.h" - #include "Core/HW/DSPLLE/DSPLLE.h" #include "Core/HW/DSPLLE/DSPLLEGlobals.h" -#include "Core/HW/DSPLLE/DSPSymbols.h" DSPLLE::DSPLLE() : m_hDSPThread() diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp index 99a6bab74f..a493fd7564 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp @@ -9,16 +9,14 @@ #include #include #include +#include #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" - #include "Core/DSP/DSPCodeUtil.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPDisassembler.h" -#include "Core/DSP/DSPInterpreter.h" -#include "Core/HW/DSPLLE/DSPLLEGlobals.h" #include "Core/HW/DSPLLE/DSPLLETools.h" bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc) diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index b46daafd4f..69802e57af 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -25,7 +25,6 @@ #include "Core/HW/ProcessorInterface.h" #include "Core/HW/StreamADPCM.h" #include "Core/HW/SystemTimers.h" -#include "Core/PowerPC/PowerPC.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index 7790b77b38..7ec74e894e 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -16,7 +16,6 @@ #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/Sram.h" -#include "Core/PowerPC/PowerPC.h" SRAM g_SRAM; bool g_SRAM_netplay_initialized = false; diff --git a/Source/Core/Core/HW/EXI_Channel.cpp b/Source/Core/Core/HW/EXI_Channel.cpp index 627eaacc1c..a2b68d9adb 100644 --- a/Source/Core/Core/HW/EXI_Channel.cpp +++ b/Source/Core/Core/HW/EXI_Channel.cpp @@ -4,16 +4,13 @@ #include +#include "Common/Assert.h" #include "Common/ChunkFile.h" -#include "Core/ConfigManager.h" -#include "Core/CoreTiming.h" -#include "Core/Movie.h" +#include "Common/CommonTypes.h" #include "Core/HW/EXI.h" #include "Core/HW/EXI_Channel.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/MMIO.h" -#include "Core/HW/ProcessorInterface.h" -#include "Core/PowerPC/PowerPC.h" enum { diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index 4a660579e7..f0fe8edb2b 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -5,8 +5,8 @@ #include #include "Common/ChunkFile.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceAD16.h" #include "Core/HW/EXI_DeviceAGP.h" diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/HW/EXI_DeviceAD16.cpp index a6bbc5a03e..e4b676f36a 100644 --- a/Source/Core/Core/HW/EXI_DeviceAD16.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAD16.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" #include "Common/ChunkFile.h" -#include "Core/Core.h" -#include "Core/HW/EXI_Device.h" +#include "Common/CommonTypes.h" #include "Core/HW/EXI_DeviceAD16.h" CEXIAD16::CEXIAD16() : diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI_DeviceAGP.cpp index e4ebe433f1..54d5ea22b0 100644 --- a/Source/Core/Core/HW/EXI_DeviceAGP.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAGP.cpp @@ -3,15 +3,14 @@ // Refer to the license.txt file included. #include +#include #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" -#include "Common/MemoryUtil.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceAGP.h" -#include "Core/HW/Memmap.h" CEXIAgp::CEXIAgp(int index) { diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp index d653401e1f..7e2d0e61ca 100644 --- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp @@ -3,10 +3,9 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Core/Core.h" #include "Core/HW/EXI.h" -#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceAMBaseboard.h" CEXIAMBaseboard::CEXIAMBaseboard() diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp index 2de81059af..2859a62c45 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp @@ -2,11 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" #include "Common/Network.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/HW/EXI.h" -#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceEthernet.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h index 465bf40893..4f9cd81e09 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h @@ -5,12 +5,12 @@ #pragma once #include +#include #ifdef _WIN32 #include #endif -#include "Common/Thread.h" #include "Core/HW/EXI_Device.h" class PointerWrap; diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp index c475b817c6..c72f4d5b25 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp @@ -2,15 +2,20 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include +#include +#include #include +#include #include "Common/ChunkFile.h" #include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/Core.h" -#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceGecko.h" u16 GeckoSockServer::server_port; diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index d8a1f701ea..223c33b8ff 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -10,9 +10,8 @@ #include "Common/FileUtil.h" #include "Common/MemoryUtil.h" #include "Common/Timer.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" #include "Core/NetPlayProto.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp index 024b45ebac..beeb4111f2 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp @@ -2,15 +2,19 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include +#include #include "Common/ChunkFile.h" +#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/IniFile.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" #include "Core/HW/EXI.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp index 659e696a37..bc9d7ee4f2 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include +#include + +#include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #if HAVE_PORTAUDIO -#include - #include "Core/CoreTiming.h" #include "Core/HW/EXI.h" -#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_DeviceMic.h" #include "Core/HW/GCPad.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h index 3fbfcb8e70..e8adf97efb 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/HW/EXI_DeviceMic.h @@ -4,12 +4,12 @@ #pragma once +#include +#include "Common/Common.h" #include "Core/HW/EXI_Device.h" #if HAVE_PORTAUDIO -#include - class CEXIMic : public IEXIDevice { public: diff --git a/Source/Core/Core/HW/GCKeyboard.cpp b/Source/Core/Core/HW/GCKeyboard.cpp index d6c720cb47..2605c48610 100644 --- a/Source/Core/Core/HW/GCKeyboard.cpp +++ b/Source/Core/Core/HW/GCKeyboard.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "Core/ConfigManager.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/GCKeyboardEmu.h" #include "InputCommon/InputConfig.h" diff --git a/Source/Core/Core/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp index b3cf34159e..658aa82f05 100644 --- a/Source/Core/Core/HW/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard.cpp @@ -5,11 +5,14 @@ #include #include #include +#include #include "Common/ColorUtil.h" +#include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MsgHandler.h" -#include "Common/Logging/Log.h" +#include "Common/StringUtil.h" #include "Core/HW/GCMemcard.h" static void ByteSwap(u8 *valueA, u8 *valueB) diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index d690a3c4f0..f5c9cbe2c7 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -8,11 +8,9 @@ #include #include "Common/CommonFuncs.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/NandPaths.h" #include "Common/NonCopyable.h" -#include "Common/StringUtil.h" #include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/Sram.h" diff --git a/Source/Core/Core/HW/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcardDirectory.cpp index 7bb7882339..ddbf543080 100644 --- a/Source/Core/Core/HW/GCMemcardDirectory.cpp +++ b/Source/Core/Core/HW/GCMemcardDirectory.cpp @@ -3,13 +3,19 @@ // Refer to the license.txt file included. #include +#include #include +#include +#include +#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/GCMemcardDirectory.h" diff --git a/Source/Core/Core/HW/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcardRaw.cpp index c3c41a8347..1c1e82f957 100644 --- a/Source/Core/Core/HW/GCMemcardRaw.cpp +++ b/Source/Core/Core/HW/GCMemcardRaw.cpp @@ -3,11 +3,15 @@ // Refer to the license.txt file included. #include +#include #include +#include #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Thread.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/GCMemcard.h" diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp index e1021af2b9..ce3cda6b53 100644 --- a/Source/Core/Core/HW/GCPad.cpp +++ b/Source/Core/Core/HW/GCPad.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" #include "Common/CommonTypes.h" - -#include "Core/ConfigManager.h" #include "Core/HW/GCPad.h" #include "Core/HW/GCPadEmu.h" #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index 66f90594a7..20ad6f9186 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/Host.h" #include "Core/HW/GCPadEmu.h" diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp index 6b9903e8ac..5d75061d77 100644 --- a/Source/Core/Core/HW/GPFifo.cpp +++ b/Source/Core/Core/HW/GPFifo.cpp @@ -7,15 +7,11 @@ #include "Common/ChunkFile.h" #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" - #include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" #include "Core/HW/ProcessorInterface.h" #include "Core/PowerPC/JitInterface.h" -#include "Core/PowerPC/PowerPC.h" - #include "VideoCommon/CommandProcessor.h" -#include "VideoCommon/VideoBackendBase.h" namespace GPFifo { diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 843ce37ee7..e8c6cf555d 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -4,7 +4,6 @@ #pragma once -#include "Common/Common.h" #include "Common/CommonTypes.h" class PointerWrap; diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index c15cdeb7e2..a1073785ed 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -24,8 +24,6 @@ #include "Core/HW/VideoInterface.h" #include "Core/HW/WII_IPC.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" -#include "Core/PowerPC/PowerPC.h" -#include "Core/PowerPC/PPCAnalyst.h" #include "DiscIO/NANDContentLoader.h" namespace HW diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index 4706ea1c7d..66a7f240f4 100644 --- a/Source/Core/Core/HW/MMIO.cpp +++ b/Source/Core/Core/HW/MMIO.cpp @@ -4,6 +4,8 @@ #include +#include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Core/HW/MMIO.h" #include "Core/HW/MMIOHandlers.h" diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index 6ae4b95b36..789ce66386 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -11,20 +11,15 @@ #include #include "Common/ChunkFile.h" +#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/MemArena.h" -#include "Common/MemoryUtil.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Debugger/Debugger_SymbolMap.h" -#include "Core/HLE/HLE.h" #include "Core/HW/AudioInterface.h" -#include "Core/HW/CPU.h" #include "Core/HW/DSP.h" #include "Core/HW/DVDInterface.h" #include "Core/HW/EXI.h" -#include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" #include "Core/HW/MemoryInterface.h" #include "Core/HW/MMIO.h" @@ -34,10 +29,8 @@ #include "Core/HW/WII_IPC.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/JitCommon/JitBase.h" - #include "VideoCommon/CommandProcessor.h" #include "VideoCommon/PixelEngine.h" -#include "VideoCommon/VideoBackendBase.h" namespace Memory { diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp index f75b8fb4a0..b97bbdc078 100644 --- a/Source/Core/Core/HW/MemoryInterface.cpp +++ b/Source/Core/Core/HW/MemoryInterface.cpp @@ -4,10 +4,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" - #include "Core/HW/MemoryInterface.h" #include "Core/HW/MMIO.h" -#include "Core/PowerPC/PowerPC.h" namespace MemoryInterface { diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index 819ee1a4cf..d48ca8796c 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -6,17 +6,12 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" - #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/HW/CPU.h" -#include "Core/HW/GPFifo.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/PowerPC/PowerPC.h" -#include "VideoCommon/VideoBackendBase.h" - namespace ProcessorInterface { diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp index e69cb158fb..5476d6c563 100644 --- a/Source/Core/Core/HW/SI.cpp +++ b/Source/Core/Core/HW/SI.cpp @@ -4,11 +4,11 @@ #include #include +#include #include #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" - #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" @@ -17,8 +17,6 @@ #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI.h" #include "Core/HW/SI_DeviceGBA.h" -#include "Core/HW/SystemTimers.h" -#include "Core/HW/VideoInterface.h" namespace SerialInterface diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI_Device.cpp index fb9b9ec638..c239ee1350 100644 --- a/Source/Core/Core/HW/SI_Device.cpp +++ b/Source/Core/Core/HW/SI_Device.cpp @@ -5,6 +5,7 @@ #include #include +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Logging/Log.h" #include "Core/HW/SI_Device.h" diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp index ce588277c4..812472bb42 100644 --- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp @@ -5,14 +5,12 @@ #include #include +#include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/Logging/Log.h" - #include "Core/HW/GCPad.h" -#include "Core/HW/SI.h" #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceAMBaseboard.h" - #include "InputCommon/GCPadStatus.h" // where to put baseboard debug diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp index 9210254686..2d81258f4b 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" #include "Core/HW/SI_DeviceDanceMat.h" #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h index 9947038f3f..a7ffafda6c 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h @@ -4,6 +4,7 @@ #pragma once +#include "Common/CommonTypes.h" #include "Core/HW/SI_DeviceGCController.h" struct GCPadStatus; diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp index f80dd5a56a..f510ada3b1 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp @@ -5,17 +5,16 @@ #include #include #include +#include -#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Common/Thread.h" #include "Common/Logging/Log.h" -#include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceGBA.h" #include "Core/HW/SystemTimers.h" -#include "Core/HW/VideoInterface.h" #include "SFML/Network.hpp" diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI_DeviceGBA.h index 6bd3ce291d..27da216afd 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.h +++ b/Source/Core/Core/HW/SI_DeviceGBA.h @@ -5,11 +5,11 @@ #pragma once #include +#include +#include "Common/CommonTypes.h" #include "Core/HW/SI_Device.h" -#include "SFML/Network.hpp" - // GameBoy Advance "Link Cable" u8 GetNumConnected(); diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp index 0f2c55ca5d..339130405b 100644 --- a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp @@ -2,11 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + +#include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Movie.h" #include "Core/HW/SI_DeviceGCAdapter.h" +#include "InputCommon/GCAdapter.h" CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.h b/Source/Core/Core/HW/SI_DeviceGCAdapter.h index e171e3a5a0..67e1adc348 100644 --- a/Source/Core/Core/HW/SI_DeviceGCAdapter.h +++ b/Source/Core/Core/HW/SI_DeviceGCAdapter.h @@ -6,7 +6,6 @@ #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceGCController.h" -#include "InputCommon/GCAdapter.h" #include "InputCommon/GCPadStatus.h" class CSIDevice_GCAdapter : public CSIDevice_GCController diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI_DeviceGCController.cpp index cf6eb50ff5..b184d4ca4d 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCController.cpp @@ -3,14 +3,13 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Core/Core.h" +#include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" #include "Core/CoreTiming.h" #include "Core/Movie.h" -#include "Core/HW/EXI_Device.h" -#include "Core/HW/EXI_DeviceMic.h" #include "Core/HW/GCPad.h" #include "Core/HW/ProcessorInterface.h" -#include "Core/HW/SI.h" #include "Core/HW/SI_Device.h" #include "Core/HW/SI_DeviceGCController.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp index a97db6ac3d..b71f5ff423 100644 --- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp @@ -2,9 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/MsgHandler.h" +#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" - #include "Core/HW/GCPad.h" #include "Core/HW/SI_DeviceGCSteeringWheel.h" diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp index 94447bfce1..1adb0a85b8 100644 --- a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp +++ b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp @@ -3,6 +3,8 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/SI_DeviceKeyboard.h" #include "InputCommon/KeyboardStatus.h" diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp index 60b6cf130c..df8c80bd64 100644 --- a/Source/Core/Core/HW/Sram.cpp +++ b/Source/Core/Core/HW/Sram.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "Core/HW/Sram.h" diff --git a/Source/Core/Core/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp index d3ea3d7e1b..c142f39749 100644 --- a/Source/Core/Core/HW/StreamADPCM.cpp +++ b/Source/Core/Core/HW/StreamADPCM.cpp @@ -4,6 +4,7 @@ // Adapted from in_cube by hcs & destop +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/HW/StreamADPCM.h" diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 129c15c8c5..82e6962bf2 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -46,7 +46,7 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: #include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Common/Timer.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" @@ -59,9 +59,7 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: #include "Core/HW/VideoInterface.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/PowerPC/PowerPC.h" - #include "VideoCommon/Fifo.h" -#include "VideoCommon/VideoBackendBase.h" namespace SystemTimers { diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 38a87b1ecd..6d43c861ea 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -7,20 +7,15 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/MathUtil.h" -#include "Common/StringUtil.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/State.h" -#include "Core/HW/Memmap.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI.h" #include "Core/HW/SystemTimers.h" #include "Core/HW/VideoInterface.h" -#include "Core/PowerPC/PowerPC.h" - #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp index f848ff1e65..2f3f1e54ea 100644 --- a/Source/Core/Core/HW/WII_IPC.cpp +++ b/Source/Core/Core/HW/WII_IPC.cpp @@ -2,16 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include -#include -#include - #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" - +#include "Common/Logging/Log.h" #include "Core/CoreTiming.h" -#include "Core/HW/CPU.h" -#include "Core/HW/Memmap.h" #include "Core/HW/MMIO.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/WII_IPC.h" diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index 94e88439cb..9451fcf36e 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -2,14 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" - -#include "Core/ConfigManager.h" #include "Core/Movie.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" - #include "InputCommon/InputConfig.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index c8f117358c..887b75e861 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -4,9 +4,10 @@ #pragma once -#include "Common/ChunkFile.h" +#include "Common/Common.h" class InputConfig; +class PointerWrap; enum { diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index 6ae780b14b..1b1ac2d822 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp index 812a196008..c5ad18feda 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Classic.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp index e8bf13524b..2ae0ab976e 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Drums.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index 0c89c91d36..d3738a1ec5 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Guitar.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp index 68f31f54a2..6a798fd2b0 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index 0f12932832..edfa5dfbe7 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/Attachment/Turntable.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index 0722364086..377cda3769 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -17,13 +17,16 @@ 0x30 - 0x3f Input This file: Update() */ #include +#include #include #include +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" -#include "Common/NandPaths.h" - +#include "Common/MsgHandler.h" +#include "Common/Logging/Log.h" +#include "Core/Core.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" #include "Core/HW/WiimoteEmu/Attachment/Attachment.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp index 870b4b06d1..720d47af49 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp @@ -2,7 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include + #include "AudioCommon/AudioCommon.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" //#define WIIMOTE_SPEAKER_DUMP diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 5ed1c55c73..289b25a9a5 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -3,12 +3,14 @@ // Refer to the license.txt file included. #include +#include #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/MathUtil.h" -#include "Common/Timer.h" +#include "Common/MsgHandler.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/Host.h" #include "Core/Movie.h" #include "Core/NetPlayClient.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 7aacdb3c9d..3bafaac290 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -6,9 +6,7 @@ #include #include -#include -#include "Core/Core.h" #include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" #include "InputCommon/ControllerEmu.h" diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index 458df3e2ff..39a0e3835c 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -19,10 +19,11 @@ #include //NOLINT #include //NOLINT -#include "Common/Common.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Thread.h" - +#include "Common/Logging/Log.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index e50fadf690..1c793258ad 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -12,6 +12,7 @@ #include "Common/StringUtil.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/Host.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h" diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index f8e77f8403..814be18d29 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -12,7 +12,11 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" +#include "Common/FileUtil.h" +#include "Common/Logging/Log.h" +#include "Core/Core.h" #include "Core/Movie.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" diff --git a/Source/Core/InputCommon/GCAdapter.h b/Source/Core/InputCommon/GCAdapter.h index 5af8f7b915..a1780cdf1e 100644 --- a/Source/Core/InputCommon/GCAdapter.h +++ b/Source/Core/InputCommon/GCAdapter.h @@ -6,6 +6,8 @@ #include +#include "Common/CommonTypes.h" + struct GCPadStatus; namespace GCAdapter diff --git a/Source/Core/InputCommon/GCAdapter_Null.cpp b/Source/Core/InputCommon/GCAdapter_Null.cpp index 0936eb33f1..b7bc81dfa7 100644 --- a/Source/Core/InputCommon/GCAdapter_Null.cpp +++ b/Source/Core/InputCommon/GCAdapter_Null.cpp @@ -2,9 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" #include "InputCommon/GCAdapter.h" + namespace GCAdapter { + void Init() {} void Reset() {} void ResetRumble() {}