Merge pull request #3507 from lioncash/header

HW: Header cleanup

Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp

@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <numeric>
 
 #include "Common/Assert.h"
 #include "Core/ConfigManager.h"

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 <algorithm>
 
+#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"

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
 {

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"

Source/Core/Core/HW/DSPHLE/DSPHLE.cpp

@@ -5,15 +5,10 @@
 #include <iostream>
 
 #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"
 

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"

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"
 

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"

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

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"

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:

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"

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"

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"
 

Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp

@@ -2,15 +2,19 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <string>
+
 #ifdef _WIN32
 #include <Windows.h>
 #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"
 

Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp

@@ -2,13 +2,18 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <string>
+
 #ifdef _WIN32
 #include <Windows.h>
 #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"

Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h

@@ -5,9 +5,8 @@
 #pragma once
 
 #include <cstring>
-#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)
 {

Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp

@@ -2,6 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <array>
+
+#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"

Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp

@@ -4,8 +4,8 @@
 
 #include <string>
 
+#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"

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