diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp
index ec75d42727..b48075db6a 100644
--- a/source/ps/CConsole.cpp
+++ b/source/ps/CConsole.cpp
@@ -46,6 +46,7 @@
 #include "ps/Hotkey.h"
 #include "ps/KeyName.h"
 #include "ps/Profile.h"
+#include "ps/Profiler2.h"
 #include "ps/VideoMode.h"
 #include "scriptinterface/JSON.h"
 #include "scriptinterface/ScriptInterface.h"
diff --git a/source/ps/DllLoader.cpp b/source/ps/DllLoader.cpp
index 3c73eb423b..e31add123b 100644
--- a/source/ps/DllLoader.cpp
+++ b/source/ps/DllLoader.cpp
@@ -23,7 +23,6 @@
 #include "lib/debug.h"
 #include "lib/posix/posix_dlfcn.h"
 #include "lib/sysdep/os.h"
-#include "lib/timer.h"
 #include "ps/Profiler2.h"
 
 #include <cstddef>
diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp
index 24eba67c34..a1524f8f06 100644
--- a/source/ps/GameSetup/Config.cpp
+++ b/source/ps/GameSetup/Config.cpp
@@ -19,9 +19,6 @@
 
 #include "Config.h"
 
-#include "lib/timer.h"
-#include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 #include "ps/GameSetup/CmdLineArgs.h"
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 4df73f1675..66dc0bff2b 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -17,34 +17,41 @@
 
 #include "precompiled.h"
 
-#include "ps/GameSetup/GameSetup.h"
+#include "GameSetup.h"
 
 #include "graphics/GameView.h"
-#include "graphics/MapReader.h"
-#include "graphics/TerrainTextureManager.h"
 #include "gui/CGUI.h"
 #include "gui/GUIManager.h"
 #include "gui/Scripting/JSInterface_GUIManager.h"
 #include "i18n/L10n.h"
 #include "lib/app_hooks.h"
+#include "lib/code_annotation.h"
+#include "lib/code_generation.h"
 #include "lib/config2.h"
-#include "lib/external_libraries/libsdl.h"
+#include "lib/debug.h"
+#include "lib/external_libraries/curl.h"
 #include "lib/file/common/file_stats.h"
+#include "lib/file/file_system.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/file/vfs/vfs_path.h"
+#include "lib/file/vfs/vfs_util.h"
 #include "lib/input.h"
+#include "lib/path.h"
+#include "lib/status.h"
+#include "lib/sysdep/os.h"
 #include "lib/timer.h"
 #include "lobby/IXmppClient.h"
 #include "network/NetClient.h"
+#include "network/NetHost.h"
 #include "network/NetMessage.h"
-#include "network/NetMessages.h"
 #include "network/NetServer.h"
 #include "network/scripting/JSInterface_Network.h"
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
-#include "ps/GUID.h"
 #include "ps/Game.h"
-#include "ps/GameSetup/Atlas.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/GameSetup/HWDetect.h"
@@ -59,31 +66,64 @@
 #include "ps/ProfileViewer.h"
 #include "ps/Profiler2.h"
 #include "ps/Pyrogenesis.h"	// psSetLogDir
+#include "ps/TemplateLoader.h"
+#include "ps/ThreadUtil.h"
 #include "ps/TouchInput.h"
 #include "ps/UserReport.h"
-#include "ps/Util.h"
 #include "ps/VideoMode.h"
-#include "ps/VisualReplay.h"
 #include "ps/World.h"
+#include "ps/XMB/XMBData.h"
 #include "ps/XML/Xeromyces.h"
-#include "ps/scripting/JSInterface_Console.h"
 #include "ps/scripting/JSInterface_Game.h"
 #include "ps/scripting/JSInterface_Main.h"
 #include "ps/scripting/JSInterface_VFS.h"
 #include "renderer/Renderer.h"
+#include "renderer/RenderingOptions.h"
 #include "renderer/SceneRenderer.h"
-#include "renderer/VertexBufferManager.h"
 #include "scriptinterface/FunctionWrapper.h"
-#include "scriptinterface/JSON.h"
+#include "scriptinterface/Object.h"
 #include "scriptinterface/ScriptContext.h"
 #include "scriptinterface/ScriptConversions.h"
 #include "scriptinterface/ScriptInterface.h"
+#include "scriptinterface/ScriptRequest.h"
 #include "scriptinterface/ScriptStats.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/scripting/JSInterface_Simulation.h"
-#include "soundmanager/scripting/JSInterface_Sound.h"
+#include "simulation2/system/ParamNode.h"
 #include "soundmanager/ISoundManager.h"
