diff --git a/source/graphics/Camera.cpp b/source/graphics/Camera.cpp
index fbf946d999..047d42a025 100644
--- a/source/graphics/Camera.cpp
+++ b/source/graphics/Camera.cpp
@@ -25,6 +25,7 @@
 #include "lib/debug.h"
 #include "lib/posix/posix_types.h"
 #include "maths/MathUtil.h"
+#include "maths/Plane.h"
 #include "maths/Vector2D.h"
 #include "maths/Vector4D.h"
 #include "ps/Game.h"
diff --git a/source/graphics/Camera.h b/source/graphics/Camera.h
index d99c718e40..90eefe41ed 100644
--- a/source/graphics/Camera.h
+++ b/source/graphics/Camera.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,10 +26,13 @@
 #include "maths/BoundingBoxAligned.h"
 #include "maths/Frustum.h"
 #include "maths/Matrix3D.h"
-#include "maths/Vector2D.h"
+#include "maths/Vector3D.h"
 
 #include <array>
 
+class CPlane;
+class CVector2D;
+
 // view port
 struct SViewPort
 {
diff --git a/source/graphics/CameraController.cpp b/source/graphics/CameraController.cpp
index 01f2edc367..0d70b5e583 100644
--- a/source/graphics/CameraController.cpp
+++ b/source/graphics/CameraController.cpp
@@ -26,6 +26,7 @@
 #include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
 #include "maths/Quaternion.h"
+#include "maths/Vector3D.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
diff --git a/source/graphics/CameraController.h b/source/graphics/CameraController.h
index 1a60ead7ca..8ad59120e2 100644
--- a/source/graphics/CameraController.h
+++ b/source/graphics/CameraController.h
@@ -20,7 +20,16 @@
 
 #include "graphics/ICameraController.h"
 #include "graphics/SmoothedValue.h"
-#include "ps/ConfigDB.h"
+#include "lib/code_annotation.h"
+#include "lib/input.h"
+#include "simulation2/system/Entity.h"
+
+#include <memory>
+
+class CCamera;
+class CConfigDBHook;
+class CMatrix3D;
+class CVector3D;
 
 class CCameraController : public ICameraController
 {
diff --git a/source/graphics/Canvas2D.h b/source/graphics/Canvas2D.h
index f35f9a121c..f80d363f0a 100644
--- a/source/graphics/Canvas2D.h
+++ b/source/graphics/Canvas2D.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,15 +19,15 @@
 #define INCLUDED_CANVAS2D
 
 #include "graphics/Texture.h"
-#include "maths/Vector2D.h"
-#include "renderer/backend/IDeviceCommandContext.h"
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
 class CRect;
 class CTextRenderer;
-
+class CVector2D;
+namespace Renderer::Backend { class IDeviceCommandContext; }
 struct CColor;
 
 // Encapsulates 2D drawing functionality to hide and optimize
diff --git a/source/graphics/ColladaManager.h b/source/graphics/ColladaManager.h
index 45d87f9782..0cfaadcca4 100644
--- a/source/graphics/ColladaManager.h
+++ b/source/graphics/ColladaManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,9 @@
 #ifndef INCLUDED_COLLADAMANAGER
 #define INCLUDED_COLLADAMANAGER
 
+#include "lib/code_annotation.h"
 #include "lib/file/vfs/vfs.h"
+#include "lib/file/vfs/vfs_path.h"
 
 class CColladaManagerImpl;
 
diff --git a/source/graphics/Color.h b/source/graphics/Color.h
index 36b4109082..6ef31eff1e 100644
--- a/source/graphics/Color.h
+++ b/source/graphics/Color.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,10 +19,14 @@
 #define INCLUDED_COLOR
 
 #include "graphics/SColor.h"
+#include "lib/types.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
 #include "ps/containers/Span.h"
-#include "ps/CStrForward.h"
+
+#include <cstddef>
+
+class CStr8;
 
 // Simple defines for 3 and 4 component floating point colors - just map to
 // corresponding vector types.
diff --git a/source/graphics/Decal.h b/source/graphics/Decal.h
index f21d66e046..72e1ee940c 100644
--- a/source/graphics/Decal.h
+++ b/source/graphics/Decal.h
@@ -20,6 +20,10 @@
 
 #include "graphics/Material.h"
 #include "graphics/ModelAbstract.h"
+#include "lib/debug.h"
+#include "lib/posix/posix_types.h"
+
+#include <cstddef>
 
 class CTerrain;
 
diff --git a/source/graphics/Entity.h b/source/graphics/Entity.h
index beb8957679..ce3178b1a4 100644
--- a/source/graphics/Entity.h
+++ b/source/graphics/Entity.h
@@ -19,6 +19,7 @@
 #define INCLUDED_RMS_ENTITY
 
 #include "lib/code_annotation.h"
+#include "lib/types.h"
 #include "maths/FixedVector3D.h"
 
 #include <string>
diff --git a/source/graphics/Font.cpp b/source/graphics/Font.cpp
index a739dcd4d2..88134a171c 100644
--- a/source/graphics/Font.cpp
+++ b/source/graphics/Font.cpp
@@ -21,6 +21,7 @@
 #include "graphics/TextureManager.h"
 #include "lib/debug.h"
 #include "lib/file/vfs/vfs.h"
+#include "maths/Vector2D.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/Profiler2.h"
diff --git a/source/graphics/Font.h b/source/graphics/Font.h
index ff1e5a28d7..f4b3b8d791 100644
--- a/source/graphics/Font.h
+++ b/source/graphics/Font.h
@@ -23,10 +23,7 @@
 #include "lib/os_path.h"
 #include "lib/types.h"
 #include "maths/Rect.h"
-#include "maths/Vector2D.h"
-#include "renderer/Renderer.h"
 #include "renderer/backend/Format.h"
-#include "renderer/backend/Sampler.h"
 
 #include <array>
 #include <ft2build.h>
@@ -40,6 +37,9 @@
 #include <type_traits>
 #include <vector>
 
+class CVector2D;
+namespace Renderer::Backend::Sampler { struct Desc; }
+
 /**
  * Storage for a bitmap font. Loaded by CFontManager.
  */
diff --git a/source/graphics/FontManager.h b/source/graphics/FontManager.h
index 852c8ba2de..12245e5f37 100644
--- a/source/graphics/FontManager.h
+++ b/source/graphics/FontManager.h
@@ -23,11 +23,12 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
 #include <memory>
 #include <unordered_map>
+#include <utility>
 
 class CFont;
+struct FT_LibraryRec_;
 
 /**
  * Font manager: loads and caches bitmap fonts.
diff --git a/source/graphics/GameView.h b/source/graphics/GameView.h
index 6cee791ec5..598e6a8122 100644
--- a/source/graphics/GameView.h
+++ b/source/graphics/GameView.h
@@ -21,18 +21,19 @@
 #include "lib/code_annotation.h"
 #include "lib/input.h" // InReaction - can't forward-declare enum
 #include "renderer/Scene.h"
-#include "renderer/backend/IDeviceCommandContext.h"
 #include "simulation2/system/Entity.h"
 
 class CCamera;
 class CCinemaManager;
 class CGame;
+class CGameViewImpl;
 class CObjectManager;
 class CVector3D;
+namespace Renderer::Backend { class IDevice; }
+namespace Renderer::Backend { class IDeviceCommandContext; }
+struct SDL_Event_;
 struct SViewPort;
 
-class CGameViewImpl;
-
 class CGameView : private Scene
 {
 	NONCOPYABLE(CGameView);
diff --git a/source/graphics/HeightMipmap.h b/source/graphics/HeightMipmap.h
index a32ecbabf7..f57e058eba 100644
--- a/source/graphics/HeightMipmap.h
+++ b/source/graphics/HeightMipmap.h
@@ -27,6 +27,7 @@
 #include "lib/code_annotation.h"
 #include "lib/types.h"
 
+#include <cstddef>
 #include <vector>
 
 class Path;
diff --git a/source/graphics/ICameraController.h b/source/graphics/ICameraController.h
index bd7f8274ed..3d3ce3cffc 100644
--- a/source/graphics/ICameraController.h
+++ b/source/graphics/ICameraController.h
@@ -18,11 +18,14 @@
 #ifndef INCLUDED_ICAMERACONTROLLER
 #define INCLUDED_ICAMERACONTROLLER
 
-#include "graphics/Camera.h"
 #include "lib/code_annotation.h"
 #include "lib/input.h" // InReaction - can't forward-declare enum
 #include "simulation2/system/Entity.h"
 
+class CCamera;
+struct SDL_Event_;
+struct SViewPort;
+
 /**
  * @interface ICameraController defines a camera controller interface. The camera object
  * is owned by the camera controller's owner. It is therefore guaranteed that the lifetime
diff --git a/source/graphics/LOSTexture.h b/source/graphics/LOSTexture.h
index 878ef34d0b..4801f9c7c7 100644
--- a/source/graphics/LOSTexture.h
+++ b/source/graphics/LOSTexture.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,17 +19,20 @@
 #define INCLUDED_LOSTEXTURE
 
 #include "graphics/ShaderTechniquePtr.h"
+#include "lib/code_annotation.h"
+#include "lib/types.h"
 #include "maths/Matrix3D.h"
 #include "renderer/backend/Format.h"
-#include "renderer/backend/IDeviceCommandContext.h"
-#include "renderer/backend/IFramebuffer.h"
-#include "renderer/backend/IShaderProgram.h"
-#include "renderer/backend/ITexture.h"
-
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 class CLosQuerier;
 class CSimulation2;
+namespace Renderer::Backend { class IDeviceCommandContext; }
+namespace Renderer::Backend { class IFramebuffer; }
+namespace Renderer::Backend { class ITexture; }
+namespace Renderer::Backend { class IVertexInputLayout; }
 
 /**
  * Maintains the LOS (fog-of-war / shroud-of-darkness) texture, used for
diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h
index f40a1154e5..0b52ee3e08 100644
--- a/source/graphics/LightEnv.h
+++ b/source/graphics/LightEnv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,12 +23,8 @@
 #define INCLUDED_LIGHTENV
 
 #include "graphics/Color.h"
-#include "maths/MathUtil.h"
 #include "maths/Vector3D.h"
 
-class CMapWriter;
-class CMapReader;
-
 /**
  * Class CLightEnv: description of a lighting environment - contains all the
  * necessary parameters for representation of the lighting within a scenario
diff --git a/source/graphics/MapIO.h b/source/graphics/MapIO.h
index b53f22da18..8e8c800113 100644
--- a/source/graphics/MapIO.h
+++ b/source/graphics/MapIO.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,6 +21,9 @@
 #include "lib/file/vfs/vfs_path.h"
 #include "lib/os_path.h"
 #include "lib/status.h"
+#include "lib/types.h"
+
+#include <vector>
 
 // Opens the given texture file and stores it in a one-dimensional u16 vector.
 Status LoadHeightmapImageVfs(const VfsPath& filepath, std::vector<u16>& heightmap);
diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h
index ef3ad229a0..2b17040f87 100644
--- a/source/graphics/MapWriter.h
+++ b/source/graphics/MapWriter.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,21 +19,20 @@
 #define INCLUDED_MAPWRITER
 
 #include "MapIO.h"
+#include "lib/file/vfs/vfs_path.h"
 #include "ps/CStr.h"
-#include "ps/FileIo.h"
 
 #include <vector>
 
-
-class CLightEnv;
-class CTerrain;
 class CCamera;
 class CCinemaManager;
+class CFilePacker;
+class CLightEnv;
 class CPostprocManager;
-class WaterManager;
-class SkyManager;
 class CSimulation2;
-struct MapTrigger;
+class CTerrain;
+class SkyManager;
+class WaterManager;
 
 class CMapWriter : public CMapIO
 {
diff --git a/source/graphics/Material.h b/source/graphics/Material.h
index d4de7015de..30cc671717 100644
--- a/source/graphics/Material.h
+++ b/source/graphics/Material.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,10 @@
 #include "graphics/Texture.h"
 #include "ps/CStr.h"
 #include "ps/CStrIntern.h"
-#include "simulation2/helpers/Player.h"
+
+#include <vector>
+
+class CVector4D;
 
 class CMaterial
 {
diff --git a/source/graphics/MeshManager.h b/source/graphics/MeshManager.h
index 816e33fe92..c5cec1d3c3 100644
--- a/source/graphics/MeshManager.h
+++ b/source/graphics/MeshManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,9 @@
 #ifndef INCLUDED_MESHMANAGER
 #define INCLUDED_MESHMANAGER
 
+#include "lib/code_annotation.h"
 #include "lib/file/vfs/vfs_path.h"
+#include "lib/path.h"
 
 #include <memory>
 #include <unordered_map>
diff --git a/source/graphics/MiniMapTexture.h b/source/graphics/MiniMapTexture.h
index 953b3edd00..085ef4dfc2 100644
--- a/source/graphics/MiniMapTexture.h
+++ b/source/graphics/MiniMapTexture.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,12 +21,13 @@
 #include "graphics/Color.h"
 #include "graphics/ShaderTechniquePtr.h"
 #include "graphics/Texture.h"
+#include "lib/code_annotation.h"
+#include "lib/posix/posix_types.h"
+#include "lib/types.h"
 #include "maths/Vector2D.h"
-#include "renderer/backend/IDeviceCommandContext.h"
-#include "renderer/backend/IShaderProgram.h"
-#include "renderer/backend/ITexture.h"
 #include "renderer/VertexArray.h"
 
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -36,6 +37,11 @@ class CLOSTexture;
 class CSimulation2;
 class CTerrain;
 class CTerritoryTexture;
+namespace Renderer::Backend { class IDevice; }
+namespace Renderer::Backend { class IDeviceCommandContext; }
+namespace Renderer::Backend { class IFramebuffer; }
+namespace Renderer::Backend { class ITexture; }
+namespace Renderer::Backend { class IVertexInputLayout; }
 
 class CMiniMapTexture
 {
diff --git a/source/graphics/Model.h b/source/graphics/Model.h
index 25ff71b4c4..49af87a722 100644
--- a/source/graphics/Model.h
+++ b/source/graphics/Model.h
@@ -25,14 +25,23 @@
 #include "graphics/Material.h"
 #include "graphics/MeshManager.h"
 #include "graphics/ModelAbstract.h"
+#include "lib/code_annotation.h"
+#include "lib/debug.h"
+#include "lib/posix/posix_types.h"
+#include "maths/BoundingBoxAligned.h"
+#include "simulation2/helpers/Player.h"
 
+#include <cstddef>
+#include <memory>
+#include <string>
 #include <vector>
 
-struct SPropPoint;
+class CMatrix3D;
 class CObjectEntry;
+class CSimulation2;
 class CSkeletonAnim;
 class CSkeletonAnimDef;
-class CSimulation2;
+struct SPropPoint;
 
 // Holds world information for a particular instance of a model in the game.
 class CModel : public CModelAbstract
diff --git a/source/graphics/ModelAbstract.h b/source/graphics/ModelAbstract.h
index b38e879113..eb942078da 100644
--- a/source/graphics/ModelAbstract.h
+++ b/source/graphics/ModelAbstract.h
@@ -20,10 +20,16 @@
 
 #include "graphics/Color.h"
 #include "graphics/RenderableObject.h"
+#include "lib/code_annotation.h"
+#include "lib/posix/posix_types.h"
+#include "maths/BoundingBoxAligned.h"
 #include "maths/BoundingBoxOriented.h"
 #include "simulation2/helpers/Player.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <string>
 
 class CModelDummy;
 class CModel;
diff --git a/source/graphics/ModelDef.h b/source/graphics/ModelDef.h
index a5cb5e3006..1a6a58a39d 100644
--- a/source/graphics/ModelDef.h
+++ b/source/graphics/ModelDef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,14 +22,14 @@
 #ifndef INCLUDED_MODELDEF
 #define INCLUDED_MODELDEF
 
+#include "lib/code_annotation.h"
+#include "lib/file/vfs/vfs_path.h"
+#include "lib/types.h"
 #include "maths/BoundingBoxAligned.h"
 #include "maths/Matrix3D.h"
 #include "maths/Quaternion.h"
-#include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
-#include "lib/file/vfs/vfs_path.h"
 #include "ps/CStr.h"
-#include "renderer/VertexArray.h"
 
 #include <cstring>
 #include <map>
@@ -38,6 +38,8 @@
 
 class CBoneState;
 class CSkeletonAnimDef;
+class CVector2D;
+template <typename T> class VertexArrayIterator;
 
 /**
  * Describes the position of a prop point within its parent model. A prop point is the location within a parent model
diff --git a/source/graphics/ModelDummy.h b/source/graphics/ModelDummy.h
index 911df417df..e3253a6de8 100644
--- a/source/graphics/ModelDummy.h
+++ b/source/graphics/ModelDummy.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,6 +19,10 @@
 #define INCLUDED_MODELDUMMY
 
 #include "graphics/ModelAbstract.h"
+#include "lib/code_annotation.h"
+#include "lib/posix/posix_types.h"
+
+#include <memory>
 
 /**
  * Empty placeholder ModelAbstract implementation, to render nothing.
diff --git a/source/graphics/ObjectBase.cpp b/source/graphics/ObjectBase.cpp
index a7fc568cdd..724dd9ed9c 100644
--- a/source/graphics/ObjectBase.cpp
+++ b/source/graphics/ObjectBase.cpp
@@ -17,17 +17,23 @@
 
 #include "precompiled.h"
 
-#include <algorithm>
-#include <queue>
-
 #include "ObjectBase.h"
 
-#include "ObjectManager.h"
-#include "ps/XML/Xeromyces.h"
-#include "ps/Filesystem.h"
-#include "ps/CLogger.h"
-#include "lib/timer.h"
+#include "graphics/ObjectManager.h"
+#include "lib/debug.h"
 #include "maths/MathUtil.h"
+#include "ps/CLogger.h"
+#include "ps/Errors.h"
+#include "ps/Filesystem.h"
+#include "ps/XMB/XMBData.h"
+#include "ps/XMB/XMBStorage.h"
+#include "ps/XML/Xeromyces.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <queue>
+#include <string>
+#include <utility>
 
 namespace
 {
diff --git a/source/graphics/ObjectEntry.cpp b/source/graphics/ObjectEntry.cpp
index 973171087b..c875265824 100644
--- a/source/graphics/ObjectEntry.cpp
+++ b/source/graphics/ObjectEntry.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,24 +24,32 @@
 #include "graphics/MaterialManager.h"
 #include "graphics/MeshManager.h"
 #include "graphics/Model.h"
+#include "graphics/ModelAbstract.h"
 #include "graphics/ModelDef.h"
 #include "graphics/ModelDummy.h"
 #include "graphics/ObjectBase.h"
 #include "graphics/ObjectManager.h"
+#include "graphics/ParticleEmitter.h"
 #include "graphics/ParticleManager.h"
 #include "graphics/SkeletonAnim.h"
 #include "graphics/SkeletonAnimManager.h"
+#include "graphics/Texture.h"
 #include "graphics/TextureManager.h"
+#include "lib/debug.h"
 #include "lib/rand.h"
+#include "lib/utf8.h"
+#include "maths/Vector4D.h"
 #include "ps/CLogger.h"
+#include "ps/CStrIntern.h"
 #include "ps/CStrInternStatic.h"
-#include "ps/Game.h"
-#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
-#include "simulation2/Simulation2.h"
+#include "renderer/backend/Sampler.h"
 
+#include <algorithm>
+#include <cstddef>
 #include <sstream>
+#include <utility>
 
 CObjectEntry::CObjectEntry(const std::shared_ptr<CObjectBase>& base, const CSimulation2& simulation) :
 	m_Base(base), m_Color(1.0f, 1.0f, 1.0f, 1.0f), m_Simulation(simulation)
diff --git a/source/graphics/Overlay.h b/source/graphics/Overlay.h
index 3cd915f96e..36b99aa23a 100644
--- a/source/graphics/Overlay.h
+++ b/source/graphics/Overlay.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,6 +24,9 @@
 #include "maths/Vector3D.h"
 #include "ps/CStrIntern.h"
 
+#include <cstddef>
+#include <memory>
+#include <string>
 #include <vector>
 
 class CFrustum;
diff --git a/source/graphics/PreprocessorWrapper.cpp b/source/graphics/PreprocessorWrapper.cpp
index 91589579a6..e75bee3097 100644
--- a/source/graphics/PreprocessorWrapper.cpp
+++ b/source/graphics/PreprocessorWrapper.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,13 +20,19 @@
 #include "PreprocessorWrapper.h"
 
 #include "graphics/ShaderDefines.h"
+#include "lib/debug.h"
 #include "ps/CLogger.h"
+#include "ps/CStrIntern.h"
 #include "ps/Profile.h"
 
 #include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <deque>
+#include <map>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 namespace
diff --git a/source/graphics/SkeletonAnimManager.cpp b/source/graphics/SkeletonAnimManager.cpp
index fcbeb6843d..961220e6bc 100644
--- a/source/graphics/SkeletonAnimManager.cpp
+++ b/source/graphics/SkeletonAnimManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,13 +24,16 @@
 #include "SkeletonAnimManager.h"
 
 #include "graphics/ColladaManager.h"
-#include "graphics/Model.h"
 #include "graphics/SkeletonAnim.h"
 #include "graphics/SkeletonAnimDef.h"
+#include "maths/BoundingBoxAligned.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/FileIo.h"
 
+#include <string>
+#include <utility>
+
 ///////////////////////////////////////////////////////////////////////////////
 // CSkeletonAnimManager constructor
 CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager)
diff --git a/source/graphics/Terrain.cpp b/source/graphics/Terrain.cpp
index 5f342e5600..720ea05c61 100644
--- a/source/graphics/Terrain.cpp
+++ b/source/graphics/Terrain.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,20 +17,19 @@
 
 #include "precompiled.h"
 
-#include "graphics/Terrain.h"
+#include "Terrain.h"
 
+#include "graphics/MiniPatch.h"
 #include "graphics/Patch.h"
-#include "graphics/TerrainProperties.h"
-#include "graphics/TerrainTextureEntry.h"
-#include "graphics/TerrainTextureManager.h"
-#include "lib/sysdep/cpu.h"
+#include "graphics/RenderableObject.h"
+#include "maths/BoundingBoxAligned.h"
 #include "maths/FixedVector3D.h"
 #include "maths/MathUtil.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
-#include "simulation2/helpers/Pathfinding.h"
 
-#include <string.h>
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <iterator>
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTerrain constructor
diff --git a/source/graphics/TerrainProperties.cpp b/source/graphics/TerrainProperties.cpp
index 9d5bb8671d..3504459ad0 100644
--- a/source/graphics/TerrainProperties.cpp
+++ b/source/graphics/TerrainProperties.cpp
@@ -16,20 +16,28 @@
  */
 
 #include "precompiled.h"
+
 #include "TerrainProperties.h"
 
-#include <string>
-#include <vector>
-
-#include <boost/tokenizer.hpp>
-
 #include "graphics/Color.h"
 #include "graphics/TerrainTextureManager.h"
+#include "lib/path.h"
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
+#include "ps/XMB/XMBData.h"
+#include "ps/XMB/XMBStorage.h"
 #include "ps/XML/Xeromyces.h"
 
+#include <boost/iterator/iterator_categories.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/token_functions.hpp>
+#include <boost/tokenizer.hpp>
+#include <cmath>
+#include <string>
+
 CTerrainProperties::CTerrainProperties(CTerrainPropertiesPtr parent):
 	m_pParent(parent),
 	m_BaseColor(0),
diff --git a/source/graphics/TerrainTextureEntry.cpp b/source/graphics/TerrainTextureEntry.cpp
index d87889863b..39f89dc935 100644
--- a/source/graphics/TerrainTextureEntry.cpp
+++ b/source/graphics/TerrainTextureEntry.cpp
@@ -20,19 +20,28 @@
 #include "TerrainTextureEntry.h"
 
 #include "graphics/MaterialManager.h"
-#include "graphics/Terrain.h"
 #include "graphics/TerrainProperties.h"
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TextureManager.h"
+#include "lib/debug.h"
+#include "lib/path.h"
 #include "lib/utf8.h"
 #include "ps/CLogger.h"
+#include "ps/CStrIntern.h"
 #include "ps/CStrInternStatic.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
+#include "ps/XMB/XMBData.h"
+#include "ps/XMB/XMBStorage.h"
 #include "ps/XML/Xeromyces.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
+#include "renderer/backend/Sampler.h"
 
-#include <map>
+#include <cmath>
+#include <cstddef>
+#include <string>
+#include <utility>
 
 CTerrainTextureEntry::CTerrainTextureEntry(CTerrainPropertiesPtr properties, const VfsPath& path):
 	m_pProperties(properties),
diff --git a/source/graphics/TerrainTextureManager.cpp b/source/graphics/TerrainTextureManager.cpp
index 9edaccc55e..6a6c06eeb8 100644
--- a/source/graphics/TerrainTextureManager.cpp
+++ b/source/graphics/TerrainTextureManager.cpp
@@ -19,22 +19,33 @@
 
 #include "TerrainTextureManager.h"
 
-#include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainProperties.h"
-#include "graphics/TextureManager.h"
+#include "graphics/TerrainTextureEntry.h"
+#include "lib/alignment.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/bits.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/file/vfs/vfs_util.h"
+#include "lib/path.h"
+#include "lib/status.h"
 #include "lib/tex/tex.h"
-#include "lib/timer.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
+#include "ps/XMB/XMBStorage.h"
 #include "ps/XML/Xeromyces.h"
+#include "renderer/backend/Format.h"
 #include "renderer/backend/IDevice.h"
-#include "renderer/Renderer.h"
+#include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/Sampler.h"
 
 #include <algorithm>
+#include <cstdint>
+#include <utility>
 #include <vector>
 
+class CFileInfo;
+
 CTerrainTextureManager::CTerrainTextureManager(Renderer::Backend::IDevice* device)
 	: m_Device(device)
 {
diff --git a/source/graphics/TerritoryBoundary.cpp b/source/graphics/TerritoryBoundary.cpp
index e970ad53db..dc370d72b9 100644
--- a/source/graphics/TerritoryBoundary.cpp
+++ b/source/graphics/TerritoryBoundary.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,14 +16,16 @@
  */
 
 #include "precompiled.h"
+
 #include "TerritoryBoundary.h"
 
-#include <algorithm> // for reverse
-
-#include "graphics/Terrain.h"
+#include "lib/debug.h"
+#include "maths/Fixed.h"
+#include "simulation2/components/ICmpTerritoryManager.h"
 #include "simulation2/helpers/Grid.h"
 #include "simulation2/helpers/Pathfinding.h"
-#include "simulation2/components/ICmpTerritoryManager.h"
+
+#include <cmath>
 
 std::vector<STerritoryBoundary> CTerritoryBoundaryCalculator::ComputeBoundaries(const Grid<u8>* territory)
 {
diff --git a/source/graphics/TerritoryTexture.cpp b/source/graphics/TerritoryTexture.cpp
index fb73efb97e..53410c167b 100644
--- a/source/graphics/TerritoryTexture.cpp
+++ b/source/graphics/TerritoryTexture.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,18 +22,26 @@
 #include "graphics/Color.h"
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
+#include "lib/debug.h"
 #include "ps/Profile.h"
+#include "renderer/backend/Format.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/ITexture.h"
 #include "renderer/backend/Sampler.h"
-#include "renderer/Renderer.h"
-#include "simulation2/Simulation2.h"
-#include "simulation2/helpers/Grid.h"
-#include "simulation2/helpers/Pathfinding.h"
 #include "simulation2/components/ICmpPlayer.h"
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/components/ICmpTerritoryManager.h"
+#include "simulation2/helpers/Grid.h"
+#include "simulation2/helpers/Pathfinding.h"
+#include "simulation2/system/CmpPtr.h"
+#include "simulation2/system/Entity.h"
+
+#include <algorithm>
+#include <cstdint>
+#include <cstring>
+#include <vector>
 
 // TODO: There's a lot of duplication with CLOSTexture - might be nice to refactor a bit
 
diff --git a/source/graphics/TextRenderer.cpp b/source/graphics/TextRenderer.cpp
index cc8e4889de..4ab9275fc2 100644
--- a/source/graphics/TextRenderer.cpp
+++ b/source/graphics/TextRenderer.cpp
@@ -21,15 +21,27 @@
 
 #include "graphics/Font.h"
 #include "graphics/FontManager.h"
-#include "graphics/ShaderProgram.h"
 #include "graphics/TextureManager.h"
-#include "maths/Matrix3D.h"
+#include "lib/code_annotation.h"
+#include "lib/debug.h"
+#include "lib/types.h"
+#include "lib/utf8.h"
+#include "ps/CStr.h"
 #include "ps/CStrIntern.h"
 #include "ps/CStrInternStatic.h"
 #include "ps/ConfigDB.h"
 #include "renderer/Renderer.h"
+#include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/IShaderProgram.h"
 
+#include <algorithm>
 #include <cerrno>
+#include <cmath>
+#include <cstdarg>
+#include <cstdint>
+#include <cwchar>
+#include <iterator>
+#include <vector>
 
 namespace
 {
diff --git a/source/graphics/TextureConverter.cpp b/source/graphics/TextureConverter.cpp
index c19e562810..9ce6b12a16 100644
--- a/source/graphics/TextureConverter.cpp
+++ b/source/graphics/TextureConverter.cpp
@@ -19,19 +19,30 @@
 
 #include "TextureConverter.h"
 
+#include "lib/alignment.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/bits.h"
+#include "lib/debug.h"
+#include "lib/path.h"
 #include "lib/regex.h"
+#include "lib/status.h"
 #include "lib/tex/tex.h"
-#include "lib/timer.h"
+#include "lib/types.h"
 #include "maths/MD5.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
+#include "ps/Errors.h"
+#include "ps/Future.h"
 #include "ps/Profiler2.h"
 #include "ps/TaskManager.h"
 #include "ps/Util.h"
+#include "ps/XMB/XMBData.h"
+#include "ps/XMB/XMBStorage.h"
 #include "ps/XML/Xeromyces.h"
 
+#include <cstring>
+#include <utility>
+
 #if CONFIG2_NVTT
 
 #include "nvtt/nvtt.h"
diff --git a/source/graphics/TextureManager.cpp b/source/graphics/TextureManager.cpp
index e893fdb775..e2e37009fd 100644
--- a/source/graphics/TextureManager.cpp
+++ b/source/graphics/TextureManager.cpp
@@ -20,30 +20,41 @@
 #include "TextureManager.h"
 
 #include "graphics/Color.h"
+#include "graphics/SColor.h"
 #include "graphics/TextureConverter.h"
-#include "lib/allocators/shared_ptr.h"
 #include "lib/bits.h"
-#include "lib/file/vfs/vfs_tree.h"
+#include "lib/debug.h"
 #include "lib/hash.h"
-#include "lib/timer.h"
-#include "maths/MathUtil.h"
+#include "lib/path.h"
+#include "lib/status.h"
+#include "lib/tex/tex.h"
 #include "maths/MD5.h"
-#include "ps/CacheLoader.h"
+#include "maths/MathUtil.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
+#include "ps/CacheLoader.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
-#include "ps/Profile.h"
+#include "ps/Profiler2.h"
 #include "ps/Util.h"
 #include "renderer/backend/IDevice.h"
-#include "renderer/Renderer.h"
+#include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/ITexture.h"
 
 #include <algorithm>
+#include <array>
 #include <boost/filesystem.hpp>
-#include <iomanip>
+#include <boost/iterator/iterator_facade.hpp>
+#include <chrono>
+#include <iterator>
 #include <set>
 #include <sstream>
+#include <string>
+#include <thread>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace
 {
diff --git a/source/graphics/Unit.cpp b/source/graphics/Unit.cpp
index a107ddf0b0..af4c95c0a2 100644
--- a/source/graphics/Unit.cpp
+++ b/source/graphics/Unit.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,14 +20,18 @@
 #include "Unit.h"
 
 #include "graphics/Model.h"
+#include "graphics/ModelAbstract.h"
 #include "graphics/ObjectBase.h"
 #include "graphics/ObjectEntry.h"
 #include "graphics/ObjectManager.h"
-#include "graphics/SkeletonAnim.h"
-#include "graphics/SkeletonAnimDef.h"
 #include "graphics/UnitAnimation.h"
+#include "lib/code_generation.h"
 #include "ps/CLogger.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 CUnit::CUnit(CObjectManager& objectManager, const CActorDef& actor, const entity_id_t id, const uint32_t seed)
 	: m_ObjectManager(objectManager), m_Actor(actor), m_ID(id), m_Seed(seed), m_Animation(nullptr)
 {
diff --git a/source/graphics/UnitAnimation.cpp b/source/graphics/UnitAnimation.cpp
index 519a88a71a..65edd14184 100644
--- a/source/graphics/UnitAnimation.cpp
+++ b/source/graphics/UnitAnimation.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,18 +20,21 @@
 #include "UnitAnimation.h"
 
 #include "graphics/Model.h"
+#include "graphics/ModelAbstract.h"
 #include "graphics/ObjectEntry.h"
 #include "graphics/SkeletonAnim.h"
 #include "graphics/SkeletonAnimDef.h"
-#include "graphics/Unit.h"
+#include "lib/debug.h"
 #include "lib/rand.h"
 #include "ps/CStr.h"
 #include "ps/Game.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpSoundManager.h"
+#include "simulation2/system/CmpPtr.h"
 
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string>
 
 // Randomly modify the speed, so that units won't stay perfectly
 // synchronised if they're playing animations of the same length
diff --git a/source/graphics/UnitManager.cpp b/source/graphics/UnitManager.cpp
index a74ec81c6c..6e36ff1166 100644
--- a/source/graphics/UnitManager.cpp
+++ b/source/graphics/UnitManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,15 +17,14 @@
 
 #include "precompiled.h"
 
-#include "graphics/Model.h"
-#include "graphics/ObjectEntry.h"
-#include "graphics/ObjectManager.h"
+#include "graphics/ModelAbstract.h"
+#include "graphics/RenderableObject.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
-#include "ps/Game.h"
-#include "ps/World.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <utility>
 
 ///////////////////////////////////////////////////////////////////////////////
 // CUnitManager constructor
diff --git a/source/graphics/tests/test_Camera.h b/source/graphics/tests/test_Camera.h
index 9fe6738da3..a8503a07fc 100644
--- a/source/graphics/tests/test_Camera.h
+++ b/source/graphics/tests/test_Camera.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,12 +18,18 @@
 #include "lib/self_test.h"
 
 #include "graphics/Camera.h"
+
+#include "maths/BoundingBoxAligned.h"
+#include "maths/Frustum.h"
 #include "maths/MathUtil.h"
-#include "maths/Vector2D.h"
+#include "maths/Matrix3D.h"
+#include "maths/Plane.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
 
 #include <cmath>
+#include <cstddef>
+#include <set>
 #include <vector>
 
 class TestCamera : public CxxTest::TestSuite
diff --git a/source/graphics/tests/test_Color.h b/source/graphics/tests/test_Color.h
index cbdc63b553..e37ecd5427 100644
--- a/source/graphics/tests/test_Color.h
+++ b/source/graphics/tests/test_Color.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,10 @@
 #include "lib/self_test.h"
 
 #include "graphics/Color.h"
+#include "graphics/SColor.h"
+#include "lib/types.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
 
 #include <cstring>
 
diff --git a/source/graphics/tests/test_LOSTexture.h b/source/graphics/tests/test_LOSTexture.h
index 40329c0f90..bb9ae4c9a5 100644
--- a/source/graphics/tests/test_LOSTexture.h
+++ b/source/graphics/tests/test_LOSTexture.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,11 +18,19 @@
 #include "lib/self_test.h"
 
 #include "graphics/LOSTexture.h"
+
+#include "lib/posix/posix_types.h"
 #include "lib/timer.h"
+#include "lib/types.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
+#include "simulation2/helpers/Grid.h"
 #include "simulation2/helpers/Los.h"
 
+#include <cstdio>
+#include <memory>
+#include <vector>
+
 class TestLOSTexture : public CxxTest::TestSuite
 {
 public:
diff --git a/source/graphics/tests/test_MeshManager.h b/source/graphics/tests/test_MeshManager.h
index f92add675d..a156c46bde 100644
--- a/source/graphics/tests/test_MeshManager.h
+++ b/source/graphics/tests/test_MeshManager.h
@@ -20,14 +20,22 @@
 #include "graphics/ColladaManager.h"
 #include "graphics/MeshManager.h"
 #include "graphics/ModelDef.h"
+#include "lib/alignment.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/file/file_system.h"
-#include "lib/file/io/io.h"
 #include "lib/file/vfs/vfs.h"
+#include "lib/file/vfs/vfs_path.h"
+#include "lib/os_path.h"
+#include "lib/path.h"
 #include "lib/secure_crt.h"
+#include "lib/types.h"
 #include "ps/CLogger.h"
 #include "ps/XML/RelaxNG.h"
 
+#include <cstddef>
+#include <memory>
+#include <string>
+
 static OsPath MOD_PATH(DataDir() / "mods" / "_test.mesh" / "");
 static OsPath CACHE_PATH(DataDir() / "_testcache" / "");
 
diff --git a/source/graphics/tests/test_Model.h b/source/graphics/tests/test_Model.h
index b770e1dc15..4ce99ba49d 100644
--- a/source/graphics/tests/test_Model.h
+++ b/source/graphics/tests/test_Model.h
@@ -20,31 +20,47 @@
 #include "graphics/ColladaManager.h"
 #include "graphics/Decal.h"
 #include "graphics/Material.h"
+#include "graphics/MeshManager.h"
 #include "graphics/Model.h"
+#include "graphics/ModelAbstract.h"
 #include "graphics/ModelDef.h"
-#include "graphics/ObjectEntry.h"
+#include "graphics/ObjectBase.h"
 #include "graphics/ObjectManager.h"
 #include "graphics/ShaderDefines.h"
 #include "graphics/SkeletonAnimManager.h"
 #include "graphics/Terrain.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
+#include "lib/file/file_system.h"
 #include "lib/file/io/io.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/os_path.h"
+#include "lib/path.h"
+#include "lib/status.h"
+#include "maths/Matrix3D.h"
+#include "maths/Quaternion.h"
+#include "maths/Vector3D.h"
 #include "ps/CLogger.h"
-#include "ps/ConfigDB.h"
+#include "ps/CStr.h"
+#include "ps/CStrIntern.h"
 #include "ps/CStrInternStatic.h"
+#include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/ProfileViewer.h"
 #include "ps/VideoMode.h"
 #include "ps/XML/Xeromyces.h"
-#include "renderer/backend/dummy/Device.h"
 #include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
+#include "simulation2/system/Entity.h"
 
-#include <optional>
+#include <cstdint>
+#include <map>
 #include <memory>
+#include <optional>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 namespace
 {
diff --git a/source/graphics/tests/test_ShaderManager.h b/source/graphics/tests/test_ShaderManager.h
index a91558df16..afa0b7c91e 100644
--- a/source/graphics/tests/test_ShaderManager.h
+++ b/source/graphics/tests/test_ShaderManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,9 +17,9 @@
 
 #include "lib/self_test.h"
 
-#include "graphics/ShaderManager.h"
-
+#include "graphics/ShaderDefines.h"
 #include "maths/Vector4D.h"
+#include "ps/CStrIntern.h"
 
 class TestShaderManager : public CxxTest::TestSuite
 {
diff --git a/source/graphics/tests/test_Terrain.h b/source/graphics/tests/test_Terrain.h
index ae7b3535e7..958ffc3d84 100644
--- a/source/graphics/tests/test_Terrain.h
+++ b/source/graphics/tests/test_Terrain.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,10 +21,16 @@
 
 #include "graphics/Patch.h"
 #include "graphics/RenderableObject.h"
+#include "lib/posix/posix_types.h"
+#include "lib/types.h"
 #include "maths/Fixed.h"
 #include "maths/FixedVector3D.h"
+#include "maths/Vector3D.h"
 
+#include <cmath>
+#include <cstddef>
 #include <sstream>
+#include <string>
 #include <vector>
 
 class TestTerrain : public CxxTest::TestSuite
diff --git a/source/graphics/tests/test_TextureConverter.h b/source/graphics/tests/test_TextureConverter.h
index f3d5506f11..e57c6d58a3 100644
--- a/source/graphics/tests/test_TextureConverter.h
+++ b/source/graphics/tests/test_TextureConverter.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,13 +17,21 @@
 
 #include "lib/self_test.h"
 
+#include "graphics/Texture.h"
 #include "graphics/TextureConverter.h"
-
-#include "lib/external_libraries/libsdl.h"
+#include "lib/file/file_system.h"
 #include "lib/file/vfs/vfs.h"
+#include "lib/path.h"
 #include "lib/tex/tex.h"
+#include "lib/types.h"
 #include "ps/CLogger.h"
-#include "ps/XML/Xeromyces.h"
+#include "ps/XMB/XMBStorage.h"
+
+#include <SDL_timer.h>
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <vector>
 
 class TestTextureConverter : public CxxTest::TestSuite
 {
diff --git a/source/graphics/tests/test_TextureManager.h b/source/graphics/tests/test_TextureManager.h
index 64d6dd6c3c..57c87c25f5 100644
--- a/source/graphics/tests/test_TextureManager.h
+++ b/source/graphics/tests/test_TextureManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,14 +17,20 @@
 
 #include "lib/self_test.h"
 
+#include "graphics/Texture.h"
 #include "graphics/TextureManager.h"
-#include "lib/external_libraries/libsdl.h"
+#include "lib/file/file_system.h"
 #include "lib/file/vfs/vfs.h"
-#include "lib/tex/tex.h"
+#include "lib/path.h"
 #include "ps/ConfigDB.h"
+#include "ps/XMB/XMBStorage.h"
 #include "ps/XML/Xeromyces.h"
+#include "renderer/backend/IDevice.h"
 #include "renderer/backend/dummy/Device.h"
 
+#include <SDL_timer.h>
+#include <cstddef>
+#include <memory>
 #include <optional>
 
 class TestTextureManager : public CxxTest::TestSuite
diff --git a/source/simulation2/helpers/Selection.cpp b/source/simulation2/helpers/Selection.cpp
index b5cf67a49b..5eaa5a3f5b 100644
--- a/source/simulation2/helpers/Selection.cpp
+++ b/source/simulation2/helpers/Selection.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include "Selection.h"
 
 #include "graphics/Camera.h"
+#include "maths/Vector2D.h"
 #include "ps/CLogger.h"
 #include "ps/Profiler2.h"
 #include "simulation2/components/ICmpIdentity.h"
diff --git a/source/soundmanager/scripting/SoundGroup.cpp b/source/soundmanager/scripting/SoundGroup.cpp
index 9f1753d4f1..52800156cd 100644
--- a/source/soundmanager/scripting/SoundGroup.cpp
+++ b/source/soundmanager/scripting/SoundGroup.cpp
@@ -21,6 +21,7 @@
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "lib/rand.h"
+#include "maths/Vector2D.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/CStr.h"
diff --git a/source/tools/atlas/GameInterface/ActorViewer.cpp b/source/tools/atlas/GameInterface/ActorViewer.cpp
index 053782c4ff..aa23243e69 100644
--- a/source/tools/atlas/GameInterface/ActorViewer.cpp
+++ b/source/tools/atlas/GameInterface/ActorViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2024 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -46,6 +46,7 @@
 #include "ps/VideoMode.h"
 #include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/IFramebuffer.h"
 #include "renderer/Renderer.h"
 #include "renderer/RenderingOptions.h"
 #include "renderer/Scene.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
index 0441eea938..7f63f74099 100644
--- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
@@ -35,6 +35,7 @@
 #include "lib/utf8.h"
 #include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
+#include "maths/Vector2D.h"
 #include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/World.h"
diff --git a/source/tools/atlas/GameInterface/Misc.cpp b/source/tools/atlas/GameInterface/Misc.cpp
index f42cf2cc38..5dc1e90799 100644
--- a/source/tools/atlas/GameInterface/Misc.cpp
+++ b/source/tools/atlas/GameInterface/Misc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 #include "Messages.h"
 
+#include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
 #include "ps/Game.h"
 #include "graphics/GameView.h"
diff --git a/source/tools/atlas/GameInterface/View.cpp b/source/tools/atlas/GameInterface/View.cpp
index 2c73f0a797..78b06b813d 100644
--- a/source/tools/atlas/GameInterface/View.cpp
+++ b/source/tools/atlas/GameInterface/View.cpp
@@ -32,6 +32,7 @@
 #include "lib/timer.h"
 #include "lib/utf8.h"
 #include "maths/MathUtil.h"
+#include "maths/Vector2D.h"
 #include "ps/ConfigDB.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/GameSetup.h"