diff --git a/src/.clang-format b/src/.clang-format
index f9a5d1378ab1571e08d8d173bfc6d0010cc4a058..fc1bbb2972510bac3ffed16b43d6a9e15ffe43de 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 0b36dbb03e1d9479b5a6efee6b1c0ff2474eaf93..c54a4b99a679cf9c867b454e8a329fe0d20663fa 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 4edfe9be0e6443e9cffeb00e6183db7a4875fd52..fd189a1761d8f880cb95bd60c85ff9bcd4836c24 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 77bbf98b530a8348a1ad8faededb6e6179af9a1e..2b0c395e696c940a0fdc6c3c7d32fdeb96257942 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 8e7e5c3cd7a4cd1497ba6958325f6e0ad9dea135..7fbc3ad9a47df9ba67d6bd4ff3b362b0b814b7d4 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 aaa3a280f191d20de8b18838f62393d07ab0bdc9..aa64dae97489fb7a3bf7d3d5aac4cace03f16760 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 f4c4b01e2234498fc43235a3c089c6902a667238..0a0f60ac121428732511b28e0e0c7bd52906ce05 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 da2a4684e4b58dc9acfd9e4e33d76572b4f6447b..edf95f6861948d7cee2c906b0c064d0d1435e8f2 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 73d5ce6700b89ab61e3e5522d144736ac6b3f205..4281a58985c83dc656134c9d7b691defdf06be46 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 126f328bc6fa64bb760fa2e6f973aebfb85166c1..6cc81dfca40b41be7a1d5ff5f0d529d5b61612c1 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 537c3a3b9f07bf9d66a3b2133dfc59a009dbc98f..bf4e865ae2439a2f475547d9947aab20f0411fff 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 f2b6d6552aecb77471069094785bf0ea6266342b..cab30c8aaf51fb7f745d2ea20a7c807939d1f10a 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 6d7fd92ab0ea6c0db48d8326858b206be3bb2274..ac053c029ee9ffa8278e16c6f386d8dd4ecb463b 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 249acc449a9623d1730d9bdb18fcfc79ea8add8c..9e6b36fcdec786fc8de844b7777eedbdac07d094 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 a1ab15520eb6f63e1946c7befcf019e37d49a7d9..3d725f2a334adf9ac61f4d9ca097c3fba654c89c 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 cb1c58a67619fe022a94e2be39fa45d77f8e75bc..8a5d4181af5b7fa4d3fe0708d0aef2e8e061282d 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 2d2e60311e857b54a2c91cdbdfe3351f4e6ededc..dd06fdda95c944cf938c91e25dcef66307d98f4e 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 9931c4778e85c09d71027c3b565d62808dec172c..e7668438cb2a5b11faceb04e77cae3a829f800b1 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 65aac877a1ac6c83b7a5717d13d92b5a9926db98..2520796cb0dd81b0577eec2684cf1b83fb67a211 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 b13827214ffd8971b347f38ad4eb1ede02d65eb8..ccd0f7c7e3273623872104aed3594b4823fe3820 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 f5ce55a6b3f9f5e0c96e4732e68b308009617241..08f3bab5b3b5105b00767e883350e03625adb203 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 ff529f4cf2c66ee1f1fbf4904921a75acaf00fc0..1dc5e862ec7fd748f78857529571dc42cceb32d0 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 f44807c84cd71b830119e3ce41812388a76c1b36..26059f503c932fe7d0f36ca04c84aeeb6d58b8f5 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 42a2136793541c3ffe3db91fa9c3048956f0e9ec..fa81718ed75f817b290adeef988d86a4e850596f 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 1b8f8cffe9e07b7cd9d62be043bb70208335fcbc..e47375f888b4ae43faa7f4c44513b99834d87df4 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 77679bd8826bb8867c58ceb3a3271809e9400bd2..58aef7a9a678f0795bf6eec1ff02ac7e77e79bc4 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 8bd2b294b2e6f0b8225d65986196d57c500dd788..b1c31f59cf59b6919e4b4a94a3092536abdb0737 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 42f2a7553b677261b9d7011a91b44694484e4d1e..7df05420880f15fcc9981dd213e49bd232f7c802 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 d4d86821d3a453ef41f7d988f0f0fec91ecfaf51..e4d14ef1272906c4c9fc97a71698445be1e030b5 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 53d035b325e66ad5309a95a38e6977e4605bdd1c..0abae86c31a9fa863cac2ea7a9477f9979d01c98 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 59241684d24c77b52d10d6c158205d643ffcea85..67228b94f1434ea9bcbddd7331fc806f92642006 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 d25bdcf9f8a24861739c2f0e72f84683514dc9f0..e3648572f166fc0c8389e1fc4825cd4b0e12f4b1 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 db76fa870980829f84c82eb847dd267be21d257e..79c9018042f7610d82224da2cfb7d8d2fc91ca8f 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 944047d056afdcd9407a34f3d2b44772aa8696b9..ba976252ecd697572b2dd8cf84a6dc6e1037dce6 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 e836910aad77646018072bb683a669eb5b486e03..51df2e27b63b028f7bb71c6f7df343b037872b32 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 dde8d670e938faa57bde903d3205bb0efe3600e5..dcc398eee2493c7ded239e791afb9756b2d861f1 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 e9c6960e2179f00ab6e74ee104c34fbd3ba4e08f..d167eb9969587825b70b238a29464670973cbfd1 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 c33c95540abc45d8761976f01a7735a92483b609..d6a4e8af143882280f247da06ae7375067070fb7 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 e4e450691d0da62223766e58c8e2846cf44aebb6..21fa1f501987ec992b670fb198b0091b2b8d045d 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 3e6f76bfef69738446e78f17ce9409a5628c6eed..27139fb303c1cd1dd6d0fedd95306e60232a14da 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 196474ae3c9a6095fe915036b8e78c186e9db6c3..447552d8c6629182c2401ea64197cba19fc4505a 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 bde6727cc86fd300cc7abe9e6b90d1563461e1dd..19c1f75c2dd7d17b69909e5b77270a086e5d58e7 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 906d534a63d15a8983ce40b707cb249e830de199..5497a55f7a72829a12bd192a9bdbb529be3412c6 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 7900134cae39c190451443057879769231fcd2d4..7039301e37920bd7dfeb734804e858af1f678321 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 "citra_qt/configure_input.h"
+#include <QTimer>
 
 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 5d9624bb0f9c829a79f7976143f9d8f9d1cf0adb..5183b904d7c87f702530be656081c807c35c8349 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 732e15dda1086dfc5db05cca9cf519b40135e38b..873d314ec1bd8bd50a4f5eff0275214332d2452e 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 3a0754bb5bc4586e140e34fa0f7397542722fcf6..db0ead13c77732a2b520e66527392d3061d57551 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 db266b50614003f3f0d29a0c46761e80c5c8ad6c..14bd1c77c1cf025943af3cedd35abc51951f587d 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 803e8b17237982739494ae2ae4437a20554580c5..7a5d3e2f1a97349008a8e127bea545abe8b81c8f 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 1f56077883a30b69bad4e16efd5c460cbac87bcb..2ca6c2bd4665384a911d470789c5de2318656884 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 b79c063dbcec49a3a3ee78e070cdfc0e6a15c49d..31b54e85563cc4dfe62f0f318d307daefaa6577c 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 7d681b97db46681ae5af345924cbcb2e9ce5aa46..bedf3e5967fc59d047e109d032a66739d09147b3 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 25a398eceb3b6fea1b962d7021a1c73499366513..ad11552d7e5497ebb90c1c550df1aea67be4e617 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 8d0871f27e1cf306af7e4e2833c864c436cb9964..e77df4f5b84f38248af5287092ef4b6d41bed970 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 b31eba533f32f08ca568e25b0e16e2c89fb60dc2..e1d1b491128cb645c6e2701e9521e3b72f88cad6 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 2371b0e39b053ebbcbfebdaacf757e60b85ca56c..5fc40c916f310da6eab222c096f4388b54071518 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 5f321ede2cb2244a77fdac5c28cbbd071b95937e..dc64706bd4f93bcaf9b106e477596b318b8f0195 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 b088ad29d59fd1ff654a6ad1e11bba9439479116..35be9b9bdf8646fa9dd44cb6e87aed92fc983565 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 b2242eca417e5b2eb50b4f0dde6c5c9454495949..fa2b9122bd94a755049f496e6a7376643ab94811 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 bb998acc402a0a6b8317ec1a8d3e22049dcfcbd0..496fce59d37b93ccb50d7d5b89bf5be91e08db37 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 5881ae60abe396b5a5063531c08f731c024a661f..21e6b5b8bda60a70f83239bc86f720ba5b4df907 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 b6f638b6005a2890363e315c154faa6bbb0aa401..944150b8eea64e3939d82cf7897ca4a9802dff92 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 "citra_qt/debugger/graphics_tracing.h"