-#include "tools/atlas/GameInterface/GameLoop.h"
+
+#include <SDL.h>
+#include <SDL_error.h>
+#include <SDL_hints.h>
+#include <SDL_keyboard.h>
+#include <SDL_version.h>
+#include <algorithm>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/constants.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <chrono>
+#include <cstdlib>
+#include <ctime>
+#include <fmt/format.h>
+#include <fstream>
+#include <js/CallArgs.h>
+#include <js/Class.h>
+#include <js/Object.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <jsapi.h>
+#include <locale>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <thread>
+#include <unordered_set>
+#include <utility>
+
 
 #if !(OS_WIN || OS_MACOSX || OS_ANDROID) // assume all other platforms use X11 for wxWidgets
 #define MUST_INIT_X11 1
@@ -94,13 +134,6 @@
 
 extern void RestartEngine();
 
-#include <fstream>
-#include <iostream>
-
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/split.hpp>
-
 using namespace std::literals;
 
 ERROR_GROUP(System);
diff --git a/source/ps/GameSetup/tests/test_CmdLineArgs.h b/source/ps/GameSetup/tests/test_CmdLineArgs.h
index 6fbfb8338f..53594bbc59 100644
--- a/source/ps/GameSetup/tests/test_CmdLineArgs.h
+++ b/source/ps/GameSetup/tests/test_CmdLineArgs.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
@@ -17,9 +17,14 @@
 
 #include "lib/self_test.h"
 
+#include "lib/sysdep/os.h"
+#include "ps/CStr.h"
 #include "ps/GameSetup/CmdLineArgs.h"
+#include "ps/containers/Span.h"
 
 #include <array>
