Treewide: Adjust order of includes

Source/Core/Common/Analytics.cpp

@@ -1,12 +1,13 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Analytics.h"
+
 #include <cmath>
 #include <cstdio>
 #include <string>
 #include <type_traits>
 
-#include "Common/Analytics.h"
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"

Source/Core/Common/AndroidAnalytics.cpp

@@ -1,11 +1,11 @@
 // Copyright 2018 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/AndroidAnalytics.h"
+
 #include <functional>
 #include <string>
 
-#include "Common/AndroidAnalytics.h"
-
 namespace Common
 {
 std::function<void(std::string, std::string)> s_android_send_report;

Source/Core/Common/Arm64Emitter.cpp

@@ -1,6 +1,8 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Arm64Emitter.h"
+
 #include <algorithm>
 #include <array>
 #include <cinttypes>
@@ -11,7 +13,6 @@
 #include <vector>
 
 #include "Common/Align.h"
-#include "Common/Arm64Emitter.h"
 #include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"

Source/Core/Common/ArmCPUDetect.cpp

@@ -1,6 +1,8 @@
 // Copyright 2013 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/CPUDetect.h"
+
 #include <cstring>
 #include <fstream>
 #include <sstream>
@@ -17,7 +19,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 

Source/Core/Common/ArmFPURoundMode.cpp

@@ -1,15 +1,16 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "Common/CPUDetect.h"
-#include "Common/CommonTypes.h"
 #include "Common/FPURoundMode.h"
-#include "Common/Logging/Log.h"
 
 #ifdef _MSC_VER
 #include <intrin.h>
 #endif
 
+#include "Common/CPUDetect.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+
 static u64 GetFPCR()
 {
 #ifdef _MSC_VER

Source/Core/Common/CDUtils.cpp

@@ -3,6 +3,8 @@
 
 // Most of the code in this file was shamelessly ripped from libcdio With minor adjustments
 
+#include "Common/CDUtils.h"
+
 #include <algorithm>
 #include <cstdlib>
 #include <string>
@@ -10,11 +12,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/CDUtils.h"
-#include "Common/Common.h"
-#include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #elif __APPLE__
@@ -36,6 +33,10 @@
 #include <linux/cdrom.h>
 #endif
 
+#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
 namespace Common
 {
 #ifdef _WIN32

Source/Core/Common/CRC32.cpp

@@ -1,10 +1,10 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <zlib.h>
-
 #include "Common/CRC32.h"
 
+#include <zlib.h>
+
 namespace Common
 {
 u32 ComputeCRC32(std::string_view data)

Source/Core/Common/CommonFuncs.cpp

@@ -1,13 +1,13 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/CommonFuncs.h"
+
 #include <cstddef>
 #include <cstring>
 #include <errno.h>
 #include <type_traits>
 
-#include "Common/CommonFuncs.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #define strerror_r(err, buf, len) strerror_s(buf, len, err)

Source/Core/Common/Config/Config.cpp

@@ -1,6 +1,8 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/Config.h"
+
 #include <algorithm>
 #include <atomic>
 #include <list>
@@ -8,8 +10,6 @@
 #include <mutex>
 #include <shared_mutex>
 
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 using Layers = std::map<LayerType, std::shared_ptr<Layer>>;

Source/Core/Common/Config/ConfigInfo.cpp

@@ -1,10 +1,11 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/ConfigInfo.h"
+
 #include <cstring>
 
 #include "Common/CommonFuncs.h"
-#include "Common/Config/ConfigInfo.h"
 
 namespace Config
 {

Source/Core/Common/Config/Layer.cpp

@@ -1,12 +1,13 @@
 // Copyright 2016 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Config/Layer.h"
+
 #include <algorithm>
 #include <cstring>
 #include <map>
 
 #include "Common/Config/Config.h"
-#include "Common/Config/Layer.h"
 
 namespace Config
 {

Source/Core/Common/Crypto/AES.cpp

@@ -1,10 +1,10 @@
 // Copyright 2017 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <mbedtls/aes.h>
-
 #include "Common/Crypto/AES.h"
 
+#include <mbedtls/aes.h>
+
 namespace Common::AES
 {
 std::vector<u8> DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size, Mode mode)

Source/Core/Common/Crypto/bn.cpp

@@ -1,11 +1,12 @@
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Crypto/bn.h"
+
 #include <cstdio>
 #include <cstring>
 
 #include "Common/CommonTypes.h"
-#include "Common/Crypto/bn.h"
 
 static void bn_zero(u8* d, int n)
 {

Source/Core/Common/Crypto/ec.cpp

@@ -2,11 +2,12 @@
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Crypto/ec.h"
+
 #include <algorithm>
 #include <cstring>
 
 #include "Common/Crypto/bn.h"
-#include "Common/Crypto/ec.h"
 #include "Common/Inline.h"
 #include "Common/Random.h"
 #include "Common/StringUtil.h"

Source/Core/Common/ENetUtil.cpp

@@ -1,7 +1,7 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "ENetUtil.h"
+#include "Common/ENetUtil.h"
 
 #include "Common/CommonTypes.h"
 

Source/Core/Common/FileSearch.cpp

@@ -1,12 +1,13 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/FileSearch.h"
+
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
 #include "Common/CommonPaths.h"
-#include "Common/FileSearch.h"
 #include "Common/StringUtil.h"
 
 #ifdef _MSC_VER

Source/Core/Common/FileUtil.cpp

@@ -1,6 +1,8 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/FileUtil.h"
+
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
@@ -22,7 +24,6 @@
 #ifdef __APPLE__
 #include "Common/DynamicLibrary.h"
 #endif
-#include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 

Source/Core/Common/GL/GLExtensions/GLExtensions.cpp

@@ -1,11 +1,12 @@
 // Copyright 2013 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLExtensions/GLExtensions.h"
+
 #include <sstream>
 #include <unordered_map>
 
 #include "Common/GL/GLContext.h"
-#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "Common/Logging/Log.h"
 
 #if defined(__linux__) || defined(__APPLE__)

Source/Core/Common/GL/GLInterface/EGL.cpp

@@ -1,12 +1,13 @@
 // Copyright 2012 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLInterface/EGL.h"
+
 #include <array>
 #include <cstdlib>
 #include <sstream>
 #include <vector>
 
-#include "Common/GL/GLInterface/EGL.h"
 #include "Common/Logging/Log.h"
 
 #ifndef EGL_KHR_create_context

Source/Core/Common/GL/GLInterface/EGLAndroid.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/GL/GLInterface/EGLAndroid.h"
+
 #include <android/native_window.h>
 
 EGLDisplay GLContextEGLAndroid::OpenEGLDisplay()

Source/Core/Common/GL/GLInterface/GLX.cpp

@@ -1,10 +1,11 @@
 // Copyright 2012 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLInterface/GLX.h"
+
 #include <array>
 #include <sstream>
 
-#include "Common/GL/GLInterface/GLX.h"
 #include "Common/Logging/Log.h"
 
 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091

Source/Core/Common/GL/GLInterface/WGL.cpp

@@ -1,11 +1,12 @@
 // Copyright 2012 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLInterface/WGL.h"
+
 #include <windows.h>
 #include <array>
 #include <string>
 
-#include "Common/GL/GLInterface/WGL.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 

Source/Core/Common/GL/GLUtil.cpp

@@ -1,11 +1,12 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/GL/GLUtil.h"
+
 #include <memory>
 
 #include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
-#include "Common/GL/GLUtil.h"
 #include "Common/Logging/Log.h"
 
 namespace GLUtil

Source/Core/Common/GenericFPURoundMode.cpp

@@ -1,9 +1,10 @@
 // Copyright 2003 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "Common/CommonTypes.h"
 #include "Common/FPURoundMode.h"
 
+#include "Common/CommonTypes.h"
+
 // Generic, do nothing
 namespace FPURoundMode
 {

Source/Core/Common/IOFile.cpp

@@ -1,6 +1,8 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/IOFile.h"
+
 #include <cstddef>
 #include <cstdio>
 #include <string>
@@ -22,7 +24,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Common/IOFile.h"
 
 namespace File
 {

Source/Core/Common/LdrWatcher.cpp

@@ -1,13 +1,13 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/LdrWatcher.h"
+
 #include <Windows.h>
 #include <TlHelp32.h>
 #include <string>
 #include <winternl.h>
 
-#include "Common/LdrWatcher.h"
-
 typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA
 {
   ULONG Flags;                   // Reserved.

Source/Core/Common/Logging/ConsoleListenerDroid.cpp

@@ -1,10 +1,10 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <android/log.h>
-
 #include "Common/Logging/ConsoleListener.h"
 
+#include <android/log.h>
+
 ConsoleListener::ConsoleListener()
 {
 }

Source/Core/Common/Logging/ConsoleListenerNix.cpp

@@ -1,6 +1,8 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Logging/ConsoleListener.h"
+
 #include <cstdio>
 #include <cstring>
 
@@ -8,7 +10,6 @@
 #include <unistd.h>
 #endif
 
-#include "Common/Logging/ConsoleListener.h"
 #include "Common/Logging/Log.h"
 
 ConsoleListener::ConsoleListener()

Source/Core/Common/Logging/ConsoleListenerWin.cpp

@@ -1,9 +1,10 @@
 // Copyright 2015 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Logging/ConsoleListener.h"
+
 #include <windows.h>
 
-#include "Common/Logging/ConsoleListener.h"
 #include "Common/StringUtil.h"
 
 ConsoleListener::ConsoleListener()

Source/Core/Common/Matrix.cpp

@@ -3,11 +3,11 @@
 
 #include "Common/Matrix.h"
 
-#include "Common/MathUtil.h"
-
 #include <algorithm>
 #include <cmath>
 
+#include "Common/MathUtil.h"
+
 namespace
 {
 // Multiply a NxM matrix by a MxP matrix.

Source/Core/Common/MemArena.cpp

@@ -1,6 +1,8 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/MemArena.h"
+
 #include <cstddef>
 #include <cstdlib>
 #include <set>
@@ -9,7 +11,6 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MemArena.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 

Source/Core/Common/MemoryUtil.cpp

@@ -1,6 +1,8 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/MemoryUtil.h"
+
 #include <cstddef>
 #include <cstdlib>
 #include <string>
@@ -8,7 +10,6 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MemoryUtil.h"
 #include "Common/MsgHandler.h"
 
 #ifdef _WIN32

Source/Core/Common/PcapFile.cpp

@@ -1,11 +1,12 @@
 // Copyright 2014 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/PcapFile.h"
+
 #include <chrono>
 
 #include "Common/CommonTypes.h"
 #include "Common/IOFile.h"
-#include "Common/PcapFile.h"
 
 namespace Common
 {

Source/Core/Common/PerformanceCounter.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #if !defined(_WIN32)
+#include "Common/PerformanceCounter.h"
 
 #include <cstdint>
 #include <ctime>
@@ -9,7 +10,6 @@
 #include <unistd.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/PerformanceCounter.h"
 
 #if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
 #if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0

Source/Core/Common/Profiler.cpp

@@ -1,6 +1,8 @@
 // Copyright 2014 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/Profiler.h"
+
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -9,7 +11,6 @@
 #include <ios>
 #include <sstream>
 
-#include "Common/Profiler.h"
 #include "Common/Timer.h"
 
 namespace Common

Source/Core/Common/QoSSession.cpp

@@ -2,13 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/QoSSession.h"
-#include "Core/ConfigManager.h"
 
 #if defined(_WIN32)
 #include <Qos2.h>
 #pragma comment(lib, "qwave")
 #endif
 
+#include "Core/ConfigManager.h"
+
 namespace Common
 {
 #if defined(_WIN32)

Source/Core/Common/SymbolDB.cpp

@@ -1,6 +1,8 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/SymbolDB.h"
+
 #include <cstring>
 #include <map>
 #include <string>
@@ -8,7 +10,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/SymbolDB.h"
 
 namespace Common
 {

Source/Core/Common/Thread.cpp

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/Thread.h"
-#include "Common/CommonFuncs.h"
-#include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -28,6 +25,10 @@
 #pragma comment(lib, "libittnotify.lib")
 #endif
 
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
 namespace Common
 {
 int CurrentThreadId()

Source/Core/Common/x64ABI.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/x64ABI.h"
+
 #include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
 

Source/Core/Common/x64CPUDetect.cpp

@@ -1,10 +1,11 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/CPUDetect.h"
+
 #include <cstring>
 #include <string>
 
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"
 

Source/Core/Common/x64Emitter.cpp

@@ -1,13 +1,14 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/x64Emitter.h"
+
 #include <cinttypes>
 #include <cstring>
 
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/x64Emitter.h"
 #include "Common/x64Reg.h"
 
 namespace Gen

Source/Core/Common/x64FPURoundMode.cpp

@@ -1,11 +1,12 @@
 // Copyright 2013 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "Common/FPURoundMode.h"
+
 #include <cfenv>
 
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
-#include "Common/FPURoundMode.h"
 #include "Common/Intrinsics.h"
 
 namespace FPURoundMode