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-10-02 15:17:08 -05:00 · 2026-01-23 21:30:01 +01:00
parent cdbea8867d
commit a14c88ba67
448 changed files with 115 additions and 936 deletions
--- a/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
+++ b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
@@ -4,7 +4,7 @@
 #pragma once

 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"

 #include "VideoCommon/BoundingBox.h"

--- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp
@@ -13,11 +13,8 @@
 #include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
-#include "Common/Logging/LogManager.h"
 #include "Common/MsgHandler.h"

-#include "Core/Config/GraphicsSettings.h"
-
 #include "VideoBackends/OGL/OGLTexture.h"

 #include "VideoCommon/DriverDetails.h"
--- a/Source/Core/VideoBackends/OGL/OGLConfig.h
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.h
@@ -3,8 +3,6 @@

 #pragma once

-#include "Common/CommonTypes.h"
-
 class GLContext;

 namespace OGL
--- a/Source/Core/VideoBackends/OGL/OGLGfx.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLGfx.cpp
@@ -5,10 +5,9 @@

 #include "Common/GL/GLContext.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/Logging/LogManager.h"

-#include "Core/Config/GraphicsSettings.h"
-
 #include "VideoBackends/OGL/OGLConfig.h"
 #include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLShader.h"
@@ -18,7 +17,6 @@

 #include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/Present.h"
 #include "VideoCommon/VideoConfig.h"

--- a/Source/Core/VideoBackends/OGL/OGLMain.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -54,7 +54,6 @@ Make AA apply instantly during gameplay if possible
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoBackends/OGL/SamplerCache.h"

-#include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/TextureCacheBase.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
@@ -3,7 +3,6 @@

 #include "Common/CommonTypes.h"
 #include "Common/EnumMap.h"
-#include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"

 #include "VideoBackends/OGL/OGLGfx.h"
--- a/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
@@ -8,7 +8,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"

-#include "VideoBackends/OGL/OGLGfx.h"
 #include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
@@ -3,8 +3,6 @@

 #include "VideoBackends/OGL/OGLPipeline.h"

-#include "Common/Assert.h"
-
 #include "VideoBackends/OGL/OGLShader.h"
 #include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
--- a/Source/Core/VideoBackends/OGL/OGLPipeline.h
+++ b/Source/Core/VideoBackends/OGL/OGLPipeline.h
@@ -5,7 +5,6 @@

 #include <memory>

-#include "Common/GL/GLUtil.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoCommon/AbstractPipeline.h"
 #include "VideoCommon/RenderState.h"
--- a/Source/Core/VideoBackends/OGL/OGLShader.h
+++ b/Source/Core/VideoBackends/OGL/OGLShader.h
@@ -3,13 +3,12 @@

 #pragma once

-#include <cstddef>
 #include <memory>
 #include <string>
 #include <string_view>

 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/AbstractShader.h"

 namespace OGL
--- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
@@ -4,14 +4,12 @@
 #include "VideoBackends/OGL/OGLStreamBuffer.h"

 #include "Common/Align.h"