-
+#include <boost/range/algorithm/copy.hpp>
 #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 0f02bc3da4a558cb4c237a04c451f7bfe0645b83..3b3ffe5c6f0699a81afa62f628d84f8ae16b0bbc 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 96692d82c96ba20203bff74ab727846f56b67663..ec42f24bb1b0062d7ac04d491a82c1d842c4c99b 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 97a3775130fc8830b0a43439c6fbac1bcaab52f4..39d2d6e393350d81d1b4a5c9a132fc5d8fe40c17 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 d0a90fdeec64bdf50ea2355a8ce04e7e88c6c170..d8c6487aaf8ca726adb42a63068adad76ab474f3 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 87c8c34182d9c67f93254f0dc24ab7e54a7aab8f..13842dac3cce0f47b8b08f26ccf3568a6e317321 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 cba6017317e728e9cc11bd251b8773d87c27376b..54c9a81550ab32afa034a658ea2c952eef44dd9a 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 9f9c22a4497eb107df257704af87b8ca1aef3f80..16d31be77d4c5507c72db5c44ea4789ab883ef80 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 c8a9ee5db763447d67f974cf10472d3088846119..60ab4cf02a530eb10814c5fe518918afaae45d10 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 3e38223ee7b8e27b365e88f73b29490884b641fd..9037f20f28417c6c8dd2877f0ee34094d31a06bb 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 e10314856b6a6f663d00484d1b3ebfe28c155181..82667446b7824aca17bd68aa372521e90b38416c 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 10157310e7769002a050319d7b674373caf4e60a..c4349513f3eb04aa71d6c827fd06ce091be7c477 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 30f031831c6160ccd3573c62715ef6269eee2a72..ed7fdff7ef6570c35e0b68577be3c4a76b23e3b3 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 5868f3b91b32e2872e3af9c01e4c7fd588a5e7f2..0bda2150259dccae3fbd979a070b86c6ba54b5ba 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 bf44d78ff34281d114939ec06cf65fac3f815e3c..e77d3796c6e36d60c30d4e9b6e4fb067c0644292 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 70214efae60ddba6e92d1edf2a906b8903917d0a..04e80c87a83d4128ecf972b54815b0eb677ef003 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 8d45743e2b5714caa43c97d7a68773e1719e465e..030f7caebd2c1a97b6c8dcf7ce4170ea2a19cb07 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 3218db314535d5f4e1c5564b94fe4cc16ad418e9..4b64a6c7b755fb468e7702c28291b49e135bda8d 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 1a5b7d2961d519e43a81402eb381fecae33855b9..e15b9f842c896e453b6fccd6191b3616f50fc565 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 2bf3c774ba04a148526190f56a99744feb0640d7..5145a3657d0b1443d5b749b09f782658420ab17e 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 0990889259d28f4d1a2c3332217badf4d6e5fcbf..6a55a8e30fc8cd658a81dd148692e31390b9d281 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 7032c21174da0dc8abd398c29fa0152c92ef420d..b141e79ed1c0a96e914f3efaffffb6644bfdc3c9 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 c86f663a8f80bfbe829ee4c66380f170edad1b59..6fd6f198733ad221c2daf5e31298530eb0476a00 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 20131300d64021cd920212b561a8dc79a07600f9..67df63e066ee600c02dd9431ab0da3bd3692d476 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 96afe2ca0501da16bf6fc8d240f3ecfc202338e5..a0cae11e395642f6b33b624ba4c4103187b36e66 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 b15021a636a158d1ef0d9957129ee2c35da4f239..204b06f1457d43fabcd8efa063758ba1ec87f2f0 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 a46c9255319604d3d99f98af9086bddb3190cdf1..5aa5118eb628d873ffc8652088b784bf8f92264e 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 e882f5f52943339a590ac0463972f1b9de2f7c2d..8380ce48968d74873db0e2f12d3236edb87397d2 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 b3d6598e44dca9268a5665da1b60149ee29779ec..b4a312948018cca11bed7b685ef008a3500a4882 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 3fe88e4f650d5df1e404053280797ca055f841fd..c4fe2acbf21132ac3a71918273ce78f176b9e649 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 186e0b621938eab28cc2688c2a616f402633d01a..9aa72cecce937fda5a555efe303f3b76695bbd4d 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 db526fead4ce81e041573dafa4bf82618fefd521..b51df61de910d65725f035e31ed5a53541af6573 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 955358553d11868f6de5aa276f77b7d5c5875253..d61c1696ba8db30babcc494fbe0a41c312248ca2 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 5938e6289cb9e7e6066083e5d2c3391b68403336..7be2235b057bf2347827a9ff692c9496d03e818f 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 231a0afc1eef893ca65715ef71298c862dea5f54..b40e7205d9f7fdf03a9ee9bf6a09f42294597e6d 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 fa1ac883f046aca1faf6fe201cfe429313f828cb..e9ce6d41c64a0f438fda876b4a7ef409cfc746f6 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 9ccd6f13587bc8cd458e83677a5c7f3476b285cd..968854baed151f68700f87beb3a253fdbb0e388d 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 6ffd735f42f11476fa595fce428ca3ea049eec31..075bf4ecb24f502095a7b544ce78308378330706 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 72c50d7892ce45baf7274d78a6e0e38f9b7d06de..e241c9f73b6b27a9d4ce4cfe0ac02a581f2c49ba 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 6044c9db6593b881e98c30373fec325c6972a0c6..f5a48e05ac1e45767d47ff59a93726e448f807b9 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 bee607ce9551624641b0916a9197374bb460f2e3..6e7b39b9a41e4c56fd7ec6e6d545a41324bd6862 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 499c151c2ed075bfa47ca6daa34ddb0ed48e563a..9c08be7e3eb2f15613db0850f28a98913b8b7bdb 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 0dcf785b652556843f8946c8dcb1eb43a39b18c5..edd0e4a3f8c993b370821eda05d6839ae76f9737 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 27560eb0ba5065cfeb4f7bc5e8a11bb4666a9c02..e843cbd9c37b51683a9612fe7cfafd54b134ca84 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 19f1a40307b91e564c1a0eb179c08210ab21eada..ac37c42bc4b0b29ab71b543906bfb36c0a5c0723 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 7cf350b4ac6ffc5e1c86093c94448536057846ac..b69e4bd5e8eea0f9837dabee6e84b415dc540ae0 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 6c9dc3d6b08ca57a28db345a5a996995f9202054..7d7cdde169eba8b31da0d06bf081a0edeb9e524a 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 b3b9971e83f3e71925709905379f300914af2a8a..068f395ace76ea57b1ae0244aed51b8fa3bb9a61 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 031f973d6097781aba2a2c3be3e6c1ea4f7a17b9..300e228ed8d1438695af5e5821ec856938b8cf34 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 58e8e6fa1cc06232cb04e816d532b5227eb3e18a..e602d451101fc01593a88a9719766fc0c6a39ba4 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 a521aec7ce4bc70e9a60c4499ea999c75284a4ab..b57d9e65bd578b787a399636c5ae3ae7a3602d73 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 d493cabd5390687f58479671ae2c7078e7a97183..ced86d29b0e8a732e6973256e24ad20d5576894a 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 91256040204d629c4b2ca5f11d2fdc962620f409..bc9ba2941d97f3e905d729ec0294aae6158ee50f 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 70f71a8280e53c31d4ddc98f7911900dab8b3eb7..65db1f0f9b904a1301558f30359cecf3a8399511 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 211d49edb24de962e2d5985617a256b505b3cae9..4f83d8332f79a756ec839b733415e65f83a34a50 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 526cf28f3dfb1929c0d2c4bb45b63ae527f6455a..5f3644c2842a01449778f2fc06e1168fcbfc7106 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 6fdb3d248e8838288bfb978f3ae729d7768f7ab4..b1ec90662686866ec4ef3a96d13f8f75be36dc3e 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 f31fb207c67a00aea4ae26f5b1731cf6f40340bd..1a707ff7ed00c74219fa387a4feb3a4634c9396b 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 e70be29a7d2b255e8972cc06b78708e7f8ac379e..b76942e478e537ae428cc19f7abb1bb7d1cf929d 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 859937645f665f2d4add0648ddffc2eb62705af4..8ac1fb95e76a9e2d65cc9ea4faf3a62ac2ee1434 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 2886f351f406ca19175f0ba9d8bdb607538704de..4d89743e7a322ef15b19522ac02e4f5289dcef5e 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 bf157e2c32dfac38ca71095de3d3ee0d431fba98..35f9d84d59b6eaf8b08c16fe3f355ccc18afa0f7 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 71a13dd33f9be88cc0ebe934325d9442bda2b489..346b6a0ae79a9119bbacb63bd1c44f8a385ed5c4 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 fb88ecaf2ceed8de1e06bef535d5c1fb08cef0c0..4f38403e30c72d89563e29b75825e3d471140609 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 64fd8dcd0268d95f5a2a3148fd1aaf4c053fc12e..b72a1b50010c476b424b89d09bcdadb41f6d8113 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 6ea920ec1bf38d1f39af0bd78fc585d11c8b95f3..5c02fb7488dbdd5a396ff7e960b845df1a8dd6a8 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 7f64fe4e2f89991fbcb07b6c0df03e8924bca55b..d69c3c7851c3717dff42919aa7915fb5f087c9cb 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 6b4af28bf38ae80dc677506ff18e872cde39b3fb..ed9fecd646e592c81f715087d4915d8ddb000699 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 2b942817e003c4889caf9980b6f75db963c66cc5..6a3431e94e35c81647ddb61ed6c4c4db01421af2 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 87455eb954d9f61036924f9c70d610f7700516a5..7c0e1da21c1ca802399e97e21fd97fcdc2df1fbd 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 3c68a6b1cc5400a55ade7d3e1adca3623e60aa7d..8a8082a05f4b074c13ab64b80dd6f5a5ce93a908 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 860f2fca80335ad856e049724803221c9e4e19ba..829f97743daa1ddb5321321ad3293920aaee377f 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 4ac32498556bbe25a3583e410e5249de32b53d3e..6a372865a38b82954f870ee227fdb62008f423e5 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 50fe004fe4bbc4f777dea650df32b5aca90841b0..8bdf24b1fb3241eb193e5f0c06d870819fed8958 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 4a4259260caeb0ca49be79d6b642a7d411797921..e9cafbed9f033f59e80a15c5442306f014692411 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 c1a28df6c6e07eb1c788b54f79602e5787f394bf..887cfbb0fd2aec91b927ab33561369499a7b1834 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 2523c3979a947c890ff3b8606eadd3d912d27b27..88e855351df7fdd97099f5ba6fe218ef6db9c186 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 0261ab5471862217f65b1ddd91439f47bd2aa20f..b3dfcf897da36fc913748d19b7c56d29fbe84d5d 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 61a002a7d2774e26bed4eba937d6d15870ea20a9..a24b89f2bd0b36f00215fac8e071778e43b767b9 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 9706e909b9e83dffc73189566037770b4c25784c..b55e382eff34d016cd03a640ba8db586f5daeca6 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 c084303c1a73391b99cc3b74e3f9c4c078d32952..7e88473bd1db9fa0a61e2df64db619251f959d22 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 64e36f5ea30bf345dcb8b2e01184198ae318929a..2165f27f9b39b67a331b976249b7f2d0ba51346b 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 3496facd4b25d98e9d677b3a0d58a89a6820c8e0..ed997537ff6cdce59b93b44fe7a5273a30eb4b48 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 235a962e997c2dda1434ad06ba86a66d8dab544e..5add3254b66797449b2b13bf2057b6af11892ae2 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 0d15550dac3d6911134441424a4f8a1d2130d7d6..0df6cf83aa52270a6b2873ff36564102d71355d4 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 fddc27a3e6fd3235c2e1baa9fcae6bad30f9119d..a7483bb10e42257a59a27623b257c0003e8bc944 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 2b4bd939d9c8653fc3e3cd66bb3039e2b6d825ba..35e683cb3fd97e6083a8dded202003259c58ee6f 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 1850ad2616690b51f5542c34fa426ce71a232e71..bfdcad126451eb86798d1e58b6d9b3cd88f33667 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 457cbb1bda86d3f5afa06b793e446cfbfba61bfa..9ad77994cfe1fb652343fc76601f75384f4b378c 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 79264d349260b8fc8354ffa5f9b76c05d4427b0a..53d5b4ab4da5cb1b4a9135ec9348a4481fd0f2e2 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 26966a271c6c62b4a0637005d4ff9166b5a66d5e..e3ab9f0cddc239945d928c9ea24638b91daab2b4 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 cf2775968cb2608cbbb2849b9b20c0d0a8ae949e..b26107332df0dfa89c3fd0579061d8cb28136859 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 4e2f9de6209014ccf8c5e761e8f112b1ec91fc79..ea0b1fba967d803dbbc3bf847f39793e379a3f5d 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 50664dac64151c5bc1ae089cef0b518eb3bd7c16..42fa6d789e0da345eb0b514e373ad6e2e6a6e312 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 d5d989c29143f21bb7d97e778f063325e5c2fd07..8ce0f6d2b6db96f9416abde7d85852d00d46b620 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 480a73e80ab008f8171f4e6bd465dedd2efe9b89..5749068d6bc5cf0a2d329fb9963eb6c164f00e33 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 3506c2d48fcd58047f89834274cbd91aa1a2666d..bcb4ee46f441e8de2fdcf7342c1454cdadb02e29 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 1a03993b2f863da92509798f579750a2f2fd52eb..6a7af93a92cd4e7187ab4538ee21982949214e93 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 444ce8d450d06189f9538b4160a19b01b9eb0f44..eed333995466cf1ece110e5bbe09d67663b7d6c9 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 70e0d56cc13d02f910cd00ecbb935a3527ab80d7..d28147718d25d6e37fe35527ed55adb7a84826fe 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 f056eb7c36920ca9a7f9d5ba6f4ec687dd8cfa93..cf8e6fa17fe803e725ecdc5ac3fbd306a4a30c1d 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 e333a46cee5c5631f81572a42ba74d94a9787327..6fe74065da5363917c377038b1ff7bc94d016011 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 1fd7c0326b84f5f083e10b068e31ad10e3771716..49bf9561885ceb2d621e94e27e07e4524531dafe 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 c683fcb80de4a5610bb53eb8b6e2dac10e71389d..0e95f7ff04a35b2a84af0f06c8fef99b3afcc476 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 89a72808a9cbed5c13de9add12a45e67787b0857..d13bc74c62bafa08c400b9ceab1a0d875745430d 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 b941c24b65b90b03e26fdb32c80c323a8acbd02f..4e1856a414043040ae13358f042639b797875c23 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 edb97d324daa5a34f640ec12b0b1a3f4d6800801..4cd237b447dc92c8ff6303b02d38d15095e435e8 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 cf6a51fdf53621d138270d0655645ce4b391315f..53c3dc1f1f373cc8107d3cc14114bf562e0b5dea 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 b764f750f71ac55fc33eff0c58728813ae8e557e..a94d74263a04f7bdeb3ddebb7a2102e2da16918f 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 070b2b5589b9db15db039ba3f28de51bac80f3a4..b566950b06cab92bcb3c3f4a6db697e0b5f75208 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 bb0baed6f5a7c0b0507df3055ecfd63bf4106ee2..64c91cc6250acb373c10e1f49cc0d6a0cb2a92eb 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 5d8b31a2d7d2ecc727037cb1f3852e0ad0387a24..6cdfbcf8dbb3f9a0d1098963a7a0e9a78640bcaf 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 16ac22f1d824a45641327c2a152b06b203aa2439..2a9ced5b9cfcfa51cd59ea4a7c8764deea367954 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 ed7d9a85c335e98c2d4957d3548dce8cba8345e3..e01908a2576edb14c97072694de64778dba195b1 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 57e93cad4b0690350c72514f604b3a359db21d34..12a709ceeebd3d9d488d60ec7bf0416d10d470c2 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 c3f2ae177b81cc6c265450d818fadf8164c119c4..fa9448ca05dadfe5cf6d147fff0a3d376a96f4fe 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 8e4e010b8ff039980b69d2dd018ee874baea6a93..ec025f732a5a20ba220e16b7a02ea6a4a0025dac 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 bf511a338a6b52f5171d56256c55f8eeba05904d..8ab916e5ba1d012d911318a5a1eec20836713166 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 afb142380e69889ac5bef080413255b91fbec120..94b335ed1212fcf272d204e67bfc1dd3b3345ff0 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 0df03c9d50c430b0f9b34e1333c5445078624c09..0185c3ae371fd4a61517abde83cff3fe330f52ed 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 2ed5cf74e83add510fe4718dbed69f7ca128f203..f63131716d936cc1896da18e0af1e85d7565b655 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 427a81923bae037d7211c05544685b08ef78ffed..7432f35676659c8d717da961cb8125b5a3026d7a 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 97cd0d63ce575aa3a8dccaba6b08d2270532525d..59a77aad382173534e4d8580734880c46ec81bed 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 4ad86cf48982b39634712811737d1f2ef700bf55..4888986418847a6d377f37e018e3920ef4a52479 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 fbcd9870f05916ec067704c0804a0bc5d2e8db46..9055664b20ab16b44bea634e6bfc48e050df63ca 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 492c1ffa6020757213ec1d040bc7730b2602bb67..7f8d8e00d90e2a688f0c944125aedd1da1c75f00 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 887b575297e95b08176ad20a2d19c093be57e4e2..0b61bfae8f8dd09e935b006a632f6d5ec6821710 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 528bb1848135ad70cae97911008ae2b03eb64fc9..e9adfaa1b65a0a8b7ec7eb5750e58ef420dc7fc3 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 dfc1e9c08e90742040499ffd90bb00c30443dc3b..6240286bb91591e04cea92cff088ccab14469a26 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 7597b0d3eabba1209e15e30b64cd3de3825e1942..a118cda1f0a45ee5855fe4fb8f7aeb5d0bf3533b 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 8936dcf63a364f32984bfccab7e91ef3b745648e..453bf7606c61a1245e1ead4544daee5988169674 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 ec1f9c749a26d060b2dbfcb93c68466c3cc4f696..be2e42963fca3319c3151fcc41596631b5403119 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 ec9b835f1400bd59acf030f6755d663ad40f5760..c9b6f8acf8fe243cb473f4268aec6406733d96a0 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 65a1d850ba8e2f41ec9ef5e82a0b325b51086cd5..4d8916bdf5baba2f69d770f8f9255d01ee83ef91 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 aff033bde7421a0234a89199c15d4a48dd435e27..1f706751f2cb0f784ee11d668f7c436003604e21 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 c7c2ab41d1764f3e9cc578f19d4f9afc13e91031..fb47c2aa558da4dd90e59d42a0e3f82891d05568 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 70e92c30c73941d7ad2c34609b0d4e1212abb7ff..3f2f09f600780de39ee52ffe4a42f15e67af4eb3 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 22f6687cce85b47c79b833786c45f3505d80ec0c..3e97da6eb7d6b06957d96d17c40c6cd6cea31111 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 a23f5896dcba6478822a8021a16a20dd9c93c8cb..ff606d883b78c529c571b76bd51a4a6a1d7aea2d 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 050665b4864497c4302f6b1086b014e501a1a4fe..bd89b522b3b9d0a886a25f9c353e13cffa14f353 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 77fe5ab6cbc44003605da7adabfec3f1ccebfb4b..b945b255ea911fc25260ea45096dd0774b304b68 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 aad540ff9cc669c33edb775be448b23fa1e2f4ad..533be34a4629bb346abc8b2308b0ca288cfa18e5 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 605832214e22c47565bd0603b9978a05b7f3ba3c..92578270b1c37ad1816034a45d2f798bedba63d5 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 2dff1e16c61fc2588c1d891c9e70813371940775..ba148eaf10aa49cf94629c62d49595a951b4606c 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 e028123f3b17e458255ea4a1215e84409ba06787..79a72f77df11189a4082b74b5245efb0fdd934ad 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 5a2edd3c0e81e6a939eb734d57ff2a67d521e3a7..a050e81f771710b76416a65eebfa729191c4b463 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 f54ffd8be45be4d2f2ffad88e9b9775ab08732be..7904e735503ee6db7e963bc867cdee961026efc4 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 fc048ae88f215fdd3c0789f474215bbc828d98e2..459fe06917eba45e8e06e280445f99cb29b608a7 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 b5da9a960425ced11b9a30d95231f795cef0bd8a..f583f5c310d91e48cf4d4e483b41f33c8bdd9b49 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 e1b8221bd95d3e456bdf370198ad041a2597b7b4..6a0d0d3bf7e1881f068f65b72444a4ab69470893 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 a8fc2c015084d95bfe45bd8ee8f68b97afae3d27..3faa2e5d73da0ee9152613995f22b8ac4f9670a6 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 aed6d336570bd11ed808ccfe715f9904f6ed283a..a3e590dfd7e6d34578de506e819362b8339f1305 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 92f267912615ae0d64593c880037472e2ca47eab..883ee4acf9270c2bbe227504f4c2c3bfd26d278a 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 e09ea56815a4978cf66b21c9b6019a1995568761..f22c49f528d2c71e12fd312b6a3fadc4d3c48349 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 a7b76ed6778e2c2ac82e6e37ebe38dbfdc00c95d..60505545caa5e5f2f64c687e114dfc5121f97907 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 bc89dc0f3897ba09be8056ecaaf1b488b8e0b1b6..c4b74985ac4d3e633ced3993258b40fb495f3de8 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 ed417fa9ac1eb811b3bb63139505d2cdfe8f67b2..3b608dcbb9f04b6db85c1d6fe4e2e956b634e88b 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 a531aad87ba270ebc0006b4d1e7728b380a6f200..eff51af047f508d396cf3979652ded3d00157a35 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 cd216f27e966bac5cb4039ddebf253a3eede952e..39b5ffaaecafbe1df1faa5d8798fa466fa03247e 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 302ab55b73d7ccfcb400e30151a4025621dcfa3c..1eab61e523d2abc44035b6508168fb3176aff4bf 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 a091f597cc742a4f154d8ab5822d0d2983fd1c08..8d02ed30f48b21bc6c353da6ead1cfac8867d7a4 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 fda9d8acf52a6be15a5d74fad926d867c698e857..241a5da94185468d438aee59d273b8615bed7b94 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 78ab922caf94bc82640fe918794c859b7bf2aa10..16ec3d1163f84f90a41a35f32f72a3c0ab752563 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 d3c6d073e4ee5ddc7ebd8ba47002083d9d15b182..38e15b5d072340bdefe2ccd81e24a42f94543002 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 95fa2fdb72148432da6327938b17e2b627429386..1b47b53228f630ad0b5bdf12478df24ac5527842 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 453fcf7ecec835014ca187b4f9bc287f3de906ac..74a9031c5619a0b9d5b3255f6c8e59c548f951ad 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 b3b10be313b0d33172eae3f31b2c5f20fb6822ed..106e47efc3df2df8a08a67daf9f49de5ebb45519 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 9d0a9c54c9a4c9f03dfc6b34d83ca0fe4cafa72b..02b397eba4ad543222f5f785db07693bb119c5ae 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 bf2c066f41a7de6140b83115a74db1afa86e8260..776c8fef71d26dcaf5e360cfb9e658d26296675f 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 077b6255f1408ee243769b9f9cd274bb73488e68..32ddc56972d2760bf9c4e178ffbd209cc1814dd4 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 71f44cbc47f66e0068503e46bd9d7454099a1e16..0f84d5adb4971daccefe6655e8f75bf25d95d2b7 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 0e3aa7cfdca81f2075f171f4922b80040aa6290d..5231e4cc56ef815a1eb8f1ed6bb0bf2041148ae6 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 404833165c30e4c403b75103f9adee12fe85e674..191fd44af78e185591ea1b833d1bf688af77831e 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 838b14163156a8cda611e2e203530f46e9ca5c11..0e13420d7110740e15029615cda08530337c76db 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 c2e87f5920892bdb7744e86237f4c6c83114f95a..212772c5dadb40f413f900de0a32dfc11b54176f 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 8d15ba55589c8754932fd551519e5892b90db966..cfcc21cc43f1ffcba60a3674ea80c74aa2e0eef4 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 53c10a45640f66d8e4e66cd3842354e6a205cfea..0f4148a59b99e3615cca6eccc4a393f92606edc3 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 04a9b482debe41ec260797a0cf88881851b7c3f6..584bf6e27dc5df184c5f47c3cd3a2a4e03b5a428 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 b392bf5441e828af0f125475254ca220ba37a99b..147bf85918c4ca5ebb55b3739fb3b4e80d76e0a8 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 fdfee835c8ba97dc83b080d0f35ddca45c7c12f5..9652d7ac5035a330ebc04ec0bfb1e11c799d4f4b 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 5b996d6717e79b0db62ca734e1f8d5a8c322c9fb..64c8fef07f059d4acfa5af8854ddcfcb5a6c7664 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 f53f8100e618b395e8c25eb3b50b3f42fb647787..04350d0069889a9856a4c6a888379105700412e4 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 2d014054abebc272cf4f22e8c2bcc3ab9d1dbb69..7c875131fb5a48aebd0965e7b34407a9afcb26eb 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 ab665ea82f41158028dff4f1800aaa325eabdff5..ac7726c8ff97d8017ddf7a609d9a85dec3b84afc 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 4de510fe54e667955e47537651d1d7f1e0fad0a7..c702fa311dd1a0952576823698409510f44a5210 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 7d60ccdf1b77ec82d6fa8f841aa0bbcba1b2f481..8fd3080ff6f639019f3d0100f63b9f8560cb281e 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 23c36d0196626aa6870de3b4f43309168c49466f..3fdf3a87dc89a73a253e56c0a88bc189a81dbe53 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 9aa59212b2aa7e6e55ed4d44d592b5d33a2ad750..f45126da8efc362d5e1ce8021c48ccba84c06130 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 09194fe1fd3e39227c8c0d7fee1222373c035172..f2d1b5e74d20c68aecbdd33141383a66813cb9dc 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 adb2fd5388ca9eb3e2999df19ca4a697f03c7e41..5a64f801803f10a5cbf2d3334dd3bccf7b2cf026 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 f2bf648bd53cda826b59b92ca216890fc4aa1764..ef190203cf89c940135213a9c21832ccfc8d8a37 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 11a289b2ce2c8326573705b91a3674deb5d0b821..ba43624848c830e73c62e4565b3f7c371882e1fe 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 6f5354f84a928eb50a54333546e8011b0c310264..aea363b958fccf3e64ba96f90aeb9e3f9b10b709 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 82178d249d47065432c6eaa7cb91c096d339ac60..5aad474187965b2abc1bd18a7cd12615d17cbb06 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 04a4ee3a2ddcc254a115b68a27e83f053d5eef23..5c74b68e9d77b912ffb3a9c3866a5be2da2d213e 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 b8dad8e7b846877b2cfb5b5faa374da5f58053e9..62ad2d3f30dc43c92fe9ab4be9548530cdc0c2be 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 194e5833c1afd2da2e7b9f772934c76e9e868ed7..8806464d93e252b0442a822923a489a9ed71b6a3 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 fe3ed247d3723c09365691ddc2348501fa6b9f54..189c93abbc7634d5ca76949ab5aba42a061a57c0 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 aea3916193376c5a90ae3bfcc823a05729e67b14..3c6636d66c80807a5cdbe2140557f12f5e544b65 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 ffd13e7179eb7b5d44f0a03a504fdc7461122dc1..771e83fe79fef39ead452d5fb48ef4f4f970b34e 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 2dbd6413f030de6600c9609ce62a28316a965bd2..e4f2e6d5d87ceaa2c9b91fb8d28fe729910de402 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 20f648b0314733aab2d8b6c94b7621020262b279..5d7e1006650b6109588ecca1ab0418db3c14c93c 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 901cca26bf1043d68fcdee9c33fa2cb977929760..670ffb67d6de98bca563d269871ff9aa30a76910 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 2ad15a8580c9d4777489ec247a3c7798b7cb0971..0384d5984f5b6d11415f43630282c70086c96aaa 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 f815d6cf0bb32adfefb9061b2466f5ac1901acb3..c179573d674c226910a7fa210c63ed5a2b2cc2bb 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 c7bd29f12c20a9c56d7fa49955f6b332b3af960f..71df233b587e394a2256786dfbffa7286a311b14 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 0906832761ce85f10b3a5922ef670c746840356c..91347dea8988bb54f36da1e74dd4448be3b70758 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 daacdb167baf5b50612a2037f40306976e1b59fe..589aca85713fc57486ca5c433a1eb26ecf0812e5 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 37977464d45ec71937a63bded3b24073b19b3e35..45a4dc97d68d101dc84633ea6dc2090b4b89b6bf 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 60d70539ccfa8847c0d6caaceae995c94a0e306a..24fefed1b0610fa28e186a01a86754bf2ea643db 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 ec3300ca6ac8ae334a651f09fc5980d22fc645bb..ce9a193bdefb4866f3f678f2043959567f82e477 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 b2272bda825ad4656238d44197ae15e3f98a47ff..849530d86089fb72a42c26b22551be4fa1cf54d5 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 2f40eb646c9d63821d3d7e0e912b2f32df0ebd0a..13301ec9f5def298457c398668435ae0d11c65f2 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 9392c67b8e0ef580f94e101e09f864d16ecd54ad..52cee2ee27dda468ff1c8432900f104f09389a6e 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 7d90ec6a3ddfa0fa83e61f437302bc4fbab7143a..c8ba3b92d0826b827f7ea4c8fe47c583996694c9 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 a97269d4418443910594bfa8c8ba1519db417df2..96af8469df494317e2184becd47e5459654ba387 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 415358b6c8db8df9d51254bdb60c54e0a65fac4a..cc49867c8a24fb70bd0ad78a8b7ac987c02b7ce2 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 a1d08e04d9f88a70752eb1682e2958362474f040..962785bdd3988a82ddad7fea38d557450a0de52e 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 762b790c102f12a4ae97a849904afbd32f8cbe80..87c556cff05621a9c156af531be7ce8eca4f2681 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 c38bdcc3c9c16545c9e61277284c7718eeadc8a9..53e91df039d4a99281428f27cc3ba429035a4e13 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 79c716b6e830fa1d9370e4ed9075f19ad17dca9e..8858d67f8cf505931202a9587a90349ea7f3b030 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 41df8a2fdd9eafbdd21cdbcf5d47454a235c97de..5df3c4e86d6a378d900dd9dc2fe6c5b087193879 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 d1b2ce8d52549d218376433473d6544a53145235..5f132379994318284240a9e0ff500c29979ad95a 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 2f37ef8bfff7f6ed5abac44e51f9b735384f3bc8..98de5ecefcd6ecb5971ee32fcece04368b7299f0 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 12dc56bef30c8f86f7ada73281fd6abe13c8e536..6d42d740903e2468183167084c843cabb10a1422 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 9dcd9d748c1a811a7d01944cebc3270d051ecefd..5704e9fea460bb5643739c34cbb918237a55dba9 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 4f8d79f14b1a841e6c6cc120c737748c543f4567..9f2098bb25c8f72b2f560f8a8f3aa645c2095554 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 880f4990dbf9fa84a5ef6a62507679fb157aa3e9..b06a88b780716574e217156c36e3aa61a4950028 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