Fix more header sorting issues in Core/ (now check-includes clean).

Source/Core/Core/ArmMemTools.cpp

@@ -3,20 +3,20 @@
 // Refer to the license.txt file included.
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <signal.h>
 #ifdef ANDROID
 #include <asm/sigcontext.h>
 #else
-#include <sys/ucontext.h>   // Look in here for the context definition.
 #include <execinfo.h>
+#include <sys/ucontext.h>   // Look in here for the context definition.
 #endif
 
 #include "Common/Common.h"
 #include "Core/MemTools.h"
 #include "Core/HW/Memmap.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 namespace EMM

Source/Core/Core/Boot/Boot.cpp

@@ -30,8 +30,8 @@
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/SignatureDB.h"
 
-#include "DiscIO/VolumeCreator.h"
 #include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/VolumeCreator.h"
 
 void CBoot::Load_FST(bool _bIsWii)
 {

Source/Core/Core/Boot/Boot_BS2Emu.cpp

@@ -15,10 +15,10 @@
 #include "Core/VolumeHandler.h"
 #include "Core/Boot/Boot.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DVDInterface.h"
 #include "Core/HW/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DVDInterface.h"
-#include "Core/HW/CPU.h"
 #include "Core/PowerPC/PowerPC.h"
 
 #include "DiscIO/VolumeCreator.h"

Source/Core/Core/BootManager.cpp

@@ -23,10 +23,8 @@
 #include <string>
 #include <vector>
 
-#include "DiscIO/Volume.h"
-#include "DiscIO/VolumeCreator.h"
-#include "Common/CommonTypes.h"
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 #include "Common/IniFile.h"
 #include "Common/SysConf.h"
 #include "Core/BootManager.h"
@@ -38,6 +36,8 @@
 #include "Core/HW/EXI.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
 #include "VideoCommon/VideoBackendBase.h"
 
 namespace BootManager

Source/Core/Core/ConfigManager.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DiscIO/NANDContentLoader.h"
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/SI.h"
+#include "DiscIO/NANDContentLoader.h"
 
 SConfig* SConfig::m_Instance;
 

Source/Core/Core/Core.cpp

@@ -9,8 +9,6 @@
 
 #include "AudioCommon/AudioCommon.h"
 
-#include "DiscIO/FileMonitor.h"
-
 #include "Common/Atomic.h"
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
@@ -48,14 +46,15 @@
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/Wiimote.h"
-
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
-
 #include "Core/PowerPC/PowerPC.h"
+
 #ifdef USE_GDBSTUB
 #include "Core/PowerPC/GDBStub.h"
 #endif
 
+#include "DiscIO/FileMonitor.h"
+
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/VideoBackendBase.h"
 

Source/Core/Core/Core.h

@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Core/CoreParameter.h"

Source/Core/Core/CoreParameter.cpp

@@ -10,9 +10,6 @@
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 
-#include "DiscIO/NANDContentLoader.h"
-#include "DiscIO/VolumeCreator.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/Core.h" // for bWii
 #include "Core/CoreParameter.h"
@@ -20,6 +17,9 @@
 #include "Core/Boot/Boot_DOL.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
 
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/VolumeCreator.h"
+
 SCoreStartupParameter::SCoreStartupParameter()
 : hInstance(0),
   bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),

Source/Core/Core/DSP/DSPHWInterface.cpp

@@ -25,11 +25,11 @@
 
 #include "Common/Atomic.h"
 #include "Common/CPUDetect.h"
-#include "Common/Thread.h"
 #include "Common/MemoryUtil.h"
+#include "Common/Thread.h"
 
-#include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPAccelerator.h"
+#include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPHost.h"
 #include "Core/DSP/DSPHWInterface.h"

Source/Core/Core/DSP/DSPIntCCUtil.cpp

@@ -8,8 +8,8 @@
 // HELPER FUNCTIONS
 
 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPInterpreter.cpp

@@ -26,9 +26,8 @@
 #include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPHWInterface.h"
-#include "Core/DSP/DSPTables.h"
-
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPTables.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPTables.cpp

@@ -6,9 +6,9 @@
 
 #include "Common/Common.h"
 
+#include "Core/DSP/DSPEmitter.h"
 #include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntExtOps.h"
-#include "Core/DSP/DSPEmitter.h"
 #include "Core/DSP/DSPTables.h"
 
 void nop(const UDSPInstruction opc)

Source/Core/Core/DSP/DspIntArithmetic.cpp

@@ -4,8 +4,8 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
 
 // Arithmetic and accumulator control.

Source/Core/Core/DSP/DspIntBranch.cpp

@@ -5,13 +5,12 @@
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPIntCCUtil.h"
 #include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
 #include "Core/DSP/DSPMemoryMap.h"
 #include "Core/DSP/DSPStacks.h"
 
-#include "Core/DSP/DSPIntCCUtil.h"
-#include "Core/DSP/DSPIntUtil.h"
-
 namespace DSPInterpreter {
 
 // Generic call implementation

Source/Core/Core/DSP/DspIntLoadStore.cpp

@@ -5,9 +5,8 @@
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #include "Core/DSP/DSPInterpreter.h"
-#include "Core/DSP/DSPMemoryMap.h"
-
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DspIntMultiplier.cpp

@@ -7,9 +7,8 @@
 
 // Multiplier and product register control
 
-#include "Core/DSP/DSPInterpreter.h"
-
 #include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {

Source/Core/Core/DSP/assemble.h

@@ -24,8 +24,8 @@
 
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "Common/Common.h"
 

Source/Core/Core/DSPEmulator.cpp

@@ -4,8 +4,8 @@
 
 #include "Core/DSPEmulator.h"
 
-#include "Core/HW/DSPLLE/DSPLLE.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPLLE/DSPLLE.h"
 
 DSPEmulator *CreateDSPEmulator(bool HLE)
 {

Source/Core/Core/Debugger/Debugger_SymbolMap.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "Common/Common.h"
 

Source/Core/Core/Debugger/PPCDebugInterface.cpp

@@ -12,8 +12,8 @@
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
 {