Remove unused imports

Yellow squiggly lines begone!
Done automatically on .cpp files through `run-clang-tidy`, with manual corrections to the mistakes.
If an import is directly used, but is technically unnecessary since it's recursively imported by something else, it is *not* removed.
The tool doesn't touch .h files, so I did some of them by hand while fixing errors due to old recursive imports.
Not everything is removed, but the cleanup should be substantial enough.
Because this done on Linux, code that isn't used on it is mostly untouched.
(Hopefully no open PR is depending on these imports...)

51 files changed, 25 insertions, 104 deletions

diff --git a/Source/Core/Common/Assembler/AssemblerShared.h b/Source/Core/Common/Assembler/AssemblerShared.h
index 23bf5be0ce..0bcce3e48c 100644
--- a/Source/Core/Common/Assembler/AssemblerShared.h
+++ b/Source/Core/Common/Assembler/AssemblerShared.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstddef>
-#include <cstdint>
 #include <string>
 #include <string_view>
 #include <variant>
diff --git a/Source/Core/Common/Assembler/CaseInsensitiveDict.h b/Source/Core/Common/Assembler/CaseInsensitiveDict.h
index 5dffbb6335..050dd7e680 100644
--- a/Source/Core/Common/Assembler/CaseInsensitiveDict.h
+++ b/Source/Core/Common/Assembler/CaseInsensitiveDict.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include <array>
+#include <cctype>
+#include <cstdint>
 #include <optional>
-#include <string>
 #include <string_view>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/Source/Core/Common/Assembler/GekkoAssembler.cpp b/Source/Core/Common/Assembler/GekkoAssembler.cpp
index 4ee97c59d9..b58c56021f 100644
--- a/Source/Core/Common/Assembler/GekkoAssembler.cpp
+++ b/Source/Core/Common/Assembler/GekkoAssembler.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Assembler/GekkoAssembler.h"
 
-#include <algorithm>
 #include <array>
 #include <string>
 #include <vector>
