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...)
2026-07-11 01:24:22 +02:00 · 2026-01-23 21:30:01 +01:00
parent cdbea8867d
commit a14c88ba67
448 changed files with 115 additions and 936 deletions
@@ -5,7 +5,6 @@

 #include <mutex>

-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"

@@ -7,9 +7,7 @@

 #include "AudioCommon/CubebUtils.h"
 #include "Common/CommonTypes.h"
-#include "Common/Event.h"
 #include "Common/Logging/Log.h"
-#include "Common/ScopeGuard.h"
 #include "Core/Config/MainSettings.h"

 #ifdef _WIN32
@@ -7,7 +7,9 @@
 #include <vector>

 #include "AudioCommon/SoundStream.h"
+#ifdef _WIN32
 #include "Common/WorkQueueThread.h"
+#endif

 #ifdef HAVE_CUBEB
 #include <cubeb/cubeb.h>
@@ -3,15 +3,15 @@

 #pragma once

-#include <thread>
-
 #include "AudioCommon/SoundStream.h"
-#include "Common/Event.h"

 #ifdef _WIN32
 #include <al.h>
 #include <alc.h>
 #include <alext.h>
+#include <thread>
+
+#include "Common/Event.h"

 // OpenAL requires a minimum of two buffers, three or more recommended
 #define OAL_BUFFERS 3
@@ -16,7 +16,6 @@
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"

 constexpr size_t WaveFileWriter::BUFFER_SIZE;

@@ -4,7 +4,6 @@
 #pragma once

 #include <cstddef>
-#include <cstdint>
 #include <string>
 #include <string_view>
 #include <variant>
@@ -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>

@@ -3,7 +3,6 @@

 #include "Common/Assembler/GekkoAssembler.h"

-#include <algorithm>
 #include <array>
 #include <string>
 #include <vector>
@@ -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
 {
@@ -7,7 +7,6 @@
 #include <vector>

 #include "Common/Assembler/AssemblerShared.h"
-#include "Common/Assembler/GekkoLexer.h"
 #include "Common/CommonTypes.h"

 namespace Common::GekkoAssembler::detail
@@ -3,7 +3,6 @@

 #include "Common/Assembler/GekkoLexer.h"

-#include "Common/Assert.h"
 #include "Common/StringUtil.h"

 #include <iterator>
@@ -8,7 +8,6 @@
 #include <deque>
 #include <optional>
 #include <string_view>
-#include <type_traits>
 #include <vector>

 #include "Common/Assembler/AssemblerShared.h"
@@ -3,9 +3,7 @@

 #include "Common/Assembler/GekkoParser.h"

-#include <algorithm>
 #include <array>
-#include <functional>

 #include <fmt/format.h>

@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <cstring>
 #include <errno.h>
-#include <type_traits>

 #ifdef _WIN32
 #include <windows.h>
@@ -3,11 +3,11 @@

 #pragma once

+#ifdef _WIN32
 #include <optional>
+#endif
 #include <string>

-#include "Common/CommonTypes.h"
-
 #ifndef _WIN32

 // go to debugger mode
@@ -5,7 +5,6 @@

 #include <functional>
 #include <limits>
-#include <map>
 #include <memory>
 #include <optional>
 #include <string>
@@ -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)
@@ -4,7 +4,6 @@
 #include "Common/Crypto/AES.h"

 #include <array>
-#include <bit>
 #include <memory>

 #include <mbedtls/aes.h>
@@ -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"
@@ -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
 {
@@ -4,7 +4,6 @@
 #include "Common/Debug/MemoryPatches.h"

 #include <algorithm>
-#include <sstream>
 #include <utility>

 namespace Common::Debug
@@ -4,7 +4,6 @@
 #pragma once

 #include <cstddef>
-#include <string>
 #include <vector>

 #include "Common/CommonTypes.h"
@@ -7,8 +7,6 @@

 #include <fmt/format.h>

-#include "Common/Assert.h"
-
 #ifdef _WIN32
 #include <Windows.h>
 #else
@@ -4,7 +4,6 @@
 #include "Common/FatFsUtil.h"

 #include <algorithm>
-#include <cmath>
 #include <cstdlib>
 #include <mutex>
 #include <string>
@@ -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
@@ -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>
@@ -3,9 +3,7 @@

 #pragma once

-#include <cstddef>
 #include <filesystem>
-#include <fstream>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -4,7 +4,6 @@
 #include "Common/GL/GLInterface/EGL.h"

 #include <array>
-#include <cstdlib>
 #include <sstream>
 #include <vector>

@@ -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"

@@ -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),
@@ -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
@@ -3,7 +3,6 @@

 #include "Common/IOFile.h"

