289 files changed, 214 insertions, 731 deletions
diff --git a/src/.clang-format b/src/.clang-format
index f9a5d1378..fc1bbb297 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -50,6 +50,8 @@ IncludeCategories:
    Priority:        1
  - Regex:           '^\<(boost|catch|dynarmic|glad|inih|nihstro)/'
    Priority:        3
+  - Regex:           '^\<(SDL|SoundTouch|Q)'
+    Priority:        3
  - Regex:           '^\<'
    Priority:        2
 IndentCaseLabels: false
diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cpp
index 0b36dbb03..c54a4b99a 100644
--- a/src/audio_core/audio_core.cpp
+++ b/src/audio_core/audio_core.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/audio_core.h"
 #include <memory>
 #include <string>
-#include "audio_core/audio_core.h"
 #include "audio_core/hle/dsp.h"
 #include "audio_core/hle/pipe.h"
 #include "audio_core/null_sink.h"
 #include "audio_core/sink.h"
 #include "audio_core/sink_details.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/service/dsp_dsp.h"
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp
index 4edfe9be0..fd189a176 100644
--- a/src/audio_core/codec.cpp
+++ b/src/audio_core/codec.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/codec.h"
 #include <array>
 #include <cstddef>
 #include <cstring>
 #include <vector>
-#include "audio_core/codec.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/math_util.h"
diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h
index 77bbf98b5..2b0c395e6 100644
--- a/src/audio_core/codec.h
+++ b/src/audio_core/codec.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <vector>
 #include "common/common_types.h"
 namespace Codec {
diff --git a/src/audio_core/hle/common.h b/src/audio_core/hle/common.h
index 8e7e5c3cd..7fbc3ad9a 100644
--- a/src/audio_core/hle/common.h
+++ b/src/audio_core/hle/common.h
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <array>
 #include "common/common_types.h"
 namespace DSP {
diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp
index aaa3a280f..aa64dae97 100644
--- a/src/audio_core/hle/dsp.cpp
+++ b/src/audio_core/hle/dsp.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/hle/dsp.h"
 #include <array>
 #include <memory>
-#include "audio_core/hle/dsp.h"
 #include "audio_core/hle/mixers.h"
 #include "audio_core/hle/pipe.h"
 #include "audio_core/hle/source.h"
diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h
index f4c4b01e2..0a0f60ac1 100644
--- a/src/audio_core/hle/dsp.h
+++ b/src/audio_core/hle/dsp.h
@@ -8,9 +8,7 @@
 #include <cstddef>
 #include <memory>
 #include <type_traits>
 #include "audio_core/hle/common.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
diff --git a/src/audio_core/hle/filter.cpp b/src/audio_core/hle/filter.cpp
index da2a4684e..edf95f686 100644
--- a/src/audio_core/hle/filter.cpp
+++ b/src/audio_core/hle/filter.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/hle/filter.h"
 #include <array>
 #include <cstddef>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
-#include "audio_core/hle/filter.h"
 #include "common/common_types.h"
 #include "common/math_util.h"
diff --git a/src/audio_core/hle/filter.h b/src/audio_core/hle/filter.h
index 73d5ce670..4281a5898 100644
--- a/src/audio_core/hle/filter.h
+++ b/src/audio_core/hle/filter.h
@@ -5,10 +5,8 @@
 #pragma once
 #include <array>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
 #include "common/common_types.h"
 namespace DSP {
diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp
index 126f328bc..6cc81dfca 100644
--- a/src/audio_core/hle/mixers.cpp
+++ b/src/audio_core/hle/mixers.cpp
@@ -7,7 +7,6 @@
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
 #include "audio_core/hle/mixers.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
diff --git a/src/audio_core/hle/mixers.h b/src/audio_core/hle/mixers.h
index 537c3a3b9..bf4e865ae 100644
--- a/src/audio_core/hle/mixers.h
+++ b/src/audio_core/hle/mixers.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <array>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp
index f2b6d6552..cab30c8aa 100644
--- a/src/audio_core/hle/pipe.cpp
+++ b/src/audio_core/hle/pipe.cpp
@@ -2,16 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/hle/pipe.h"
 #include <array>
 #include <vector>
 #include "audio_core/hle/dsp.h"
-#include "audio_core/hle/pipe.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/service/dsp_dsp.h"
 namespace DSP {
diff --git a/src/audio_core/hle/pipe.h b/src/audio_core/hle/pipe.h
index 6d7fd92ab..ac053c029 100644
--- a/src/audio_core/hle/pipe.h
+++ b/src/audio_core/hle/pipe.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <vector>
 #include "common/common_types.h"
 namespace DSP {
diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp
index 249acc449..9e6b36fcd 100644
--- a/src/audio_core/hle/source.cpp
+++ b/src/audio_core/hle/source.cpp
@@ -2,17 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/hle/source.h"
 #include <algorithm>
 #include <array>
 #include "audio_core/codec.h"
 #include "audio_core/hle/common.h"
-#include "audio_core/hle/source.h"
 #include "audio_core/interpolate.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/memory.h"
 namespace DSP {
diff --git a/src/audio_core/hle/source.h b/src/audio_core/hle/source.h
index a1ab15520..3d725f2a3 100644
--- a/src/audio_core/hle/source.h
+++ b/src/audio_core/hle/source.h
@@ -7,13 +7,11 @@
 #include <array>
 #include <queue>
 #include <vector>
 #include "audio_core/codec.h"
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
 #include "audio_core/hle/filter.h"
 #include "audio_core/interpolate.h"
 #include "common/common_types.h"
 namespace DSP {
diff --git a/src/audio_core/interpolate.cpp b/src/audio_core/interpolate.cpp
index cb1c58a67..8a5d4181a 100644
--- a/src/audio_core/interpolate.cpp
+++ b/src/audio_core/interpolate.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 #include "audio_core/interpolate.h"
 #include "common/assert.h"
 #include "common/math_util.h"
diff --git a/src/audio_core/interpolate.h b/src/audio_core/interpolate.h
index 2d2e60311..dd06fdda9 100644
--- a/src/audio_core/interpolate.h
+++ b/src/audio_core/interpolate.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <vector>
 #include "common/common_types.h"
 namespace AudioInterp {
diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h
index 9931c4778..e7668438c 100644
--- a/src/audio_core/null_sink.h
+++ b/src/audio_core/null_sink.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <cstddef>
 #include "audio_core/audio_core.h"
 #include "audio_core/sink.h"
diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp
index 65aac877a..2520796cb 100644
--- a/src/audio_core/sdl2_sink.cpp
+++ b/src/audio_core/sdl2_sink.cpp
@@ -2,15 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/sdl2_sink.h"
 #include <list>
+#include <numeric>
 #include <vector>
 #include <SDL.h>
 #include "audio_core/audio_core.h"
-#include "audio_core/sdl2_sink.h"
-#include <numeric>
 #include "common/assert.h"
 #include "common/logging/log.h"
diff --git a/src/audio_core/sdl2_sink.h b/src/audio_core/sdl2_sink.h
index b13827214..ccd0f7c7e 100644
--- a/src/audio_core/sdl2_sink.h
+++ b/src/audio_core/sdl2_sink.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <memory>
 #include "audio_core/sink.h"
 namespace AudioCore {
diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h
index f5ce55a6b..08f3bab5b 100644
--- a/src/audio_core/sink.h
+++ b/src/audio_core/sink.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <vector>
 #include "common/common_types.h"
 namespace AudioCore {
diff --git a/src/audio_core/sink_details.cpp b/src/audio_core/sink_details.cpp
index ff529f4cf..1dc5e862e 100644
--- a/src/audio_core/sink_details.cpp
+++ b/src/audio_core/sink_details.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/sink_details.h"
 #include <memory>
 #include <vector>
 #include "audio_core/null_sink.h"
-#include "audio_core/sink_details.h"
 #ifdef HAVE_SDL2
 #include "audio_core/sdl2_sink.h"
 #endif
diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp
index f44807c84..26059f503 100644
--- a/src/audio_core/time_stretch.cpp
+++ b/src/audio_core/time_stretch.cpp
@@ -2,15 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "audio_core/time_stretch.h"
 #include <chrono>
 #include <cmath>
 #include <vector>
 #include <SoundTouch.h>
 #include "audio_core/audio_core.h"
-#include "audio_core/time_stretch.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
diff --git a/src/audio_core/time_stretch.h b/src/audio_core/time_stretch.h
index 42a213679..fa81718ed 100644
--- a/src/audio_core/time_stretch.h
+++ b/src/audio_core/time_stretch.h
@@ -5,7 +5,6 @@
 #include <cstddef>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 namespace AudioCore {
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 1b8f8cffe..e47375f88 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -21,22 +21,19 @@
 #include <Windows.h>
 #endif
+#include "citra/config.h"
+#include "citra/emu_window/emu_window_sdl2.h"
 #include "common/logging/backend.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/loader/loader.h"
 #include "core/settings.h"
 #include "core/system.h"
-#include "citra/config.h"
-#include "citra/emu_window/emu_window_sdl2.h"
 #include "video_core/video_core.h"
 static void PrintHelp(const char* argv0) {
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 77679bd88..58aef7a9a 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -2,21 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "config.h"
 #include <memory>
-#include <inih/cpp/INIReader.h>
 #include <SDL.h>
+#include <inih/cpp/INIReader.h>
 #include "citra/default_ini.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "core/settings.h"
-#include "config.h"
 Config::Config() {
    // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
    sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";
diff --git a/src/citra/config.h b/src/citra/config.h
index 8bd2b294b..b1c31f59c 100644
--- a/src/citra/config.h
+++ b/src/citra/config.h
@@ -6,7 +6,6 @@
 #include <memory>
 #include <string>
 #include <inih/cpp/INIReader.h>
 class Config {
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp
index 42f2a7553..7df054208 100644
--- a/src/citra/emu_window/emu_window_sdl2.cpp
+++ b/src/citra/emu_window/emu_window_sdl2.cpp
@@ -5,22 +5,16 @@
 #include <algorithm>
 #include <cstdlib>
 #include <string>
 #define SDL_MAIN_HANDLED
 #include <SDL.h>
 #include <glad/glad.h>
+#include "citra/emu_window/emu_window_sdl2.h"
 #include "common/key_map.h"
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/string_util.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/settings.h"
-#include "citra/emu_window/emu_window_sdl2.h"
 #include "video_core/video_core.h"
 void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h
index d4d86821d..e4d14ef12 100644
--- a/src/citra/emu_window/emu_window_sdl2.h
+++ b/src/citra/emu_window/emu_window_sdl2.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <utility>
 #include "common/emu_window.h"
 struct SDL_Window;
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 53d035b32..0abae86c3 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -9,16 +9,13 @@
 #endif
 #include "citra_qt/bootmanager.h"
 #include "common/key_map.h"
 #include "common/microprofile.h"
 #include "common/scm_rev.h"
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/settings.h"
 #include "core/system.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/video_core.h"
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index 59241684d..67228b94f 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -5,10 +5,8 @@
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
 #include <QGLWidget>
 #include <QThread>
 #include "common/emu_window.h"
 #include "common/thread.h"
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index d25bdcf9f..e3648572f 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -2,11 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QSettings>
 #include "citra_qt/config.h"
+#include <QSettings>
 #include "citra_qt/ui_settings.h"
 #include "common/file_util.h"
 Config::Config() {
diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h
index db76fa870..79c901804 100644
--- a/src/citra_qt/config.h
+++ b/src/citra_qt/config.h
@@ -4,9 +4,8 @@
 #pragma once
-#include <QVariant>
 #include <string>
+#include <QVariant>
 #include "core/settings.h"
 class QSettings;
diff --git a/src/citra_qt/configure_audio.cpp b/src/citra_qt/configure_audio.cpp
index 944047d05..ba976252e 100644
--- a/src/citra_qt/configure_audio.cpp
+++ b/src/citra_qt/configure_audio.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "audio_core/sink_details.h"
 #include "citra_qt/configure_audio.h"
-#include "ui_configure_audio.h"
+#include "audio_core/sink_details.h"
 #include "core/settings.h"
+#include "ui_configure_audio.h"
 ConfigureAudio::ConfigureAudio(QWidget* parent)
    : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) {
diff --git a/src/citra_qt/configure_audio.h b/src/citra_qt/configure_audio.h
index e836910aa..51df2e27b 100644
--- a/src/citra_qt/configure_audio.h
+++ b/src/citra_qt/configure_audio.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QWidget>
 #include <memory>
+#include <QWidget>
 namespace Ui {
 class ConfigureAudio;
diff --git a/src/citra_qt/configure_debug.cpp b/src/citra_qt/configure_debug.cpp
index dde8d670e..dcc398eee 100644
--- a/src/citra_qt/configure_debug.cpp
+++ b/src/citra_qt/configure_debug.cpp
@@ -3,9 +3,8 @@
 // Refer to the license.txt file included.
 #include "citra_qt/configure_debug.h"
-#include "ui_configure_debug.h"
 #include "core/settings.h"
+#include "ui_configure_debug.h"
 ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) {
    ui->setupUi(this);
diff --git a/src/citra_qt/configure_debug.h b/src/citra_qt/configure_debug.h
index e9c6960e2..d167eb996 100644
--- a/src/citra_qt/configure_debug.h
+++ b/src/citra_qt/configure_debug.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QWidget>
 #include <memory>
+#include <QWidget>
 namespace Ui {
 class ConfigureDebug;
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp
index c33c95540..d6a4e8af1 100644
--- a/src/citra_qt/configure_dialog.cpp
+++ b/src/citra_qt/configure_dialog.cpp
@@ -4,9 +4,8 @@
 #include "citra_qt/configure_dialog.h"
 #include "citra_qt/config.h"
-#include "ui_configure.h"
 #include "core/settings.h"
+#include "ui_configure.h"
 ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) {
    ui->setupUi(this);
diff --git a/src/citra_qt/configure_dialog.h b/src/citra_qt/configure_dialog.h
index e4e450691..21fa1f501 100644
--- a/src/citra_qt/configure_dialog.h
+++ b/src/citra_qt/configure_dialog.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QDialog>
 #include <memory>
+#include <QDialog>
 namespace Ui {
 class ConfigureDialog;
diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index 3e6f76bfe..27139fb30 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -4,10 +4,9 @@
 #include "citra_qt/configure_general.h"
 #include "citra_qt/ui_settings.h"
-#include "ui_configure_general.h"
 #include "core/settings.h"
 #include "core/system.h"
+#include "ui_configure_general.h"
 ConfigureGeneral::ConfigureGeneral(QWidget* parent)
    : QWidget(parent), ui(new Ui::ConfigureGeneral) {
diff --git a/src/citra_qt/configure_general.h b/src/citra_qt/configure_general.h
index 196474ae3..447552d8c 100644
--- a/src/citra_qt/configure_general.h
+++ b/src/citra_qt/configure_general.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QWidget>
 #include <memory>
+#include <QWidget>
 namespace Ui {
 class ConfigureGeneral;
diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp
index bde6727cc..19c1f75c2 100644
--- a/src/citra_qt/configure_graphics.cpp
+++ b/src/citra_qt/configure_graphics.cpp
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 #include "citra_qt/configure_graphics.h"
-#include "ui_configure_graphics.h"
 #include "core/settings.h"
 #include "core/system.h"
+#include "ui_configure_graphics.h"
 ConfigureGraphics::ConfigureGraphics(QWidget* parent)
    : QWidget(parent), ui(new Ui::ConfigureGraphics) {
diff --git a/src/citra_qt/configure_graphics.h b/src/citra_qt/configure_graphics.h
index 906d534a6..5497a55f7 100644
--- a/src/citra_qt/configure_graphics.h
+++ b/src/citra_qt/configure_graphics.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QWidget>
 #include <memory>
+#include <QWidget>
 namespace Ui {
 class ConfigureGraphics;
diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp
index 7900134ca..7039301e3 100644
--- a/src/citra_qt/configure_input.cpp
+++ b/src/citra_qt/configure_input.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QTimer>
+#include "citra_qt/configure_input.h"
 #include <memory>
 #include <utility>
+#include <QTimer>
-#include "citra_qt/configure_input.h"
 ConfigureInput::ConfigureInput(QWidget* parent)
    : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) {
diff --git a/src/citra_qt/configure_input.h b/src/citra_qt/configure_input.h
index 5d9624bb0..5183b904d 100644
--- a/src/citra_qt/configure_input.h
+++ b/src/citra_qt/configure_input.h
@@ -4,9 +4,9 @@
 #pragma once
+#include <memory>
 #include <QKeyEvent>
 #include <QWidget>
 #include "citra_qt/config.h"
 #include "core/settings.h"
 #include "ui_configure_input.h"
diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp
index 732e15dda..873d314ec 100644
--- a/src/citra_qt/configure_system.cpp
+++ b/src/citra_qt/configure_system.cpp
@@ -4,11 +4,10 @@
 #include "citra_qt/configure_system.h"
 #include "citra_qt/ui_settings.h"
-#include "ui_configure_system.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/system.h"
+#include "ui_configure_system.h"
 static const std::array<int, 12> days_in_month = {{
    31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
diff --git a/src/citra_qt/configure_system.h b/src/citra_qt/configure_system.h
index 3a0754bb5..db0ead13c 100644
--- a/src/citra_qt/configure_system.h
+++ b/src/citra_qt/configure_system.h
@@ -4,8 +4,8 @@
 #pragma once
-#include <QWidget>
 #include <memory>
+#include <QWidget>
 namespace Ui {
 class ConfigureSystem;
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index db266b506..14bd1c77c 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -2,13 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QStandardItemModel>
 #include "citra_qt/debugger/callstack.h"
+#include <QStandardItemModel>
 #include "common/common_types.h"
 #include "common/symbols.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/core.h"
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index 803e8b172..7a5d3e2f1 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -2,16 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/disassembler.h"
 #include <QShortcut>
 #include "citra_qt/bootmanager.h"
-#include "citra_qt/debugger/disassembler.h"
 #include "citra_qt/hotkeys.h"
 #include "citra_qt/util/util.h"
 #include "common/break_points.h"
 #include "common/symbols.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/core.h"
diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h
index 1f5607788..2ca6c2bd4 100644
--- a/src/citra_qt/debugger/disassembler.h
+++ b/src/citra_qt/debugger/disassembler.h
@@ -6,11 +6,9 @@
 #include <QAbstractListModel>
 #include <QDockWidget>
-#include "ui_disassembler.h"
 #include "common/break_points.h"
 #include "common/common_types.h"
+#include "ui_disassembler.h"
 class QAction;
 class EmuThread;
diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp
index b79c063db..31b54e855 100644
--- a/src/citra_qt/debugger/graphics.cpp
+++ b/src/citra_qt/debugger/graphics.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QListView>
 #include "citra_qt/debugger/graphics.h"
+#include <QListView>
 #include "citra_qt/util/util.h"
 extern GraphicsDebugger g_debugger;
diff --git a/src/citra_qt/debugger/graphics.h b/src/citra_qt/debugger/graphics.h
index 7d681b97d..bedf3e596 100644
--- a/src/citra_qt/debugger/graphics.h
+++ b/src/citra_qt/debugger/graphics.h
@@ -6,7 +6,6 @@
 #include <QAbstractListModel>
 #include <QDockWidget>
 #include "video_core/gpu_debugger.h"
 class GPUCommandStreamItemModel : public QAbstractListModel,
diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp
index 25a398ece..ad11552d7 100644
--- a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp
+++ b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QMetaType>
 #include "citra_qt/debugger/graphics_breakpoint_observer.h"
+#include <QMetaType>
 BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
                                               const QString& title, QWidget* parent)
diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.h b/src/citra_qt/debugger/graphics_breakpoint_observer.h
index 8d0871f27..e77df4f5b 100644
--- a/src/citra_qt/debugger/graphics_breakpoint_observer.h
+++ b/src/citra_qt/debugger/graphics_breakpoint_observer.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <QDockWidget>
 #include "video_core/debug_utils/debug_utils.h"
 /**
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp
index b31eba533..e1d1b4911 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.cpp
+++ b/src/citra_qt/debugger/graphics_breakpoints.cpp
@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/graphics_breakpoints.h"
 #include <QLabel>
 #include <QMetaType>
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include "citra_qt/debugger/graphics_breakpoints.h"
 #include "citra_qt/debugger/graphics_breakpoints_p.h"
 #include "common/assert.h"
 BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
diff --git a/src/citra_qt/debugger/graphics_breakpoints.h b/src/citra_qt/debugger/graphics_breakpoints.h
index 2371b0e39..5fc40c916 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.h
+++ b/src/citra_qt/debugger/graphics_breakpoints.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <memory>
 #include <QDockWidget>
 #include "video_core/debug_utils/debug_utils.h"
 class QLabel;
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics_breakpoints_p.h
index 5f321ede2..dc64706bd 100644
--- a/src/citra_qt/debugger/graphics_breakpoints_p.h
+++ b/src/citra_qt/debugger/graphics_breakpoints_p.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <memory>
 #include <QAbstractListModel>
 #include "video_core/debug_utils/debug_utils.h"
 class BreakPointModel : public QAbstractListModel {
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index b088ad29d..35be9b9bd 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/graphics_cmdlists.h"
 #include <QApplication>
 #include <QClipboard>
 #include <QComboBox>
@@ -13,13 +14,9 @@
 #include <QSpinBox>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include "citra_qt/debugger/graphics_cmdlists.h"
 #include "citra_qt/util/spinbox.h"
 #include "citra_qt/util/util.h"
 #include "common/vector_math.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/citra_qt/debugger/graphics_cmdlists.h b/src/citra_qt/debugger/graphics_cmdlists.h
index b2242eca4..fa2b9122b 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.h
+++ b/src/citra_qt/debugger/graphics_cmdlists.h
@@ -6,7 +6,6 @@
 #include <QAbstractListModel>
 #include <QDockWidget>
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/gpu_debugger.h"
diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics_surface.cpp
index bb998acc4..496fce59d 100644
--- a/src/citra_qt/debugger/graphics_surface.cpp
+++ b/src/citra_qt/debugger/graphics_surface.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/graphics_surface.h"
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QDebug>
@@ -11,15 +12,10 @@
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSpinBox>
-#include "citra_qt/debugger/graphics_surface.h"
 #include "citra_qt/util/spinbox.h"
 #include "common/color.h"
 #include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/utils.h"
diff --git a/src/citra_qt/debugger/graphics_surface.h b/src/citra_qt/debugger/graphics_surface.h
index 5881ae60a..21e6b5b8b 100644
--- a/src/citra_qt/debugger/graphics_surface.h
+++ b/src/citra_qt/debugger/graphics_surface.h
@@ -4,10 +4,9 @@
 #pragma once
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
 #include <QLabel>
 #include <QPushButton>
+#include "citra_qt/debugger/graphics_breakpoint_observer.h"
 class QComboBox;
 class QSpinBox;
diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp
index b6f638b60..944150b8e 100644
--- a/src/citra_qt/debugger/graphics_tracing.cpp
+++ b/src/citra_qt/debugger/graphics_tracing.cpp
@@ -2,29 +2,22 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/graphics_tracing.h"
 #include <algorithm>
 #include <array>
 #include <iterator>
 #include <memory>
-#include <boost/range/algorithm/copy.hpp>
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
+#include <boost/range/algorithm/copy.hpp>
-#include "citra_qt/debugger/graphics_tracing.h"
 #include "common/common_types.h"
 #include "core/hw/gpu.h"
 #include "core/hw/lcd.h"
 #include "core/tracer/recorder.h"
 #include "nihstro/float24.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index 0f02bc3da..3b3ffe5c6 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/graphics_vertex_shader.h"
 #include <iomanip>
 #include <sstream>
 #include <QBoxLayout>
 #include <QFileDialog>
 #include <QFormLayout>
@@ -15,10 +15,7 @@
 #include <QSignalMapper>
 #include <QSpinBox>
 #include <QTreeView>
-#include "citra_qt/debugger/graphics_vertex_shader.h"
 #include "citra_qt/util/util.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/shader/shader.h"
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics_vertex_shader.h
index 96692d82c..ec42f24bb 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.h
+++ b/src/citra_qt/debugger/graphics_vertex_shader.h
@@ -5,11 +5,9 @@
 #pragma once
 #include <QAbstractTableModel>
+#include <QTreeView>
 #include "citra_qt/debugger/graphics_breakpoint_observer.h"
 #include "nihstro/parser_shbin.h"
 #include "video_core/shader/shader.h"
 class QLabel;
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp
index 97a377513..39d2d6e39 100644
--- a/src/citra_qt/debugger/profiler.cpp
+++ b/src/citra_qt/debugger/profiler.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/debugger/profiler.h"
 #include <QMouseEvent>
 #include <QPainter>
 #include <QString>
-#include "citra_qt/debugger/profiler.h"
 #include "citra_qt/util/util.h"
 #include "common/common_types.h"
 #include "common/microprofile.h"
 #include "common/profiler_reporting.h"
diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h
index d0a90fdee..d8c6487aa 100644
--- a/src/citra_qt/debugger/profiler.h
+++ b/src/citra_qt/debugger/profiler.h
@@ -7,11 +7,9 @@
 #include <QAbstractItemModel>
 #include <QDockWidget>
 #include <QTimer>
-#include "ui_profiler.h"
 #include "common/microprofile.h"
 #include "common/profiler_reporting.h"
+#include "ui_profiler.h"
 class ProfilerModel : public QAbstractItemModel {
    Q_OBJECT
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index 87c8c3418..13842dac3 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -2,11 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <QTreeWidgetItem>
 #include "citra_qt/debugger/registers.h"
+#include <QTreeWidgetItem>
 #include "citra_qt/util/util.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"
diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h
index cba601731..54c9a8155 100644
--- a/src/citra_qt/debugger/registers.h
+++ b/src/citra_qt/debugger/registers.h
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include "ui_registers.h"
 #include <QDockWidget>
+#include "ui_registers.h"
 class QTreeWidget;
 class QTreeWidgetItem;
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp
index 9f9c22a44..16d31be77 100644
--- a/src/citra_qt/game_list.cpp
+++ b/src/citra_qt/game_list.cpp
@@ -2,19 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "game_list.h"
 #include <QHeaderView>
 #include <QThreadPool>
 #include <QVBoxLayout>
-#include "game_list.h"
-#include "game_list_p.h"
-#include "ui_settings.h"
-#include "core/loader/loader.h"
 #include "common/common_paths.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/loader/loader.h"
+#include "game_list_p.h"
+#include "ui_settings.h"
 GameList::GameList(QWidget* parent) {
    QVBoxLayout* layout = new QVBoxLayout;
diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h
index c8a9ee5db..60ab4cf02 100644
--- a/src/citra_qt/game_list_p.h
+++ b/src/citra_qt/game_list_p.h
@@ -5,18 +5,14 @@
 #pragma once
 #include <atomic>
 #include <QImage>
 #include <QRunnable>
 #include <QStandardItem>
 #include <QString>
 #include "citra_qt/util/util.h"
 #include "common/color.h"
 #include "common/string_util.h"
 #include "core/loader/smdh.h"
 #include "video_core/utils.h"
 /**
diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp
index 3e38223ee..9037f20f2 100644
--- a/src/citra_qt/hotkeys.cpp
+++ b/src/citra_qt/hotkeys.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/hotkeys.h"
 #include <map>
 #include <QKeySequence>
 #include <QShortcut>
 #include <QtGlobal>
-#include "citra_qt/hotkeys.h"
 #include "citra_qt/ui_settings.h"
 struct Hotkey {
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index e10314856..82667446b 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -5,25 +5,15 @@
 #include <clocale>
 #include <memory>
 #include <thread>
 #include <glad/glad.h>
 #define QT_NO_OPENGL
 #include <QDesktopWidget>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QtGui>
-#include "qhexedit.h"
 #include "citra_qt/bootmanager.h"
 #include "citra_qt/config.h"
 #include "citra_qt/configure_dialog.h"
-#include "citra_qt/game_list.h"
-#include "citra_qt/hotkeys.h"
-#include "citra_qt/main.h"
-#include "citra_qt/ui_settings.h"
-// Debugger
 #include "citra_qt/debugger/callstack.h"
 #include "citra_qt/debugger/disassembler.h"
 #include "citra_qt/debugger/graphics.h"
@@ -35,7 +25,10 @@
 #include "citra_qt/debugger/profiler.h"
 #include "citra_qt/debugger/ramview.h"
 #include "citra_qt/debugger/registers.h"
+#include "citra_qt/game_list.h"
+#include "citra_qt/hotkeys.h"
+#include "citra_qt/main.h"
+#include "citra_qt/ui_settings.h"
 #include "common/logging/backend.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
@@ -45,14 +38,13 @@
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
 #include "core/arm/disassembler/load_symbol_map.h"
 #include "core/core.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/loader/loader.h"
 #include "core/settings.h"
 #include "core/system.h"
+#include "qhexedit.h"
 #include "video_core/video_core.h"
 GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 10157310e..c4349513f 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -5,9 +5,8 @@
 #ifndef _CITRA_QT_MAIN_HXX_
 #define _CITRA_QT_MAIN_HXX_
-#include <QMainWindow>
 #include <memory>
+#include <QMainWindow>
 #include "ui_main.h"
 class Config;
diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h
index 30f031831..ed7fdff7e 100644
--- a/src/citra_qt/ui_settings.h
+++ b/src/citra_qt/ui_settings.h
@@ -4,12 +4,11 @@
 #pragma once
+#include <vector>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <vector>
 namespace UISettings {
 using ContextualShortcut = std::pair<QString, int>;
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp
index 5868f3b91..0bda21502 100644
--- a/src/citra_qt/util/spinbox.cpp
+++ b/src/citra_qt/util/spinbox.cpp
@@ -28,11 +28,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "citra_qt/util/spinbox.h"
+#include <cstdlib>
 #include <QLineEdit>
 #include <QRegExpValidator>
-#include <cstdlib>
-#include "citra_qt/util/spinbox.h"
 #include "common/assert.h"
 CSpinBox::CSpinBox(QWidget* parent)
diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp
index bf44d78ff..e77d3796c 100644
--- a/src/citra_qt/util/util.cpp
+++ b/src/citra_qt/util/util.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "citra_qt/util/util.h"
 #include <array>
 #include <cmath>
-#include "citra_qt/util/util.h"
 QFont GetMonospaceFont() {
    QFont font("monospace");
    // Automatic fallback to a monospace font on on platforms without a font called "monospace"
diff --git a/src/common/assert.h b/src/common/assert.h
index 70214efae..04e80c87a 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <cstdlib>
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
@@ -54,4 +53,4 @@ __declspec(noinline, noreturn)
 #endif
 #define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
-#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
-\ No newline at end of file
+#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 8d45743e2..030f7caeb 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -33,7 +33,6 @@
 #include <cstddef>
 #include <limits>
 #include <type_traits>
 #include "common/common_funcs.h"
 /*
diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp
index 3218db314..4b64a6c7b 100644
--- a/src/common/break_points.cpp
+++ b/src/common/break_points.cpp
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 #include "common/break_points.h"
-#include "common/logging/log.h"
 #include <algorithm>
 #include <sstream>
+#include "common/logging/log.h"
 bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const {
    auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress; };
diff --git a/src/common/break_points.h b/src/common/break_points.h
index 1a5b7d296..e15b9f842 100644
--- a/src/common/break_points.h
+++ b/src/common/break_points.h
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 class DebugInterface;
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index 2bf3c774b..5145a3657 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -35,7 +35,6 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
diff --git a/src/common/code_block.h b/src/common/code_block.h
index 099088925..6a55a8e30 100644
--- a/src/common/code_block.h
+++ b/src/common/code_block.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <cstddef>
 #include "common/common_types.h"
 #include "common/memory_util.h"
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 7032c2117..b141e79ed 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -7,7 +7,6 @@
 #if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM)
 #include <cstdlib> // for exit
 #endif
 #include "common_types.h"
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index c86f663a8..6fd6f1987 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "emu_window.h"
 #include <algorithm>
 #include <cmath>
 #include "common/assert.h"
 #include "common/key_map.h"
-#include "emu_window.h"
 #include "video_core/video_core.h"
 void EmuWindow::ButtonPressed(Service::HID::PadState pad) {
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 20131300d..67df63e06 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -6,10 +6,8 @@
 #include <tuple>
 #include <utility>
 #include "common/common_types.h"
 #include "common/math_util.h"
 #include "core/hle/service/hid/hid.h"
 /**
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 96afe2ca0..a0cae11e3 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -16,7 +16,6 @@
 #include <shellapi.h>
 #include <shlobj.h> // for SHGetFolderPath
 #include <tchar.h>
 #include "common/string_util.h"
 // 64 bit offsets for windows
diff --git a/src/common/file_util.h b/src/common/file_util.h
index b15021a63..204b06f14 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -11,9 +11,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
 #include "common/common_types.h"
 #ifdef _MSC_VER
 #include "common/string_util.h"
 #endif
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index a46c92553..5aa5118eb 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -5,7 +5,6 @@
 #if defined(_MSC_VER)
 #include <stdlib.h>
 #endif
 #include "common_funcs.h"
 #include "common_types.h"
 #include "hash.h"
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index e882f5f52..8380ce489 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "common/key_map.h"
 #include <map>
 #include "common/emu_window.h"
-#include "common/key_map.h"
 namespace KeyMap {
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index b3d6598e4..b4a312948 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -2,13 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "common/logging/backend.h"
 #include <algorithm>
 #include <array>
 #include <cstdio>
 #include "common/assert.h"
 #include "common/common_funcs.h" // snprintf compatibility define
-#include "common/logging/backend.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index 3fe88e4f6..c4fe2acbf 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -8,7 +8,6 @@
 #include <cstdarg>
 #include <string>
 #include <utility>
 #include "common/logging/log.h"
 namespace Log {
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 186e0b621..9aa72cecc 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "common/logging/filter.h"
 #include <algorithm>
 #include "common/logging/backend.h"
-#include "common/logging/filter.h"
 #include "common/string_util.h"
 namespace Log {
diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h
index db526fead..b51df61de 100644
--- a/src/common/logging/filter.h
+++ b/src/common/logging/filter.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <string>
 #include "common/logging/log.h"
 namespace Log {
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index 955358553..d61c1696b 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -10,12 +10,11 @@
 #include <Windows.h>
 #endif
+#include "common/assert.h"
+#include "common/common_funcs.h"
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
-#include "common/assert.h"
-#include "common/common_funcs.h"
 #include "common/string_util.h"
 namespace Log {
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 5938e6289..7be2235b0 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 #include <cstddef>
 #ifdef _WIN32
 #include <windows.h>
 #else
diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp
index 231a0afc1..b40e7205d 100644
--- a/src/common/profiler.cpp
+++ b/src/common/profiler.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <vector>
 #include "common/assert.h"
 #include "common/profiler_reporting.h"
 #include "common/synchronized_wrapper.h"
diff --git a/src/common/profiler_reporting.h b/src/common/profiler_reporting.h
index fa1ac883f..e9ce6d41c 100644
--- a/src/common/profiler_reporting.h
+++ b/src/common/profiler_reporting.h
@@ -7,7 +7,6 @@
 #include <chrono>
 #include <cstddef>
 #include <vector>
 #include "common/synchronized_wrapper.h"
 namespace Common {
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 9ccd6f135..968854bae 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -2,17 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "common/string_util.h"
 #include <cctype>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <boost/range/algorithm/transform.hpp>
 #include "common/common_paths.h"
 #include "common/logging/log.h"
-#include "common/string_util.h"
 #ifdef _MSC_VER
 #include <Windows.h>
 #include <codecvt>
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 6ffd735f4..075bf4ecb 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -10,7 +10,6 @@
 #include <sstream>
 #include <string>
 #include <vector>
 #include "common/common_types.h"
 namespace Common {
diff --git a/src/common/swap.h b/src/common/swap.h
index 72c50d789..e241c9f73 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -24,9 +24,7 @@
 #elif defined(__FreeBSD__)
 #include <sys/endian.h>
 #endif
 #include <cstring>
 #include "common/common_types.h"
 // GCC 4.6+
diff --git a/src/common/symbols.h b/src/common/symbols.h
index 6044c9db6..f5a48e05a 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -7,7 +7,6 @@
 #include <map>
 #include <string>
 #include <utility>
 #include "common/common_types.h"
 struct TSymbol {
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index bee607ce9..6e7b39b9a 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 #include "common/thread.h"
 #ifdef __APPLE__
 #include <mach/mach.h>
 #elif defined(_WIN32)
@@ -16,7 +15,6 @@
 #endif
 #include <sched.h>
 #endif
 #ifndef _WIN32
 #include <unistd.h>
 #endif
diff --git a/src/common/thread.h b/src/common/thread.h
index 499c151c2..9c08be7e3 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <mutex>
 #include <thread>
 #include "common/common_types.h"
 // Support for C++11's thread_local keyword was surprisingly spotty in compilers until very
diff --git a/src/common/thread_queue_list.h b/src/common/thread_queue_list.h
index 0dcf785b6..edd0e4a3f 100644
--- a/src/common/thread_queue_list.h
+++ b/src/common/thread_queue_list.h
@@ -6,7 +6,6 @@
 #include <array>
 #include <deque>
 #include <boost/range/algorithm_ext/erase.hpp>
 namespace Common {
diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index 27560eb0b..e843cbd9c 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 #include <time.h>
 #ifdef _WIN32
 #include <Windows.h>
 #include <mmsystem.h>
@@ -11,7 +10,6 @@
 #else
 #include <sys/time.h>
 #endif
 #include "common/common_types.h"
 #include "common/string_util.h"
 #include "common/timer.h"
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 19f1a4030..ac37c42bc 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "cpu_detect.h"
 #include <cstring>
 #include <string>
 #include <thread>
 #include "common/common_types.h"
-#include "cpu_detect.h"
 namespace Common {
 #ifndef _MSC_VER
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index 7cf350b4a..b69e4bd5e 100644
--- a/src/common/x64/emitter.cpp
+++ b/src/common/x64/emitter.cpp
@@ -15,16 +15,14 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
+#include "emitter.h"
 #include <cinttypes>
 #include <cstring>
+#include "abi.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/memory_util.h"
-#include "abi.h"
 #include "cpu_detect.h"
-#include "emitter.h"
 namespace Gen {
@@ -222,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp
 void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
                      bool warn_64bit_offset) const {
    if (_operandReg == INVALID_REG)
-        _operandReg = (X64Reg)this->operandReg;
+        _operandReg = (X64Reg) this->operandReg;
    int mod = 0;
    int ireg = indexReg;
    bool SIB = false;
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h
index 6c9dc3d6b..7d7cdde16 100644
--- a/src/common/x64/emitter.h
+++ b/src/common/x64/emitter.h
@@ -18,7 +18,6 @@
 #pragma once
 #include <cstddef>
 #include "common/assert.h"
 #include "common/bit_set.h"
 #include "common/code_block.h"
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 {
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index 82178d249..5aad47418 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -2,19 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/clipper.h"
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <boost/container/static_vector.hpp>
 #include <boost/container/vector.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
-#include "video_core/clipper.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 04a4ee3a2..5c74b68e9 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -2,22 +2,19 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/command_processor.h"
 #include <array>
 #include <cstddef>
 #include <memory>
 #include <utility>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "core/tracer/recorder.h"
-#include "video_core/command_processor.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h
index b8dad8e7b..62ad2d3f3 100644
--- a/src/video_core/command_processor.h
+++ b/src/video_core/command_processor.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <type_traits>
 #include "common/bit_field.h"
 #include "common/common_types.h"
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 194e5833c..8806464d9 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -20,7 +20,6 @@
 #include <nihstro/bit_field.h>
 #include <nihstro/float24.h>
 #include <nihstro/shader_binary.h>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/color.h"
@@ -29,7 +28,6 @@
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/vector_math.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index fe3ed247d..189c93abb 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -15,10 +15,8 @@
 #include <string>
 #include <utility>
 #include <vector>
 #include "common/common_types.h"
 #include "common/vector_math.h"
 #include "video_core/pica.h"
 namespace CiTrace {
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index aea391619..3c6636d66 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
 #include "core/hle/service/gsp_gpu.h"
 class GraphicsDebugger {
diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp
index ffd13e717..771e83fe7 100644
--- a/src/video_core/pica.cpp
+++ b/src/video_core/pica.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/pica.h"
 #include <cstring>
 #include <iterator>
 #include <unordered_map>
 #include <utility>
-#include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
diff --git a/src/video_core/pica_state.h b/src/video_core/pica_state.h
index 2dbd6413f..e4f2e6d5d 100644
--- a/src/video_core/pica_state.h
+++ b/src/video_core/pica_state.h
@@ -5,10 +5,8 @@
 #pragma once
 #include <array>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "video_core/pica.h"
 #include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
diff --git a/src/video_core/pica_types.h b/src/video_core/pica_types.h
index 20f648b03..5d7e10066 100644
--- a/src/video_core/pica_types.h
+++ b/src/video_core/pica_types.h
@@ -6,7 +6,6 @@
 #include <cmath>
 #include <cstring>
 #include "common/common_types.h"
 namespace Pica {
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp
index 901cca26b..670ffb67d 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/primitive_assembly.h"
 #include "common/logging/log.h"
 #include "video_core/pica.h"
-#include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
 namespace Pica {
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h
index 2ad15a858..0384d5984 100644
--- a/src/video_core/primitive_assembly.h
+++ b/src/video_core/primitive_assembly.h
@@ -5,7 +5,6 @@
 #pragma once
 #include <functional>
 #include "video_core/pica.h"
 namespace Pica {
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index f815d6cf0..c179573d6 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/rasterizer.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/color.h"
@@ -14,15 +14,12 @@
 #include "common/math_util.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
 #include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
-#include "video_core/rasterizer.h"
 #include "video_core/shader/shader.h"
 #include "video_core/utils.h"
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h
index c7bd29f12..71df233b5 100644
--- a/src/video_core/rasterizer_interface.h
+++ b/src/video_core/rasterizer_interface.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "core/hw/gpu.h"
 struct ScreenInfo;
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
index 090683276..91347dea8 100644
--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_base.h"
 #include <atomic>
 #include <memory>
-#include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/swrasterizer.h"
 #include "video_core/video_core.h"
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index daacdb167..589aca857 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -5,9 +5,7 @@
 #pragma once
 #include <memory>
 #include "common/common_types.h"
 #include "video_core/rasterizer_interface.h"
 class EmuWindow;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 37977464d..45a4dc97d 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -2,24 +2,20 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include <memory>
 #include <string>
 #include <tuple>
 #include <utility>
 #include <glad/glad.h>
 #include "common/assert.h"
 #include "common/color.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/vector_math.h"
 #include "core/hw/gpu.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
-#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 #include "video_core/renderer_opengl/pica_to_gl.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 60d70539c..24fefed1b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -10,16 +10,12 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
 #include <glad/glad.h>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/hash.h"
 #include "common/vector_math.h"
 #include "core/hw/gpu.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index ec3300ca6..ce9a193bd 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include <algorithm>
 #include <atomic>
 #include <cstring>
@@ -9,21 +10,16 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
 #include <glad/glad.h>
 #include "common/bit_field.h"
 #include "common/emu_window.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica_state.h"
-#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include "video_core/renderer_opengl/gl_state.h"
 #include "video_core/utils.h"
 #include "video_core/video_core.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index b2272bda8..849530d86 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -8,16 +8,12 @@
 #include <memory>
 #include <set>
 #include <tuple>
 #include <boost/icl/interval_map.hpp>
 #include <glad/glad.h>
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/hw/gpu.h"
 #include "video_core/pica.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h
index 2f40eb646..13301ec9f 100644
--- a/src/video_core/renderer_opengl/gl_resource_manager.h
+++ b/src/video_core/renderer_opengl/gl_resource_manager.h
@@ -5,11 +5,8 @@
 #pragma once
 #include <utility>
 #include <glad/glad.h>
 #include "common/common_types.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 #include "video_core/renderer_opengl/gl_state.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index 9392c67b8..52cee2ee2 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include <array>
 #include <cstddef>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/logging/log.h"
 #include "video_core/pica.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
-#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 using Pica::Regs;
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 7d90ec6a3..c8ba3b92d 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/gl_shader_util.h"
 #include <vector>
 #include <glad/glad.h>
 #include "common/logging/log.h"
-#include "video_core/renderer_opengl/gl_shader_util.h"
 namespace GLShader {
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index a97269d44..96af8469d 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/gl_state.h"
 #include <glad/glad.h>
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
-#include "video_core/renderer_opengl/gl_state.h"
 OpenGLState OpenGLState::cur_state;
 OpenGLState::OpenGLState() {
diff --git a/src/video_core/renderer_opengl/pica_to_gl.h b/src/video_core/renderer_opengl/pica_to_gl.h
index 415358b6c..cc49867c8 100644
--- a/src/video_core/renderer_opengl/pica_to_gl.h
+++ b/src/video_core/renderer_opengl/pica_to_gl.h
@@ -6,15 +6,12 @@
 #include <array>
 #include <cstddef>
 #include <glad/glad.h>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "video_core/pica.h"
 using GLvec2 = std::array<GLfloat, 2>;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index a1d08e04d..962785bdd 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -2,30 +2,26 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/renderer_opengl/renderer_opengl.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
 #include <memory>
 #include <glad/glad.h>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/emu_window.h"
 #include "common/logging/log.h"
 #include "common/profiler_reporting.h"
 #include "common/synchronized_wrapper.h"
 #include "core/hw/gpu.h"
 #include "core/hw/hw.h"
 #include "core/hw/lcd.h"
 #include "core/memory.h"
 #include "core/settings.h"
 #include "core/tracer/recorder.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/rasterizer_interface.h"
-#include "video_core/renderer_opengl/renderer_opengl.h"
 #include "video_core/video_core.h"
 static const char vertex_shader[] = R"(
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 762b790c1..87c556cff 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -5,14 +5,10 @@
 #pragma once
 #include <array>
 #include <glad/glad.h>
 #include "common/common_types.h"
 #include "common/math_util.h"
 #include "core/hw/gpu.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
 #include "video_core/renderer_opengl/gl_state.h"
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index c38bdcc3c..53e91df03 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -2,28 +2,23 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/shader/shader.h"
 #include <atomic>
 #include <cmath>
 #include <cstring>
 #include <unordered_map>
 #include <utility>
 #include <boost/range/algorithm/fill.hpp>
 #include "common/bit_field.h"
 #include "common/hash.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
-#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
 #ifdef ARCHITECTURE_x86_64
 #include "video_core/shader/shader_jit_x64.h"
 #endif // ARCHITECTURE_x86_64
 #include "video_core/video_core.h"
 namespace Pica {
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index 79c716b6e..8858d67f8 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -9,16 +9,12 @@
 #include <memory>
 #include <type_traits>
 #include <vector>
 #include <boost/container/static_vector.hpp>
 #include <nihstro/shader_bytecode.h>
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/vector_math.h"
 #include "video_core/pica.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index 41df8a2fd..5df3c4e86 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -2,21 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/shader/shader.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
 #include <numeric>
 #include <nihstro/shader_bytecode.h>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
-#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
 using nihstro::OpCode;
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index d1b2ce8d5..5f1323799 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -2,23 +2,19 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "shader.h"
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <xmmintrin.h>
 #include <nihstro/shader_bytecode.h>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
 #include "common/x64/abi.h"
 #include "common/x64/cpu_detect.h"
 #include "common/x64/emitter.h"
-#include "shader.h"
 #include "shader_jit_x64.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h
index 2f37ef8bf..98de5ecef 100644
--- a/src/video_core/shader/shader_jit_x64.h
+++ b/src/video_core/shader/shader_jit_x64.h
@@ -8,13 +8,10 @@
 #include <cstddef>
 #include <utility>
 #include <vector>
 #include <nihstro/shader_bytecode.h>
 #include "common/bit_set.h"
 #include "common/common_types.h"
 #include "common/x64/emitter.h"
 #include "video_core/shader/shader.h"
 using nihstro::Instruction;
diff --git a/src/video_core/swrasterizer.h b/src/video_core/swrasterizer.h
index 12dc56bef..6d42d7409 100644
--- a/src/video_core/swrasterizer.h
+++ b/src/video_core/swrasterizer.h
@@ -5,7 +5,6 @@
 #pragma once
 #include "common/common_types.h"
 #include "video_core/rasterizer_interface.h"
 namespace Pica {
diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp
index 9dcd9d748..5704e9fea 100644
--- a/src/video_core/vertex_loader.cpp
+++ b/src/video_core/vertex_loader.cpp
@@ -1,22 +1,18 @@
+#include "video_core/vertex_loader.h"
 #include <memory>
 #include <boost/range/algorithm/fill.hpp>
 #include "common/alignment.h"
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
 #include "video_core/shader/shader.h"
-#include "video_core/vertex_loader.h"
 namespace Pica {
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h
index 4f8d79f14..9f2098bb2 100644
--- a/src/video_core/vertex_loader.h
+++ b/src/video_core/vertex_loader.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <array>
 #include "common/common_types.h"
 #include "video_core/pica.h"
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 880f4990d..b06a88b78 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include "video_core/video_core.h"
 #include <memory>
 #include "common/logging/log.h"
 #include "video_core/pica.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/renderer_opengl.h"
-#include "video_core/video_core.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Video Core namespace