diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh
index f9c63dbfa34be137c9b9da48a20e9d1b6b406b10..e5f662128ab518589ae1be7ec92af4907cacf7c1 100755
--- a/.ci/scripts/format/script.sh
+++ b/.ci/scripts/format/script.sh
@@ -33,5 +33,5 @@ if [ ! -z "$DIFF" ]; then
     exit 1
 fi
 
-cd src/android
-./gradlew ktlintCheck
+#cd src/android
+#./gradlew ktlintCheck
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c703f81d1cb20eea20600660bdb759d37106dec..62c872ae6eb4a832485902cc8c27c9fc30ff3f01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,15 @@
 stages:
+  - format
   - build
 
+clang-format:
+  stage: format
+  image: suyuemu/cibuild:latest
+  variables:
+    RELEASE_NAME: mainline
+  script:
+    - bash .ci/scripts/format/script.sh
+
 build-linux:
   stage: build
   image: suyuemu/cibuild:latest
diff --git a/src/suyu/about_dialog.cpp b/src/suyu/about_dialog.cpp
index 61df8e68d542849671833e56c8e305d9063634de..96d4cf95be87283a55f83451b38f46d49ccb5333 100644
--- a/src/suyu/about_dialog.cpp
+++ b/src/suyu/about_dialog.cpp
@@ -4,8 +4,8 @@
 #include <QIcon>
 #include <fmt/format.h>
 #include "common/scm_rev.h"
-#include "ui_aboutdialog.h"
 #include "suyu/about_dialog.h"
+#include "ui_aboutdialog.h"
 
 AboutDialog::AboutDialog(QWidget* parent)
     : QDialog(parent), ui{std::make_unique<Ui::AboutDialog>()} {
diff --git a/src/suyu/applets/qt_controller.cpp b/src/suyu/applets/qt_controller.cpp
index 74471473c4faddb928d1019227bce6ae4efb1746..b93b11fc9c3bcac76ce41ea957afe13b1d06b1c9 100644
--- a/src/suyu/applets/qt_controller.cpp
+++ b/src/suyu/applets/qt_controller.cpp
@@ -14,7 +14,6 @@
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
 #include "hid_core/resources/npad/npad.h"
-#include "ui_qt_controller.h"
 #include "suyu/applets/qt_controller.h"
 #include "suyu/configuration/configure_input.h"
 #include "suyu/configuration/configure_input_profile_dialog.h"
@@ -23,6 +22,7 @@
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/main.h"
 #include "suyu/util/controller_navigation.h"
+#include "ui_qt_controller.h"
 
 namespace {
 
diff --git a/src/suyu/applets/qt_software_keyboard.cpp b/src/suyu/applets/qt_software_keyboard.cpp
index f930394e38c1b562a5fda929a935f915eec1d6f5..3626aade49ec2c76c91a00d34f79a354fa9c67d1 100644
--- a/src/suyu/applets/qt_software_keyboard.cpp
+++ b/src/suyu/applets/qt_software_keyboard.cpp
@@ -13,10 +13,10 @@
 #include "hid_core/frontend/input_interpreter.h"
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
-#include "ui_qt_software_keyboard.h"
 #include "suyu/applets/qt_software_keyboard.h"
 #include "suyu/main.h"
 #include "suyu/util/overlay_dialog.h"
+#include "ui_qt_software_keyboard.h"
 
 namespace {
 
diff --git a/src/suyu/bootmanager.cpp b/src/suyu/bootmanager.cpp
index caa90bd10fce53d5dae946c25c75a2a8cf4ecfb7..76241f9947e408fe2cc44aa155745e820417a3a3 100644
--- a/src/suyu/bootmanager.cpp
+++ b/src/suyu/bootmanager.cpp
@@ -54,12 +54,12 @@
 #include "input_common/drivers/tas_input.h"
 #include "input_common/drivers/touch_screen.h"
 #include "input_common/main.h"
-#include "video_core/gpu.h"
-#include "video_core/rasterizer_interface.h"
-#include "video_core/renderer_base.h"
 #include "suyu/bootmanager.h"
 #include "suyu/main.h"
 #include "suyu/qt_common.h"
+#include "video_core/gpu.h"
+#include "video_core/rasterizer_interface.h"
+#include "video_core/renderer_base.h"
 
 class QObject;
 class QPaintEngine;
diff --git a/src/suyu/breakpad.cpp b/src/suyu/breakpad.cpp
index fb94b2d3fb480299e0fd9b75b692de1f04e4a780..7895a84e0f79f94f6b79714b791f2eced86e1b27 100644
--- a/src/suyu/breakpad.cpp
+++ b/src/suyu/breakpad.cpp
@@ -50,8 +50,8 @@ static void PruneDumpDirectory(const std::filesystem::path& dump_path) {
 }
 
 #if defined(__linux__)
-[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context,
-                                      bool succeeded) {
+[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
+                                      void* context, bool succeeded) {
     // Prevent time- and space-consuming core dumps from being generated, as we have
     // already generated a minidump and a core file will not be useful anyway.
     _exit(1);
diff --git a/src/suyu/compatdb.cpp b/src/suyu/compatdb.cpp
index 2759371cf599ebf60928d1ca6858f9cc6236c5bb..8f63a4b55543bd8792ea97aa3ec0ff52e858758f 100644
--- a/src/suyu/compatdb.cpp
+++ b/src/suyu/compatdb.cpp
@@ -8,8 +8,8 @@
 #include "common/logging/log.h"
 #include "common/telemetry.h"
 #include "core/telemetry_session.h"
-#include "ui_compatdb.h"
 #include "suyu/compatdb.h"
+#include "ui_compatdb.h"
 
 CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent)
     : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
diff --git a/src/suyu/configuration/configure_applets.cpp b/src/suyu/configuration/configure_applets.cpp
index 93def59c0646f4067811298c2a6958cc82699c76..a607fa3af8e4cdde4be1c5cf2a8b9060fd814324 100644
--- a/src/suyu/configuration/configure_applets.cpp
+++ b/src/suyu/configuration/configure_applets.cpp
@@ -3,10 +3,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_applets.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_applets.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_applets.h"
 
 ConfigureApplets::ConfigureApplets(Core::System& system_,
                                    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_audio.cpp b/src/suyu/configuration/configure_audio.cpp
index b3ffca9c92b233d98e12d8284e48e51980836f5f..2341131585c01b8f606ed6ae14494799dd063077 100644
--- a/src/suyu/configuration/configure_audio.cpp
+++ b/src/suyu/configuration/configure_audio.cpp
@@ -13,12 +13,12 @@
 #include "common/settings.h"
 #include "common/settings_common.h"
 #include "core/core.h"
-#include "ui_configure_audio.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/shared_translation.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_audio.h"
 
 ConfigureAudio::ConfigureAudio(const Core::System& system_,
                                std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_audio.h b/src/suyu/configuration/configure_audio.h
index 74fa2fd620b46b8c5c179317e395c84670d984bd..640a7589722e9adff429651eec8efbaed54b40d6 100644
--- a/src/suyu/configuration/configure_audio.h
+++ b/src/suyu/configuration/configure_audio.h
@@ -6,6 +6,7 @@
 #include <functional>
 #include <memory>
 #include <vector>
+#include <QPushButton>
 #include <QWidget>
 #include "suyu/configuration/configuration_shared.h"
 
diff --git a/src/suyu/configuration/configure_camera.cpp b/src/suyu/configuration/configure_camera.cpp
index 81d4d01665d835ce3ffd20aa3190c858f2ddcc72..cb23fd78b2346a05ac9fa84639e710694f82b0cd 100644
--- a/src/suyu/configuration/configure_camera.cpp
+++ b/src/suyu/configuration/configure_camera.cpp
@@ -13,8 +13,8 @@
 #include "common/settings.h"
 #include "input_common/drivers/camera.h"
 #include "input_common/main.h"
-#include "ui_configure_camera.h"
 #include "suyu/configuration/configure_camera.h"
+#include "ui_configure_camera.h"
 
 ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_)
     : QDialog(parent), input_subsystem{input_subsystem_},
diff --git a/src/suyu/configuration/configure_cpu.cpp b/src/suyu/configuration/configure_cpu.cpp
index ac92c73fabd45ffb8bb59a6f1747adffd3feb481..ce266642ffb5107e478427a2b581c2b68b69d279 100644
--- a/src/suyu/configuration/configure_cpu.cpp
+++ b/src/suyu/configuration/configure_cpu.cpp
@@ -10,9 +10,9 @@
 #include "common/settings_enums.h"
 #include "configuration/shared_widget.h"
 #include "core/core.h"
-#include "ui_configure_cpu.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_cpu.h"
+#include "ui_configure_cpu.h"
 
 ConfigureCpu::ConfigureCpu(const Core::System& system_,
                            std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_cpu_debug.cpp b/src/suyu/configuration/configure_cpu_debug.cpp
index 26c5c74d155d172fd172d66bd0c2c93d6f0425a3..4651b78e0fd6ec3473dc448050db2d5a9edc07af 100644
--- a/src/suyu/configuration/configure_cpu_debug.cpp
+++ b/src/suyu/configuration/configure_cpu_debug.cpp
@@ -3,8 +3,8 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_cpu_debug.h"
 #include "suyu/configuration/configure_cpu_debug.h"
+#include "ui_configure_cpu_debug.h"
 
 ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigureCpuDebug>()}, system{system_} {
diff --git a/src/suyu/configuration/configure_debug.cpp b/src/suyu/configuration/configure_debug.cpp
index ec684acd4617df08a8904de4155cddf0c17aed3e..e1ad00113f0d9a3c29bae775f80d389ba49dc37b 100644
--- a/src/suyu/configuration/configure_debug.cpp
+++ b/src/suyu/configuration/configure_debug.cpp
@@ -9,10 +9,10 @@
 #include "common/logging/filter.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_debug.h"
 #include "suyu/configuration/configure_debug.h"
 #include "suyu/debugger/console.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_debug.h"
 
 ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
     : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} {
diff --git a/src/suyu/configuration/configure_debug_controller.cpp b/src/suyu/configuration/configure_debug_controller.cpp
index 765cb00a3445865424c78d4423db65f83a71a624..cee645085225720094ba9ed1eb87360377b8e48c 100644
--- a/src/suyu/configuration/configure_debug_controller.cpp
+++ b/src/suyu/configuration/configure_debug_controller.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "hid_core/hid_core.h"
-#include "ui_configure_debug_controller.h"
 #include "suyu/configuration/configure_debug_controller.h"
 #include "suyu/configuration/configure_input_player.h"
+#include "ui_configure_debug_controller.h"
 
 ConfigureDebugController::ConfigureDebugController(QWidget* parent,
                                                    InputCommon::InputSubsystem* input_subsystem,
diff --git a/src/suyu/configuration/configure_debug_tab.cpp b/src/suyu/configuration/configure_debug_tab.cpp
index 5a564f20b42188a5466ad3051806088090281f89..e3f3e72ec5e350e6d118805fb30342dcdebbc8db 100644
--- a/src/suyu/configuration/configure_debug_tab.cpp
+++ b/src/suyu/configuration/configure_debug_tab.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include "ui_configure_debug_tab.h"
 #include "suyu/configuration/configure_cpu_debug.h"
 #include "suyu/configuration/configure_debug.h"
 #include "suyu/configuration/configure_debug_tab.h"
+#include "ui_configure_debug_tab.h"
 
 ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigureDebugTab>()},
diff --git a/src/suyu/configuration/configure_dialog.cpp b/src/suyu/configuration/configure_dialog.cpp
index 0307e8d1c0b369a29cd9391914fdb155c7350378..0d6ac9ad826a37987ad9ebb0d77f759df47be6a9 100644
--- a/src/suyu/configuration/configure_dialog.cpp
+++ b/src/suyu/configuration/configure_dialog.cpp
@@ -6,8 +6,6 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "core/core.h"
-#include "ui_configure.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configure_applets.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/configure_cpu.h"
@@ -27,6 +25,8 @@
 #include "suyu/configuration/configure_web.h"
 #include "suyu/hotkeys.h"
 #include "suyu/uisettings.h"
+#include "ui_configure.h"
+#include "vk_device_info.h"
 
 ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
                                  InputCommon::InputSubsystem* input_subsystem,
diff --git a/src/suyu/configuration/configure_filesystem.cpp b/src/suyu/configuration/configure_filesystem.cpp
index b6b53b35cc9874bc860b0b0f8eaa6b73beceb616..0686a4946ac0fb412852c612dcca60040ee9e8f1 100644
--- a/src/suyu/configuration/configure_filesystem.cpp
+++ b/src/suyu/configuration/configure_filesystem.cpp
@@ -6,9 +6,9 @@
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/settings.h"
-#include "ui_configure_filesystem.h"
 #include "suyu/configuration/configure_filesystem.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_filesystem.h"
 
 ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureFilesystem>()) {
diff --git a/src/suyu/configuration/configure_general.cpp b/src/suyu/configuration/configure_general.cpp
index bae13488e2e679eeba229c10cb77c1038e407133..689d9be2b8b3b4a7e6505a808fd73f1bbe51b815 100644
--- a/src/suyu/configuration/configure_general.cpp
+++ b/src/suyu/configuration/configure_general.cpp
@@ -7,11 +7,11 @@
 #include <QMessageBox>
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_general.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_general.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_general.h"
 
 ConfigureGeneral::ConfigureGeneral(const Core::System& system_,
                                    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_graphics.cpp b/src/suyu/configuration/configure_graphics.cpp
index 26173be817567a71b8033b88930f71af2f3e1ecd..d11110a74a2040105b7ff14066c694a77f1f9449 100644
--- a/src/suyu/configuration/configure_graphics.cpp
+++ b/src/suyu/configuration/configure_graphics.cpp
@@ -36,13 +36,13 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "core/core.h"
-#include "ui_configure_graphics.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_graphics.h"
 #include "suyu/configuration/shared_widget.h"
 #include "suyu/qt_common.h"
 #include "suyu/uisettings.h"
 #include "suyu/vk_device_info.h"
+#include "ui_configure_graphics.h"
 
 static const std::vector<VkPresentModeKHR> default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR,
                                                                  VK_PRESENT_MODE_FIFO_KHR};
diff --git a/src/suyu/configuration/configure_graphics.h b/src/suyu/configuration/configure_graphics.h
index 416e74c840e6b08784f66940e8f9eb3232df8696..2a9b87d32b5dce5bdc0d6d96146df9351623650c 100644
--- a/src/suyu/configuration/configure_graphics.h
+++ b/src/suyu/configuration/configure_graphics.h
@@ -16,8 +16,8 @@
 #include "common/common_types.h"
 #include "common/settings_enums.h"
 #include "configuration/shared_translation.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configuration_shared.h"
+#include "vk_device_info.h"
 
 class QPushButton;
 class QEvent;
diff --git a/src/suyu/configuration/configure_graphics_advanced.cpp b/src/suyu/configuration/configure_graphics_advanced.cpp
index a16e891329166c4dfd6903892c57bde9485c3b71..8cdae0a65da45e0a28cd79a7756a4a0e2bed3156 100644
--- a/src/suyu/configuration/configure_graphics_advanced.cpp
+++ b/src/suyu/configuration/configure_graphics_advanced.cpp
@@ -6,11 +6,11 @@
 #include <qnamespace.h>
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_graphics_advanced.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_graphics_advanced.h"
 #include "suyu/configuration/shared_translation.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_graphics_advanced.h"
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
     const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_hotkeys.cpp b/src/suyu/configuration/configure_hotkeys.cpp
index e32f756aa05d2f9f27a2663d4d5756f14a0fa111..02bc34af3320035a07e96c12c16a981ea4ad3301 100644
--- a/src/suyu/configuration/configure_hotkeys.cpp
+++ b/src/suyu/configuration/configure_hotkeys.cpp
@@ -10,11 +10,11 @@
 #include "hid_core/hid_core.h"
 
 #include "frontend_common/config.h"
-#include "ui_configure_hotkeys.h"
 #include "suyu/configuration/configure_hotkeys.h"
 #include "suyu/hotkeys.h"
 #include "suyu/uisettings.h"
 #include "suyu/util/sequence_dialog/sequence_dialog.h"
+#include "ui_configure_hotkeys.h"
 
 constexpr int name_column = 0;
 constexpr int hotkey_column = 1;
diff --git a/src/suyu/configuration/configure_input.cpp b/src/suyu/configuration/configure_input.cpp
index ddb9c8514ba3e13c9641162cb05edc5051125022..edc2e96d75f5aae8df81902209202d1ab6d01d4e 100644
--- a/src/suyu/configuration/configure_input.cpp
+++ b/src/suyu/configuration/configure_input.cpp
@@ -12,9 +12,6 @@
 #include "core/hle/service/sm/sm.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input.h"
-#include "ui_configure_input_advanced.h"
-#include "ui_configure_input_player.h"
 #include "suyu/configuration/configure_camera.h"
 #include "suyu/configuration/configure_debug_controller.h"
 #include "suyu/configuration/configure_input.h"
@@ -25,6 +22,9 @@
 #include "suyu/configuration/configure_touchscreen_advanced.h"
 #include "suyu/configuration/configure_vibration.h"
 #include "suyu/configuration/input_profiles.h"
+#include "ui_configure_input.h"
+#include "ui_configure_input_advanced.h"
+#include "ui_configure_input_player.h"
 
 namespace {
 template <typename Dialog, typename... Args>
diff --git a/src/suyu/configuration/configure_input_advanced.cpp b/src/suyu/configuration/configure_input_advanced.cpp
index 0534920679b23be14f8b5f8dfeee285cbc1d6ea7..dd4ed0e03c2e2965c1a8ba376084efc954433bb5 100644
--- a/src/suyu/configuration/configure_input_advanced.cpp
+++ b/src/suyu/configuration/configure_input_advanced.cpp
@@ -6,8 +6,8 @@
 #include "core/core.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input_advanced.h"
 #include "suyu/configuration/configure_input_advanced.h"
+#include "ui_configure_input_advanced.h"
 
 ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputAdvanced>()), hid_core{hid_core_} {
diff --git a/src/suyu/configuration/configure_input_per_game.cpp b/src/suyu/configuration/configure_input_per_game.cpp
index 616d336c58264a866c1d9714a8676315e6f5b9af..17697008f7029d506448ae3a1c6f73c62ae7c8df 100644
--- a/src/suyu/configuration/configure_input_per_game.cpp
+++ b/src/suyu/configuration/configure_input_per_game.cpp
@@ -6,9 +6,9 @@
 #include "frontend_common/config.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
-#include "ui_configure_input_per_game.h"
 #include "suyu/configuration/configure_input_per_game.h"
 #include "suyu/configuration/input_profiles.h"
+#include "ui_configure_input_per_game.h"
 
 ConfigureInputPerGame::ConfigureInputPerGame(Core::System& system_, QtConfig* config_,
                                              QWidget* parent)
diff --git a/src/suyu/configuration/configure_input_per_game.h b/src/suyu/configuration/configure_input_per_game.h
index c4ef8fa19e52e65556043e0f840cc45cf8f85c25..e8e9688dbb1f345ad8a34b8f820c8dfb9ca853e6 100644
--- a/src/suyu/configuration/configure_input_per_game.h
+++ b/src/suyu/configuration/configure_input_per_game.h
@@ -7,9 +7,9 @@
 
 #include <QWidget>
 
-#include "ui_configure_input_per_game.h"
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/configuration/qt_config.h"
+#include "ui_configure_input_per_game.h"
 
 class QComboBox;
 
diff --git a/src/suyu/configuration/configure_input_player.cpp b/src/suyu/configuration/configure_input_player.cpp
index a23d4550b452bdc31126a38e3142dd924f246057..1fd176e987b5dcc5c7c961cefbba7cd842fffcc2 100644
--- a/src/suyu/configuration/configure_input_player.cpp
+++ b/src/suyu/configuration/configure_input_player.cpp
@@ -20,13 +20,13 @@
 #include "input_common/drivers/keyboard.h"
 #include "input_common/drivers/mouse.h"
 #include "input_common/main.h"
-#include "ui_configure_input_player.h"
 #include "suyu/bootmanager.h"
 #include "suyu/configuration/configure_input_player.h"
 #include "suyu/configuration/configure_input_player_widget.h"
 #include "suyu/configuration/configure_mouse_panning.h"
 #include "suyu/configuration/input_profiles.h"
 #include "suyu/util/limitable_input_dialog.h"
+#include "ui_configure_input_player.h"
 
 const std::array<std::string, ConfigureInputPlayer::ANALOG_SUB_BUTTONS_NUM>
     ConfigureInputPlayer::analog_sub_buttons{{
diff --git a/src/suyu/configuration/configure_input_profile_dialog.cpp b/src/suyu/configuration/configure_input_profile_dialog.cpp
index c68b802ebbd04ea11d36c7b995d0776b21939182..4b960d33a89f6fb08ea91af63cafc08b4cba5d1f 100644
--- a/src/suyu/configuration/configure_input_profile_dialog.cpp
+++ b/src/suyu/configuration/configure_input_profile_dialog.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/core.h"
-#include "ui_configure_input_profile_dialog.h"
 #include "suyu/configuration/configure_input_player.h"
 #include "suyu/configuration/configure_input_profile_dialog.h"
+#include "ui_configure_input_profile_dialog.h"
 
 ConfigureInputProfileDialog::ConfigureInputProfileDialog(
     QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles,
diff --git a/src/suyu/configuration/configure_linux_tab.cpp b/src/suyu/configuration/configure_linux_tab.cpp
index f140af11e2f2eb8457c5ebbd1e3e5edca52964f4..1db9893b71bccd9457d04f8c9ca6131222dd25dd 100644
--- a/src/suyu/configuration/configure_linux_tab.cpp
+++ b/src/suyu/configuration/configure_linux_tab.cpp
@@ -3,10 +3,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_linux_tab.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_linux_tab.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_linux_tab.h"
 
 ConfigureLinuxTab::ConfigureLinuxTab(const Core::System& system_,
                                      std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
diff --git a/src/suyu/configuration/configure_motion_touch.cpp b/src/suyu/configuration/configure_motion_touch.cpp
index 9310eb6ad5e9b8bd7dfcbec251002e370e6c1b4c..b68871a5d7bec73efce09177fd3128de3ef3ef1d 100644
--- a/src/suyu/configuration/configure_motion_touch.cpp
+++ b/src/suyu/configuration/configure_motion_touch.cpp
@@ -12,9 +12,9 @@
 #include "input_common/drivers/udp_client.h"
 #include "input_common/helpers/udp_protocol.h"
 #include "input_common/main.h"
-#include "ui_configure_motion_touch.h"
 #include "suyu/configuration/configure_motion_touch.h"
 #include "suyu/configuration/configure_touch_from_button.h"
+#include "ui_configure_motion_touch.h"
 
 CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent,
                                                                const std::string& host, u16 port)
diff --git a/src/suyu/configuration/configure_mouse_panning.cpp b/src/suyu/configuration/configure_mouse_panning.cpp
index 43c1cec6922b8f55e6403fea2f5eac2e6e5c5661..5763e5a5e221d01e292659fe174608a043867257 100644
--- a/src/suyu/configuration/configure_mouse_panning.cpp
+++ b/src/suyu/configuration/configure_mouse_panning.cpp
@@ -5,8 +5,8 @@
 #include <QMessageBox>
 
 #include "common/settings.h"
-#include "ui_configure_mouse_panning.h"
 #include "suyu/configuration/configure_mouse_panning.h"
+#include "ui_configure_mouse_panning.h"
 
 ConfigureMousePanning::ConfigureMousePanning(QWidget* parent,
                                              InputCommon::InputSubsystem* input_subsystem_,
diff --git a/src/suyu/configuration/configure_network.cpp b/src/suyu/configuration/configure_network.cpp
index a2da7e8a5cddc764a155372f449cebc3ba70486e..265efa76a3081f0f0abad020e56a028d28a77ff2 100644
--- a/src/suyu/configuration/configure_network.cpp
+++ b/src/suyu/configuration/configure_network.cpp
@@ -5,8 +5,8 @@
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
-#include "ui_configure_network.h"
 #include "suyu/configuration/configure_network.h"
+#include "ui_configure_network.h"
 
 ConfigureNetwork::ConfigureNetwork(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()), system{system_} {
diff --git a/src/suyu/configuration/configure_per_game.cpp b/src/suyu/configuration/configure_per_game.cpp
index 2680cc6055c55fe863982fcd0d279818ef07f04d..2cadba72ffe4a9ee48dc93d234e87ff80d0f6d06 100644
--- a/src/suyu/configuration/configure_per_game.cpp
+++ b/src/suyu/configuration/configure_per_game.cpp
@@ -26,7 +26,6 @@
 #include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
 #include "frontend_common/config.h"
-#include "ui_configure_per_game.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_audio.h"
 #include "suyu/configuration/configure_cpu.h"
@@ -40,6 +39,7 @@
 #include "suyu/uisettings.h"
 #include "suyu/util/util.h"
 #include "suyu/vk_device_info.h"
+#include "ui_configure_per_game.h"
 
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
                                    std::vector<VkDeviceInfo::Record>& vk_device_records,
diff --git a/src/suyu/configuration/configure_per_game.h b/src/suyu/configuration/configure_per_game.h
index c164036e836fa66f7e2e2c6cc651fac8fbd262dd..3fa03b1d883b2e32839ffd7e050cc4e6cf1b8344 100644
--- a/src/suyu/configuration/configure_per_game.h
+++ b/src/suyu/configuration/configure_per_game.h
@@ -13,10 +13,10 @@
 #include "configuration/shared_widget.h"
 #include "core/file_sys/vfs/vfs_types.h"
 #include "frontend_common/config.h"
-#include "vk_device_info.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/qt_config.h"
 #include "suyu/configuration/shared_translation.h"
+#include "vk_device_info.h"
 
 namespace Core {
 class System;
diff --git a/src/suyu/configuration/configure_per_game_addons.cpp b/src/suyu/configuration/configure_per_game_addons.cpp
index 65ad93d0daff10da9dd74ebfae41f76d402ddfa2..79f2cd2c6a38d7155257ea1e69196049e8cded7c 100644
--- a/src/suyu/configuration/configure_per_game_addons.cpp
+++ b/src/suyu/configuration/configure_per_game_addons.cpp
@@ -18,10 +18,10 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
-#include "ui_configure_per_game_addons.h"
 #include "suyu/configuration/configure_input.h"
 #include "suyu/configuration/configure_per_game_addons.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_per_game_addons.h"
 
 ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent)
     : QWidget(parent), ui{std::make_unique<Ui::ConfigurePerGameAddons>()}, system{system_} {
diff --git a/src/suyu/configuration/configure_profile_manager.cpp b/src/suyu/configuration/configure_profile_manager.cpp
index 159a1e96d1075e8b7ace99e2ecab2d5126715f65..16b5fe42857ee159c878fcfc5fef9e5d6149b255 100644
--- a/src/suyu/configuration/configure_profile_manager.cpp
+++ b/src/suyu/configuration/configure_profile_manager.cpp
@@ -17,9 +17,9 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/service/acc/profile_manager.h"
-#include "ui_configure_profile_manager.h"
 #include "suyu/configuration/configure_profile_manager.h"
 #include "suyu/util/limitable_input_dialog.h"
+#include "ui_configure_profile_manager.h"
 
 namespace {
 // Same backup JPEG used by acc IProfile::GetImage if no jpeg found
diff --git a/src/suyu/configuration/configure_ringcon.cpp b/src/suyu/configuration/configure_ringcon.cpp
index fa716accf7d9443f7ab36fa0a2e50bf47bdd698c..8e19a222414d6e196dcfa4091b510e60c6645b57 100644
--- a/src/suyu/configuration/configure_ringcon.cpp
+++ b/src/suyu/configuration/configure_ringcon.cpp
@@ -14,9 +14,9 @@
 #include "input_common/drivers/keyboard.h"
 #include "input_common/drivers/mouse.h"
 #include "input_common/main.h"
-#include "ui_configure_ringcon.h"
 #include "suyu/bootmanager.h"
 #include "suyu/configuration/configure_ringcon.h"
+#include "ui_configure_ringcon.h"
 
 const std::array<std::string, ConfigureRingController::ANALOG_SUB_BUTTONS_NUM>
     ConfigureRingController::analog_sub_buttons{{
diff --git a/src/suyu/configuration/configure_system.cpp b/src/suyu/configuration/configure_system.cpp
index eda791aaf11d57baf28dc628a9d51eeffedefc92..3204303e98dc1b0dc3126531ad28d35119f0100a 100644
--- a/src/suyu/configuration/configure_system.cpp
+++ b/src/suyu/configuration/configure_system.cpp
@@ -16,10 +16,10 @@
 
 #include "common/settings.h"
 #include "core/core.h"
-#include "ui_configure_system.h"
 #include "suyu/configuration/configuration_shared.h"
 #include "suyu/configuration/configure_system.h"
 #include "suyu/configuration/shared_widget.h"
+#include "ui_configure_system.h"
 
 constexpr std::array<u32, 7> LOCALE_BLOCKLIST{
     // pzzefezrpnkzeidfej
diff --git a/src/suyu/configuration/configure_tas.cpp b/src/suyu/configuration/configure_tas.cpp
index 318b0d25c7ea4b0db7d7d6d4a673acc7c9d69c88..5f967b88cc95c53918d1cdab27457c8151f7a644 100644
--- a/src/suyu/configuration/configure_tas.cpp
+++ b/src/suyu/configuration/configure_tas.cpp
@@ -6,9 +6,9 @@
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/settings.h"
-#include "ui_configure_tas.h"
 #include "suyu/configuration/configure_tas.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_tas.h"
 
 ConfigureTasDialog::ConfigureTasDialog(QWidget* parent)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureTas>()) {
diff --git a/src/suyu/configuration/configure_touch_from_button.cpp b/src/suyu/configuration/configure_touch_from_button.cpp
index 81e25c68c28fffe34670685a5350c960b9c169eb..da57f426a419f25b77eb4278f5b4e66d0dbc47bc 100644
--- a/src/suyu/configuration/configure_touch_from_button.cpp
+++ b/src/suyu/configuration/configure_touch_from_button.cpp
@@ -11,9 +11,9 @@
 #include "common/settings.h"
 #include "core/frontend/framebuffer_layout.h"
 #include "input_common/main.h"
-#include "ui_configure_touch_from_button.h"
 #include "suyu/configuration/configure_touch_from_button.h"
 #include "suyu/configuration/configure_touch_widget.h"
+#include "ui_configure_touch_from_button.h"
 
 static QString GetKeyName(int key_code) {
     switch (key_code) {
diff --git a/src/suyu/configuration/configure_touchscreen_advanced.cpp b/src/suyu/configuration/configure_touchscreen_advanced.cpp
index fd20653f06c5de05f43b7332166e873a00819d25..66925a85c2b6418a761e83ef985bcaef693f28d8 100644
--- a/src/suyu/configuration/configure_touchscreen_advanced.cpp
+++ b/src/suyu/configuration/configure_touchscreen_advanced.cpp
@@ -3,8 +3,8 @@
 
 #include <memory>
 #include "common/settings.h"
-#include "ui_configure_touchscreen_advanced.h"
 #include "suyu/configuration/configure_touchscreen_advanced.h"
+#include "ui_configure_touchscreen_advanced.h"
 
 ConfigureTouchscreenAdvanced::ConfigureTouchscreenAdvanced(QWidget* parent)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchscreenAdvanced>()) {
diff --git a/src/suyu/configuration/configure_ui.cpp b/src/suyu/configuration/configure_ui.cpp
index 2d9f5cde976e9b5f063a890e975ff2cbdef67288..408a7372a7813e2040f7f00118312f396188e74a 100644
--- a/src/suyu/configuration/configure_ui.cpp
+++ b/src/suyu/configuration/configure_ui.cpp
@@ -26,8 +26,8 @@
 #include "common/settings_enums.h"
 #include "core/core.h"
 #include "core/frontend/framebuffer_layout.h"
-#include "ui_configure_ui.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_ui.h"
 
 namespace {
 constexpr std::array default_game_icon_sizes{
diff --git a/src/suyu/configuration/configure_vibration.cpp b/src/suyu/configuration/configure_vibration.cpp
index f12b83545899fe5b8ba6fd03f47d5b19a61d50f4..6fa197d89b072affef54da09a8ca0999e8c09e3d 100644
--- a/src/suyu/configuration/configure_vibration.cpp
+++ b/src/suyu/configuration/configure_vibration.cpp
@@ -5,8 +5,8 @@
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
 #include "hid_core/hid_types.h"
-#include "ui_configure_vibration.h"
 #include "suyu/configuration/configure_vibration.h"
+#include "ui_configure_vibration.h"
 
 ConfigureVibration::ConfigureVibration(QWidget* parent, Core::HID::HIDCore& hid_core_)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureVibration>()), hid_core{hid_core_} {
diff --git a/src/suyu/configuration/configure_web.cpp b/src/suyu/configuration/configure_web.cpp
index af8c8e46625f2ca212ff81b43df66985ec82a09f..196f5001cfc0206a9cbe0660dd15bd6f3b5afc19 100644
--- a/src/suyu/configuration/configure_web.cpp
+++ b/src/suyu/configuration/configure_web.cpp
@@ -6,9 +6,9 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/settings.h"
 #include "core/telemetry_session.h"
-#include "ui_configure_web.h"
 #include "suyu/configuration/configure_web.h"
 #include "suyu/uisettings.h"
+#include "ui_configure_web.h"
 
 static constexpr char token_delimiter{':'};
 
diff --git a/src/suyu/game_list.cpp b/src/suyu/game_list.cpp
index feff438ad121493a2cbd01af718ca92735de0ddf..478838bc8486c51b8cccb1d4e76c4803bd31eccf 100644
--- a/src/suyu/game_list.cpp
+++ b/src/suyu/game_list.cpp
@@ -3,7 +3,6 @@
 
 // Modified by palfaiate on <2024/03/07>
 
-
 #include <regex>
 #include <QApplication>
 #include <QDir>
diff --git a/src/suyu/game_list.h b/src/suyu/game_list.h
index ae72bdd7c7b4ffa3b10ed30327dd396fa4441c07..f8796fa82138fffcadc6d8c6b1a44a03992fc2d9 100644
--- a/src/suyu/game_list.h
+++ b/src/suyu/game_list.h
@@ -3,7 +3,6 @@
 
 // Modified by palfaiate on <2024/03/07>
 
-
 #pragma once
 
 #include <QFileSystemWatcher>
@@ -19,9 +18,9 @@
 
 #include "common/common_types.h"
 #include "core/core.h"
-#include "uisettings.h"
 #include "suyu/compatibility_list.h"
 #include "suyu/play_time_manager.h"
+#include "uisettings.h"
 
 namespace Core {
 class System;
diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp
index eef8d5e1987e054d3c2b1edb4cb9f4290ac35afb..64f3264bec4a9a257bd14aa45e336e388efee532 100644
--- a/src/suyu/loading_screen.cpp
+++ b/src/suyu/loading_screen.cpp
@@ -13,9 +13,9 @@
 #include <QStyleOption>
 #include "core/frontend/framebuffer_layout.h"
 #include "core/loader/loader.h"
+#include "suyu/loading_screen.h"
 #include "ui_loading_screen.h"
 #include "video_core/rasterizer_interface.h"
-#include "suyu/loading_screen.h"
 
 // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an
 // showing the full animation
diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp
index 7bc30c73b359c922a43fd38d6acde5e8a5412e08..ede59bda1225f8912f376c4aae530d1a1b5007fd 100644
--- a/src/suyu/main.cpp
+++ b/src/suyu/main.cpp
@@ -124,11 +124,6 @@
 #include "input_common/drivers/tas_input.h"
 #include "input_common/drivers/virtual_amiibo.h"
 #include "input_common/main.h"
-#include "ui_main.h"
-#include "util/overlay_dialog.h"
-#include "video_core/gpu.h"
-#include "video_core/renderer_base.h"
-#include "video_core/shader_notify.h"
 #include "suyu/about_dialog.h"
 #include "suyu/bootmanager.h"
 #include "suyu/compatdb.h"
@@ -152,6 +147,11 @@
 #include "suyu/uisettings.h"
 #include "suyu/util/clickable_label.h"
 #include "suyu/vk_device_info.h"
+#include "ui_main.h"
+#include "util/overlay_dialog.h"
+#include "video_core/gpu.h"
+#include "video_core/renderer_base.h"
+#include "video_core/shader_notify.h"
 
 #ifdef SUYU_CRASH_DUMPS
 #include "suyu/breakpad.h"
diff --git a/src/suyu/multiplayer/chat_room.cpp b/src/suyu/multiplayer/chat_room.cpp
index a4f6c70f59933efd60942d4f66ce1520ab27e487..2863971f42ae676a3af5b01c0a84794a61597c06 100644
--- a/src/suyu/multiplayer/chat_room.cpp
+++ b/src/suyu/multiplayer/chat_room.cpp
@@ -17,10 +17,10 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_chat_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/multiplayer/chat_room.h"
 #include "suyu/multiplayer/message.h"
+#include "ui_chat_room.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/web_backend.h"
 #endif
diff --git a/src/suyu/multiplayer/client_room.cpp b/src/suyu/multiplayer/client_room.cpp
index 6f67b15b2d723380439018245222087474366c62..eebd29d9b544c40285909f03e40235f96be38bb7 100644
--- a/src/suyu/multiplayer/client_room.cpp
+++ b/src/suyu/multiplayer/client_room.cpp
@@ -11,12 +11,12 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_client_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/multiplayer/client_room.h"
 #include "suyu/multiplayer/message.h"
 #include "suyu/multiplayer/moderation_dialog.h"
 #include "suyu/multiplayer/state.h"
+#include "ui_client_room.h"
 
 ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
diff --git a/src/suyu/multiplayer/direct_connect.cpp b/src/suyu/multiplayer/direct_connect.cpp
index 71733bbbc6285d0d69f4a2ea33031d00f25ddf34..5d5cb7aabc12f4debf74ba8c44504bca5dfb2736 100644
--- a/src/suyu/multiplayer/direct_connect.cpp
+++ b/src/suyu/multiplayer/direct_connect.cpp
@@ -11,7 +11,6 @@
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
 #include "network/network.h"
-#include "ui_direct_connect.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/client_room.h"
 #include "suyu/multiplayer/direct_connect.h"
@@ -19,6 +18,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_direct_connect.h"
 
 enum class ConnectionType : u8 { TraversalServer, IP };
 
diff --git a/src/suyu/multiplayer/host_room.cpp b/src/suyu/multiplayer/host_room.cpp
index e3e79386e5f3b0fdb20657676a594900cb4a3303..6c71454c8eeb7ca8bf816c41de94524b144216df 100644
--- a/src/suyu/multiplayer/host_room.cpp
+++ b/src/suyu/multiplayer/host_room.cpp
@@ -15,7 +15,6 @@
 #include "core/core.h"
 #include "core/internal_network/network_interface.h"
 #include "network/announce_multiplayer_session.h"
-#include "ui_host_room.h"
 #include "suyu/game_list_p.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/host_room.h"
@@ -23,6 +22,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_host_room.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/verify_user_jwt.h"
 #endif
diff --git a/src/suyu/multiplayer/lobby.cpp b/src/suyu/multiplayer/lobby.cpp
index 18bfb653ad99e682cb9b6c51df1f58b56c031c0e..b4c0596632a38d20e9cb643173527fc9978d2e0b 100644
--- a/src/suyu/multiplayer/lobby.cpp
+++ b/src/suyu/multiplayer/lobby.cpp
@@ -10,7 +10,6 @@
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/internal_network/network_interface.h"
 #include "network/network.h"
-#include "ui_lobby.h"
 #include "suyu/game_list_p.h"
 #include "suyu/main.h"
 #include "suyu/multiplayer/client_room.h"
@@ -20,6 +19,7 @@
 #include "suyu/multiplayer/state.h"
 #include "suyu/multiplayer/validation.h"
 #include "suyu/uisettings.h"
+#include "ui_lobby.h"
 #ifdef ENABLE_WEB_SERVICE
 #include "web_service/web_backend.h"
 #endif
diff --git a/src/suyu/multiplayer/moderation_dialog.cpp b/src/suyu/multiplayer/moderation_dialog.cpp
index 8b40b9cfae615ca5c53de0d90c1655768849493b..9650bb26ba9112ac270e4285ab72267da1c53e8c 100644
--- a/src/suyu/multiplayer/moderation_dialog.cpp
+++ b/src/suyu/multiplayer/moderation_dialog.cpp
@@ -5,8 +5,8 @@
 #include <QStandardItemModel>
 #include "network/network.h"
 #include "network/room_member.h"
-#include "ui_moderation_dialog.h"
 #include "suyu/multiplayer/moderation_dialog.h"
+#include "ui_moderation_dialog.h"
 
 namespace Column {
 enum {
diff --git a/src/suyu/startup_checks.cpp b/src/suyu/startup_checks.cpp
index 0c4ba8f041210bacc0407144d42356666c3b3050..f7308e067763017872cf067819eaf46ad8ae925b 100644
--- a/src/suyu/startup_checks.cpp
+++ b/src/suyu/startup_checks.cpp
@@ -17,9 +17,9 @@
 #endif
 
 #include <fmt/core.h>
+#include "suyu/startup_checks.h"
 #include "video_core/vulkan_common/vulkan_instance.h"
 #include "video_core/vulkan_common/vulkan_library.h"
-#include "suyu/startup_checks.h"
 
 void CheckVulkan() {
     // Just start the Vulkan loader, this will crash if something is wrong
diff --git a/src/suyu/util/overlay_dialog.cpp b/src/suyu/util/overlay_dialog.cpp
index a687c15454b01e06aedbbb3b71b5bacaaee981dc..3a6245ec78a21d9ffcd70a3922f8a55093cb2f53 100644
--- a/src/suyu/util/overlay_dialog.cpp
+++ b/src/suyu/util/overlay_dialog.cpp
@@ -8,8 +8,8 @@
 #include "core/core.h"
 #include "hid_core/frontend/input_interpreter.h"
 #include "hid_core/hid_types.h"
-#include "ui_overlay_dialog.h"
 #include "suyu/util/overlay_dialog.h"
+#include "ui_overlay_dialog.h"
 
 namespace {
 
diff --git a/src/suyu/vk_device_info.cpp b/src/suyu/vk_device_info.cpp
index 68a9270ac474cc28d62556bbf796e4548a12922c..fe10c85e921d222c7b05f51ff81fd85fa76731b6 100644
--- a/src/suyu/vk_device_info.cpp
+++ b/src/suyu/vk_device_info.cpp
@@ -8,13 +8,13 @@
 
 #include "common/dynamic_library.h"
 #include "common/logging/log.h"
+#include "suyu/vk_device_info.h"
 #include "video_core/vulkan_common/vulkan_device.h"
 #include "video_core/vulkan_common/vulkan_instance.h"
 #include "video_core/vulkan_common/vulkan_library.h"
 #include "video_core/vulkan_common/vulkan_surface.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 #include "vulkan/vulkan_core.h"
-#include "suyu/vk_device_info.h"
 
 class QWindow;
 
diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp
index 87fdc1a7c811b0599f467323c84efa83747471dd..92380538b5343f4fb3c8ab747789faef69bba332 100644
--- a/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -16,8 +16,8 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "input_common/main.h"
-#include "video_core/renderer_base.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h"
+#include "video_core/renderer_base.h"
 
 class SDLGLContext : public Core::Frontend::GraphicsContext {
 public:
diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp
index 18c379801009dda416b6b07af8af0ac07f15f12f..1f7924dc469e262d6899eac1a663f368eca59e42 100644
--- a/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp
+++ b/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp
@@ -9,8 +9,8 @@
 
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include "video_core/renderer_null/renderer_null.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_null.h"
+#include "video_core/renderer_null/renderer_null.h"
 
 #ifdef SUYU_USE_EXTERNAL_SDL2
 // Include this before SDL.h to prevent the external from including a dummy
diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp
index 59606831fbe7543f002b0bfd9c6e71ed955c0ad4..5e6cac5f5e84b4238658711ab8540b15f7829173 100644
--- a/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -9,8 +9,8 @@
 
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include "video_core/renderer_vulkan/renderer_vulkan.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "video_core/renderer_vulkan/renderer_vulkan.h"
 
 #include <SDL.h>
 #include <SDL_syswm.h>
diff --git a/src/suyu_cmd/suyu.cpp b/src/suyu_cmd/suyu.cpp
index bebe1a07df4ec31b9b6dc09a9f63c62cc6f3d4fc..c50a3976b99c9d7a0f94bb12a6c619937e015402 100644
--- a/src/suyu_cmd/suyu.cpp
+++ b/src/suyu_cmd/suyu.cpp
@@ -34,11 +34,11 @@
 #include "input_common/main.h"
 #include "network/network.h"
 #include "sdl_config.h"
-#include "video_core/renderer_base.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_null.h"
 #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "video_core/renderer_base.h"
 
 #ifdef _WIN32
 // windows.h needs to be included before shellapi.h