Fix some includes in source/renderer

Make include-what-you-use happy with some files in source/renderer and
fix what needs to be fixed.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>

source/graphics/Font.cpp

@@ -19,16 +19,28 @@
 #include "Font.h"
 
 #include "graphics/TextureManager.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
-#include "ps/Profile.h"
+#include "ps/Profiler2.h"
+#include "ps/containers/Span.h"
+#include "renderer/Renderer.h"
+#include "renderer/backend/IDevice.h"
+#include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/ITexture.h"
+#include "renderer/backend/Sampler.h"
 
+#include FT_ERRORS_H
+#include FT_TYPES_H
 #include <algorithm>
 #include <cmath>
+#include <cstring>
 #include <numeric>
+#include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
-#include <cstdlib>
 
 namespace
 {

source/graphics/Font.h

@@ -19,16 +19,26 @@
 #define INCLUDED_FONT
 
 #include "graphics/Texture.h"
+#include "lib/code_annotation.h"
+#include "lib/os_path.h"
+#include "lib/types.h"
 #include "maths/Rect.h"
+#include "maths/Vector2D.h"
 #include "renderer/Renderer.h"
-#include "ps/Filesystem.h"
+#include "renderer/backend/Format.h"
+#include "renderer/backend/Sampler.h"
 
+#include <array>
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_STROKER_H
 #include FT_GLYPH_H
+#include FT_IMAGE_H
+#include FT_STROKER_H
 #include <memory>
 #include <optional>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 /**
  * Storage for a bitmap font. Loaded by CFontManager.

source/graphics/LOSTexture.cpp

@@ -28,7 +28,10 @@
 #include "ps/CStrInternStatic.h"
 #include "ps/Game.h"
 #include "ps/Profile.h"
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/IDevice.h"
+#include "renderer/backend/PipelineState.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/Renderer.h"
 #include "renderer/RenderingOptions.h"
 #include "renderer/TimeManager.h"

source/graphics/RenderableObject.h

@@ -22,7 +22,8 @@
 #ifndef INCLUDED_RENDERABLEOBJECT
 #define INCLUDED_RENDERABLEOBJECT
 
-
+#include "lib/code_annotation.h"
+#include "lib/types.h"
 #include "maths/BoundingBoxAligned.h"
 #include "maths/Matrix3D.h"
 

source/graphics/ShaderManager.cpp

@@ -31,6 +31,8 @@
 #include "ps/Filesystem.h"
 #include "ps/Profile.h"
 #include "ps/XML/Xeromyces.h"
+#include "renderer/backend/Backend.h"
+#include "renderer/backend/CompareOp.h"
 #include "renderer/backend/IDevice.h"
 
 #define USE_SHADER_XML_VALIDATION 1

source/graphics/TerritoryTexture.cpp

@@ -25,6 +25,7 @@
 #include "ps/Profile.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/Grid.h"

source/graphics/TextureManager.h

@@ -24,6 +24,7 @@
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
 #include "renderer/backend/ITexture.h"
+#include "renderer/backend/Sampler.h"
 
 #include <memory>
 

source/gui/GUIRenderer.cpp

@@ -33,6 +33,7 @@
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "renderer/Renderer.h"
+#include "renderer/backend/Sampler.h"
 
 #include <string>
 #include <utility>

source/lib/ogl.h

@@ -27,6 +27,7 @@
 #ifndef INCLUDED_OGL
 #define INCLUDED_OGL
 
+#include "lib/code_annotation.h"
 #include "lib/config2.h" // CONFIG2_GLES
 #include "lib/sysdep/os.h" // OS_WIN
 

source/ps/ArchiveBuilder.cpp

@@ -19,12 +19,13 @@
 
 #include "ArchiveBuilder.h"
 
-#include "graphics/TextureManager.h"
 #include "graphics/ColladaManager.h"
-#include "lib/tex/tex_codec.h"
+#include "graphics/TextureManager.h"
 #include "lib/file/archive/archive_zip.h"
 #include "lib/file/vfs/vfs_util.h"
+#include "lib/tex/tex_codec.h"
 #include "ps/XML/Xeromyces.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/backend/dummy/Device.h"
 
 #include <boost/algorithm/string/predicate.hpp>

source/ps/CStrIntern.h

@@ -18,6 +18,8 @@
 #ifndef INCLUDED_CSTRINTERN
 #define INCLUDED_CSTRINTERN
 
+#include "lib/types.h"
+
 class CStrInternInternals;
 
 /**

source/renderer/BlendShapes.h

@@ -18,6 +18,8 @@
 #ifndef INCLUDED_BLENDSHAPES
 #define INCLUDED_BLENDSHAPES
 
+#include <cstring>
+
 struct BlendShape4
 {
 public:

source/renderer/GPUSkinnedModelRenderer.cpp

@@ -30,9 +30,11 @@
 #include "ps/CLogger.h"
 #include "ps/containers/StaticVector.h"
 #include "ps/CStrInternStatic.h"
-#include "renderer/Renderer.h"
 #include "renderer/RenderModifiers.h"
+#include "renderer/Renderer.h"
 #include "renderer/VertexArray.h"
+#include "renderer/backend/Barrier.h"
+#include "renderer/backend/PipelineState.h"
 #include "third_party/mikktspace/weldmesh.h"
 
 namespace

source/renderer/PostprocManager.cpp

@@ -31,7 +31,9 @@
 #include "ps/Game.h"
 #include "ps/Profile.h"
 #include "ps/World.h"
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/IDevice.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/Renderer.h"
 #include "renderer/RenderingOptions.h"
 #include "tools/atlas/GameInterface/GameLoop.h"

source/renderer/RenderingOptions.h

@@ -30,6 +30,8 @@
 #include "ps/CStr.h"
 #include "ps/CStrIntern.h"
 
+#include <memory>
+
 class CRenderer;
 
 enum RenderPath

source/renderer/SceneRenderer.cpp

@@ -43,6 +43,7 @@
 #include "ps/Game.h"
 #include "ps/Profile.h"
 #include "ps/World.h"
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/CPUSkinnedModelRenderer.h"
 #include "renderer/DebugRenderer.h"

source/renderer/ShadowMap.cpp

@@ -32,8 +32,12 @@
 #include "ps/ConfigDB.h"
 #include "ps/CStrInternStatic.h"
 #include "ps/Profile.h"
+#include "renderer/backend/Backend.h"
+#include "renderer/backend/CompareOp.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/ITexture.h"
+#include "renderer/backend/IFramebuffer.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/DebugRenderer.h"
 #include "renderer/Renderer.h"
 #include "renderer/RenderingOptions.h"

source/renderer/SkyManager.h

@@ -23,10 +23,11 @@
 #define INCLUDED_SKYMANAGER
 
 #include "graphics/Texture.h"
+#include "ps/CStr.h"
+#include "renderer/VertexArray.h"
 #include "renderer/backend/IDeviceCommandContext.h"
 #include "renderer/backend/IShaderProgram.h"
 #include "renderer/backend/ITexture.h"
-#include "renderer/VertexArray.h"
 
 #include <memory>
 #include <vector>

source/renderer/TerrainOverlay.cpp

@@ -32,6 +32,7 @@
 #include "ps/World.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
 #include "renderer/TerrainRenderer.h"

source/renderer/WaterManager.cpp

@@ -29,6 +29,7 @@
 #include "ps/CStrInternStatic.h"
 #include "ps/Game.h"
 #include "ps/World.h"
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/PostprocManager.h"
 #include "renderer/Renderer.h"

source/renderer/backend/Barrier.h

@@ -18,6 +18,8 @@
 #ifndef INCLUDED_RENDERER_BACKEND_BARRIER
 #define INCLUDED_RENDERER_BACKEND_BARRIER
 
+#include <cstdint>
+
 namespace Renderer
 {
 

source/renderer/backend/CompareOp.cpp

@@ -19,6 +19,10 @@
 
 #include "CompareOp.h"
 
+#include "lib/debug.h"
+
+#include <string>
+
 namespace Renderer
 {
 

source/renderer/backend/CompareOp.h

@@ -18,9 +18,7 @@
 #ifndef INCLUDED_RENDERER_BACKEND_COMPAREOP
 #define INCLUDED_RENDERER_BACKEND_COMPAREOP
 
-#include "graphics/Color.h"
-
-class CStr;
+#include "ps/CStr.h"
 
 namespace Renderer
 {

source/renderer/backend/IDevice.h

@@ -19,24 +19,36 @@
 #define INCLUDED_RENDERER_BACKEND_IDEVICE
 
 #include "graphics/Color.h"
-#include "ps/containers/Span.h"
-#include "renderer/backend/Backend.h"
-#include "renderer/backend/Format.h"
 #include "renderer/backend/IBuffer.h"
 #include "renderer/backend/IDevice.h"
-#include "renderer/backend/IDeviceCommandContext.h"
-#include "renderer/backend/IFramebuffer.h"
-#include "renderer/backend/IShaderProgram.h"
 #include "renderer/backend/ITexture.h"
-#include "renderer/backend/PipelineState.h"
-#include "scriptinterface/ScriptForward.h"
 
+#include <cstdint>
+#include <js/TypeDecls.h>
 #include <memory>
 #include <string>
 #include <vector>
 
 class CShaderDefines;
 class CStr;
+class ScriptRequest;
+namespace PS { template <typename T> class span; }
+namespace Renderer::Backend { class IComputePipelineState; }
+namespace Renderer::Backend { class IDeviceCommandContext; }
+namespace Renderer::Backend { class IFramebuffer; }
+namespace Renderer::Backend { class IGraphicsPipelineState; }
+namespace Renderer::Backend { class IShaderProgram; }
+namespace Renderer::Backend { class IVertexInputLayout; }
+namespace Renderer::Backend { enum class AttachmentLoadOp; }
+namespace Renderer::Backend { enum class AttachmentStoreOp; }
+namespace Renderer::Backend { enum class Backend; }
+namespace Renderer::Backend { enum class Format; }
+namespace Renderer::Backend { struct SColorAttachment; }
+namespace Renderer::Backend { struct SComputePipelineStateDesc; }
+namespace Renderer::Backend { struct SDepthStencilAttachment; }
+namespace Renderer::Backend { struct SGraphicsPipelineStateDesc; }
+namespace Renderer::Backend { struct SVertexAttributeFormat; }
+namespace Renderer::Backend::Sampler { struct Desc; }
 
 namespace Renderer
 {

source/renderer/backend/IDeviceCommandContext.h

@@ -18,16 +18,20 @@
 #ifndef INCLUDED_RENDERER_BACKEND_IDEVICECOMMANDCONTEXT
 #define INCLUDED_RENDERER_BACKEND_IDEVICECOMMANDCONTEXT
 
-#include "ps/containers/Span.h"
-#include "renderer/backend/Barrier.h"
-#include "renderer/backend/Format.h"
-#include "renderer/backend/IDeviceObject.h"
-#include "renderer/backend/PipelineState.h"
-#include "renderer/backend/Sampler.h"
+#include "lib/types.h"
 
+#include "renderer/backend/IDeviceObject.h"
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 
+namespace PS { template <typename T> class span; }
+namespace Renderer::Backend { class IComputePipelineState; }
+namespace Renderer::Backend { class IGraphicsPipelineState; }
+namespace Renderer::Backend { class IVertexInputLayout; }
+namespace Renderer::Backend { enum class Format; }
+namespace Renderer::Backend::Sampler { enum class Filter; }
+
 namespace Renderer
 {
 
@@ -35,7 +39,6 @@ namespace Backend
 {
 
 class IBuffer;
-class IDevice;
 class IFramebuffer;
 class ITexture;
 

source/renderer/backend/IFramebuffer.h

@@ -21,6 +21,8 @@
 #include "graphics/Color.h"
 #include "renderer/backend/IDeviceObject.h"
 
+#include <cstdint>
+
 namespace Renderer
 {
 

source/renderer/backend/IShaderProgram.h

@@ -19,10 +19,14 @@
 #define INCLUDED_RENDERER_BACKEND_ISHADERPROGRAM
 
 #include "lib/file/vfs/vfs_path.h"
-#include "ps/CStrIntern.h"
-#include "renderer/backend/Format.h"
 #include "renderer/backend/IDeviceObject.h"
 
+#include <cstdint>
+#include <vector>
+
+class CStrIntern;
+namespace Renderer::Backend { enum class Format; }
+
 namespace Renderer
 {
 

source/renderer/backend/ITexture.h

@@ -20,7 +20,6 @@
 
 #include "renderer/backend/Format.h"
 #include "renderer/backend/IDeviceObject.h"
-#include "renderer/backend/Sampler.h"
 
 #include <cstdint>
 

source/renderer/backend/PipelineState.cpp

@@ -19,6 +19,9 @@
 
 #include "PipelineState.h"
 
+#include "renderer/backend/Backend.h"
+#include "renderer/backend/CompareOp.h"
+
 #include <limits>
 
 namespace Renderer

source/renderer/backend/PipelineState.h

@@ -19,11 +19,13 @@
 #define INCLUDED_RENDERER_BACKEND_PIPELINESTATE
 
 #include "graphics/Color.h"
-#include "renderer/backend/CompareOp.h"
+#include "ps/CStr.h"
 #include "renderer/backend/IDeviceObject.h"
-#include "renderer/backend/IShaderProgram.h"
 
-class CStr;
+#include <cstdint>
+
+namespace Renderer::Backend { class IShaderProgram; }
+namespace Renderer::Backend { enum class CompareOp; }
 
 namespace Renderer
 {

source/renderer/backend/Sampler.h

@@ -18,10 +18,7 @@
 #ifndef INCLUDED_RENDERER_BACKEND_SAMPLER
 #define INCLUDED_RENDERER_BACKEND_SAMPLER
 
-#include "graphics/Color.h"
-#include "renderer/backend/CompareOp.h"
-
-#include <cstdint>
+namespace Renderer::Backend { enum class CompareOp; }
 
 namespace Renderer
 {

source/renderer/backend/dummy/Buffer.h

@@ -20,6 +20,7 @@
 
 #include "renderer/backend/IBuffer.h"
 
+#include <cstdint>
 #include <memory>
 
 namespace Renderer

source/renderer/backend/dummy/Device.cpp

@@ -30,6 +30,8 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptRequest.h"
 
+#include <SDL_video.h>
+
 namespace Renderer
 {
 

source/renderer/backend/dummy/Device.h

@@ -18,14 +18,18 @@
 #ifndef INCLUDED_RENDERER_BACKEND_DUMMY_DEVICE
 #define INCLUDED_RENDERER_BACKEND_DUMMY_DEVICE
 
-#include "renderer/backend/dummy/DeviceForward.h"
+#include "renderer/backend/Backend.h"
+#include "renderer/backend/IBuffer.h"
 #include "renderer/backend/IDevice.h"
+#include "renderer/backend/ITexture.h"
 
+#include <cstdint>
+#include <js/TypeDecls.h>
 #include <memory>
 #include <string>
 #include <vector>
 
-class CShaderDefines;
+namespace Renderer::Backend { class IFramebuffer; }
 
 namespace Renderer
 {
@@ -36,8 +40,6 @@ namespace Backend
 namespace Dummy
 {
 
-class CDeviceCommandContext;
-
 class CDevice : public IDevice
 {
 public:

source/renderer/backend/dummy/DeviceCommandContext.h

@@ -18,12 +18,16 @@
 #ifndef INCLUDED_RENDERER_BACKEND_DUMMY_DEVICECOMMANDCONTEXT
 #define INCLUDED_RENDERER_BACKEND_DUMMY_DEVICECOMMANDCONTEXT
 
-#include "renderer/backend/Format.h"
+#include "lib/types.h"
 #include "renderer/backend/IDeviceCommandContext.h"
-#include "renderer/backend/PipelineState.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
 
+namespace Renderer::Backend::Dummy { class CDevice; }
+
 namespace Renderer
 {
 
@@ -33,12 +37,6 @@ namespace Backend
 namespace Dummy
 {
 
-class CDevice;
-class CBuffer;
-class CFramebuffer;
-class CShaderProgram;
-class CTexture;
-
 class CDeviceCommandContext : public IDeviceCommandContext
 {
 public:

source/renderer/backend/dummy/DeviceForward.h

@@ -33,8 +33,6 @@ class IDevice;
 namespace Dummy
 {
 
-class CDevice;
-
 std::unique_ptr<IDevice> CreateDevice(SDL_Window* window);
 
 } // namespace Dummy

source/renderer/backend/dummy/Framebuffer.h

@@ -20,6 +20,9 @@
 
 #include "renderer/backend/IFramebuffer.h"
 
+#include "graphics/Color.h"
+
+#include <cstdint>
 #include <memory>
 
 namespace Renderer

source/renderer/backend/dummy/PipelineState.h

@@ -20,7 +20,8 @@
 
 #include "renderer/backend/PipelineState.h"
 
-#include <cstdint>
+#include "graphics/Color.h"
+
 #include <memory>
 
 namespace Renderer

source/renderer/backend/dummy/ShaderProgram.cpp

@@ -19,6 +19,7 @@
 
 #include "ShaderProgram.h"
 
+#include "ps/CStrIntern.h"
 #include "renderer/backend/dummy/Device.h"
 
 namespace Renderer

source/renderer/backend/dummy/ShaderProgram.h

@@ -20,6 +20,9 @@
 
 #include "renderer/backend/IShaderProgram.h"
 
+#include "lib/file/vfs/vfs_path.h"
+
+#include <cstdint>
 #include <memory>
 
 namespace Renderer

source/renderer/backend/dummy/Texture.h

@@ -20,6 +20,9 @@
 
 #include "renderer/backend/ITexture.h"
 
+#include "renderer/backend/Format.h"
+
+#include <cstdint>
 #include <memory>
 
 namespace Renderer

source/renderer/backend/gl/Device.h

@@ -18,6 +18,8 @@
 #ifndef INCLUDED_RENDERER_BACKEND_GL_DEVICE
 #define INCLUDED_RENDERER_BACKEND_GL_DEVICE
 
+#include "ps/CStr.h"
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/Format.h"
 #include "renderer/backend/gl/Buffer.h"
 #include "renderer/backend/gl/DeviceForward.h"

source/renderer/backend/gl/DeviceCommandContext.cpp

@@ -20,6 +20,14 @@
 #include "DeviceCommandContext.h"
 
 #include "ps/CLogger.h"
+#include "ps/containers/Span.h"
+#include "renderer/backend/Barrier.h"
+#include "renderer/backend/Format.h"
+#include "renderer/backend/IDeviceObject.h"
+#include "renderer/backend/IShaderProgram.h"
+#include "renderer/backend/PipelineState.h"
+#include "renderer/backend/Sampler.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/backend/gl/Buffer.h"
 #include "renderer/backend/gl/Device.h"
 #include "renderer/backend/gl/Framebuffer.h"

source/renderer/backend/gl/DeviceCommandContext.h

@@ -18,20 +18,25 @@
 #ifndef INCLUDED_RENDERER_BACKEND_GL_DEVICECOMMANDCONTEXT
 #define INCLUDED_RENDERER_BACKEND_GL_DEVICECOMMANDCONTEXT
 
+#include "graphics/Color.h"
 #include "lib/ogl.h"
-#include "ps/containers/Span.h"
-#include "renderer/backend/Format.h"
-#include "renderer/backend/gl/Buffer.h"
+#include "lib/types.h"
+#include "renderer/backend/IBuffer.h"
 #include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/IShaderProgram.h"
 #include "renderer/backend/PipelineState.h"
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <iterator>
 #include <memory>
-#include <optional>
 #include <utility>
 
+namespace Renderer::Backend { enum class Format; }
+namespace Renderer::Backend::GL { class CBuffer; }
+
 namespace Renderer
 {
 

source/renderer/backend/gl/DeviceForward.h

@@ -33,8 +33,6 @@ class IDevice;
 namespace GL
 {
 
-class CDevice;
-
 std::unique_ptr<IDevice> CreateDevice(SDL_Window* window, const bool arb);
 
 } // namespace GL

source/renderer/backend/gl/Framebuffer.h

@@ -35,7 +35,6 @@ namespace GL
 {
 
 class CDevice;
-class CTexture;
 
 class CFramebuffer final : public IFramebuffer
 {

source/renderer/backend/gl/Mapping.cpp

@@ -20,6 +20,8 @@
 #include "Mapping.h"
 
 #include "lib/config2.h"
+#include "renderer/backend/CompareOp.h"
+#include "renderer/backend/PipelineState.h"
 
 namespace Renderer
 {

source/renderer/backend/gl/Mapping.h

@@ -19,7 +19,11 @@
 #define INCLUDED_RENDERER_BACKEND_GL_MAPPING
 
 #include "lib/ogl.h"
-#include "renderer/backend/PipelineState.h"
+
+namespace Renderer::Backend { enum class BlendFactor; }
+namespace Renderer::Backend { enum class BlendOp; }
+namespace Renderer::Backend { enum class CompareOp; }
+namespace Renderer::Backend { enum class StencilOp; }
 
 namespace Renderer
 {

source/renderer/backend/gl/PipelineState.h

@@ -21,7 +21,6 @@
 #include "lib/ogl.h"
 #include "renderer/backend/PipelineState.h"
 
-#include <cstdint>
 #include <memory>
 
 namespace Renderer

source/renderer/backend/gl/Texture.cpp

@@ -20,6 +20,7 @@
 #include "Texture.h"
 
 #include "lib/config2.h"
+#include "renderer/backend/Sampler.h"
 #include "renderer/backend/gl/Device.h"
 #include "renderer/backend/gl/DeviceCommandContext.h"
 #include "renderer/backend/gl/Mapping.h"

source/renderer/backend/gl/Texture.h

@@ -19,12 +19,14 @@
 #define INCLUDED_RENDERER_BACKEND_GL_TEXTURE
 
 #include "lib/ogl.h"
+#include "renderer/backend/Format.h"
 #include "renderer/backend/ITexture.h"
-#include "renderer/backend/Sampler.h"
 
 #include <cstdint>
 #include <memory>
 
+namespace Renderer::Backend::Sampler { struct Desc; }
+
 namespace Renderer
 {
 

source/renderer/backend/vulkan/Buffer.cpp

@@ -19,6 +19,7 @@
 
 #include "Buffer.h"
 
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/vulkan/Device.h"
 #include "renderer/backend/vulkan/Utilities.h"
 

source/renderer/backend/vulkan/DescriptorManager.h

@@ -27,6 +27,7 @@
 #include <glad/vulkan.h>
 #include <limits>
 #include <memory>
+#include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>

source/renderer/backend/vulkan/Device.h

@@ -18,6 +18,7 @@
 #ifndef INCLUDED_RENDERER_BACKEND_VULKAN_DEVICE
 #define INCLUDED_RENDERER_BACKEND_VULKAN_DEVICE
 
+#include "renderer/backend/Backend.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/vulkan/DeviceForward.h"
 #include "renderer/backend/vulkan/DeviceSelection.h"

source/renderer/backend/vulkan/DeviceCommandContext.h

@@ -19,13 +19,13 @@
 #define INCLUDED_RENDERER_VULKAN_DEVICECOMMANDCONTEXT
 
 #include "ps/containers/StaticVector.h"
-#include "renderer/backend/IBuffer.h"
 #include "renderer/backend/IDeviceCommandContext.h"
 #include "renderer/backend/vulkan/DeviceObjectUID.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <glad/vulkan.h>
 #include <memory>
-#include <vector>
 
 namespace Renderer
 {

source/renderer/backend/vulkan/DeviceForward.h

@@ -33,8 +33,6 @@ class IDevice;
 namespace Vulkan
 {
 
-class CDevice;
-
 std::unique_ptr<IDevice> CreateDevice(SDL_Window* window);
 
 } // namespace Vulkan

source/renderer/backend/vulkan/Mapping.cpp

@@ -21,6 +21,7 @@
 
 #include "lib/code_annotation.h"
 #include "lib/config2.h"
+#include "renderer/backend/CompareOp.h"
 
 namespace Renderer
 {

source/renderer/backend/vulkan/RingCommandContext.h

@@ -21,6 +21,7 @@
 #include "renderer/backend/vulkan/SubmitScheduler.h"
 
 #include <glad/vulkan.h>
+#include <functional>
 #include <memory>
 #include <vector>
 

source/renderer/scripting/JSInterface_Renderer.cpp

@@ -20,10 +20,15 @@
 #include "JSInterface_Renderer.h"
 
 #include "graphics/TextureManager.h"
-#include "renderer/RenderingOptions.h"
+#include "ps/CStr.h"
+#include "ps/CStrIntern.h"
 #include "renderer/Renderer.h"
+#include "renderer/RenderingOptions.h"
 #include "scriptinterface/FunctionWrapper.h"
 
+#include <js/PropertyAndElement.h>
+#include <string>
+
 namespace JSI_Renderer
 {
 #define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME) \

source/simulation2/components/CCmpRallyPointRenderer.cpp

@@ -21,6 +21,7 @@
 
 #include "ps/algorithm.h"
 #include "ps/Profile.h"
+#include "renderer/backend/Sampler.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/helpers/Los.h"
 

source/simulation2/components/CCmpSelectable.cpp

@@ -29,8 +29,9 @@
 #include "maths/Vector2D.h"
 #include "ps/CLogger.h"
 #include "ps/Profile.h"
-#include "renderer/Scene.h"
 #include "renderer/Renderer.h"
+#include "renderer/Scene.h"
+#include "renderer/backend/Sampler.h"
 #include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpFootprint.h"

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -30,6 +30,7 @@
 #include "renderer/Renderer.h"
 #include "renderer/Scene.h"
 #include "renderer/TerrainOverlay.h"
+#include "renderer/backend/Sampler.h"
 #include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPathfinder.h"

source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp

@@ -31,6 +31,7 @@
 #include "lib/tex/tex.h"
 #include "ps/Filesystem.h"
 #include "renderer/Renderer.h"
+#include "renderer/backend/Sampler.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPathfinder.h"
 #include "simulation2/components/ICmpTerrain.h"