-#include "Common/GL/GLUtil.h"
 #include "Common/MathUtil.h"
 #include "Common/MemoryUtil.h"

 #include "VideoBackends/OGL/OGLConfig.h"

 #include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/OnScreenDisplay.h"

 namespace OGL
 {
--- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
+++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
@@ -8,7 +8,7 @@
 #include <utility>

 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"

 namespace OGL
 {
--- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp
@@ -5,11 +5,11 @@

 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"

 #include "VideoBackends/OGL/OGLConfig.h"
 #include "VideoBackends/OGL/OGLGfx.h"
-#include "VideoBackends/OGL/SamplerCache.h"

 #include "VideoCommon/VideoConfig.h"

--- a/Source/Core/VideoBackends/OGL/OGLTexture.h
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.h
@@ -8,7 +8,7 @@
 #include <string_view>
 #include <vector>

-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"

 #include "VideoCommon/AbstractFramebuffer.h"
 #include "VideoCommon/AbstractStagingTexture.h"
--- a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
@@ -3,17 +3,14 @@

 #include "VideoBackends/OGL/OGLVertexManager.h"

-#include <fstream>
 #include <memory>
-#include <string>
-#include <vector>

 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
+#include "Common/GL/GLUtil.h"

 #include "VideoBackends/OGL/OGLGfx.h"
-#include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"

--- a/Source/Core/VideoBackends/OGL/OGLVertexManager.h
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.h
@@ -7,7 +7,7 @@
 #include <memory>

 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexManagerBase.h"

--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -5,6 +5,7 @@

 #include <array>
 #include <atomic>
+#include <fstream>
 #include <memory>
 #include <string>

@@ -15,6 +16,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/GL/GLContext.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Version.h"
@@ -28,11 +30,9 @@
 #include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/OGLVertexManager.h"

-#include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -9,7 +9,7 @@
 #include <string_view>
 #include <unordered_map>

-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/AsyncShaderCompiler.h"

 namespace OGL
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -8,7 +8,7 @@
 #include <memory>

 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/Constants.h"
 #include "VideoCommon/RenderState.h"

--- a/Source/Core/VideoBackends/Software/SWTexture.cpp
+++ b/Source/Core/VideoBackends/Software/SWTexture.cpp
@@ -5,8 +5,6 @@

 #include <cstring>

-#include "Common/Assert.h"
-
 #include "VideoBackends/Software/CopyRegion.h"
 #include "VideoBackends/Software/SWGfx.h"

--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -8,7 +8,6 @@

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

 #include "Core/System.h"

@@ -22,9 +21,7 @@
 #include "VideoCommon/DataReader.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/OpcodeDecoding.h"
-#include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderBase.h"
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -3,7 +3,6 @@

 #include "VideoBackends/Software/VideoBackend.h"

-#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -4,7 +4,6 @@
 #include "VideoBackends/Software/TextureSampler.h"

 #include <algorithm>
-#include <cmath>
 #include <span>

 #include "Common/CommonTypes.h"
--- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
+++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
@@ -8,7 +8,6 @@

 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
-#include "Common/Thread.h"

 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"
--- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
+++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
@@ -7,19 +7,12 @@
 #include <array>
 #include <type_traits>

-#include "Common/Assert.h"
-#include "Common/CommonFuncs.h"
 #include "Common/FileUtil.h"
 #include "Common/LinearDiskCache.h"
 #include "Common/MsgHandler.h"

-#include "Core/ConfigManager.h"
-
-#include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/ShaderCompiler.h"
 #include "VideoBackends/Vulkan/VKStreamBuffer.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"
 #include "VideoCommon/VideoCommon.h"
--- a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp
@@ -3,7 +3,6 @@

 #include "VideoBackends/Vulkan/StagingBuffer.h"

-#include <algorithm>
 #include <cstring>

 #include "Common/Assert.h"
--- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
+++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
@@ -11,7 +11,6 @@
 #include "VideoBackends/Vulkan/VKPipeline.h"
 #include "VideoBackends/Vulkan/VKShader.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"

--- a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp
@@ -5,8 +5,6 @@

 #include <vector>

-#include "Common/Logging/Log.h"
-
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/StagingBuffer.h"
--- a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
@@ -3,12 +3,9 @@

 #include "VideoBackends/Vulkan/VKPerfQuery.h"

-#include <algorithm>
 #include <cstring>
-#include <functional>

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

 #include "VideoBackends/Vulkan/CommandBufferManager.h"
--- a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
@@ -15,8 +15,6 @@
 #include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"

-#include "VideoCommon/DriverDetails.h"
-
 namespace Vulkan
 {
 VKPipeline::VKPipeline(const AbstractPipelineConfig& config, VkPipeline pipeline,
--- a/Source/Core/VideoBackends/Vulkan/VKShader.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKShader.cpp
@@ -4,7 +4,6 @@
 #include "VideoBackends/Vulkan/VKShader.h"

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

 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/ShaderCompiler.h"
--- a/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp
@@ -3,10 +3,6 @@

 #include "VideoBackends/Vulkan/VKStreamBuffer.h"

-#include <algorithm>
-#include <cstdint>
-#include <functional>
-
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
--- a/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp
@@ -7,7 +7,6 @@
 #include <cstdint>

 #include "Common/Assert.h"
-#include "Common/CommonFuncs.h"
 #include "Common/Contains.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
--- a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
@@ -6,7 +6,6 @@
 #include "Common/Assert.h"
 #include "Common/EnumMap.h"

-#include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"

 #include "VideoCommon/VertexLoaderManager.h"
--- a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp
@@ -12,20 +12,16 @@

 #include "Core/System.h"

-#include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/VKGfx.h"
 #include "VideoBackends/Vulkan/VKStreamBuffer.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"

 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
-#include "VideoCommon/VideoConfig.h"

 namespace Vulkan
 {
--- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
@@ -4,21 +4,19 @@
 #define VMA_IMPLEMENTATION
 #include "VideoBackends/Vulkan/VulkanLoader.h"

-#include <atomic>
-#include <cstdarg>
-#include <cstdlib>
-
 #if defined(ANDROID)
 #include <adrenotools/driver.h>
 #include <dlfcn.h>
 #endif

-#include "Common/CommonFuncs.h"
 #include "Common/DynamicLibrary.h"
+#if defined(__APPLE__)
+#include "Common/FileUtil.h"
+#elif defined(ANDROID) && _M_ARM_64
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"

 #include "VideoCommon/VideoConfig.h"
+#endif

 #define VULKAN_MODULE_ENTRY_POINT(name, required) PFN_##name name;
 #define VULKAN_INSTANCE_ENTRY_POINT(name, required) PFN_##name name;