-#include <cstddef>
 #include <cstdio>
 #include <string>

@@ -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
@@ -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>
@@ -5,7 +5,6 @@

 #include <cstddef>
 #include <fmt/format.h>
-#include <string_view>
 #include "Common/FormatUtil.h"

 namespace Common::Log
@@ -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"
@@ -3,7 +3,6 @@

 #include "Common/Matrix.h"

-#include <algorithm>
 #include <cmath>

 #include "Common/MathUtil.h"
@@ -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
 {
@@ -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__
@@ -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
 {
@@ -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
@@ -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
@@ -5,8 +5,6 @@

 #include <algorithm>
 #include <cmath>
-#include <cstdio>
-#include <cstring>
 #include <iomanip>
 #include <ios>
 #include <sstream>
@@ -8,8 +8,6 @@
 #pragma comment(lib, "qwave")
 #endif

-#include "Core/ConfigManager.h"
-
 namespace Common
 {
 #if defined(_WIN32)
@@ -7,6 +7,7 @@
 #include <mbedtls/hmac_drbg.h>

 #include "Common/Assert.h"
+#include "Common/CommonTypes.h"

 namespace Common::Random
 {
@@ -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.
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <ctime>
-#include <iomanip>
 #include <string>

 #include <fmt/chrono.h>
@@ -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
 {
@@ -5,8 +5,8 @@

 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 #include <span>
-#include <utility>

 #include "Common/CommonTypes.h"

@@ -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
 {
@@ -10,8 +10,6 @@
 #ifdef _WIN32
 #include <Windows.h>
 #include <timeapi.h>
-#else
-#include <sys/time.h>
 #endif

 #include "Common/CommonTypes.h"
@@ -12,7 +12,6 @@

 #include "Common/CommonTypes.h"
 #include "Common/ENet.h"
-#include "Common/Thread.h"
 #include "Common/TraversalProto.h"

 namespace Common
@@ -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>
@@ -16,7 +16,6 @@
 #include <thread>
 #include <upnpcommands.h>
 #include <upnperrors.h>
-#include <vector>

 static UPNPUrls s_urls;
 static IGDdatas s_data;
@@ -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

@@ -3,9 +3,6 @@

 #include "Common/FPURoundMode.h"

-#include <cfenv>
-
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"

@@ -5,13 +5,10 @@

 #include "Core/AchievementManager.h"

-#include <cctype>
 #include <memory>

 #include <fmt/format.h>

-#include <rcheevos/include/rc_api_info.h>
-
 #include "Common/BitUtils.h"
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
@@ -33,7 +33,6 @@
 #include <fmt/format.h>

 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
@@ -5,8 +5,8 @@

 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <cstring>
+#include <fstream>
 #include <memory>
 #include <numeric>
 #include <optional>
@@ -17,7 +17,6 @@

 #include <fmt/ranges.h>

-#include "Common/Align.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
@@ -1,13 +1,10 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <memory>
-
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"

 #include "Core/Boot/Boot.h"
-#include "Core/CommonTitles.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/ES/Formats.h"
 #include "Core/IOS/IOS.h"
@@ -17,17 +17,11 @@

 #include "Core/BootManager.h"

-#include <algorithm>
-#include <array>
-#include <string>
-
 #include <fmt/format.h>

 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
-#include "Common/IniFile.h"
-#include "Common/Logging/Log.h"

 #include "Core/AchievementManager.h"
 #include "Core/Boot/Boot.h"
@@ -41,17 +35,13 @@
 #include "Core/HW/SI/SI.h"
 #include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Sram.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 #include "Core/WiiRoot.h"

 #include "DiscIO/Enums.h"

-#include "VideoCommon/VideoBackendBase.h"
-
 namespace BootManager
 {
 // Boot the ISO or file
@@ -6,8 +6,6 @@

 #include <string>

-#include "Common/Config/Config.h"
-
 namespace Config
 {
 // Configuration Information
@@ -5,7 +5,6 @@

 #include <algorithm>
 #include <array>
-#include <locale>
 #include <optional>
 #include <string>
 #include <string_view>
@@ -5,7 +5,6 @@

 #include <string>

-#include "Common/Config/Config.h"
 #include "VideoCommon/VideoConfig.h"

 namespace Config
@@ -3,8 +3,6 @@

 #include "Core/Config/NetplaySettings.h"

-#include "Common/Config/Config.h"
-
 namespace Config
 {
 static constexpr u16 DEFAULT_LISTEN_PORT = 2626;
@@ -4,8 +4,6 @@
 #include "Core/Config/SessionSettings.h"

 #include "Common/CPUDetect.h"
-#include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"

 namespace Config
 {
@@ -6,11 +6,9 @@
 #include <algorithm>
 #include <cstring>
 #include <functional>
-#include <list>
 #include <map>
 #include <memory>
 #include <string>
-#include <type_traits>
 #include <variant>

 #include "Common/CommonTypes.h"
@@ -14,9 +14,7 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/Config/SessionSettings.h"
-#include "Core/ConfigManager.h"
 #include "Core/Movie.h"
-#include "VideoCommon/VideoConfig.h"

 namespace PowerPC
 {
@@ -8,7 +8,6 @@
 #include <fmt/format.h>

 #include "Common/CommonPaths.h"
-#include "Common/Config/Config.h"
 #include "Common/FileUtil.h"

 #include "Core/Config/AchievementSettings.h"
@@ -5,7 +5,6 @@

 #include <algorithm>
 #include <atomic>
-#include <cstring>
 #include <functional>
 #include <future>
 #include <mutex>
@@ -27,7 +26,6 @@
 #include "Common/CPUDetect.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/FPURoundMode.h"
 #include "Common/FatFsUtil.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
@@ -9,7 +9,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <fstream>
 #include <map>
 #include <sstream>
 #include <string>
@@ -20,7 +19,6 @@

 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"

 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPDisassembler.h"
@@ -4,7 +4,6 @@
 #include "Core/DSP/DSPCodeUtil.h"

 #include <algorithm>
-#include <iostream>
 #include <string>
 #include <vector>

@@ -13,9 +12,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
-#include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"

 #include "Core/DSP/DSPAssembler.h"
@@ -4,7 +4,6 @@

 #include "Core/DSP/DSPDisassembler.h"

-#include <algorithm>
 #include <limits>
 #include <string>
 #include <utility>
@@ -5,15 +5,10 @@
 #include "Core/DSP/DSPCore.h"

 #include <atomic>
-#include <cstddef>
-#include <cstring>

-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
-#include "Common/Intrinsics.h"
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"
-#include "Common/Swap.h"

 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/DSP/DSPHost.h"
@@ -6,8 +6,6 @@
 #include "Core/DSP/Interpreter/DSPInterpreter.h"

 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/DSPTables.h"
-#include "Core/DSP/Interpreter/DSPIntUtil.h"

 namespace DSP::Interpreter
 {
@@ -7,9 +7,7 @@

 #include "Core/DSP/Interpreter/DSPInterpreter.h"

-#include "Core/DSP/DSPTables.h"
 #include "Core/DSP/Interpreter/DSPIntCCUtil.h"
-#include "Core/DSP/Interpreter/DSPIntUtil.h"

 namespace DSP::Interpreter
 {
@@ -7,7 +7,8 @@
 #include <string>
 #include <vector>

-#include "Common/Logging/Log.h"
+#include <fmt/base.h>
+
 #include "Core/DSP/DSPTables.h"

 namespace DSP
@@ -8,8 +8,6 @@
 #include <cstdio>
 #include <functional>

-#include <fmt/format.h>
-
 #include "Common/Assert.h"
 #include "Common/BitField.h"
 #include "Common/CommonTypes.h"
@@ -8,7 +8,6 @@
 #include <regex>

 #include "Common/Contains.h"
-#include "Common/Event.h"
 #include "Core/Core.h"
 #include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/HW/CPU.h"
@@ -3,14 +3,12 @@

 #include "Core/Debugger/Debugger_SymbolMap.h"

-#include <cstdio>
 #include <functional>
 #include <string>

 #include <fmt/format.h>

 #include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"

 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
@@ -3,7 +3,6 @@

 #include "Core/Debugger/OSThread.h"

-#include <algorithm>
 #include <fmt/format.h>

 #include "Core/PowerPC/MMU.h"
@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>

-#include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
@@ -5,7 +5,6 @@

 #include <algorithm>
 #include <cstring>
-#include <mutex>
 #include <type_traits>

 #include "Common/Assert.h"
@@ -8,7 +8,6 @@

 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/Thread.h"

 #include "Core/HW/Memmap.h"
 #include "Core/System.h"
@@ -19,7 +18,6 @@
 #include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/VideoEvents.h"
 #include "VideoCommon/XFMemory.h"
-#include "VideoCommon/XFStructs.h"

 class FifoRecorder::FifoRecordAnalyzer : public OpcodeDecoder::Callback
 {
@@ -6,7 +6,6 @@
 #include <chrono>
 #include <optional>

-#include "Common/CommonTypes.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"

 class CameraControllerInput;
@@ -12,7 +12,6 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 #include "Common/FileUtil.h"

 #include "Core/AchievementManager.h"
@@ -3,7 +3,6 @@

 #include "Core/GeckoCodeConfig.h"

-#include <algorithm>
 #include <optional>
 #include <sstream>
 #include <string>
@@ -11,7 +10,6 @@

 #include "Common/HttpRequest.h"
 #include "Common/IniFile.h"
-#include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/CheatCodes.h"

@@ -8,7 +8,6 @@
 #include <map>

 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"

 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
@@ -17,7 +16,6 @@
 #include "Core/HLE/HLE_OS.h"
 #include "Core/HW/Memmap.h"
 #include "Core/Host.h"
-#include "Core/IOS/ES/ES.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
@@ -3,7 +3,6 @@

 #include "Core/HLE/HLE_Misc.h"

-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Core/Core.h"
 #include "Core/GeckoCode.h"
@@ -11,7 +11,6 @@
 #include <fmt/format.h>
 #include <fmt/printf.h>

-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
@@ -8,7 +8,6 @@
 #include <queue>

 #include "AudioCommon/AudioCommon.h"
-#include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/Thread.h"
 #include "Common/Timer.h"
@@ -6,7 +6,6 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
 #include "Core/HW/DSP.h"

 namespace DSP::HLE
@@ -10,7 +10,6 @@

 #include "Common/ChunkFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
@@ -3,7 +3,6 @@

 #include "Core/HW/DSPHLE/UCodes/AX.h"

-#include <algorithm>
 #include <array>
 #include <cstring>
 #include <iterator>
@@ -5,7 +5,6 @@

 #include "Core/HW/DSPHLE/UCodes/AXWii.h"

-#include <algorithm>
 #include <array>

 #include "Common/ChunkFile.h"
@@ -3,8 +3,6 @@

 #include "Core/HW/DSPHLE/UCodes/ROM.h"

-#include <string>
-
 #ifdef _WIN32
 #include <Windows.h>
 #endif
@@ -5,7 +5,6 @@

 #include <cstring>
 #include <memory>
-#include <string>

 #ifdef _WIN32
 #include <Windows.h>
@@ -12,11 +12,9 @@
 #include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCodeUtil.h"
 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/Jit/x64/DSPEmitter.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPLLE/DSPSymbols.h"
 #include "Core/HW/Memmap.h"
-#include "Core/Host.h"
 #include "Core/System.h"
 #include "VideoCommon/OnScreenDisplay.h"

@@ -13,10 +13,8 @@
 #include "Common/Event.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/MemoryUtil.h"
 #include "Common/Thread.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/DSP/DSPCaptureLogger.h"
@@ -26,7 +24,6 @@
 #include "Core/DSP/Interpreter/DSPInterpreter.h"
 #include "Core/DSP/Jit/DSPEmitterBase.h"
 #include "Core/HW/Memmap.h"
-#include "Core/Host.h"

 namespace DSP::LLE
 {
@@ -5,7 +5,6 @@

 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <memory>
 #include <optional>
 #include <string>
--- a/Show More
+++ b/Show More