146 files changed, 117 insertions, 369 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index b3b9971e8..068f395ac 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/src/core/arm/disassembler/arm_disasm.cpp
@@ -1,12 +1,10 @@
 // Copyright 2006 The Android Open Source Project
+#include "core/arm/disassembler/arm_disasm.h"
 #include <string>
 #include <unordered_set>
 #include "common/common_types.h"
 #include "common/string_util.h"
-#include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/skyeye_common/armsupp.h"
 static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
diff --git a/src/core/arm/disassembler/arm_disasm.h b/src/core/arm/disassembler/arm_disasm.h
index 031f973d6..300e228ed 100644
--- a/src/core/arm/disassembler/arm_disasm.h
+++ b/src/core/arm/disassembler/arm_disasm.h
@@ -3,7 +3,6 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 // Note: this list of opcodes must match the list used to initialize
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index 58e8e6fa1..e602d4511 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/arm/disassembler/load_symbol_map.h"
 #include <sstream>
 #include <string>
 #include <vector>
 #include "common/file_util.h"
 #include "common/symbols.h"
-#include "core/arm/disassembler/load_symbol_map.h"
 /*
 * Loads a symbol map file for use with the disassembler
 * @param filename String filename path of symbol map file
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index a521aec7c..b57d9e65b 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/arm/dynarmic/arm_dynarmic.h"
+#include <dynarmic/dynarmic.h>
 #include "common/assert.h"
 #include "common/microprofile.h"
-#include <dynarmic/dynarmic.h>
-#include "core/arm/dynarmic/arm_dynarmic.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/core.h"
 #include "core/core_timing.h"
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h
index d493cabd5..ced86d29b 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.h
+++ b/src/core/arm/dynarmic/arm_dynarmic.h
@@ -5,11 +5,8 @@
 #pragma once
 #include <memory>
 #include <dynarmic/dynarmic.h>
 #include "common/common_types.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/armstate.h"
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index 912560402..bc9ba2941 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -2,18 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/arm/dyncom/arm_dyncom.h"
 #include <cstring>
 #include <memory>
-#include "core/arm/skyeye_common/armstate.h"
-#include "core/arm/skyeye_common/armsupp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
-#include "core/arm/dyncom/arm_dyncom.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"
+#include "core/arm/skyeye_common/armstate.h"
+#include "core/arm/skyeye_common/armsupp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/core.h"
 #include "core/core_timing.h"
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 70f71a828..65db1f0f9 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <memory>
 #include "common/common_types.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/armstate.h"
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 211d49edb..4f83d8332 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -4,27 +4,24 @@
 #define CITRA_IGNORE_EXIT(x)
+#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include <algorithm>
 #include <cstdio>
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/dyncom/arm_dyncom_dec.h"
-#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_thumb.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
+#include "core/gdbstub/gdbstub.h"
 #include "core/hle/svc.h"
 #include "core/memory.h"
-#include "core/gdbstub/gdbstub.h"
 #define RM BITS(sht_oper, 0, 3)
 #define RS BITS(sht_oper, 8, 11)
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.cpp b/src/core/arm/dyncom/arm_dyncom_trans.cpp
index 526cf28f3..5f3644c28 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_trans.cpp
@@ -1,10 +1,8 @@
+#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include <cstdlib>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
-#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.h b/src/core/arm/dyncom/arm_dyncom_trans.h
index 6fdb3d248..b1ec90662 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.h
+++ b/src/core/arm/dyncom/arm_dyncom_trans.h
@@ -1,3 +1,6 @@
+#include <cstddef>
+#include "common/common_types.h"
 struct ARMul_State;
 typedef unsigned int (*shtop_fp_t)(ARMul_State* cpu, unsigned int sht_oper);
diff --git a/src/core/arm/skyeye_common/armstate.h b/src/core/arm/skyeye_common/armstate.h
index f31fb207c..1a707ff7e 100644
--- a/src/core/arm/skyeye_common/armstate.h
+++ b/src/core/arm/skyeye_common/armstate.h
@@ -19,7 +19,6 @@
 #include <array>
 #include <unordered_map>
 #include "common/common_types.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
diff --git a/src/core/arm/skyeye_common/armsupp.cpp b/src/core/arm/skyeye_common/armsupp.cpp
index e70be29a7..b76942e47 100644
--- a/src/core/arm/skyeye_common/armsupp.cpp
+++ b/src/core/arm/skyeye_common/armsupp.cpp
@@ -15,11 +15,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+#include "core/arm/skyeye_common/armsupp.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/armstate.h"
-#include "core/arm/skyeye_common/armsupp.h"
 // Unsigned sum of absolute difference
 u8 ARMul_UnsignedAbsoluteDifference(u8 left, u8 right) {
diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp
index 859937645..8ac1fb95e 100644
--- a/src/core/arm/skyeye_common/vfp/vfp.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfp.cpp
@@ -20,13 +20,12 @@
 /* Note: this file handles interface with arm core and vfp registers */
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 void VFPInit(ARMul_State* state) {
    state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN << 24 | VFP_FPSID_SW << 23 | VFP_FPSID_SUBARCH << 16 |
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
index 2886f351f..4d89743e7 100644
--- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
@@ -51,10 +51,10 @@
 * ===========================================================================
 */
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 static struct vfp_double vfp_double_default_qnan = {
diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
index bf157e2c3..35f9d84d5 100644
--- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
@@ -51,15 +51,13 @@
 * ===========================================================================
 */
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include <cinttypes>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 static struct vfp_single vfp_single_default_qnan = {
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 71a13dd33..346b6a0ae 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/core.h"
 #include <memory>
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/dynarmic/arm_dynarmic.h"
 #include "core/arm/dyncom/arm_dyncom.h"
-#include "core/core.h"
 #include "core/core_timing.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/hle/hle.h"
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index fb88ecaf2..4f38403e3 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -2,17 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/core.h"
 #include <atomic>
 #include <cinttypes>
 #include <mutex>
 #include <vector>
 #include "common/chunk_file.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/arm/arm_interface.h"
-#include "core/core.h"
 #include "core/core_timing.h"
 int g_clock_rate_arm11 = 268123480;
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 64fd8dcd0..b72a1b500 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -4,7 +4,9 @@
 #pragma once
+#include <functional>
 #include <string>
+#include "common/common_types.h"
 // This is a system to schedule events into the emulated machine's future. Time is measured
 // in main CPU clock cycles.
@@ -19,10 +21,6 @@
 // inside callback:
 //   ScheduleEvent(periodInCycles - cycles_late, callback, "whatever")
-#include <functional>
-#include "common/common_types.h"
 extern int g_clock_rate_arm11;
 inline s64 msToCycles(int ms) {
diff --git a/src/core/file_sys/archive_backend.cpp b/src/core/file_sys/archive_backend.cpp
index 6ea920ec1..5c02fb748 100644
--- a/src/core/file_sys/archive_backend.cpp
+++ b/src/core/file_sys/archive_backend.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_backend.h"
 #include <cstddef>
 #include <iomanip>
 #include <sstream>
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/file_sys/archive_backend.h"
 #include "core/memory.h"
 namespace FileSys {
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h
index 7f64fe4e2..d69c3c785 100644
--- a/src/core/file_sys/archive_backend.h
+++ b/src/core/file_sys/archive_backend.h
@@ -8,11 +8,9 @@
 #include <string>
 #include <utility>
 #include <vector>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/result.h"
 namespace FileSys {
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp
index 6b4af28bf..ed9fecd64 100644
--- a/src/core/file_sys/archive_extsavedata.cpp
+++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_extsavedata.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h
index 2b942817e..6a3431e94 100644
--- a/src/core/file_sys/archive_extsavedata.h
+++ b/src/core/file_sys/archive_extsavedata.h
@@ -6,9 +6,7 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp
index 87455eb95..7c0e1da21 100644
--- a/src/core/file_sys/archive_romfs.cpp
+++ b/src/core/file_sys/archive_romfs.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_romfs.h"
 #include <algorithm>
 #include <memory>
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/file_sys/archive_romfs.h"
 #include "core/file_sys/ivfc_archive.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h
index 3c68a6b1c..8a8082a05 100644
--- a/src/core/file_sys/archive_romfs.h
+++ b/src/core/file_sys/archive_romfs.h
@@ -7,9 +7,7 @@
 #include <memory>
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 #include "core/loader/loader.h"
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index 860f2fca8..829f97743 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_savedata.h"
 #include <algorithm>
 #include <memory>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/file_sys/archive_savedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
diff --git a/src/core/file_sys/archive_savedata.h b/src/core/file_sys/archive_savedata.h
index 4ac324985..6a372865a 100644
--- a/src/core/file_sys/archive_savedata.h
+++ b/src/core/file_sys/archive_savedata.h
@@ -6,7 +6,6 @@
 #include <memory>
 #include <string>
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp
index 50fe004fe..8bdf24b1f 100644
--- a/src/core/file_sys/archive_savedatacheck.cpp
+++ b/src/core/file_sys/archive_savedatacheck.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_savedatacheck.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/file_sys/archive_savedatacheck.h"
 #include "core/file_sys/ivfc_archive.h"
 #include "core/hle/service/fs/archive.h"
diff --git a/src/core/file_sys/archive_savedatacheck.h b/src/core/file_sys/archive_savedatacheck.h
index 4a4259260..e9cafbed9 100644
--- a/src/core/file_sys/archive_savedatacheck.h
+++ b/src/core/file_sys/archive_savedatacheck.h
@@ -6,7 +6,6 @@
 #include <memory>
 #include <string>
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index c1a28df6c..887cfbb0f 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_sdmc.h"
 #include <algorithm>
 #include <memory>
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/file_sys/archive_sdmc.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/settings.h"
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 2523c3979..88e855351 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -6,7 +6,6 @@
 #include <memory>
 #include <string>
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 0261ab547..b3dfcf897 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/archive_systemsavedata.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/string_util.h"
-#include "core/file_sys/archive_systemsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index 61a002a7d..a24b89f2b 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -6,9 +6,7 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/directory_backend.h b/src/core/file_sys/directory_backend.h
index 9706e909b..b55e382ef 100644
--- a/src/core/file_sys/directory_backend.h
+++ b/src/core/file_sys/directory_backend.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <cstddef>
 #include "common/common_types.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp
index c084303c1..7e88473bd 100644
--- a/src/core/file_sys/disk_archive.cpp
+++ b/src/core/file_sys/disk_archive.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/disk_archive.h"
 #include <algorithm>
 #include <cstdio>
 #include <memory>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/file_sys/disk_archive.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 64e36f5ea..2165f27f9 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -8,10 +8,8 @@
 #include <memory>
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index 3496facd4..ed997537f 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <cstddef>
 #include "common/common_types.h"
 #include "core/hle/result.h"
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp
index 235a962e9..5add3254b 100644
--- a/src/core/file_sys/ivfc_archive.cpp
+++ b/src/core/file_sys/ivfc_archive.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/file_sys/ivfc_archive.h"
 #include <cstring>
 #include <memory>
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/file_sys/ivfc_archive.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index 0d15550da..0df6cf83a 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -8,10 +8,8 @@
 #include <memory>
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"
diff --git a/src/core/gdbstub/gdbstub.h b/src/core/gdbstub/gdbstub.h
index fddc27a3e..a7483bb10 100644
--- a/src/core/gdbstub/gdbstub.h
+++ b/src/core/gdbstub/gdbstub.h
@@ -6,7 +6,6 @@
 #pragma once
 #include <atomic>
 #include "common/common_types.h"
 namespace GDBStub {
diff --git a/src/core/hle/applets/applet.cpp b/src/core/hle/applets/applet.cpp
index 2b4bd939d..35e683cb3 100644
--- a/src/core/hle/applets/applet.cpp
+++ b/src/core/hle/applets/applet.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/applets/applet.h"
 #include <cstddef>
 #include <memory>
 #include <type_traits>
 #include <unordered_map>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/core_timing.h"
-#include "core/hle/applets/applet.h"
 #include "core/hle/applets/erreula.h"
 #include "core/hle/applets/mii_selector.h"
 #include "core/hle/applets/swkbd.h"
diff --git a/src/core/hle/applets/applet.h b/src/core/hle/applets/applet.h
index 1850ad261..bfdcad126 100644
--- a/src/core/hle/applets/applet.h
+++ b/src/core/hle/applets/applet.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <memory>
 #include "core/hle/result.h"
 #include "core/hle/service/apt/apt.h"
diff --git a/src/core/hle/applets/erreula.cpp b/src/core/hle/applets/erreula.cpp
index 457cbb1bd..9ad77994c 100644
--- a/src/core/hle/applets/erreula.cpp
+++ b/src/core/hle/applets/erreula.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "common/string_util.h"
 #include "core/hle/applets/erreula.h"
+#include "common/string_util.h"
 #include "core/hle/service/apt/apt.h"
 namespace HLE {
diff --git a/src/core/hle/applets/mii_selector.cpp b/src/core/hle/applets/mii_selector.cpp
index 79264d349..53d5b4ab4 100644
--- a/src/core/hle/applets/mii_selector.cpp
+++ b/src/core/hle/applets/mii_selector.cpp
@@ -2,18 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/applets/mii_selector.h"
 #include <cstring>
 #include <string>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/hle/applets/mii_selector.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 #include "video_core/video_core.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/applets/mii_selector.h b/src/core/hle/applets/mii_selector.h
index 26966a271..e3ab9f0cd 100644
--- a/src/core/hle/applets/mii_selector.h
+++ b/src/core/hle/applets/mii_selector.h
@@ -6,7 +6,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/hle/applets/applet.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
diff --git a/src/core/hle/applets/swkbd.cpp b/src/core/hle/applets/swkbd.cpp
index cf2775968..b26107332 100644
--- a/src/core/hle/applets/swkbd.cpp
+++ b/src/core/hle/applets/swkbd.cpp
@@ -2,21 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/applets/swkbd.h"
 #include <cstring>
 #include <string>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/hle/applets/swkbd.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/memory.h"
 #include "video_core/video_core.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/applets/swkbd.h b/src/core/hle/applets/swkbd.h
index 4e2f9de62..ea0b1fba9 100644
--- a/src/core/hle/applets/swkbd.h
+++ b/src/core/hle/applets/swkbd.h
@@ -6,7 +6,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/hle/applets/applet.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
diff --git a/src/core/hle/config_mem.h b/src/core/hle/config_mem.h
index 50664dac6..42fa6d789 100644
--- a/src/core/hle/config_mem.h
+++ b/src/core/hle/config_mem.h
@@ -12,7 +12,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/memory.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index d5d989c29..8ce0f6d2b 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -5,8 +5,8 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/arm/arm_interface.h"
+#include "core/core.h"
 #include "core/hle/hle.h"
 #include "core/hle/result.h"
 #include "core/hle/svc.h"
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index 480a73e80..5749068d6 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/hle.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"
-#include "core/hle/hle.h"
 #include "core/hle/service/service.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 3506c2d48..bcb4ee46f 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/address_arbiter.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/memory.h"
 #include "core/hle/hle.h"
-#include "core/hle/kernel/address_arbiter.h"
 #include "core/hle/kernel/thread.h"
+#include "core/memory.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Kernel namespace
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index 1a03993b2..6a7af93a9 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 // Address arbiters are an underlying kernel synchronization object that can be created/used via
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index 444ce8d45..eed333995 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "common/assert.h"
 #include "core/hle/kernel/client_port.h"
+#include "common/assert.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/server_port.h"
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h
index 70e0d56cc..d28147718 100644
--- a/src/core/hle/kernel/client_port.h
+++ b/src/core/hle/kernel/client_port.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index f056eb7c3..cf8e6fa17 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/event.h"
 #include <algorithm>
 #include <map>
 #include <vector>
 #include "common/assert.h"
-#include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h
index e333a46ce..6fe74065d 100644
--- a/src/core/hle/kernel/event.h
+++ b/src/core/hle/kernel/event.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 1fd7c0326..49bf95618 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/kernel.h"
 #include <algorithm>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/config_mem.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index c683fcb80..0e95f7ff0 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -4,16 +4,13 @@
 #pragma once
-#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <string>
 #include <vector>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include "common/common_types.h"
 #include "core/hle/hle.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index 89a72808a..d13bc74c6 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -2,18 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/memory.h"
 #include <map>
 #include <memory>
 #include <utility>
 #include <vector>
 #include "audio_core/audio_core.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/config_mem.h"
-#include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/result.h"
 #include "core/hle/shared_page.h"
diff --git a/src/core/hle/kernel/memory.h b/src/core/hle/kernel/memory.h
index b941c24b6..4e1856a41 100644
--- a/src/core/hle/kernel/memory.h
+++ b/src/core/hle/kernel/memory.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <memory>
 #include "common/common_types.h"
 #include "core/hle/kernel/process.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index edb97d324..4cd237b44 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -2,15 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/mutex.h"
 #include <map>
 #include <vector>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include "common/assert.h"
 #include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/thread.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h
index cf6a51fdf..53c3dc1f1 100644
--- a/src/core/hle/kernel/mutex.h
+++ b/src/core/hle/kernel/mutex.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index b764f750f..a94d74263 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/process.h"
 #include <memory>
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/memory.h"
-#include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/vm_manager.h"
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h
index 070b2b558..b566950b0 100644
--- a/src/core/hle/kernel/process.h
+++ b/src/core/hle/kernel/process.h
@@ -8,12 +8,9 @@
 #include <cstddef>
 #include <memory>
 #include <string>
 #include <boost/container/static_vector.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/vm_manager.h"
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp
index bb0baed6f..64c91cc62 100644
--- a/src/core/hle/kernel/resource_limit.cpp
+++ b/src/core/hle/kernel/resource_limit.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/resource_limit.h"
 #include <cstring>
 #include "common/logging/log.h"
-#include "core/hle/kernel/resource_limit.h"
 namespace Kernel {
 static SharedPtr<ResourceLimit> resource_limits[4];
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h
index 5d8b31a2d..6cdfbcf8d 100644
--- a/src/core/hle/kernel/resource_limit.h
+++ b/src/core/hle/kernel/resource_limit.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 16ac22f1d..2a9ced5b9 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/semaphore.h"
 #include "common/assert.h"
 #include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/semaphore.h"
 #include "core/hle/kernel/thread.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h
index ed7d9a85c..e01908a25 100644
--- a/src/core/hle/kernel/semaphore.h
+++ b/src/core/hle/kernel/semaphore.h
@@ -6,9 +6,7 @@
 #include <queue>
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp
index 57e93cad4..12a709cee 100644
--- a/src/core/hle/kernel/server_port.cpp
+++ b/src/core/hle/kernel/server_port.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/server_port.h"
 #include <tuple>
 #include "common/assert.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/server_port.h"
 #include "core/hle/kernel/thread.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h
index c3f2ae177..fa9448ca0 100644
--- a/src/core/hle/kernel/server_port.h
+++ b/src/core/hle/kernel/server_port.h
@@ -6,9 +6,7 @@
 #include <string>
 #include <tuple>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index 8e4e010b8..ec025f732 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -5,10 +5,8 @@
 #pragma once
 #include <string>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index bf511a338..8ab916e5b 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/shared_memory.h"
 #include <cstring>
 #include "common/logging/log.h"
 #include "core/hle/kernel/memory.h"
-#include "core/hle/kernel/shared_memory.h"
 #include "core/memory.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index afb142380..94b335ed1 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 0df03c9d5..0185c3ae3 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -2,16 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/thread.h"
 #include <algorithm>
 #include <list>
 #include <vector>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/thread_queue_list.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/core.h"
@@ -21,7 +20,6 @@
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/thread.h"
 #include "core/hle/result.h"
 #include "core/memory.h"
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 2ed5cf74e..f63131716 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -6,13 +6,9 @@
 #include <string>
 #include <vector>
 #include <boost/container/flat_set.hpp>
 #include "common/common_types.h"
 #include "core/core.h"
 #include "core/hle/hle.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 427a81923..7432f3567 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/timer.h"
 #include <cinttypes>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
-#include "core/hle/kernel/timer.h"
 namespace Kernel {
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h
index 97cd0d63c..59a77aad3 100644
--- a/src/core/hle/kernel/timer.h
+++ b/src/core/hle/kernel/timer.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 4ad86cf48..488898641 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -2,11 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/kernel/vm_manager.h"
 #include <iterator>
 #include "common/assert.h"
-#include "core/hle/kernel/vm_manager.h"
 #include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index fbcd9870f..9055664b2 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -7,9 +7,7 @@
 #include <map>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "core/hle/result.h"
 #include "core/mmio.h"
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 492c1ffa6..7f8d8e00d 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -6,7 +6,6 @@
 #include <new>
 #include <utility>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
diff --git a/src/core/hle/service/ac_u.cpp b/src/core/hle/service/ac_u.cpp
index 887b57529..0b61bfae8 100644
--- a/src/core/hle/service/ac_u.cpp
+++ b/src/core/hle/service/ac_u.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ac_u.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/ac_u.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace AC_U
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 528bb1848..e9adfaa1b 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -2,11 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/am/am.h"
 #include <cinttypes>
 #include "common/logging/log.h"
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_app.h"
 #include "core/hle/service/am/am_net.h"
 #include "core/hle/service/am/am_sys.h"
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index dfc1e9c08..6240286bb 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -2,12 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/apt/apt.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "core/hle/applets/applet.h"
-#include "core/hle/service/apt/apt.h"
+#include "core/hle/kernel/event.h"
+#include "core/hle/kernel/mutex.h"
+#include "core/hle/kernel/process.h"
+#include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/apt/apt_a.h"
 #include "core/hle/service/apt/apt_s.h"
 #include "core/hle/service/apt/apt_u.h"
@@ -16,11 +19,6 @@
 #include "core/hle/service/ptm/ptm.h"
 #include "core/hle/service/service.h"
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/mutex.h"
-#include "core/hle/kernel/process.h"
-#include "core/hle/kernel/shared_memory.h"
 namespace Service {
 namespace APT {
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 7597b0d3e..a118cda1f 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -6,7 +6,6 @@
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/kernel/kernel.h"
 namespace Service {
diff --git a/src/core/hle/service/apt/bcfnt/bcfnt.h b/src/core/hle/service/apt/bcfnt/bcfnt.h
index 8936dcf63..453bf7606 100644
--- a/src/core/hle/service/apt/bcfnt/bcfnt.h
+++ b/src/core/hle/service/apt/bcfnt/bcfnt.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/swap.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp
index ec1f9c749..be2e42963 100644
--- a/src/core/hle/service/cam/cam.cpp
+++ b/src/core/hle/service/cam/cam.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/cam/cam.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_c.h"
 #include "core/hle/service/cam/cam_q.h"
 #include "core/hle/service/cam/cam_s.h"
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h
index ec9b835f1..c9b6f8acf 100644
--- a/src/core/hle/service/cam/cam.h
+++ b/src/core/hle/service/cam/cam.h
@@ -7,7 +7,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp
index 65a1d850b..4d8916bdf 100644
--- a/src/core/hle/service/cecd/cecd.cpp
+++ b/src/core/hle/service/cecd/cecd.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/cecd/cecd.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cecd/cecd_s.h"
 #include "core/hle/service/cecd/cecd_u.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index aff033bde..1f706751f 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -2,17 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/cfg/cfg.h"
 #include <algorithm>
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "common/swap.h"
 #include "core/file_sys/archive_systemsavedata.h"
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
-#include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_i.h"
 #include "core/hle/service/cfg/cfg_s.h"
 #include "core/hle/service/cfg/cfg_u.h"
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index c7c2ab41d..fb47c2aa5 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <string>
 #include "common/common_types.h"
 union ResultCode;
diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp
index 70e92c30c..3f2f09f60 100644
--- a/src/core/hle/service/dsp_dsp.cpp
+++ b/src/core/hle/service/dsp_dsp.cpp
@@ -2,16 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/dsp_dsp.h"
 #include <algorithm>
 #include <cinttypes>
 #include "audio_core/hle/pipe.h"
 #include "common/hash.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/dsp_dsp.h"
 using DspPipe = DSP::HLE::DspPipe;
diff --git a/src/core/hle/service/dsp_dsp.h b/src/core/hle/service/dsp_dsp.h
index 22f6687cc..3e97da6eb 100644
--- a/src/core/hle/service/dsp_dsp.h
+++ b/src/core/hle/service/dsp_dsp.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <string>
 #include "core/hle/service/service.h"
 namespace DSP {
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp
index a23f5896d..ff606d883 100644
--- a/src/core/hle/service/err_f.cpp
+++ b/src/core/hle/service/err_f.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/err_f.h"
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/hle/service/err_f.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace ERR_F
diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp
index 050665b48..bd89b522b 100644
--- a/src/core/hle/service/frd/frd.cpp
+++ b/src/core/hle/service/frd/frd.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "common/string_util.h"
 #include "core/hle/service/frd/frd.h"
+#include "common/string_util.h"
 #include "core/hle/service/frd/frd_a.h"
 #include "core/hle/service/frd/frd_u.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 77fe5ab6c..b945b255e 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -2,20 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/fs/archive.h"
 #include <cstddef>
 #include <memory>
 #include <system_error>
 #include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <boost/container/flat_map.hpp>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/archive_savedata.h"
@@ -26,7 +24,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/hle.h"
 #include "core/hle/result.h"
-#include "core/hle/service/fs/archive.h"
 #include "core/hle/service/fs/fs_user.h"
 #include "core/hle/service/service.h"
 #include "core/memory.h"
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h
index aad540ff9..533be34a4 100644
--- a/src/core/hle/service/fs/archive.h
+++ b/src/core/hle/service/fs/archive.h
@@ -6,9 +6,7 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/kernel/session.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 605832214..92578270b 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -2,16 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/fs/fs_user.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/hle/service/fs/fs_user.h"
 #include "core/settings.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index 2dff1e16c..ba148eaf1 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "gsp_gpu.h"
 #include "common/bit_field.h"
 #include "common/microprofile.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
@@ -12,12 +12,9 @@
 #include "core/hw/hw.h"
 #include "core/hw/lcd.h"
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/gpu_debugger.h"
-#include "gsp_gpu.h"
 // Main graphics debugger object - TODO: Here is probably not the best place for this
 GraphicsDebugger g_debugger;
diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp_gpu.h
index e028123f3..79a72f77d 100644
--- a/src/core/hle/service/gsp_gpu.h
+++ b/src/core/hle/service/gsp_gpu.h
@@ -6,10 +6,8 @@
 #include <cstddef>
 #include <string>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 5a2edd3c0..a050e81f7 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -2,20 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/hid/hid.h"
 #include <cmath>
 #include "common/emu_window.h"
 #include "common/logging/log.h"
-#include "core/hle/service/hid/hid.h"
-#include "core/hle/service/hid/hid_spvr.h"
-#include "core/hle/service/hid/hid_user.h"
-#include "core/hle/service/service.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
+#include "core/hle/service/hid/hid_spvr.h"
+#include "core/hle/service/hid/hid_user.h"
+#include "core/hle/service/service.h"
 #include "video_core/video_core.h"
 namespace Service {
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index f54ffd8be..7904e7355 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <array>
 #ifndef _MSC_VER
 #include <cstddef>
 #endif
diff --git a/src/core/hle/service/ir/ir.cpp b/src/core/hle/service/ir/ir.cpp
index fc048ae88..459fe0691 100644
--- a/src/core/hle/service/ir/ir.cpp
+++ b/src/core/hle/service/ir/ir.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ir/ir.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_rst.h"
 #include "core/hle/service/ir/ir_u.h"
 #include "core/hle/service/ir/ir_user.h"
diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp
index b5da9a960..f583f5c31 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.cpp
+++ b/src/core/hle/service/ldr_ro/cro_helper.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ldr_ro/cro_helper.h"
 #include "common/alignment.h"
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
-#include "core/hle/service/ldr_ro/cro_helper.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace LDR_RO
diff --git a/src/core/hle/service/ldr_ro/cro_helper.h b/src/core/hle/service/ldr_ro/cro_helper.h
index e1b8221bd..6a0d0d3bf 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.h
+++ b/src/core/hle/service/ldr_ro/cro_helper.h
@@ -6,10 +6,8 @@
 #include <array>
 #include <tuple>
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/result.h"
 #include "core/memory.h"
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp
index a8fc2c015..3faa2e5d7 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp
@@ -2,15 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ldr_ro/ldr_ro.h"
 #include "common/alignment.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/service/ldr_ro/cro_helper.h"
-#include "core/hle/service/ldr_ro/ldr_ro.h"
 #include "core/hle/service/ldr_ro/memory_synchronizer.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ldr_ro/memory_synchronizer.cpp b/src/core/hle/service/ldr_ro/memory_synchronizer.cpp
index aed6d3365..a3e590dfd 100644
--- a/src/core/hle/service/ldr_ro/memory_synchronizer.cpp
+++ b/src/core/hle/service/ldr_ro/memory_synchronizer.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ldr_ro/memory_synchronizer.h"
 #include <algorithm>
 #include "common/assert.h"
-#include "core/hle/service/ldr_ro/memory_synchronizer.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace LDR_RO
diff --git a/src/core/hle/service/ldr_ro/memory_synchronizer.h b/src/core/hle/service/ldr_ro/memory_synchronizer.h
index 92f267912..883ee4acf 100644
--- a/src/core/hle/service/ldr_ro/memory_synchronizer.h
+++ b/src/core/hle/service/ldr_ro/memory_synchronizer.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <vector>
 #include "core/memory.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/news/news.cpp b/src/core/hle/service/news/news.cpp
index e09ea5681..f22c49f52 100644
--- a/src/core/hle/service/news/news.cpp
+++ b/src/core/hle/service/news/news.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "common/logging/log.h"
 #include "core/hle/service/news/news.h"
+#include "common/logging/log.h"
 #include "core/hle/service/news/news_s.h"
 #include "core/hle/service/news/news_u.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp
index a7b76ed67..60505545c 100644
--- a/src/core/hle/service/nim/nim.cpp
+++ b/src/core/hle/service/nim/nim.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/nim/nim.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/nim/nim_aoc.h"
 #include "core/hle/service/nim/nim_s.h"
 #include "core/hle/service/nim/nim_u.h"
diff --git a/src/core/hle/service/nim/nim_u.h b/src/core/hle/service/nim/nim_u.h
index bc89dc0f3..c4b74985a 100644
--- a/src/core/hle/service/nim/nim_u.h
+++ b/src/core/hle/service/nim/nim_u.h
@@ -1,6 +1,6 @@
 // Copyright 2015 Citra Emulator Project
 // Licensed under GPLv2 or any later version
-// Refer to the license.txt file included..
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/service/nwm_uds.cpp b/src/core/hle/service/nwm_uds.cpp
index ed417fa9a..3b608dcbb 100644
--- a/src/core/hle/service/nwm_uds.cpp
+++ b/src/core/hle/service/nwm_uds.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/nwm_uds.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/nwm_uds.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace NWM_UDS
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index a531aad87..eff51af04 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -2,44 +2,42 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/service.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/hle/service/ac_u.h"
 #include "core/hle/service/act_a.h"
 #include "core/hle/service/act_u.h"
-#include "core/hle/service/csnd_snd.h"
-#include "core/hle/service/dsp_dsp.h"
-#include "core/hle/service/err_f.h"
-#include "core/hle/service/gsp_gpu.h"
-#include "core/hle/service/gsp_lcd.h"
-#include "core/hle/service/http_c.h"
-#include "core/hle/service/mic_u.h"
-#include "core/hle/service/ns_s.h"
-#include "core/hle/service/nwm_uds.h"
-#include "core/hle/service/pm_app.h"
-#include "core/hle/service/service.h"
-#include "core/hle/service/soc_u.h"
-#include "core/hle/service/srv.h"
-#include "core/hle/service/ssl_c.h"
-#include "core/hle/service/y2r_u.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/apt/apt.h"
 #include "core/hle/service/boss/boss.h"
 #include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/csnd_snd.h"
 #include "core/hle/service/dlp/dlp.h"
+#include "core/hle/service/dsp_dsp.h"
+#include "core/hle/service/err_f.h"
 #include "core/hle/service/frd/frd.h"
 #include "core/hle/service/fs/archive.h"
+#include "core/hle/service/gsp_gpu.h"
+#include "core/hle/service/gsp_lcd.h"
 #include "core/hle/service/hid/hid.h"
+#include "core/hle/service/http_c.h"
 #include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ldr_ro/ldr_ro.h"
+#include "core/hle/service/mic_u.h"
 #include "core/hle/service/ndm/ndm.h"
 #include "core/hle/service/news/news.h"
 #include "core/hle/service/nim/nim.h"
+#include "core/hle/service/ns_s.h"
+#include "core/hle/service/nwm_uds.h"
+#include "core/hle/service/pm_app.h"
 #include "core/hle/service/ptm/ptm.h"
+#include "core/hle/service/soc_u.h"
+#include "core/hle/service/srv.h"
+#include "core/hle/service/ssl_c.h"
+#include "core/hle/service/y2r_u.h"
 namespace Service {
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index cd216f27e..39b5ffaae 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -7,11 +7,8 @@
 #include <cstddef>
 #include <string>
 #include <unordered_map>
 #include <boost/container/flat_map.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/session.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index 302ab55b7..1eab61e52 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -2,20 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/soc_u.h"
 #include <algorithm>
 #include <cstring>
 #include <unordered_map>
 #include <vector>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
 #include "core/hle/kernel/session.h"
 #include "core/hle/result.h"
-#include "core/hle/service/soc_u.h"
 #include "core/memory.h"
 #ifdef _WIN32
diff --git a/src/core/hle/service/soc_u.h b/src/core/hle/service/soc_u.h
index a091f597c..8d02ed30f 100644
--- a/src/core/hle/service/soc_u.h
+++ b/src/core/hle/service/soc_u.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <string>
 #include "core/hle/service/service.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index fda9d8acf..241a5da94 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/srv.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/service/srv.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace SRV
diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl_c.cpp
index 78ab922ca..16ec3d116 100644
--- a/src/core/hle/service/ssl_c.cpp
+++ b/src/core/hle/service/ssl_c.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/ssl_c.h"
 #include <random>
 #include "common/common_types.h"
-#include "core/hle/service/ssl_c.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace SSL_C
diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp
index d3c6d073e..38e15b5d0 100644
--- a/src/core/hle/service/y2r_u.cpp
+++ b/src/core/hle/service/y2r_u.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/service/y2r_u.h"
 #include <cstring>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
-#include "core/hle/service/y2r_u.h"
 #include "core/hw/y2r.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/y2r_u.h b/src/core/hle/service/y2r_u.h
index 95fa2fdb7..1b47b5322 100644
--- a/src/core/hle/service/y2r_u.h
+++ b/src/core/hle/service/y2r_u.h
@@ -6,9 +6,7 @@
 #include <array>
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
index 453fcf7ec..74a9031c5 100644
--- a/src/core/hle/shared_page.cpp
+++ b/src/core/hle/shared_page.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hle/shared_page.h"
 #include <chrono>
 #include <cstring>
 #include <ctime>
 #include "core/core_timing.h"
-#include "core/hle/shared_page.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
index b3b10be31..106e47efc 100644
--- a/src/core/hle/shared_page.h
+++ b/src/core/hle/shared_page.h
@@ -13,7 +13,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/memory.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 9d0a9c54c..02b397eba 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -3,16 +3,14 @@
 // Refer to the license.txt file included.
 #include <map>
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
 #include "common/symbols.h"
 #include "core/arm/arm_interface.h"
 #include "core/core_timing.h"
+#include "core/hle/function_wrappers.h"
 #include "core/hle/kernel/address_arbiter.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/event.h"
@@ -26,8 +24,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
 #include "core/hle/kernel/vm_manager.h"
-#include "core/hle/function_wrappers.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index bf2c066f4..776c8fef7 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -2,36 +2,29 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hw/gpu.h"
 #include <cstring>
 #include <numeric>
 #include <type_traits>
 #include "common/color.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
 #include "core/core_timing.h"
-#include "core/memory.h"
-#include "core/settings.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/hid/hid.h"
-#include "core/hw/gpu.h"
 #include "core/hw/hw.h"
+#include "core/memory.h"
+#include "core/settings.h"
 #include "core/tracer/recorder.h"
 #include "video_core/command_processor.h"
+#include "video_core/debug_utils/debug_utils.h"
 #include "video_core/rasterizer_interface.h"
 #include "video_core/renderer_base.h"
 #include "video_core/utils.h"
 #include "video_core/video_core.h"
-#include "video_core/debug_utils/debug_utils.h"
 namespace GPU {
 Regs g_regs;
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 077b6255f..32ddc5697 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <type_traits>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 71f44cbc4..0f84d5adb 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hw/hw.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hw/gpu.h"
-#include "core/hw/hw.h"
 #include "core/hw/lcd.h"
 namespace HW {
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp
index 0e3aa7cfd..5231e4cc5 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -2,14 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hw/lcd.h"
 #include <cstring>
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hw/hw.h"
-#include "core/hw/lcd.h"
 #include "core/tracer/recorder.h"
 #include "video_core/debug_utils/debug_utils.h"
diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h
index 404833165..191fd44af 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/lcd.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <type_traits>
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp
index 838b14163..0e13420d7 100644
--- a/src/core/hw/y2r.cpp
+++ b/src/core/hw/y2r.cpp
@@ -2,19 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/hw/y2r.h"
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <memory>
 #include "common/assert.h"
 #include "common/color.h"
 #include "common/common_types.h"
 #include "common/math_util.h"
 #include "common/vector_math.h"
 #include "core/hle/service/y2r_u.h"
-#include "core/hw/y2r.h"
 #include "core/memory.h"
 namespace HW {
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index c2e87f592..212772c5d 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/loader/3dsx.h"
 #include <algorithm>
 #include <vector>
 #include "common/logging/log.h"
 #include "core/file_sys/archive_romfs.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/loader/3dsx.h"
 #include "core/memory.h"
 namespace Loader {
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index 8d15ba555..cfcc21cc4 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 #include "core/loader/loader.h"
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 53c10a456..0f4148a59 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -2,18 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/loader/elf.h"
 #include <cstring>
 #include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/symbols.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
-#include "core/loader/elf.h"
 #include "core/memory.h"
 using Kernel::SharedPtr;
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index 04a9b482d..584bf6e27 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <string>
 #include "common/common_types.h"
 #include "core/loader/loader.h"
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index b392bf544..147bf8591 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -4,10 +4,8 @@
 #include <memory>
 #include <string>
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/hle/kernel/process.h"
 #include "core/loader/3dsx.h"
 #include "core/loader/elf.h"
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index fdfee835c..9652d7ac5 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -9,7 +9,6 @@
 #include <memory>
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 5b996d671..64c8fef07 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -2,19 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/loader/ncch.h"
 #include <algorithm>
 #include <cstring>
 #include <memory>
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "common/swap.h"
 #include "core/file_sys/archive_romfs.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/loader/ncch.h"
 #include "core/memory.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index f53f8100e..04350d006 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -5,11 +5,9 @@
 #pragma once
 #include <memory>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/loader/loader.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/loader/smdh.cpp b/src/core/loader/smdh.cpp
index 2d014054a..7c875131f 100644
--- a/src/core/loader/smdh.cpp
+++ b/src/core/loader/smdh.cpp
@@ -2,14 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/loader/smdh.h"
 #include <cstring>
 #include <vector>
 #include "common/common_types.h"
 #include "core/loader/loader.h"
-#include "core/loader/smdh.h"
 #include "video_core/utils.h"
 namespace Loader {
diff --git a/src/core/loader/smdh.h b/src/core/loader/smdh.h
index ab665ea82..ac7726c8f 100644
--- a/src/core/loader/smdh.h
+++ b/src/core/loader/smdh.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <vector>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 4de510fe5..c702fa311 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -2,19 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/memory.h"
 #include <array>
 #include <cstring>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/hle/kernel/process.h"
-#include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"
diff --git a/src/core/memory.h b/src/core/memory.h
index 7d60ccdf1..8fd3080ff 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <string>
 #include "common/common_types.h"
 namespace Memory {
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h
index 23c36d019..3fdf3a87d 100644
--- a/src/core/memory_setup.h
+++ b/src/core/memory_setup.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/mmio.h"
 namespace Memory {
diff --git a/src/core/mmio.h b/src/core/mmio.h
index 9aa59212b..f45126da8 100644
--- a/src/core/mmio.h
+++ b/src/core/mmio.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <memory>
 #include "common/common_types.h"
 namespace Memory {
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 09194fe1f..f2d1b5e74 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -3,11 +3,8 @@
 // Refer to the license.txt file included.
 #include "settings.h"
 #include "audio_core/audio_core.h"
 #include "core/gdbstub/gdbstub.h"
 #include "video_core/video_core.h"
 namespace Settings {
diff --git a/src/core/settings.h b/src/core/settings.h
index adb2fd538..5a64f8018 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <string>
 #include "common/common_types.h"
 namespace Settings {
diff --git a/src/core/system.cpp b/src/core/system.cpp
index f2bf648bd..ef190203c 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "core/system.h"
 #include "audio_core/audio_core.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/gdbstub/gdbstub.h"
@@ -11,8 +11,6 @@
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hw/hw.h"
-#include "core/system.h"
 #include "video_core/video_core.h"
 namespace System {
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp
index 11a289b2c..ba4362484 100644
--- a/src/core/tracer/recorder.cpp
+++ b/src/core/tracer/recorder.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "recorder.h"
 #include <cstring>
 #include "common/assert.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "recorder.h"
 namespace CiTrace {
 Recorder::Recorder(const InitialState& initial_state) : initial_state(initial_state) {}
diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h
index 6f5354f84..aea363b95 100644
--- a/src/core/tracer/recorder.h
+++ b/src/core/tracer/recorder.h
@@ -7,12 +7,9 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
 #include <boost/crc.hpp>
-#include "common/common_types.h"
 #include "citrace.h"
+#include "common/common_types.h"
 namespace CiTrace {