diff --git a/Source/Core/Common/Assembler/GekkoIRGen.cpp b/Source/Core/Common/Assembler/GekkoIRGen.cpp
index c35024619d..b32c0fd582 100644
--- a/Source/Core/Common/Assembler/GekkoIRGen.cpp
+++ b/Source/Core/Common/Assembler/GekkoIRGen.cpp
@@ -17,7 +17,6 @@
 #include "Common/Assembler/AssemblerShared.h"
 #include "Common/Assembler/GekkoParser.h"
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 
 namespace Common::GekkoAssembler::detail
 {
diff --git a/Source/Core/Common/Assembler/GekkoIRGen.h b/Source/Core/Common/Assembler/GekkoIRGen.h
index 4a1a56fa66..00bf9dbdb5 100644
--- a/Source/Core/Common/Assembler/GekkoIRGen.h
+++ b/Source/Core/Common/Assembler/GekkoIRGen.h
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "Common/Assembler/AssemblerShared.h"
-#include "Common/Assembler/GekkoLexer.h"
 #include "Common/CommonTypes.h"
 
 namespace Common::GekkoAssembler::detail
diff --git a/Source/Core/Common/Assembler/GekkoLexer.cpp b/Source/Core/Common/Assembler/GekkoLexer.cpp
index 2b643601e1..4cfb1c6243 100644
--- a/Source/Core/Common/Assembler/GekkoLexer.cpp
+++ b/Source/Core/Common/Assembler/GekkoLexer.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Assembler/GekkoLexer.h"
 
-#include "Common/Assert.h"
 #include "Common/StringUtil.h"
 
 #include <iterator>
diff --git a/Source/Core/Common/Assembler/GekkoLexer.h b/Source/Core/Common/Assembler/GekkoLexer.h
index bd99fa511b..f20a951e97 100644
--- a/Source/Core/Common/Assembler/GekkoLexer.h
+++ b/Source/Core/Common/Assembler/GekkoLexer.h
@@ -8,7 +8,6 @@
 #include <deque>
 #include <optional>
 #include <string_view>
-#include <type_traits>
 #include <vector>
 
 #include "Common/Assembler/AssemblerShared.h"
diff --git a/Source/Core/Common/Assembler/GekkoParser.cpp b/Source/Core/Common/Assembler/GekkoParser.cpp
index ddd3f65e1f..d76aad9be8 100644
--- a/Source/Core/Common/Assembler/GekkoParser.cpp
+++ b/Source/Core/Common/Assembler/GekkoParser.cpp
@@ -3,9 +3,7 @@
 
 #include "Common/Assembler/GekkoParser.h"
 
-#include <algorithm>
 #include <array>
-#include <functional>
 
 #include <fmt/format.h>
 
diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp
index 9d0b3c97b7..2c70ced6ca 100644
--- a/Source/Core/Common/CommonFuncs.cpp
+++ b/Source/Core/Common/CommonFuncs.cpp
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <cstring>
 #include <errno.h>
-#include <type_traits>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
index 8737037102..a2c20c67e3 100644
--- a/Source/Core/Common/CommonFuncs.h
+++ b/Source/Core/Common/CommonFuncs.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
+#ifdef _WIN32
 #include <optional>
+#endif
 #include <string>
 
-#include "Common/CommonTypes.h"
-
 #ifndef _WIN32
 
 // go to debugger mode
diff --git a/Source/Core/Common/Config/Config.h b/Source/Core/Common/Config/Config.h
index 1e0b32551b..d8a2a9a691 100644
--- a/Source/Core/Common/Config/Config.h
+++ b/Source/Core/Common/Config/Config.h
@@ -5,7 +5,6 @@
 
 #include <functional>
 #include <limits>
-#include <map>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp
index 5520e02d2e..09cee1dfeb 100644
--- a/Source/Core/Common/Config/Layer.cpp
+++ b/Source/Core/Common/Config/Layer.cpp
@@ -3,12 +3,6 @@
 
 #include "Common/Config/Layer.h"
 
-#include <algorithm>
-#include <cstring>
-#include <map>
-
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 ConfigLayerLoader::ConfigLayerLoader(LayerType layer) : m_layer(layer)
diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp
index e0ffa5591d..a83812ff2e 100644
--- a/Source/Core/Common/Crypto/AES.cpp
+++ b/Source/Core/Common/Crypto/AES.cpp
@@ -4,7 +4,6 @@
 #include "Common/Crypto/AES.h"
 
 #include <array>
-#include <bit>
 #include <memory>
 
 #include <mbedtls/aes.h>
diff --git a/Source/Core/Common/Crypto/HMAC.cpp b/Source/Core/Common/Crypto/HMAC.cpp
index 660817ea75..6313f44e50 100644
--- a/Source/Core/Common/Crypto/HMAC.cpp
+++ b/Source/Core/Common/Crypto/HMAC.cpp
@@ -1,7 +1,7 @@
 // Copyright 2023 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <mbedtls/hmac_drbg.h>
+#include "mbedtls/md.h"
 
 #include "Common/Crypto/HMAC.h"
 #include "Common/ScopeGuard.h"
diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
index cdfe228f81..c8b85eb387 100644
--- a/Source/Core/Common/Crypto/ec.cpp
+++ b/Source/Core/Common/Crypto/ec.cpp
@@ -8,9 +8,7 @@
 #include <cstring>
 
 #include "Common/Crypto/bn.h"
-#include "Common/Inline.h"
 #include "Common/Random.h"
-#include "Common/StringUtil.h"
 
 namespace Common::ec
 {
diff --git a/Source/Core/Common/Debug/MemoryPatches.cpp b/Source/Core/Common/Debug/MemoryPatches.cpp
index 0becba1dde..b9f6e14901 100644
--- a/Source/Core/Common/Debug/MemoryPatches.cpp
+++ b/Source/Core/Common/Debug/MemoryPatches.cpp
@@ -4,7 +4,6 @@
 #include "Common/Debug/MemoryPatches.h"
 
 #include <algorithm>
-#include <sstream>
 #include <utility>
 
 namespace Common::Debug
diff --git a/Source/Core/Common/Debug/MemoryPatches.h b/Source/Core/Common/Debug/MemoryPatches.h
index 607bb831a0..187934beca 100644
--- a/Source/Core/Common/Debug/MemoryPatches.h
+++ b/Source/Core/Common/Debug/MemoryPatches.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstddef>
-#include <string>
 #include <vector>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Common/DynamicLibrary.cpp b/Source/Core/Common/DynamicLibrary.cpp
index 73c25ce2a2..e9686859d3 100644
--- a/Source/Core/Common/DynamicLibrary.cpp
+++ b/Source/Core/Common/DynamicLibrary.cpp
@@ -7,8 +7,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/Assert.h"
-
 #ifdef _WIN32
 #include <Windows.h>
 #else
diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp
index 80e2c424b4..004d84b688 100644
--- a/Source/Core/Common/FatFsUtil.cpp
+++ b/Source/Core/Common/FatFsUtil.cpp
@@ -4,7 +4,6 @@
 #include "Common/FatFsUtil.h"
 
 #include <algorithm>
-#include <cmath>
 #include <cstdlib>
 #include <mutex>
 #include <string>
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
index 1eecb1d36d..ebaa9f37b0 100644
--- a/Source/Core/Common/FileSearch.cpp
+++ b/Source/Core/Common/FileSearch.cpp
@@ -13,14 +13,10 @@
 
 #ifdef _MSC_VER
 #include <Windows.h>
-#else
-#ifdef ANDROID
+#elifdef ANDROID
 #include "jni/AndroidCommon/AndroidCommon.h"
 #endif
 
-#include <cstring>
-#endif
-
 namespace fs = std::filesystem;
 
 namespace Common
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index bcfd74256d..05be18b610 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -3,28 +3,24 @@
 
 #include "Common/FileUtil.h"
 
-#include <algorithm>
-#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <fcntl.h>
 #include <filesystem>
-#include <fstream>
 #include <limits.h>
 #include <stack>
 #include <string>
-#include <sys/stat.h>
 #include <system_error>
-#include <thread>
 #include <vector>
 
-#include "Common/Assert.h"
-#include "Common/Common.h"
 #include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#ifdef ANDROID
+#include "Common/Assert.h"
+#endif
 #ifdef __APPLE__
 #include "Common/DynamicLibrary.h"
 #endif
@@ -41,8 +37,6 @@
 #include <objbase.h>  // guid stuff
 #include <shellapi.h>
 #else
-#include <dirent.h>
-#include <errno.h>
 #include <libgen.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index 37548acfed..49f6847768 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <cstddef>
 #include <filesystem>
-#include <fstream>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index 30230e7d08..a0bf6dcbab 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -4,7 +4,6 @@
 #include "Common/GL/GLInterface/EGL.h"
 
 #include <array>
-#include <cstdlib>
 #include <sstream>
 #include <vector>
 
diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp
index 9f65e7158b..f447d55d3f 100644
--- a/Source/Core/Common/GL/GLUtil.cpp
+++ b/Source/Core/Common/GL/GLUtil.cpp
@@ -3,9 +3,6 @@
 
 #include "Common/GL/GLUtil.h"
 
-#include <memory>
-
-#include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
 #include "Common/Logging/Log.h"
 
diff --git a/Source/Core/Common/GL/GLX11Window.cpp b/Source/Core/Common/GL/GLX11Window.cpp
index d8f072d1a7..1fb8c1935c 100644
--- a/Source/Core/Common/GL/GLX11Window.cpp
+++ b/Source/Core/Common/GL/GLX11Window.cpp
@@ -3,8 +3,6 @@
 
 #include "Common/GL/GLX11Window.h"
 
-#include "Common/GL/GLContext.h"
-
 GLX11Window::GLX11Window(Display* display, Window parent_window, Colormap color_map, Window window,
                          int width, int height)
     : m_display(display), m_parent_window(parent_window), m_color_map(color_map), m_window(window),
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp
index 8cb697b695..a3984745f5 100644
--- a/Source/Core/Common/Hash.cpp
+++ b/Source/Core/Common/Hash.cpp
@@ -9,9 +9,7 @@
 
 #include <zlib.h>
 
-#include "Common/BitUtils.h"
 #include "Common/CPUDetect.h"
-#include "Common/CommonFuncs.h"
 #include "Common/Intrinsics.h"
 
 #ifdef _M_ARM_64
diff --git a/Source/Core/Common/IOFile.cpp b/Source/Core/Common/IOFile.cpp
index cf7762ea68..9402da1a94 100644
--- a/Source/Core/Common/IOFile.cpp
+++ b/Source/Core/Common/IOFile.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/IOFile.h"
 
-#include <cstddef>
 #include <cstdio>
 #include <string>
 
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 31a7ee0e6b..181175101f 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -3,14 +3,12 @@
 
 #pragma once
 
-#include <algorithm>
 #include <list>
 #include <map>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 namespace Common
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
index 4d8ba45fc6..94da2afdb0 100644
--- a/Source/Core/Common/JitRegister.cpp
+++ b/Source/Core/Common/JitRegister.cpp
@@ -3,17 +3,14 @@
 
 #include "Common/JitRegister.h"
 
-#include <cstddef>
 #include <cstdio>
 #include <cstdlib>
-#include <fstream>
 #include <string>
 
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/IOFile.h"
-#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #include <process.h>
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
index c4f38e72f6..9e55f779cd 100644
--- a/Source/Core/Common/Logging/Log.h
+++ b/Source/Core/Common/Logging/Log.h
@@ -5,7 +5,6 @@
 
 #include <cstddef>
 #include <fmt/format.h>
-#include <string_view>
 #include "Common/FormatUtil.h"
 
 namespace Common::Log
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index a1302a8171..0755dc92ab 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -6,18 +6,15 @@
 #include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <cstdarg>
 #include <cstring>
-#include <locale>
+#include <fstream>
 #include <memory>
 #include <mutex>
-#include <ostream>
 #include <string>
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
-#include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/ConsoleListener.h"
diff --git a/Source/Core/Common/Matrix.cpp b/Source/Core/Common/Matrix.cpp
index 44463ef1ef..9c75487111 100644
--- a/Source/Core/Common/Matrix.cpp
+++ b/Source/Core/Common/Matrix.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Matrix.h"
 
-#include <algorithm>
 #include <cmath>
 
 #include "Common/MathUtil.h"
diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp
index 83026f76b8..c25d2357f9 100644
--- a/Source/Core/Common/MemArenaUnix.cpp
+++ b/Source/Core/Common/MemArenaUnix.cpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <set>
 #include <string>
 
 #include <fmt/format.h>
@@ -21,7 +20,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 namespace Common
 {
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index f4759c41a0..0d66890d2b 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -5,10 +5,8 @@
 
 #include <cstddef>
 #include <cstdlib>
-#include <string>
 
 #include "Common/CommonFuncs.h"
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
@@ -16,10 +14,11 @@
 #include <windows.h>
 #include "Common/StringUtil.h"
 #else
-#include <pthread.h>
 #include <stdio.h>
 #include <sys/mman.h>
-#include <sys/types.h>
+#if defined(_M_ARM_64) && defined(__APPLE__)
+#include <pthread.h>
+#endif
 #if defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
 #include <sys/sysctl.h>
 #elif defined __HAIKU__
diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp
index 660782ad9d..f6201c651f 100644
--- a/Source/Core/Common/MsgHandler.cpp
+++ b/Source/Core/Common/MsgHandler.cpp
@@ -3,21 +3,19 @@
 
 #include "Common/MsgHandler.h"
 
-#include <cstdarg>
 #include <cstdlib>
 #include <string>
 
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include <cstdio>
 #include <fmt/format.h>
 #endif
 
-#include "Common/Common.h"
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
+#ifdef _WIN32
 #include "Common/StringUtil.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
index 0220c78186..4fc7196a97 100644
--- a/Source/Core/Common/MsgHandler.h
+++ b/Source/Core/Common/MsgHandler.h
@@ -3,13 +3,11 @@
 
 #pragma once
 
-#include <cstdint>
 #include <string>
 #include <utility>
 
 #include <fmt/format.h>
 
-#include "Common/FormatUtil.h"
 #include "Common/Logging/Log.h"
 
 namespace Common
diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
index aed767a85e..0ed2360267 100644
--- a/Source/Core/Common/Network.cpp
+++ b/Source/Core/Common/Network.cpp
@@ -11,8 +11,6 @@
 #ifndef _WIN32
 #include <netinet/in.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #else
 #include <WinSock2.h>
 #endif
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
index 34aafd38fd..3a8eeb2746 100644
--- a/Source/Core/Common/Profiler.cpp
+++ b/Source/Core/Common/Profiler.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <cstdio>
-#include <cstring>
 #include <iomanip>
 #include <ios>
 #include <sstream>
diff --git a/Source/Core/Common/QoSSession.cpp b/Source/Core/Common/QoSSession.cpp
index e2e3914e53..2bcecea2bf 100644
--- a/Source/Core/Common/QoSSession.cpp
+++ b/Source/Core/Common/QoSSession.cpp
@@ -8,8 +8,6 @@
 #pragma comment(lib, "qwave")
 #endif
 
-#include "Core/ConfigManager.h"
-
 namespace Common
 {
 #if defined(_WIN32)
diff --git a/Source/Core/Common/Random.cpp b/Source/Core/Common/Random.cpp
index 0c859eaa12..9ecb6bcc1c 100644
--- a/Source/Core/Common/Random.cpp
+++ b/Source/Core/Common/Random.cpp
@@ -7,6 +7,7 @@
 #include <mbedtls/hmac_drbg.h>
 
 #include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 
 namespace Common::Random
 {
diff --git a/Source/Core/Common/Random.h b/Source/Core/Common/Random.h
index 86192f840f..e899743c41 100644
--- a/Source/Core/Common/Random.h
+++ b/Source/Core/Common/Random.h
@@ -4,11 +4,8 @@
 #pragma once
 
 #include <cstddef>
-#include <memory>
 #include <type_traits>
 
-#include "Common/CommonTypes.h"
-
 namespace Common::Random
 {
 /// Fill `buffer` with random bytes using a cryptographically secure pseudo-random number generator.
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index b0faf6f6f0..7f2f436798 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <ctime>
-#include <iomanip>
 #include <string>
 
 #include <fmt/chrono.h>
diff --git a/Source/Core/Common/SocketContext.cpp b/Source/Core/Common/SocketContext.cpp
index f9c630c434..dcc637891a 100644
--- a/Source/Core/Common/SocketContext.cpp
+++ b/Source/Core/Common/SocketContext.cpp
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/SocketContext.h"
-
+#ifdef _WIN32
 #include "Common/Logging/Log.h"
 #include "Common/Network.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/SpanUtils.h b/Source/Core/Common/SpanUtils.h
index d09193b314..eef3567f4c 100644
--- a/Source/Core/Common/SpanUtils.h
+++ b/Source/Core/Common/SpanUtils.h
@@ -5,8 +5,8 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 #include <span>
-#include <utility>
 
 #include "Common/CommonTypes.h"
 
diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp
index 4c8a61b386..258559bc4f 100644
--- a/Source/Core/Common/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -26,9 +26,10 @@
 #pragma comment(lib, "libittnotify.lib")
 #endif
 
-#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
+#ifdef _WIN32
 #include "Common/StringUtil.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index 0e260b833c..957073426b 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -10,8 +10,6 @@
 #ifdef _WIN32
 #include <Windows.h>
 #include <timeapi.h>
-#else
-#include <sys/time.h>
 #endif
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
index efe0e2f7d1..759edd653a 100644
--- a/Source/Core/Common/TraversalClient.h
+++ b/Source/Core/Common/TraversalClient.h
@@ -12,7 +12,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/ENet.h"
-#include "Common/Thread.h"
 #include "Common/TraversalProto.h"
 
 namespace Common
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
index 3d449256d1..0a9b6c0d0b 100644
--- a/Source/Core/Common/TraversalServer.cpp
+++ b/Source/Core/Common/TraversalServer.cpp
@@ -7,18 +7,14 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <tuple>
-#include <unistd.h>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/base.h>
 
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>
diff --git a/Source/Core/Common/UPnP.cpp b/Source/Core/Common/UPnP.cpp
index be5474706b..81807f1e3c 100644
--- a/Source/Core/Common/UPnP.cpp
+++ b/Source/Core/Common/UPnP.cpp
@@ -16,7 +16,6 @@
 #include <thread>
 #include <upnpcommands.h>
 #include <upnperrors.h>
-#include <vector>
 
 static UPNPUrls s_urls;
 static IGDdatas s_data;
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp
index d256b4188a..d1e9d53273 100644
--- a/Source/Core/Common/x64CPUDetect.cpp
+++ b/Source/Core/Common/x64CPUDetect.cpp
@@ -17,9 +17,10 @@
 #include <fmt/ranges.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/Intrinsics.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+#ifdef _WIN32
+#include "Common/MsgHandler.h"
+#endif
 
 #ifndef _WIN32
 
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
index 06b66ec527..fdd13d9cf4 100644
--- a/Source/Core/Common/x64FPURoundMode.cpp
+++ b/Source/Core/Common/x64FPURoundMode.cpp
@@ -3,9 +3,6 @@
 
 #include "Common/FPURoundMode.h"
 
-#include <cfenv>
-
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"