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

84 files changed, 149 insertions, 170 deletions

diff --git a/Source/Core/Core/ArmMemTools.cpp b/Source/Core/Core/ArmMemTools.cpp
index 0509db8f88..29a578e495 100644
--- a/Source/Core/Core/ArmMemTools.cpp
+++ b/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
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 1cef73ada5..6c79bd2f21 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/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)
 {
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index 678ac06b22..7891a56819 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/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"
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 56e9898bed..7b7820201f 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/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
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 2c001787db..036e662ee8 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/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;
 
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 4c2eb66b23..ad3cbd6f8f 100644
--- a/Source/Core/Core/Core.cpp
+++ b/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"
 
diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
index 9c60c1b461..4e750108dc 100644
--- a/Source/Core/Core/Core.h
+++ b/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"
diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp
index f5dd1f9565..4cfec8c7c6 100644
--- a/Source/Core/Core/CoreParameter.cpp
+++ b/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),
diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp
index a201027b6d..12a01ee375 100644
--- a/Source/Core/Core/DSP/DSPHWInterface.cpp
+++ b/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"
diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/DSP/DSPIntCCUtil.cpp
index ad7f5abc15..5aa6871839 100644
--- a/Source/Core/Core/DSP/DSPIntCCUtil.cpp
+++ b/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 {
 
diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp
index aaae6cd623..4898dbe924 100644
--- a/Source/Core/Core/DSP/DSPInterpreter.cpp
+++ b/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 {
 
diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp
index bef2df1507..bacc0964ad 100644
--- a/Source/Core/Core/DSP/DSPTables.cpp
+++ b/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)
diff --git a/Source/Core/Core/DSP/DspIntArithmetic.cpp b/Source/Core/Core/DSP/DspIntArithmetic.cpp
index f7a82f648a..95a9665c0c 100644
--- a/Source/Core/Core/DSP/DspIntArithmetic.cpp
+++ b/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.
diff --git a/Source/Core/Core/DSP/DspIntBranch.cpp b/Source/Core/Core/DSP/DspIntBranch.cpp
index 78cf972674..4dd92572fa 100644
--- a/Source/Core/Core/DSP/DspIntBranch.cpp
+++ b/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
diff --git a/Source/Core/Core/DSP/DspIntLoadStore.cpp b/Source/Core/Core/DSP/DspIntLoadStore.cpp
index b676479c5e..43f58508dd 100644
--- a/Source/Core/Core/DSP/DspIntLoadStore.cpp
+++ b/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 {
 
diff --git a/Source/Core/Core/DSP/DspIntMultiplier.cpp b/Source/Core/Core/DSP/DspIntMultiplier.cpp
index 514b87f537..bff947bded 100644
--- a/Source/Core/Core/DSP/DspIntMultiplier.cpp
+++ b/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 {
diff --git a/Source/Core/Core/DSP/assemble.h b/Source/Core/Core/DSP/assemble.h
index 2011fa783b..28a9db4981 100644
--- a/Source/Core/Core/DSP/assemble.h
+++ b/Source/Core/Core/DSP/assemble.h
@@ -24,8 +24,8 @@
 
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "Common/Common.h"
 
diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp
index 65e63ea926..a15f5be6e6 100644
--- a/Source/Core/Core/DSPEmulator.cpp
+++ b/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)
 {
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
index d01db6d605..0388024de9 100644
--- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "Common/Common.h"
 
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
index ce2ba27b23..25d344990c 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp
+++ b/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)
 {
diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
index 3fd73f288d..7f641e9159 100644
--- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
@@ -6,8 +6,8 @@
 #include "Core/FifoPlayer/FifoAnalyzer.h"
 
 #include "VideoCommon/VertexLoader.h"
-#include "VideoCommon/VertexLoader_Position.h"
 #include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoader_Position.h"
 #include "VideoCommon/VertexLoader_TextCoord.h"
 
 namespace FifoAnalyzer
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index 1787246f70..a8f540d223 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -8,8 +8,8 @@
 #include "Core/Core.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/HLE/HLE.h"
-#include "Core/HLE/HLE_OS.h"
 #include "Core/HLE/HLE_Misc.h"
+#include "Core/HLE/HLE_OS.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
 #include "Core/PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
index 3bfb88201e..cb5070260e 100644
--- a/Source/Core/Core/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -18,8 +18,8 @@
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCCache.h"
-#include "Core/PowerPC/SignatureDB.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
 
 #include "DiscIO/Filesystem.h"
 #include "DiscIO/VolumeCreator.h"
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
index 2a5bc52ffa..21cfcc71b8 100644
--- a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
+++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
@@ -31,8 +31,8 @@
 // the TAP-Win32 driver and contains definitions
 // common to both.
 //===============================================
-#include <windows.h>
 #include <stdlib.h>
+#include <windows.h>
 #include <winioctl.h>
 #define TAP_WIN32_MIN_MAJOR 9
 #define TAP_WIN32_MIN_MINOR 0
diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
index 39a80ace47..17838c4428 100644
--- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
+++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
@@ -14,8 +14,8 @@
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
-#include "Core/HW/DSPHLE/HLEMixer.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPHLE/HLEMixer.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 DSPHLE::DSPHLE()
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
index 5a8162e452..df4550ba12 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
@@ -1,6 +1,8 @@
 // Copyright 2013 Dolphin Emulator Project
 // Licensed under GPLv2
 // Refer to the license.txt file included.
+//
+#define AX_WII // Used in UCode_AX_Voice.
 
 #include "AudioCommon/Mixer.h"
 #include "Common/MathUtil.h"
@@ -8,12 +10,10 @@
 
 #include "Core/HW/DSPHLE/MailHandler.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
-
-#define AX_WII
-#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
 CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h
index 3253e94fbd..6f4c2a490c 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h
@@ -17,6 +17,8 @@
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 #include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
 
 #ifdef AX_GC
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp
index 2ff25c78c4..9708a90773 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp
@@ -5,8 +5,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
 CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp
index f61070245d..e9dd1da116 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp
@@ -4,8 +4,8 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_GBA.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
 : IUCode(dsp_hle, crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
index 24bc2029e1..840d284e27 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "Core/ConfigManager.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
index d6e12f9087..1a905978a6 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
@@ -10,8 +10,8 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
index a33b546d67..7c8536ccc0 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
@@ -12,8 +12,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
 CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
index 2f90d967bf..1ae76d2af8 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
@@ -7,8 +7,8 @@
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/Mixer.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
index ccc029891e..bd503baebd 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
@@ -10,8 +10,8 @@
 
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 void CUCode_Zelda::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
index 82f9e3bb35..4dad9783b0 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
@@ -8,7 +8,6 @@
 
 #include "Common/Hash.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
@@ -16,6 +15,7 @@
 #include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
 #include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
index 2413c08e58..73bf8795fb 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Common/Common.h"
 #include "Common/ChunkFile.h"
+#include "Common/Common.h"
 #include "Common/Thread.h"
 
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
index c29a3e9d7c..cf49032fe1 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
@@ -4,14 +4,15 @@
 
 #include "Common/Common.h"
 #include "Common/Hash.h"
-#include "Core/Host.h"
+
 #include "Core/ConfigManager.h"
+#include "Core/Host.h"
 #include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPHost.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPLLE/DSPSymbols.h"
 #include "Core/HW/DSPLLE/DSPLLETools.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "VideoCommon/OnScreenDisplay.h"
 
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
index b891bec503..7f9a926352 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -20,8 +20,8 @@
 #include "Core/DSP/disassemble.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPHost.h"
-#include "Core/DSP/DSPInterpreter.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"
diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp
index b4048c76f4..b5492ac3be 100644
--- a/Source/Core/Core/HW/EXI.cpp
+++ b/Source/Core/Core/HW/EXI.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/Common.h"
 #include "Common/ChunkFile.h"
+#include "Common/Common.h"
 
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp
index e19ceabf42..86833c270d 100644
--- a/Source/Core/Core/HW/EXI_Device.cpp
+++ b/Source/Core/Core/HW/EXI_Device.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 
-#include "Core/Core.h"
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/EXI_DeviceAD16.h"
 #include "Core/HW/EXI_DeviceAMBaseboard.h"
diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp
index 4c3b1aa210..8c17a3d4df 100644
--- a/Source/Core/Core/HW/GCPad.cpp
+++ b/Source/Core/Core/HW/GCPad.cpp
@@ -8,8 +8,8 @@
 #include "Core/HW/GCPadEmu.h"
 
 #include "InputCommon/GCPadStatus.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 
 namespace Pad
diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp
index 1aafdf36cb..512fea8ab9 100644
--- a/Source/Core/Core/HW/GPFifo.cpp
+++ b/Source/Core/Core/HW/GPFifo.cpp
@@ -8,8 +8,8 @@
 #include "Core/HW/GPFifo.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 #include "VideoCommon/VideoBackendBase.h"
 
diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h
index 684d25c595..c01ec7b52d 100644
--- a/Source/Core/Core/HW/HW.h
+++ b/Source/Core/Core/HW/HW.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Common/Common.h"
 #include "Common/ChunkFile.h"
+#include "Common/Common.h"
 
 namespace HW
 {
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index fa569618d2..ca57d24f44 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -13,8 +13,8 @@
 #include "Common/MemArena.h"
 #include "Common/MemoryUtil.h"
 
-#include "Core/Core.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"
@@ -23,13 +23,13 @@
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/EXI.h"
 #include "Core/HW/GPFifo.h"
-#include "Core/HW/MemoryInterface.h"
 #include "Core/HW/Memmap.h"
+#include "Core/HW/MemoryInterface.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/SI.h"
-#include "Core/HW/WII_IPC.h"
 #include "Core/HW/VideoInterface.h"
+#include "Core/HW/WII_IPC.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
index 49f3f6078e..4729d3a678 100644
--- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "Core/HW/GCPad.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/SI_Device.h"
 #include "Core/HW/SI_DeviceAMBaseboard.h"
 
-#include "Core/HW/GCPad.h"
 #include "InputCommon/GCPadStatus.h"
 
 // where to put baseboard debug
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp
index 0e83744f6f..93a73650bb 100644
--- a/Source/Core/Core/HW/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp
@@ -4,13 +4,12 @@
 
 #include <queue>
 
-#include "SFML/Network.hpp"
-
 #include "Common/Thread.h"
-
 #include "Core/HW/SI_Device.h"
 #include "Core/HW/SI_DeviceGBA.h"
 
+#include "SFML/Network.hpp"
+
 static std::thread connectionThread;
 static std::queue<sf::SocketTCP> waiting_socks;
 static std::mutex cs_gba;
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index d6fe5e69a3..4e51ba8585 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -61,8 +61,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
 #include "Common/Thread.h"
 #include "Common/Timer.h"
 
-#include "Core/CoreTiming.h"
 #include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
 #include "Core/DSPEmulator.h"
 #include "Core/Host.h"
 #include "Core/PatchEngine.h"
@@ -72,8 +72,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
 #include "Core/HW/SI.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PowerPC.h"
 
 #include "VideoCommon/CommandProcessor.h"
 #include "VideoCommon/VideoBackendBase.h"
diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp
index 94a359af50..f93aa1c9e8 100644
--- a/Source/Core/Core/HW/Wiimote.cpp
+++ b/Source/Core/Core/HW/Wiimote.cpp
@@ -10,8 +10,8 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 namespace Wiimote
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index 6f57548f45..d306c111c3 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -4,8 +4,8 @@
 
 #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
 
-#include "InputCommon/UDPWrapper.h"
 #include "InputCommon/UDPWiimote.h"
+#include "InputCommon/UDPWrapper.h"
 
 namespace WiimoteEmu
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
index 255833e57f..0a56b60b2b 100644
--- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -25,8 +25,8 @@
 
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
 
 namespace WiimoteEmu
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index efe5274b03..520dd4119d 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -7,23 +7,23 @@
 #include "Common/Common.h"
 #include "Common/Timer.h"
 
-#include "Core/Host.h"
 #include "Core/ConfigManager.h"
+#include "Core/Host.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayClient.h"
 
+#include "Core/HW/WiimoteEmu/MatrixMath.h"
+#include "Core/HW/WiimoteEmu/UDPTLayer.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
 #include "Core/HW/WiimoteEmu/Attachment/Classic.h"
 #include "Core/HW/WiimoteEmu/Attachment/Drums.h"
 #include "Core/HW/WiimoteEmu/Attachment/Guitar.h"
 #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
 #include "Core/HW/WiimoteEmu/Attachment/Turntable.h"
-
-#include "Core/HW/WiimoteEmu/MatrixMath.h"
-#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-#include "Core/HW/WiimoteEmu/WiimoteHid.h"
-#include "Core/HW/WiimoteEmu/UDPTLayer.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 
+
 inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } //because damn MSVSC doesen't comply to C99
 
 namespace
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
index 49714cb6bb..99979efb69 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -7,13 +7,10 @@
 #include <queue>
 #include <vector>
 
-#include "Core/Core.h"
-
 #include "Common/ChunkFile.h"
-
+#include "Core/Core.h"
 #include "Core/HW/WiimoteEmu/Encryption.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
-
 #include "InputCommon/ControllerEmu.h"
 #include "InputCommon/UDPWrapper.h"
 
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
index e924428789..d580126a6b 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -2,28 +2,27 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+// Used for pair up
+#undef NTDDI_VERSION
+#define NTDDI_VERSION  NTDDI_WINXPSP2
+
 #include <algorithm>
+#include <BluetoothAPIs.h>
+#include <bthdef.h>
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
+#include <dbt.h>
+#include <setupapi.h>
 #include <unordered_map>
 #include <unordered_set>
-
 #include <windows.h>
-#include <dbt.h>
-#include <setupapi.h>
 
 #include "Common/Common.h"
 #include "Common/StringUtil.h"
 
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 
-// Used for pair up
-#undef NTDDI_VERSION
-#define NTDDI_VERSION  NTDDI_WINXPSP2
-#include <bthdef.h>
-#include <BluetoothAPIs.h>
-
 //#define AUTHENTICATE_WIIMOTES
 #define SHARE_WRITE_WIIMOTES
 
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index 99db68ba4d..b185f62549 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -6,8 +6,6 @@
 #include <cstdlib>
 #include <queue>
 
-#include "SFML/Network.hpp"
-
 #include "Common/Common.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
@@ -15,8 +13,10 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Host.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+#include "SFML/Network.hpp"
 
 unsigned int g_wiimote_sources[MAX_BBMOTES];
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
index a26ebfc00e..fadd41422d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
@@ -20,13 +20,13 @@ in case of success they are
 They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp.
 */
 
-#include <map>
 #include <list>
+#include <map>
 #include <string>
 
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
-#include "Common/FileUtil.h" // For Copy
+#include "Common/FileUtil.h"
 #include "Common/Thread.h"
 
 #include "Core/ConfigManager.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
index ebeb0cf531..90f586414c 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -33,8 +33,6 @@
 */
 // =============
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
-
 // need to include this before polarssl/aes.h,
 // otherwise we may not get __STDC_FORMAT_MACROS
 #include <cinttypes>
@@ -47,12 +45,13 @@
 #include "Common/StringUtil.h"
 
 #include "Core/ConfigManager.h"
+#include "Core/ec_wii.h"
 #include "Core/Movie.h"
 #include "Core/VolumeHandler.h"
 #include "Core/Boot/Boot_DOL.h"
-#include "Core/PowerPC/PowerPC.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "Core/ec_wii.h"
+#include "Core/PowerPC/PowerPC.h"
 
 #ifdef _WIN32
 #include <Windows.h>
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
index 89fb6c85b8..c3d3f53580 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include <list>
-
 #include <libusb.h>
+#include <list>
 
 #include "Common/Thread.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
index 6b8f224140..80e87eafba 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
+#include <polarssl/havege.h>
 #include <polarssl/net.h>
 #include <polarssl/ssl.h>
-#include <polarssl/havege.h>
 
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
index 985927aa20..25e4f8283b 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
@@ -5,8 +5,8 @@
 #include "Common/Common.h"
 #include "Common/SDCardUtil.h"
 
-#include "Core/Core.h"
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 22e18386ba..bcc83c8078 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -9,8 +9,8 @@
 #include "Core/Movie.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/HW/SystemTimers.h"
-#include "Core/HW/Wiimote.h"
 #include "Core/HW/WII_IPC.h"
+#include "Core/HW/Wiimote.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index da50bc3cb6..9eb3b778b1 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -9,12 +9,11 @@
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/l2cap.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
 #include "Core/IPC_HLE/WiiMote_HID_Attr.h"
 
-#include "Core/IPC_HLE/l2cap.h" // Local
-
 static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL;
 
 CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer()
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 242ac4e933..67b14fb131 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "polarssl/md5.h"
+#include <polarssl/md5.h>
 
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
index d8709d5359..391449ddfd 100644
--- a/Source/Core/Core/Movie.h
+++ b/Source/Core/Core/Movie.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
+#include <string>
+
 #include "Common/ChunkFile.h"
 #include "Common/Common.h"
 
 #include "InputCommon/GCPadStatus.h"
 
-#include <string>
-
 namespace WiimoteEmu
 {
 struct ReportFeatures;
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index a77c7f5dd9..d60eb49259 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -2,24 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Movie.h"
 #include "Core/NetPlayClient.h"
-
-// for wiimote
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
-// for gcpad
+#include "Core/HW/EXI_DeviceIPL.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/SI_DeviceDanceMat.h"
 #include "Core/HW/SI_DeviceGCController.h"
 #include "Core/HW/SI_DeviceGCSteeringWheel.h"
-// for gctime
-#include "Core/HW/EXI_DeviceIPL.h"
-// for wiimote/ OSD messages
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/Movie.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+
 
 std::mutex crit_netplay_client;
 static NetPlayClient * netplay_client = NULL;
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
index 8c14111beb..5882fef75f 100644
--- a/Source/Core/Core/PatchEngine.cpp
+++ b/Source/Core/Core/PatchEngine.cpp
@@ -15,10 +15,10 @@
 // [OnLoad]
 // 0x80020394=dword,0x4e800020
 
+#include <algorithm>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <algorithm>
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp
index 06d40a1086..d73573c9dd 100644
--- a/Source/Core/Core/PowerPC/GDBStub.cpp
+++ b/Source/Core/Core/PowerPC/GDBStub.cpp
@@ -4,11 +4,10 @@
 
 // Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
 
-#include "Core/PowerPC/GDBStub.h"
-
+#include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
 #include <unistd.h>
 #ifdef _WIN32
 #include <ws2tcpip.h>
@@ -19,9 +18,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
-#include <stdarg.h>
 
-#include "Host.h"
+#include "Core/Host.h"
+#include "Core/PowerPC/GDBStub.h"
 
 #define GDB_BFR_MAX  10000
 #define GDB_MAX_BP   10
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp
index 514a9a4a80..46013597fc 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp
@@ -5,11 +5,10 @@
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
+#include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 
-#include "Core/PowerPC/JitInterface.h"
-
 
 bool Interpreter::g_bReserve;
 u32  Interpreter::g_reserveAddr;
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
index cee8fc2c83..e34ab8c6ae 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
@@ -15,9 +15,9 @@
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/Profiler.h"
 #include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/Jit64_Tables.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
-#include "Core/PowerPC/Jit64/Jit64_Tables.h"
 #if defined(_DEBUG) || defined(DEBUGFAST)
 #include "PowerPCDisasm.h"
 #endif
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h
index 1387fd546e..b1c9d0ef45 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit.h
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.h
@@ -32,10 +32,10 @@
 #include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBackpatch.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
-#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 class Jit64 : public Jitx86Base
 {
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
index c3ed548a89..d24b058218 100644
--- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <cinttypes>
+#include <ctime> // For profiling
 #include <map>
 #include <memory>
 
@@ -11,8 +12,8 @@
 #include "Core/HLE/HLE.h"
 #include "Core/PowerPC/Profiler.h"
 #include "Core/PowerPC/Jit64IL/JitIL.h"
-#include "Core/PowerPC/Jit64IL/JitILAsm.h"
 #include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
+#include "Core/PowerPC/Jit64IL/JitILAsm.h"
 
 using namespace Gen;
 using namespace PowerPC;
@@ -130,10 +131,6 @@ ps_adds1
 
 */
 
-
-// For profiling
-#include <time.h>
-
 #ifdef _WIN32
 #include <windows.h>
 #include <intrin.h>
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h
index 9ed2a354a3..146f905f73 100644
--- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h
@@ -23,18 +23,18 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/Memmap.h"
 #include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Jit64IL/JitILAsm.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBackpatch.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
-#include "Core/PowerPC/JitCommon/Jit_Util.h"
-#include "Core/PowerPC/JitILCommon/JitILBase.h"
 #include "Core/PowerPC/JitILCommon/IR.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
 
 #ifdef _M_X64
 #define DISABLE64 \
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp
index cb28dd42c5..79ea71a811 100644
--- a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.cpp
@@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Core/PowerPC/Jit64IL/JitIL.h"
-#include "Core/PowerPC/Jit64IL/JitILAsm.h"
-
 #include "Common/CPUDetect.h"
 #include "Common/MemoryUtil.h"
 
+#include "Core/PowerPC/Jit64IL/JitIL.h"
+#include "Core/PowerPC/Jit64IL/JitILAsm.h"
+
 using namespace Gen;
 
 //static int temp32; // unused?
diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp
index cb62c023e0..3c4cdf6ca5 100644
--- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp
+++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp
@@ -4,20 +4,21 @@
 
 #include <map>
 
-#include "Common/Common.h"
 #include "Common/ArmEmitter.h"
+#include "Common/Common.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/PatchEngine.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCTables.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Profiler.h"
-#include "Core/HW/GPFifo.h"
-#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitArm32/Jit.h"
 #include "Core/PowerPC/JitArm32/JitArm_Tables.h"
 
diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
index 16d13a6941..a66cdbed8b 100644
--- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
+++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
@@ -11,12 +11,10 @@
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCTables.h"
-#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
-
 #include "Core/PowerPC/JitArm32/Jit.h"
+#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
 #include "Core/PowerPC/JitArm32/JitAsm.h"
 #include "Core/PowerPC/JitArm32/JitFPRCache.h"
-#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
 #include "Core/PowerPC/JitArm32/JitRegCache.h"
 
 void JitArm::Helper_UpdateCR1(ARMReg fpscr, ARMReg temp)
diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp
index 00c51eca19..ed7a39cbf4 100644
--- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp
+++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp
@@ -4,8 +4,8 @@
 
 #include <map>
 
-#include "Common/Common.h"
 #include "Common/ArmEmitter.h"
+#include "Common/Common.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp
index ab2c92db9a..be7c34f5d8 100644
--- a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp
+++ b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp
@@ -10,9 +10,9 @@
 #include "Core/HW/GPFifo.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "Core/PowerPC/JitCommon/JitCache.h"
 #include "Core/PowerPC/JitArmIL/JitIL.h"
 #include "Core/PowerPC/JitArmIL/JitILAsm.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
 
 JitArmILAsmRoutineManager armil_asm_routines;
 void JitArmILAsmRoutineManager::Generate()
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
index 79469a5f79..f99bfc65a5 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
@@ -9,8 +9,8 @@
 
 #include "Common/Common.h"
 #include "Common/StringUtil.h"
-#include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitBackpatch.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 #ifdef _WIN32
 	#include <windows.h>
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
index 38f142bed3..44cdfa00d0 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "Common/Common.h"
-#include "Common/x64Emitter.h"
 #include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
 
 // meh.
 #if defined(_WIN32)
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
index 55e5fe6798..fde0750017 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
@@ -22,10 +22,10 @@
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitAsmCommon.h"
-#include "Core/PowerPC/JitCommon/JitBackpatch.h"  // for EmuCodeBlock
+#include "Core/PowerPC/JitCommon/JitBackpatch.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
-#include "Core/PowerPC/JitCommon/Jit_Util.h"      // for EmuCodeBlock
 
 // Use these to control the instruction selection
 // #define INSTRUCTION_START Default(inst); return;
diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
index 7475f4431c..ec03303a97 100644
--- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
@@ -5,8 +5,8 @@
 #include "Common/Common.h"
 #include "Common/CPUDetect.h"
 
-#include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 using namespace Gen;
 
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp
index 54a82d9245..6527093ea9 100644
--- a/Source/Core/Core/PowerPC/JitInterface.cpp
+++ b/Source/Core/Core/PowerPC/JitInterface.cpp
@@ -9,8 +9,12 @@
 #include <windows.h>
 #endif
 
-#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 #ifndef _M_GENERIC
 #include "Core/PowerPC/Jit64/Jit.h"
@@ -26,11 +30,6 @@
 #include "Core/PowerPC/JitArmIL/JitIL_Tables.h"
 #endif
 
-#include "Core/ConfigManager.h"
-#include "Core/HW/Memmap.h"
-#include "Core/PowerPC/Profiler.h"
-#include "Core/PowerPC/PPCSymbolDB.h"
-
 bool bFakeVMEM = false;
 bool bMMU = false;
 
diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp
index 976435ef5f..3ccd6f683f 100644
--- a/Source/Core/Core/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/PowerPC/PPCCache.cpp
@@ -3,11 +3,11 @@
 // Refer to the license.txt file included.
 
 #include "Core/HW/Memmap.h"
-#include "Core/PowerPC/PPCCache.h"
+#include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCCache.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
-#include "Core/PowerPC/JitInterface.h"
 
 namespace PowerPC
 {
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 3d8f3d5c0c..a1eecd3312 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -9,8 +9,8 @@
 #include "Common/Thread.h"
 #include "Common/Timer.h"
 
-#include "Core/Core.h"
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/Movie.h"
 #include "Core/State.h"
diff --git a/Source/Core/Core/ec_wii.cpp b/Source/Core/Core/ec_wii.cpp
index bb858a987b..d89e17f71d 100644
--- a/Source/Core/Core/ec_wii.cpp
+++ b/Source/Core/Core/ec_wii.cpp
@@ -10,7 +10,7 @@
 #include <cstdio>
 #include <string.h>
 
-#include "polarssl/sha1.h"
+#include <polarssl/sha1.h>
 
 #include "Common/FileUtil.h"
 #include "Common/Crypto/tools.h"