+#include <cstddef>
+#include <vector>
 
 class TestCmdLineArgs : public CxxTest::TestSuite
 {
diff --git a/source/ps/Globals.cpp b/source/ps/Globals.cpp
index 7d96ef2128..3774aa20c9 100644
--- a/source/ps/Globals.cpp
+++ b/source/ps/Globals.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 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,11 +16,15 @@
  */
 
 #include "precompiled.h"
+
 #include "Globals.h"
 
-#include "network/NetClient.h"
-#include "ps/GameSetup/Config.h"
-#include "soundmanager/ISoundManager.h"
+#include "lib/code_annotation.h"
+#include "lib/external_libraries/libsdl.h"
+
+#include <SDL_events.h>
+#include <SDL_video.h>
+#include <cstddef>
 
 bool g_app_minimized = false;
 bool g_app_has_focus = true;
diff --git a/source/ps/Hotkey.cpp b/source/ps/Hotkey.cpp
index c7143a61d0..4af251d536 100644
--- a/source/ps/Hotkey.cpp
+++ b/source/ps/Hotkey.cpp
@@ -16,12 +16,10 @@
  */
 
 #include "precompiled.h"
+
 #include "Hotkey.h"
 
-#include <boost/tokenizer.hpp>
-
 #include "lib/external_libraries/libsdl.h"
-#include "ps/CConsole.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
@@ -29,6 +27,20 @@
 #include "ps/KeyName.h"
 #include "ps/Profiler2.h"
 
+#include <SDL_events.h>
+#include <SDL_mouse.h>
+#include <SDL_scancode.h>
+#include <algorithm>
+#include <boost/iterator/iterator_categories.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/token_functions.hpp>
+#include <boost/tokenizer.hpp>
+#include <cstddef>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 static bool unified[UNIFIED_LAST - UNIFIED_SHIFT];
 
 std::unordered_map<int, KeyMapping> g_HotkeyMap;
diff --git a/source/ps/Joystick.cpp b/source/ps/Joystick.cpp
index c4ff7e0280..8757ba9087 100644
--- a/source/ps/Joystick.cpp
+++ b/source/ps/Joystick.cpp
@@ -19,10 +19,15 @@
 
 #include "Joystick.h"
 
-#include "lib/external_libraries/libsdl.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 
+#include <SDL.h>
+#include <SDL_error.h>
+#include <SDL_events.h>
+#include <cstddef>
+#include <cstdint>
+
 CJoystick g_Joystick;
 
 CJoystick::CJoystick() :
diff --git a/source/ps/ModInstaller.cpp b/source/ps/ModInstaller.cpp
index 2d6be7fa3e..9a452f473e 100644
--- a/source/ps/ModInstaller.cpp
+++ b/source/ps/ModInstaller.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
@@ -19,14 +19,22 @@
 
 #include "ModInstaller.h"
 
-#include "lib/file/vfs/vfs_util.h"
 #include "lib/file/file_system.h"
+#include "lib/status.h"
 #include "lib/sysdep/os.h"
 #include "ps/CLogger.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
-#include "ps/XML/Xeromyces.h"
-#include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/JSON.h"
+#include "scriptinterface/ScriptConversions.h"
+#include "scriptinterface/ScriptInterface.h"
+#include "scriptinterface/ScriptRequest.h"
+
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <string>
 
 #if !OS_WIN
 #include "lib/os_path.h"
diff --git a/source/ps/ModIo.cpp b/source/ps/ModIo.cpp
index 2cffa7e0af..5fe96a1bed 100644
--- a/source/ps/ModIo.cpp
+++ b/source/ps/ModIo.cpp
@@ -25,7 +25,10 @@
 #include "ModIo.h"
 
 #include "i18n/L10n.h"
+#include "lib/code_generation.h"
+#include "lib/debug.h"
 #include "lib/file/file_system.h"
+#include "lib/status.h"
 #include "lib/sysdep/filesystem.h"
 #include "lib/sysdep/sysdep.h"
 #include "maths/MD5.h"
@@ -36,14 +39,26 @@
 #include "ps/Mod.h"
 #include "ps/ModInstaller.h"
 #include "ps/Util.h"
-#include "scriptinterface/ScriptConversions.h"
-#include "scriptinterface/ScriptContext.h"
-#include "scriptinterface/ScriptRequest.h"
 #include "scriptinterface/JSON.h"
+#include "scriptinterface/ScriptContext.h"
+#include "scriptinterface/ScriptConversions.h"
+#include "scriptinterface/ScriptRequest.h"
 
+#include <algorithm>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <cstdio>
+#include <cstring>
+#include <fmt/printf.h>
+#include <initializer_list>
+#include <js/Array.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+
+class ScriptInterface;
 
 ModIo* g_ModIo = nullptr;
 
diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp
index ecf0de5657..d72a74767d 100644
--- a/source/ps/ProfileViewer.cpp
+++ b/source/ps/ProfileViewer.cpp
@@ -19,6 +19,7 @@
 
 #include "ProfileViewer.h"
 
+#include "lib/code_annotation.h"
 #include "graphics/Canvas2D.h"
 #include "graphics/Color.h"
 #include "graphics/FontMetrics.h"
diff --git a/source/ps/Profiler2.cpp b/source/ps/Profiler2.cpp
index 41bbcbda6e..33f71a162e 100644
--- a/source/ps/Profiler2.cpp
+++ b/source/ps/Profiler2.cpp
@@ -31,7 +31,7 @@
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
-#include "ps/Profiler2.h"
+#include "ps/Future.h"
 #include "ps/Profiler2GPU.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/TaskManager.h"
@@ -48,6 +48,7 @@
 #include <tuple>
 #include <unordered_map>
 #include <utility>
+#include <variant>
 
 CProfiler2 g_Profiler2;
 
diff --git a/source/ps/SavedGame.cpp b/source/ps/SavedGame.cpp
index 475907138b..9b1090b103 100644
--- a/source/ps/SavedGame.cpp
+++ b/source/ps/SavedGame.cpp
@@ -33,7 +33,6 @@
 #include "lib/file/vfs/vfs_util.h"
 #include "lib/path.h"
 #include "lib/sysdep/filesystem.h"
-#include "lib/timer.h"
 #include "lib/types.h"
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
diff --git a/source/ps/TouchInput.cpp b/source/ps/TouchInput.cpp
index 1e557c7576..42bcc2fa9a 100644
--- a/source/ps/TouchInput.cpp
+++ b/source/ps/TouchInput.cpp
@@ -21,7 +21,6 @@
 
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
-#include "lib/code_annotation.h"
 #include "lib/debug.h"
 #include "lib/external_libraries/libsdl.h"
 #include "lib/sysdep/os.h"
diff --git a/source/ps/UserReport.cpp b/source/ps/UserReport.cpp
index a2f6d57fec..a36cdd68e1 100644
--- a/source/ps/UserReport.cpp
+++ b/source/ps/UserReport.cpp
@@ -19,25 +19,36 @@
 
 #include "UserReport.h"
 
-#include "lib/timer.h"
-#include "lib/utf8.h"
+#include "lib/code_annotation.h"
+#include "lib/code_generation.h"
+#include "lib/debug.h"
 #include "lib/external_libraries/curl.h"
 #include "lib/external_libraries/zlib.h"
-#include "lib/file/archive/stream.h"
 #include "lib/os_path.h"
+#include "lib/path.h"
+#include "lib/secure_crt.h"
+#include "lib/status.h"
 #include "lib/sysdep/sysdep.h"
+#include "lib/timer.h"
+#include "lib/types.h"
+#include "lib/utf8.h"
+#include "ps/CStr.h"
 #include "ps/ConfigDB.h"
-#include "ps/Filesystem.h"
 #include "ps/Profiler2.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Threading.h"
 
+#include <algorithm>
 #include <condition_variable>
+#include <cstring>
+#include <ctime>
 #include <deque>
 #include <fstream>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 
 #define DEBUG_UPLOADS 0
 
diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp
index 2b0ad11b80..629cdc7ef2 100644
--- a/source/ps/VideoMode.cpp
+++ b/source/ps/VideoMode.cpp
@@ -19,36 +19,52 @@
 
 #include "VideoMode.h"
 
+#include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "graphics/ShaderDefines.h"
 #include "graphics/ShaderProgram.h"
 #include "gui/GUIManager.h"
 #include "lib/config2.h"
-#include "lib/external_libraries/libsdl.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/file/vfs/vfs_path.h"
+#include "lib/status.h"
 #include "lib/sysdep/os.h"
 #include "lib/tex/tex.h"
+#include "lib/types.h"
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
-#include "ps/ConfigDB.h"
 #include "ps/CStr.h"
-#if OS_MACOSX && SDL_VERSION_ATLEAST(2, 0, 6)
-#include "ps/DllLoader.h"
-#endif
+#include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Pyrogenesis.h"
+#include "renderer/Renderer.h"
+#include "renderer/backend/IDevice.h"
 #include "renderer/backend/dummy/DeviceForward.h"
 #include "renderer/backend/gl/DeviceForward.h"
-#include "renderer/backend/IDevice.h"
 #include "renderer/backend/vulkan/DeviceForward.h"
-#include "renderer/Renderer.h"
 
+#include <SDL.h>
+#include <SDL_error.h>
+#include <SDL_events.h>
+#include <SDL_mouse.h>
+#include <SDL_pixels.h>
+#include <SDL_stdinc.h>
+#include <SDL_surface.h>
+#include <SDL_version.h>
+#include <SDL_video.h>
+#include <algorithm>
+#include <cstdlib>
+#include <sstream>
+#include <string>
 #include <string_view>
 
 #if OS_MACOSX && SDL_VERSION_ATLEAST(2, 0, 6)
+#include "ps/DllLoader.h"
+
 #include <SDL_vulkan.h>
-#include <stdlib.h>
 #endif
 
 using namespace std::literals;
diff --git a/source/ps/VisualReplay.cpp b/source/ps/VisualReplay.cpp
index 3c75b24229..81fecc6e5e 100644
--- a/source/ps/VisualReplay.cpp
+++ b/source/ps/VisualReplay.cpp
@@ -18,28 +18,39 @@
 #include "precompiled.h"
 
 #include "VisualReplay.h"
-#include "graphics/GameView.h"
-#include "lib/timer.h"
-#include "lib/utf8.h"
-#include "lib/allocators/shared_ptr.h"
-#include "lib/external_libraries/libsdl.h"
+
+#include "lib/code_generation.h"
+#include "lib/debug.h"
 #include "lib/file/file_system.h"
+#include "lib/path.h"
+#include "lib/posix/posix_types.h"
+#include "lib/status.h"
 #include "lib/sysdep/filesystem.h"
+#include "lib/types.h"
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "ps/CLogger.h"
-#include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 #include "ps/GameSetup/Paths.h"
-#include "ps/Mod.h"
 #include "ps/Profiler2.h"
 #include "ps/Pyrogenesis.h"
-#include "ps/Replay.h"
-#include "ps/Util.h"
 #include "scriptinterface/JSON.h"
+#include "scriptinterface/Object.h"
+#include "scriptinterface/ScriptRequest.h"
 
+#include <SDL_events.h>
+#include <SDL_quit.h>
 #include <fstream>
+#include <iterator>
+#include <js/Array.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <map>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 /**
  * Filter too short replays (value in seconds).
diff --git a/source/ps/XMB/tests/test_XMBData.h b/source/ps/XMB/tests/test_XMBData.h
index 30f6fffa66..12cffe500c 100644
--- a/source/ps/XMB/tests/test_XMBData.h
+++ b/source/ps/XMB/tests/test_XMBData.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
@@ -17,12 +17,21 @@
 
 #include "lib/self_test.h"
 
-#include "ps/XML/Xeromyces.h"
+#include "lib/types.h"
+#include "ps/CStr.h"
+#include "ps/XMB/XMBData.h"
 #include "ps/XMB/XMBStorage.h"
+#include "ps/XML/Xeromyces.h"
 #include "scriptinterface/ScriptInterface.h"
+#include "scriptinterface/ScriptRequest.h"
 
+#include <cstring>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
 #include <libxml/parser.h>
 #include <memory>
+#include <string>
 
 class TestXMBData : public CxxTest::TestSuite
 {
diff --git a/source/ps/XML/tests/test_RelaxNG.h b/source/ps/XML/tests/test_RelaxNG.h
index bbd3caf8a8..1e574d7d3a 100644
--- a/source/ps/XML/tests/test_RelaxNG.h
+++ b/source/ps/XML/tests/test_RelaxNG.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,10 +18,11 @@
 #include "lib/self_test.h"
 
 #include "ps/CLogger.h"
-#include "ps/XML/Xeromyces.h"
 #include "ps/XML/RelaxNG.h"
+#include "ps/XML/Xeromyces.h"
 
 #include <optional>
+#include <string>
 
 class TestRelaxNG : public CxxTest::TestSuite
 {
diff --git a/source/ps/XML/tests/test_XMLWriter.h b/source/ps/XML/tests/test_XMLWriter.h
index 8d9a228b82..954567554c 100644
--- a/source/ps/XML/tests/test_XMLWriter.h
+++ b/source/ps/XML/tests/test_XMLWriter.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
@@ -17,6 +17,7 @@
 
 #include "lib/self_test.h"
 
+#include "ps/CStr.h"
 #include "ps/XML/XMLWriter.h"
 
 class TestXmlWriter : public CxxTest::TestSuite
diff --git a/source/ps/XML/tests/test_Xeromyces.h b/source/ps/XML/tests/test_Xeromyces.h
index 600da1c518..521da25f9e 100644
--- a/source/ps/XML/tests/test_Xeromyces.h
+++ b/source/ps/XML/tests/test_Xeromyces.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,8 +18,9 @@
 #include "lib/self_test.h"
 
 #include "ps/CLogger.h"
+#include "ps/Errors.h"
+#include "ps/XMB/XMBData.h"
 #include "ps/XML/Xeromyces.h"
-#include "lib/file/vfs/vfs.h"
 
 class TestXeromyces : public CxxTest::TestSuite
 {
diff --git a/source/ps/containers/tests/test_StaticVector.h b/source/ps/containers/tests/test_StaticVector.h
index de89d6f906..55c52419bc 100644
--- a/source/ps/containers/tests/test_StaticVector.h
+++ b/source/ps/containers/tests/test_StaticVector.h
@@ -20,7 +20,12 @@
 #include "ps/containers/StaticVector.h"
 
 #include <algorithm>
+#include <cinttypes>
+#include <cstddef>
+#include <iterator>
+#include <limits>
 #include <numeric>
+#include <stdexcept>
 #include <type_traits>
 #include <utility>
 
diff --git a/source/ps/scripting/JSInterface_ConfigDB.cpp b/source/ps/scripting/JSInterface_ConfigDB.cpp
index 6c67142fa4..cad83c5b47 100644
--- a/source/ps/scripting/JSInterface_ConfigDB.cpp
+++ b/source/ps/scripting/JSInterface_ConfigDB.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
@@ -19,14 +19,16 @@
 
 #include "JSInterface_ConfigDB.h"
 
-#include "ps/ConfigDB.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
+#include "ps/ConfigDB.h"
 #include "ps/VideoMode.h"
 #include "scriptinterface/FunctionWrapper.h"
-#include "scriptinterface/ScriptRequest.h"
 
+#include <js/PropertyAndElement.h>
 #include <string>
 #include <unordered_set>
+#include <vector>
 
 namespace JSI_ConfigDB
 {
diff --git a/source/ps/scripting/JSInterface_Console.cpp b/source/ps/scripting/JSInterface_Console.cpp
index def3251d43..f8969f50ad 100644
--- a/source/ps/scripting/JSInterface_Console.cpp
+++ b/source/ps/scripting/JSInterface_Console.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
@@ -23,6 +23,10 @@
 #include "ps/CLogger.h"
 #include "scriptinterface/FunctionWrapper.h"
 
+#include <js/PropertyAndElement.h>
+
+namespace JS { class CallArgs; }
+
 namespace JSI_Console
 {
 CConsole* ConsoleGetter(const ScriptRequest&, JS::CallArgs&)
diff --git a/source/ps/scripting/JSInterface_Debug.cpp b/source/ps/scripting/JSInterface_Debug.cpp
index edb70a2afb..bbc87d2843 100644
--- a/source/ps/scripting/JSInterface_Debug.cpp
+++ b/source/ps/scripting/JSInterface_Debug.cpp
@@ -22,12 +22,16 @@
 #include "i18n/L10n.h"
 #include "lib/build_version.h"
 #include "lib/debug.h"
+#include "lib/utf8.h"
 #include "scriptinterface/FunctionWrapper.h"
-#include "scriptinterface/ScriptRequest.h"
 
-#include <unicode/smpdtfmt.h>
 #include <ctime>
+#include <js/PropertyAndElement.h>
+#include <jsapi.h>
 #include <string>
+#include <unicode/locid.h>
+#include <unicode/smpdtfmt.h>
+#include <unicode/utypes.h>
 
 namespace JSI_Debug
 {
diff --git a/source/ps/scripting/JSInterface_Game.cpp b/source/ps/scripting/JSInterface_Game.cpp
index 490e832918..513b3c41f1 100644
--- a/source/ps/scripting/JSInterface_Game.cpp
+++ b/source/ps/scripting/JSInterface_Game.cpp
@@ -19,7 +19,13 @@
 
 #include "JSInterface_Game.h"
 
+#include "graphics/HeightMipmap.h"
 #include "graphics/Terrain.h"
+#include "lib/config2.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/os_path.h"
+#include "lib/path.h"
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "ps/CLogger.h"
@@ -29,12 +35,20 @@
 #include "ps/Replay.h"
 #include "ps/World.h"
 #include "scriptinterface/FunctionWrapper.h"
+#include "scriptinterface/ScriptRequest.h"
 #include "scriptinterface/StructuredClone.h"
-#include "simulation2/system/TurnManager.h"
 #include "simulation2/Simulation2.h"
-#include "soundmanager/SoundManager.h"
+#include "simulation2/system/TurnManager.h"
+#include "soundmanager/ISoundManager.h"
 
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
 #include <stdexcept>
+#include <string>
+
+class ScriptInterface;
 
 namespace JSI_Game
 {
diff --git a/source/ps/scripting/JSInterface_Hotkey.cpp b/source/ps/scripting/JSInterface_Hotkey.cpp
index 453390ea98..8a32e8a5b8 100644
--- a/source/ps/scripting/JSInterface_Hotkey.cpp
+++ b/source/ps/scripting/JSInterface_Hotkey.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
@@ -19,17 +19,27 @@
 
 #include "JSInterface_Hotkey.h"
 
-#include "lib/external_libraries/libsdl.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 #include "ps/Hotkey.h"
 #include "ps/KeyName.h"
+#include "ps/containers/StaticVector.h"
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/ScriptConversions.h"
+#include "scriptinterface/ScriptRequest.h"
 
-#include <unordered_map>
-#include <vector>
+#include <SDL_scancode.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <jsapi.h>
 #include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 /**
  * Convert an unordered map to a JS object, mapping keys to values.
diff --git a/source/ps/scripting/JSInterface_Main.cpp b/source/ps/scripting/JSInterface_Main.cpp
index 963c4b0431..45a7f1bf99 100644
--- a/source/ps/scripting/JSInterface_Main.cpp
+++ b/source/ps/scripting/JSInterface_Main.cpp
@@ -22,20 +22,32 @@
 #include "graphics/FontMetrics.h"
 #include "graphics/MapReader.h"
 #include "lib/code_generation.h"
+#include "lib/file/vfs/vfs_path.h"
+#include "lib/frequency_filter.h"
 #include "lib/sysdep/sysdep.h"
-#include "lib/utf8.h"
-#include "maths/Size2D.h"
+#include "lib/types.h"
 #include "maths/MD5.h"
+#include "maths/Size2D.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/CStrIntern.h"
+#include "ps/Errors.h"
 #include "ps/GUID.h"
 #include "ps/GameSetup/Atlas.h"
 #include "ps/Globals.h"
-#include "ps/Hotkey.h"
 #include "ps/Util.h"
 #include "scriptinterface/FunctionWrapper.h"
+#include "scriptinterface/ScriptRequest.h"
 #include "tools/atlas/GameInterface/GameLoop.h"
 
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <string>
+
+class ScriptInterface;
+
 namespace JSI_Main
 {
 bool AtlasIsAvailable()
diff --git a/source/ps/scripting/JSInterface_Mod.cpp b/source/ps/scripting/JSInterface_Mod.cpp
index fbef650ffa..91c53a0684 100644
--- a/source/ps/scripting/JSInterface_Mod.cpp
+++ b/source/ps/scripting/JSInterface_Mod.cpp
@@ -19,14 +19,27 @@
 
 #include "JSInterface_Mod.h"
 
+#include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/Mod.h"
 #include "ps/Pyrogenesis.h"
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/JSON.h"
 #include "scriptinterface/Object.h"
 #include "scriptinterface/ScriptConversions.h"
+#include "scriptinterface/ScriptRequest.h"
 
+#include <fmt/format.h>
+#include <js/Array.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
 #include <stdexcept>
+#include <vector>
+
+class ScriptInterface;
+namespace JS { class CallArgs; }
 
 extern void RestartEngine();
 
diff --git a/source/ps/scripting/JSInterface_ModIo.cpp b/source/ps/scripting/JSInterface_ModIo.cpp
index 3b7b60b1ee..0c5854a141 100644
--- a/source/ps/scripting/JSInterface_ModIo.cpp
+++ b/source/ps/scripting/JSInterface_ModIo.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
@@ -19,10 +19,24 @@
 
 #include "JSInterface_ModIo.h"
 
+#include "lib/debug.h"
+#include "lib/types.h"
 #include "ps/CLogger.h"
 #include "ps/ModIo.h"
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/Object.h"
+#include "scriptinterface/ScriptRequest.h"
+
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace JS { class CallArgs; }
 
 namespace JSI_ModIo
 {
diff --git a/source/ps/scripting/JSInterface_SavedGame.cpp b/source/ps/scripting/JSInterface_SavedGame.cpp
index 4626d9a194..7887b5dd83 100644
--- a/source/ps/scripting/JSInterface_SavedGame.cpp
+++ b/source/ps/scripting/JSInterface_SavedGame.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
@@ -19,17 +19,27 @@
 
 #include "JSInterface_SavedGame.h"
 
+#include "lib/debug.h"
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/SavedGame.h"
 #include "scriptinterface/FunctionWrapper.h"
+#include "scriptinterface/Object.h"
+#include "scriptinterface/ScriptRequest.h"
 #include "scriptinterface/StructuredClone.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/system/TurnManager.h"
 
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
 #include <optional>
+#include <string>
+
+class ScriptInterface;
 
 namespace JSI_SavedGame
 {
diff --git a/source/ps/scripting/JSInterface_UserReport.cpp b/source/ps/scripting/JSInterface_UserReport.cpp
index b6bd37f20f..59877157df 100644
--- a/source/ps/scripting/JSInterface_UserReport.cpp
+++ b/source/ps/scripting/JSInterface_UserReport.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
@@ -19,12 +19,15 @@
 
 #include "JSInterface_UserReport.h"
 
+#include "lib/file/vfs/vfs.h"
+#include "lib/path.h"
+#include "lib/status.h"
 #include "ps/Filesystem.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/UserReport.h"
 #include "scriptinterface/FunctionWrapper.h"
-#include "scriptinterface/ScriptRequest.h"
 
+#include <js/PropertyAndElement.h>
 #include <string>
 
 namespace JSI_UserReport
diff --git a/source/ps/scripting/JSInterface_VFS.cpp b/source/ps/scripting/JSInterface_VFS.cpp
index aee99320a1..6cb140b968 100644
--- a/source/ps/scripting/JSInterface_VFS.cpp
+++ b/source/ps/scripting/JSInterface_VFS.cpp
@@ -19,18 +19,42 @@
 
 #include "JSInterface_VFS.h"
 
+#include "lib/debug.h"
+#include "lib/file/file_system.h"
+#include "lib/file/io/write_buffer.h"
+#include "lib/file/vfs/vfs.h"
 #include "lib/file/vfs/vfs_util.h"
+#include "lib/os_path.h"
+#include "lib/path.h"
+#include "lib/status.h"
 #include "lib/sysdep/filesystem.h"
+#include "lib/utf8.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/JSON.h"
 #include "scriptinterface/Object.h"
+#include "scriptinterface/ScriptConversions.h"
+#include "scriptinterface/ScriptRequest.h"
 
 #include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <fmt/format.h>
+#include <js/Array.h>
+#include <js/PropertyAndElement.h>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
 #include <sstream>
 #include <stdexcept>
+#include <string>
+#include <string_view>
+
+class ScriptInterface;
 
 namespace JSI_VFS
 {
diff --git a/source/ps/scripting/JSInterface_VisualReplay.cpp b/source/ps/scripting/JSInterface_VisualReplay.cpp
index 5f7a5687ec..f4e642f0c5 100644
--- a/source/ps/scripting/JSInterface_VisualReplay.cpp
+++ b/source/ps/scripting/JSInterface_VisualReplay.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
@@ -19,10 +19,14 @@
 
 #include "JSInterface_VisualReplay.h"
 
+#include "lib/os_path.h"
+#include "lib/utf8.h"
 #include "ps/CStr.h"
 #include "ps/VisualReplay.h"
 #include "scriptinterface/FunctionWrapper.h"
-#include "scriptinterface/ScriptRequest.h"
+
+#include <js/PropertyAndElement.h>
+#include <string>
 
 namespace JSI_VisualReplay
 {
diff --git a/source/ps/tests/test_CLogger.h b/source/ps/tests/test_CLogger.h
index 63f93757f7..be0d8fbb34 100644
--- a/source/ps/tests/test_CLogger.h
+++ b/source/ps/tests/test_CLogger.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,8 +17,14 @@
 
 #include "lib/self_test.h"
 
+#include "lib/utf8.h"
 #include "ps/CLogger.h"
 
+#include <cstddef>
+#include <sstream>
+#include <string>
+#include <vector>
+
 class TestCLogger : public CxxTest::TestSuite
 {
 public:
diff --git a/source/ps/tests/test_CStr.h b/source/ps/tests/test_CStr.h
index 1f630e7f68..09d96789a3 100644
--- a/source/ps/tests/test_CStr.h
+++ b/source/ps/tests/test_CStr.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
@@ -17,8 +17,13 @@
 
 #include "lib/self_test.h"
 
+#include "lib/code_annotation.h"
+#include "lib/types.h"
 #include "ps/CStr.h"
 
+#include <clocale>
+#include <cstddef>
+
 class TestCStr : public CxxTest::TestSuite
 {
 public:
diff --git a/source/ps/tests/test_ConfigDB.h b/source/ps/tests/test_ConfigDB.h
index 36769d0728..651b951acf 100644
--- a/source/ps/tests/test_ConfigDB.h
+++ b/source/ps/tests/test_ConfigDB.h
@@ -17,10 +17,15 @@
 
 #include "lib/self_test.h"
 
+#include "lib/file/file_system.h"
 #include "lib/file/vfs/vfs.h"
+#include "lib/path.h"
+#include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 
 #include <memory>
+#include <string>
+#include <vector>
 
 extern PIVFS g_VFS;
 
diff --git a/source/ps/tests/test_Future.h b/source/ps/tests/test_Future.h
index 01a987742b..c54e2a93fd 100644
--- a/source/ps/tests/test_Future.h
+++ b/source/ps/tests/test_Future.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
@@ -19,9 +19,13 @@
 
 #include "ps/Future.h"
 
+#include <cstring>
 #include <exception>
 #include <functional>
+#include <memory>
+#include <new>
 #include <type_traits>
+#include <utility>
 
 class TestFuture : public CxxTest::TestSuite
 {
diff --git a/source/ps/tests/test_Hashing.h b/source/ps/tests/test_Hashing.h
index 2400baa561..9b7b4450ea 100644
--- a/source/ps/tests/test_Hashing.h
+++ b/source/ps/tests/test_Hashing.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,8 +18,11 @@
 #include "lib/self_test.h"
 
 #include "lib/timer.h"
+#include "ps/CStr.h"
 #include "ps/Hashing.h"
 
+#include <cstdio>
+
 class TestHashing : public CxxTest::TestSuite
 {
 public:
diff --git a/source/ps/tests/test_Mod.h b/source/ps/tests/test_Mod.h
index af4b4e3aab..2cf5d9d34c 100644
--- a/source/ps/tests/test_Mod.h
+++ b/source/ps/tests/test_Mod.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -22,10 +22,15 @@
 
 #include "lib/self_test.h"
 
-#include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/Mod.h"
-#include "scriptinterface/JSON.h"
 #include "scriptinterface/ScriptInterface.h"
+#include "scriptinterface/ScriptRequest.h"
+
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <jsapi.h>
+#include <vector>
 
 class TestMod : public CxxTest::TestSuite
 {
diff --git a/source/ps/tests/test_test.h b/source/ps/tests/test_test.h
index 9566d45bab..bde8c31ed7 100644
--- a/source/ps/tests/test_test.h
+++ b/source/ps/tests/test_test.h
@@ -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
@@ -17,8 +17,13 @@
 
 #include "lib/self_test.h"
 
+#include "lib/posix/posix_types.h"
 #include "ps/CStr.h"
 
+#include <cstddef>
+#include <limits>
+#include <string>
+
 class TestTest : public CxxTest::TestSuite
 {
 public: