diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/GameList/GameList.h"
+
 #include <QDesktopServices>
 #include <QDir>
 #include <QErrorMessage>
@@ -17,16 +19,17 @@
 #include <QUrl>
 
 #include "Common/FileUtil.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/WiiUtils.h"
+
 #include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 
 #include "DolphinQt2/Config/PropertiesDialog.h"
-#include "DolphinQt2/GameList/GameList.h"
 #include "DolphinQt2/GameList/GridProxyModel.h"
 #include "DolphinQt2/GameList/ListProxyModel.h"
 #include "DolphinQt2/QtUtils/ActionHelper.h"

diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.cpp b/Source/Core/DolphinQt2/GameList/GameListModel.cpp
@@ -7,10 +7,13 @@
 #include <QPixmap>
 
 #include "Core/ConfigManager.h"
+
 #include "DiscIO/Enums.h"
+
 #include "DolphinQt2/QtUtils/ImageConverter.h"
 #include "DolphinQt2/Resources.h"
 #include "DolphinQt2/Settings.h"
+
 #include "UICommon/UICommon.h"
 
 const QSize GAMECUBE_BANNER_SIZE(96, 32);

diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.h b/Source/Core/DolphinQt2/GameList/GameListModel.h
@@ -11,6 +11,7 @@
 #include <QString>
 
 #include "DolphinQt2/GameList/GameTracker.h"
+
 #include "UICommon/GameFile.h"
 
 class GameListModel final : public QAbstractTableModel

diff --git a/Source/Core/DolphinQt2/GameList/GameTracker.cpp b/Source/Core/DolphinQt2/GameList/GameTracker.cpp
@@ -2,13 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/GameList/GameTracker.h"
+
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
 
 #include "Core/ConfigManager.h"
+
 #include "DiscIO/DirectoryBlob.h"
-#include "DolphinQt2/GameList/GameTracker.h"
+
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 #include "DolphinQt2/Settings.h"
 

diff --git a/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp b/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp
@@ -2,11 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/GameList/GridProxyModel.h"
+
 #include <QPixmap>
 #include <QSize>
 
 #include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/GameList/GridProxyModel.h"
 
 const QSize LARGE_BANNER_SIZE(144, 48);
 

diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp
@@ -9,13 +9,16 @@
 #include <QProgressDialog>
 
 #include "Common/Common.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/Host.h"
 #include "Core/PowerPC/PowerPC.h"
+
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 #include "DolphinQt2/Settings.h"
+
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
 

diff --git a/Source/Core/DolphinQt2/Host.h b/Source/Core/DolphinQt2/Host.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include <QObject>
 #include <atomic>
 
+#include <QObject>
+
 // Singleton that talks to the Core via the interface defined in Core/Host.h.
 // Because Host_* calls might come from different threads than the MainWindow,
 // the Host class communicates with it via signals/slots only.

diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.cpp b/Source/Core/DolphinQt2/HotkeyScheduler.cpp
@@ -10,7 +10,9 @@
 #include <QCoreApplication>
 
 #include "AudioCommon/AudioCommon.h"
+
 #include "Common/Thread.h"
+
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -23,6 +25,7 @@
 #include "DolphinQt2/Settings.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
+
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"

diff --git a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp
@@ -2,16 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "MD5Dialog.h"
-
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt2/NetPlay/MD5Dialog.h"
 
 #include <QDialogButtonBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QProgressBar>
 #include <QVBoxLayout>
 
+#include "DolphinQt2/Settings.h"
+
 static QString GetPlayerNameFromPID(int pid)
 {
   QString player_name = QObject::tr("Invalid Player ID");

diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
@@ -30,17 +30,20 @@
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/TraversalClient.h"
+
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/NetPlayServer.h"
+
 #include "DolphinQt2/GameList/GameList.h"
 #include "DolphinQt2/NetPlay/GameListDialog.h"
 #include "DolphinQt2/NetPlay/MD5Dialog.h"
 #include "DolphinQt2/NetPlay/PadMappingDialog.h"
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 #include "DolphinQt2/QtUtils/RunOnObject.h"
 #include "DolphinQt2/Settings.h"
+
 #include "VideoCommon/VideoConfig.h"
 
 NetPlayDialog::NetPlayDialog(QWidget* parent)

diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp
@@ -4,10 +4,6 @@
 
 #include "DolphinQt2/NetPlay/NetPlaySetupDialog.h"
 
-#include "Core/Config/NetplaySettings.h"
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/Settings.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
@@ -20,6 +16,11 @@
 #include <QSpinBox>
 #include <QTabWidget>
 
+#include "Core/Config/NetplaySettings.h"
+
+#include "DolphinQt2/GameList/GameListModel.h"
+#include "DolphinQt2/Settings.h"
+
 NetPlaySetupDialog::NetPlaySetupDialog(QWidget* parent)
     : QDialog(parent), m_game_list_model(Settings::Instance().GetGameListModel())
 {

diff --git a/Source/Core/DolphinQt2/RenderWidget.cpp b/Source/Core/DolphinQt2/RenderWidget.cpp
@@ -14,14 +14,15 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "VideoCommon/VertexShaderManager.h"
-#include "VideoCommon/VideoConfig.h"
 
 #include "DolphinQt2/Host.h"
 #include "DolphinQt2/RenderWidget.h"
 #include "DolphinQt2/Resources.h"
 #include "DolphinQt2/Settings.h"
 
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
 RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent)
 {
   setWindowTitle(QStringLiteral("Dolphin"));

diff --git a/Source/Core/DolphinQt2/Resources.cpp b/Source/Core/DolphinQt2/Resources.cpp
@@ -8,7 +8,9 @@
 #include <QScreen>
 
 #include "Common/FileUtil.h"
+
 #include "Core/ConfigManager.h"
+
 #include "DolphinQt2/Resources.h"
 #include "DolphinQt2/Settings.h"
 

diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp
@@ -2,21 +2,26 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/Settings.h"
+
 #include <QApplication>
 #include <QDir>
 #include <QFile>
 #include <QSettings>
 #include <QSize>
 
 #include "AudioCommon/AudioCommon.h"
+
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+
 #include "DolphinQt2/GameList/GameListModel.h"
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/Settings.h"
+
 #include "InputCommon/InputConfig.h"
 
 Settings::Settings()

diff --git a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp
@@ -16,6 +16,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/SystemTimers.h"
+
 #include "DolphinQt2/Settings.h"
 
 AdvancedPane::AdvancedPane(QWidget* parent) : QWidget(parent)

diff --git a/Source/Core/DolphinQt2/Settings/AudioPane.cpp b/Source/Core/DolphinQt2/Settings/AudioPane.cpp
@@ -18,8 +18,10 @@
 
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/WASAPIStream.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+
 #include "DolphinQt2/Config/SettingsWindow.h"
 #include "DolphinQt2/Settings.h"
 

diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp
@@ -17,10 +17,12 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
+
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCMemcard/GCMemcard.h"
+
 #include "DolphinQt2/Config/Mapping/MappingWindow.h"
 
 constexpr int SLOT_A_INDEX = 0;

diff --git a/Source/Core/DolphinQt2/Settings/GeneralPane.cpp b/Source/Core/DolphinQt2/Settings/GeneralPane.cpp
@@ -22,7 +22,9 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/PowerPC.h"
+
 #include "DolphinQt2/Settings.h"
+
 #include "UICommon/AutoUpdate.h"
 
 constexpr int AUTO_UPDATE_DISABLE_INDEX = 0;

diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp
@@ -18,6 +18,7 @@
 #include "Common/FileUtil.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
 
 #include "DolphinQt2/Settings.h"

diff --git a/Source/Core/DolphinQt2/Settings/PathPane.cpp b/Source/Core/DolphinQt2/Settings/PathPane.cpp
@@ -13,6 +13,7 @@
 #include <QVBoxLayout>
 
 #include "Common/Config/Config.h"
+
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 

diff --git a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h"
+
 #include <QButtonGroup>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -18,9 +20,11 @@
 #include <QWidget>
 
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
-#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h"
+
 #include "DolphinQt2/Settings/WiiPane.h"
+
 #include "UICommon/USBUtils.h"
 
 static bool IsValidUSBIDString(const std::string& string)

diff --git a/Source/Core/DolphinQt2/Settings/WiiPane.cpp b/Source/Core/DolphinQt2/Settings/WiiPane.cpp
@@ -15,13 +15,17 @@
 #include <QSlider>
 #include <QSpacerItem>
 #include <QStringList>
+
 #include "Common/Config/Config.h"
 #include "Common/StringUtil.h"
+
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/IOS/IOS.h"
+
 #include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h"
+
 #include "UICommon/USBUtils.h"
 
 // SYSCONF uses 0 for bottom and 1 for top, but we place them in

diff --git a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp
@@ -11,7 +11,9 @@
 #include <QVBoxLayout>
 
 #include "Common/CommonTypes.h"
+
 #include "DolphinQt2/TAS/Shared.h"
+
 #include "InputCommon/GCPadStatus.h"
 
 GCTASInputWindow::GCTASInputWindow(QWidget* parent, int num) : QDialog(parent)

diff --git a/Source/Core/DolphinQt2/TAS/Shared.cpp b/Source/Core/DolphinQt2/TAS/Shared.cpp
@@ -13,8 +13,10 @@
 #include <QVBoxLayout>
 
 #include "Common/CommonTypes.h"
+
 #include "DolphinQt2/QtUtils/AspectRatioWidget.h"
 #include "DolphinQt2/TAS/StickWidget.h"
+
 #include "InputCommon/GCPadStatus.h"
 
 QGroupBox* CreateStickInputs(QDialog* window, QString name, QSpinBox*& x_value, QSpinBox*& y_value,

diff --git a/Source/Core/DolphinQt2/TAS/Shared.h b/Source/Core/DolphinQt2/TAS/Shared.h
@@ -8,13 +8,13 @@
 
 #include "Common/CommonTypes.h"
 
+struct GCPadStatus;
 class QDialog;
 class QString;
 class QSpinBox;
 class QCheckBox;
 class QBoxLayout;
 class QGroupBox;
-struct GCPadStatus;
 
 QGroupBox* CreateStickInputs(QDialog* window, QString name, QSpinBox*& x_value, QSpinBox*& y_value,
                              u16 max_x, u16 max_y, Qt::Key x_shortcut_key, Qt::Key y_shortcut_key);

diff --git a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp
@@ -12,15 +12,18 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
+
 #include "Core/Core.h"
 #include "Core/HW/WiimoteEmu/Attachment/Classic.h"
 #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
 #include "Core/HW/WiimoteEmu/Encryption.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
+
 #include "DolphinQt2/QtUtils/AspectRatioWidget.h"
 #include "DolphinQt2/TAS/IRWidget.h"
 #include "DolphinQt2/TAS/Shared.h"
+
 #include "InputCommon/InputConfig.h"
 
 WiiTASInputWindow::WiiTASInputWindow(QWidget* parent, int num) : QDialog(parent), m_num(num)

diff --git a/Source/Core/DolphinQt2/Translation.cpp b/Source/Core/DolphinQt2/Translation.cpp
@@ -17,7 +17,9 @@
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
+
 #include "UICommon/UICommon.h"
 
 constexpr u32 MO_MAGIC_NUMBER = 0x950412de;

diff --git a/Source/Core/DolphinQt2/Updater.cpp b/Source/Core/DolphinQt2/Updater.cpp
@@ -14,6 +14,7 @@
 #include <QVBoxLayout>
 
 #include "Common/Version.h"
+
 #include "DolphinQt2/QtUtils/RunOnObject.h"
 #include "DolphinQt2/Settings.h"
 

diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt2/WiiUpdate.cpp
@@ -15,9 +15,12 @@
 
 #include "Common/FileUtil.h"
 #include "Common/Flag.h"
+
 #include "Core/Core.h"
 #include "Core/WiiUtils.h"
+
 #include "DiscIO/NANDImporter.h"
+
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 
 namespace WiiUpdate