Fix some includes in atlas

Make include-what-you-use happy with some files in source/tools/atlas and fix what needs to be fixed. Add "source" to include path for AtlasUI target to allow for absolute includes. In the future all but one should be removed. Drop check for at least boost 1.40. Ref: #8086 Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
2026-06-16 05:13:58 -07:00 · 2025-08-08 21:04:43 +02:00 · 2025-08-08 21:04:43 +02:00 · 73ca3d303b
commit 73ca3d303b
parent cc7a165365
36 changed files with 451 additions and 232 deletions
--- a/build/premake/premake5.lua
+++ b/build/premake/premake5.lua
@ -1348,6 +1348,7 @@ function setup_atlas_projects()

 	setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
 	{	-- include
+		"../../..",
 		"..",
 		"CustomControls",
 		"Misc",
--- a/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2011 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,27 @@

 #include "precompiled.h"

-#include "wx/sysopt.h"
-#include "wx/wfstream.h"
-#include "wx/filename.h"
-#include "wx/image.h"
-
 #include "ToolButton.h"
-#include "ScenarioEditor/Tools/Common/Tools.h"
-#include "ScenarioEditor/SectionLayout.h"
-#include "General/Datafile.h"
+
+#include "tools/atlas/AtlasUI/General/Datafile.h"
+#include "tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h"
+#include "tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h"
+
+#include <utility>
+#include <wx/bitmap.h>
+#include <wx/chartype.h>
+#include <wx/colour.h>
+#include <wx/debug.h>
+#include <wx/filename.h>
+#include <wx/gdicmn.h>
+#include <wx/image.h>
+#include <wx/log.h>
+#include <wx/settings.h>
+#include <wx/sysopt.h>
+#include <wx/translation.h>
+#include <wx/wfstream.h>
+
+class wxWindow;

 BEGIN_EVENT_TABLE(ToolButton, wxButton)
 	EVT_BUTTON(wxID_ANY, ToolButton::OnClick)
--- a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.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,8 +19,15 @@

 #include "Canvas.h"

-#include "GameInterface/Messages.h"
-#include "ScenarioEditor/Tools/Common/Tools.h"
+#include "tools/atlas/GameInterface/MessagePasser.h"
+#include "tools/atlas/GameInterface/Messages.h"
+
+#include <wx/chartype.h>
+#include <wx/mousestate.h>
+#include <wx/string.h>
+#include <wx/tbarbase.h>
+
+class wxWindow;

 Canvas::Canvas(wxWindow* parent, int* attribList, long style)
 	: wxGLCanvas(parent, -1, attribList, wxDefaultPosition, wxDefaultSize, style, _T("GLCanvas")),
--- a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2011 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
@ -15,7 +15,12 @@
 * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "wx/glcanvas.h"
+#include <wx/defs.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/glcanvas.h>
+
+class wxWindow;

 class Canvas : public wxGLCanvas
 {
--- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
@ -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
@ -18,11 +18,26 @@
 #include "precompiled.h"

 #include "MapResizeDialog.h"
-#include "GameInterface/MessagePasser.h"
-#include "GameInterface/Messages.h"
-#include "ScenarioEditor/ScenarioEditor.h"

+#include "tools/atlas/AtlasObject/AtlasObject.h"
+#include "tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+
+#include <string>
+#include <wx/button.h>
+#include <wx/clntdata.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
 #include <wx/statline.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/toolbar.h>
+#include <wx/toplevel.h>
+#include <wx/translation.h>
+#include <wx/wxcrt.h>
+
+class wxWindow;

 MapResizeDialog::MapResizeDialog(wxWindow* parent)
 	: wxDialog(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCAPTION | wxRESIZE_BORDER)
--- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
@ -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
@ -19,16 +19,27 @@

 #include "PseudoMiniMapPanel.h"

-#include "GameInterface/MessagePasser.h"
-#include "GameInterface/Messages.h"
-#include "ScenarioEditor/Tools/Common/Tools.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"

 #include <algorithm>
 #include <cmath>
+#include <cstdint>
+#include <vector>
+#include <wx/brush.h>
+#include <wx/clntdata.h>
+#include <wx/colour.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 #include <wx/defs.h>
 #include <wx/event.h>
+#include <wx/graphics.h>
+#include <wx/mousestate.h>
+#include <wx/pen.h>
+#include <wx/tbarbase.h>
+#include <wx/wxcrt.h>
+
+class wxWindow;

 namespace
 {
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.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
@ -19,13 +19,37 @@

 #include "AtlasWindow.h"

-#include "AtlasObject/AtlasObject.h"
-#include "General/AtlasWindowCommand.h"
-#include "General/Datafile.h"
+#include "tools/atlas/AtlasObject/AtlasObject.h"
+#include "tools/atlas/AtlasUI/General/AtlasWindowCommand.h"
+#include "tools/atlas/AtlasUI/General/Datafile.h"

-#include "wx/artprov.h"
-#include "wx/config.h"
-#include "wx/file.h"
+#include <boost/signals2/optional_last_value.hpp>
+#include <cassert>
+#include <list>
+#include <string>
+#include <wx/artprov.h>
+#include <wx/bitmap.h>
+#include <wx/button.h>
+#include <wx/chartype.h>
+#include <wx/config.h>
+#include <wx/debug.h>
+#include <wx/dialog.h>
+#include <wx/file.h>
+#include <wx/filedlg.h>
+#include <wx/filename.h>
+#include <wx/icon.h>
+#include <wx/log.h>
+#include <wx/menu.h>
+#include <wx/menuitem.h>
+#include <wx/rtti.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+#include <wx/toolbar.h>
+#include <wx/translation.h>
+
+class wxSize;
+class wxWindow;

 //////////////////////////////////////////////////////////////////////////

--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2014 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,21 +18,25 @@
 #ifndef INCLUDED_ATLASWINDOW
 #define INCLUDED_ATLASWINDOW

-#include "General/AtlasWindowCommandProc.h"
+#include "tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h"
+#include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h"
+#include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h"

-#include "General/IAtlasSerialiser.h"
-#include "FileHistory/FileHistory.h"
+#include <boost/function.hpp>
+#include <boost/signals2/signal.hpp>
+#include <wx/defs.h>
+#include <wx/event.h>
+#include <wx/filename.h>
+#include <wx/frame.h>
+#include <wx/object.h>
+#include <wx/string.h>

-#include "wx/filename.h"
-
-#include <boost/version.hpp>
-#if BOOST_VERSION >= 104000
-# include <boost/signals2/signal.hpp>
-#else
-# error Atlas requires Boost 1.40 or later
-#endif
-
-class AtObj;
+class wxClassInfo;
+class wxMenu;
+class wxMenuBar;
+class wxMenuItem;
+class wxSize;
+class wxWindow;

 class AtlasWindow : public wxFrame, public IAtlasSerialiser
 {
--- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h
+++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommandProc.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
@ -20,6 +20,8 @@

 #include "wx/cmdproc.h"

+class wxWindow;
+
 class AtlasWindowCommandProc : public wxCommandProcessor
 {
 public:
--- a/source/tools/atlas/GameInterface/ActorViewer.cpp
+++ b/source/tools/atlas/GameInterface/ActorViewer.cpp
@ -19,41 +19,47 @@

 #include "ActorViewer.h"

-#include "View.h"
-
+#include "graphics/Camera.h"
 #include "graphics/Canvas2D.h"
 #include "graphics/ColladaManager.h"
+#include "graphics/Color.h"
 #include "graphics/LOSTexture.h"
+#include "graphics/MeshManager.h"
 #include "graphics/MiniMapTexture.h"
+#include "graphics/MiniPatch.h"
 #include "graphics/Model.h"
-#include "graphics/ModelDef.h"
+#include "graphics/ModelAbstract.h"
 #include "graphics/ObjectManager.h"
+#include "graphics/Overlay.h"
 #include "graphics/ParticleManager.h"
 #include "graphics/Patch.h"
 #include "graphics/SkeletonAnimManager.h"
 #include "graphics/Terrain.h"
-#include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TerritoryTexture.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
-#include "graphics/Overlay.h"
-#include "maths/MathUtil.h"
-#include "ps/Filesystem.h"
+#include "lib/debug.h"
+#include "lib/posix/posix_types.h"
+#include "maths/BoundingBoxAligned.h"
+#include "maths/Fixed.h"
+#include "maths/FixedVector3D.h"
+#include "maths/Matrix3D.h"
+#include "maths/Vector3D.h"
 #include "ps/CLogger.h"
-#include "ps/GameSetup/Config.h"
+#include "ps/Filesystem.h"
 #include "ps/ProfileViewer.h"
 #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"
 #include "renderer/SceneRenderer.h"
 #include "renderer/SkyManager.h"
 #include "renderer/WaterManager.h"
-#include "scriptinterface/ScriptContext.h"
+#include "renderer/backend/IDevice.h"
+#include "renderer/backend/IDeviceCommandContext.h"
+#include "renderer/backend/IFramebuffer.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpAttack.h"
 #include "simulation2/components/ICmpOwnership.h"
@ -63,8 +69,16 @@
 #include "simulation2/components/ICmpUnitMotion.h"
 #include "simulation2/components/ICmpVisual.h"
 #include "simulation2/components/ICmpWaterManager.h"
+#include "simulation2/helpers/Position.h"
 #include "simulation2/helpers/Render.h"
 #include "simulation2/system/Component.h"
+#include "tools/atlas/GameInterface/View.h"
+
+#include <cstddef>
+#include <memory>
+#include <vector>
+
+class CTerrainTextureEntry;

 extern int g_xres, g_yres;

--- a/source/tools/atlas/GameInterface/ActorViewer.h
+++ b/source/tools/atlas/GameInterface/ActorViewer.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
@ -18,13 +18,16 @@
 #ifndef INCLUDED_ACTORVIEWER
 #define INCLUDED_ACTORVIEWER

-#include "ps/CStrForward.h"
+#include "lib/code_annotation.h"
 #include "simulation2/helpers/Player.h"
 #include "simulation2/system/Entity.h"

-struct ActorViewerImpl;
-struct SColor4ub;
+#include <string>
+
 class CSimulation2;
+class CStr8;
+class CStrW;
+struct ActorViewerImpl;

 class ActorViewer
 {
--- a/source/tools/atlas/GameInterface/Brushes.cpp
+++ b/source/tools/atlas/GameInterface/Brushes.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
@ -21,14 +21,13 @@

 #include "graphics/Color.h"
 #include "graphics/Terrain.h"
-#include "maths/MathUtil.h"
+#include "lib/debug.h"
 #include "ps/Game.h"
-#include "ps/World.h"
 #include "renderer/TerrainOverlay.h"
 #include "simulation2/Simulation2.h"
-#include "simulation2/system/SimContext.h"

 #include <algorithm>
+#include <cstddef>

 using namespace AtlasMessage;

--- a/source/tools/atlas/GameInterface/Brushes.h
+++ b/source/tools/atlas/GameInterface/Brushes.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
@ -18,6 +18,7 @@
 #ifndef INCLUDED_BRUSHES
 #define INCLUDED_BRUSHES

+#include "lib/posix/posix_types.h"
 #include "maths/Vector3D.h"

 #include <vector>
--- a/source/tools/atlas/GameInterface/CommandProc.h
+++ b/source/tools/atlas/GameInterface/CommandProc.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
@ -18,11 +18,13 @@
 #ifndef INCLUDED_COMMANDPROC
 #define INCLUDED_COMMANDPROC

-#include <string>
+#include "lib/code_annotation.h"
+#include "lib/debug.h"
+
+#include <cstddef>
 #include <list>
 #include <map>
-
-#include "SharedMemory.h"
+#include <string>

 namespace AtlasMessage
 {
--- a/source/tools/atlas/GameInterface/DeltaArray.h
+++ b/source/tools/atlas/GameInterface/DeltaArray.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,6 +18,13 @@
 #ifndef INCLUDED_DELTAARRAY
 #define INCLUDED_DELTAARRAY

+#include "lib/posix/posix_types.h"
+
+#include <cstddef>
+#include <functional>
+#include <unordered_map>
+#include <utility>
+
 template<typename T> class DeltaArray2D
 {
 public:
--- a/source/tools/atlas/GameInterface/GameLoop.cpp
+++ b/source/tools/atlas/GameInterface/GameLoop.cpp
@ -19,32 +19,23 @@

 #include "GameLoop.h"

-#include "MessagePasserImpl.h"
-#include "Messages.h"
-#include "SharedMemory.h"
-#include "Handlers/MessageHandler.h"
-#include "ActorViewer.h"
-#include "View.h"
-
-#include "InputProcessor.h"
-
 #include "graphics/TextureManager.h"
-#include "lib/app_hooks.h"
-#include "lib/external_libraries/libsdl.h"
+#include "lib/debug.h"
 #include "lib/timer.h"
-#include "ps/CLogger.h"
 #include "ps/DllLoader.h"
-#include "ps/Filesystem.h"
-#include "ps/Profile.h"
-#include "ps/ThreadUtil.h"
 #include "ps/GameSetup/Paths.h"
+#include "ps/ThreadUtil.h"
 #include "renderer/Renderer.h"
+#include "tools/atlas/GameInterface/MessagePasser.h"
+#include "tools/atlas/GameInterface/MessagePasserImpl.h"
+#include "tools/atlas/GameInterface/SharedMemory.h"
+#include "tools/atlas/GameInterface/View.h"
+
+#include <cstddef>
+#include <string>

 using namespace AtlasMessage;

-#include <thread>
-
-
 namespace AtlasMessage
 {
 	extern void RegisterHandlers();
--- a/source/tools/atlas/GameInterface/Handlers/BrushHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/BrushHandlers.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
@ -19,7 +19,11 @@

 #include "MessageHandler.h"

-#include "../Brushes.h"
+#include "maths/Vector3D.h"
+#include "tools/atlas/GameInterface/Brushes.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"

 namespace AtlasMessage {

--- a/source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp
@ -18,21 +18,24 @@
 #include "precompiled.h"

 #include "MessageHandler.h"
-#include "../GameLoop.h"
-#include "../View.h"

-#include "maths/MathUtil.h"
-#include "maths/Vector3D.h"
-#include "maths/Quaternion.h"
-#include "ps/Game.h"
-#include "renderer/Renderer.h"
-#include "graphics/GameView.h"
+#include "graphics/Camera.h"
 #include "graphics/CinemaManager.h"
-
-#include "ps/World.h"
+#include "graphics/GameView.h"
 #include "graphics/Terrain.h"
-
-#include <assert.h>
+#include "lib/debug.h"
+#include "maths/MathUtil.h"
+#include "maths/Matrix3D.h"
+#include "maths/Quaternion.h"
+#include "maths/Vector3D.h"
+#include "ps/Game.h"
+#include "ps/World.h"
+#include "renderer/Renderer.h"
+#include "tools/atlas/GameInterface/GameLoop.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"

 namespace AtlasMessage {

--- a/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp
@ -18,24 +18,41 @@
 #include "precompiled.h"

 #include "MessageHandler.h"
-#include "../CommandProc.h"
-#include "../GameLoop.h"
-#include "../View.h"
+
 #include "graphics/Camera.h"
 #include "graphics/CinemaManager.h"
 #include "graphics/GameView.h"
-#include "ps/Game.h"
-#include "ps/CStr.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
+#include "lib/debug.h"
+#include "maths/Fixed.h"
+#include "maths/FixedVector3D.h"
 #include "maths/MathUtil.h"
+#include "maths/Matrix3D.h"
+#include "maths/NUSpline.h"
 #include "maths/Quaternion.h"
 #include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
-#include "simulation2/Simulation2.h"
+#include "ps/CStr.h"
+#include "ps/Game.h"
 #include "simulation2/components/ICmpCinemaManager.h"
 #include "simulation2/helpers/CinemaPath.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/GameLoop.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"
+
+#include <cstddef>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace AtlasMessage { struct cAddPathNode; }
+namespace AtlasMessage { struct cDeletePathNode; }
+namespace AtlasMessage { struct cMovePathNode; }

 namespace AtlasMessage
 {
--- a/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp
@ -17,23 +17,30 @@

 #include "precompiled.h"

-#include "MessageHandler.h"
-
-#include "../CommandProc.h"
-
 #include "graphics/RenderableObject.h"
 #include "graphics/Terrain.h"
 #include "graphics/UnitManager.h"
-#include "ps/CStr.h"
+#include "lib/posix/posix_types.h"
+#include "lib/types.h"
+#include "maths/MathUtil.h"
+#include "maths/Vector3D.h"
 #include "ps/Game.h"
 #include "ps/World.h"
-#include "maths/MathUtil.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/Brushes.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/DeltaArray.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <vector>

-#include "../Brushes.h"
-#include "../DeltaArray.h"

 namespace AtlasMessage {

--- a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
@ -19,11 +19,11 @@

 #include "MessageHandler.h"

-#include "../CommandProc.h"
-
+#include "graphics/Color.h"
 #include "graphics/LightEnv.h"
 #include "graphics/Terrain.h"
-#include "maths/MathUtil.h"
+#include "lib/debug.h"
+#include "maths/Vector3D.h"
 #include "ps/CStr.h"
 #include "ps/Game.h"
 #include "ps/World.h"
@ -32,9 +32,18 @@
 #include "renderer/SceneRenderer.h"
 #include "renderer/SkyManager.h"
 #include "renderer/WaterManager.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpWaterManager.h"
+#include "simulation2/helpers/Position.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+
+#include <cmath>
+#include <string>
+#include <vector>

 namespace AtlasMessage {

--- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@ -18,33 +18,39 @@
 #include "precompiled.h"

 #include "MessageHandler.h"
-#include "../GameLoop.h"
-#include "../CommandProc.h"
-#include "../ActorViewer.h"
-#include "../View.h"
-#include "../InputProcessor.h"

-#include "graphics/GameView.h"
-#include "graphics/ObjectManager.h"
 #include "gui/GUIManager.h"
+#include "lib/debug.h"
 #include "lib/external_libraries/libsdl.h"
+#include "lib/input.h"
+#include "lib/sysdep/os.h"
 #include "lib/timer.h"
-#include "maths/MathUtil.h"
-#include "ps/CConsole.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/Filesystem.h"
-#include "ps/Profile.h"
-#include "ps/Profiler2.h"
-#include "ps/Game.h"
-#include "ps/VideoMode.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/GameSetup/GameSetup.h"
-#include "renderer/backend/IDevice.h"
+#include "ps/Profile.h"
+#include "ps/VideoMode.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
+#include "renderer/backend/IDevice.h"
 #include "scriptinterface/ScriptInterface.h"
+#include "tools/atlas/GameInterface/ActorViewer.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/GameLoop.h"
+#include "tools/atlas/GameInterface/InputProcessor.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"

+#include <SDL.h>
+#include <SDL_error.h>
+#include <SDL_video.h>
+#include <memory>
 #include <optional>
+#include <vector>

 #if OS_WIN
 // We don't include wutil header directly to prevent including Windows headers.
--- a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
@ -18,51 +18,72 @@
 #include "precompiled.h"

 #include "MessageHandler.h"
-#include "../CommandProc.h"
-#include "../GameLoop.h"
-#include "../MessagePasser.h"

 #include "graphics/GameView.h"
 #include "graphics/LOSTexture.h"
 #include "graphics/MapIO.h"
 #include "graphics/MapWriter.h"
 #include "graphics/MiniMapTexture.h"
+#include "graphics/MiniPatch.h"
 #include "graphics/Patch.h"
 #include "graphics/Terrain.h"
 #include "graphics/TerrainTextureEntry.h"
-#include "graphics/TerrainTextureManager.h"
-#include "lib/bits.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
 #include "lib/file/vfs/vfs_path.h"
 #include "lib/file/vfs/vfs_util.h"
+#include "lib/os_path.h"
+#include "lib/path.h"
+#include "lib/posix/posix_types.h"
 #include "lib/status.h"
+#include "lib/types.h"
+#include "maths/Fixed.h"
+#include "maths/FixedVector3D.h"
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
+#include "ps/Errors.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
-#include "ps/GameSetup/GameSetup.h"
 #include "ps/Loader.h"
 #include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
 #include "renderer/WaterManager.h"
-#include "scriptinterface/Object.h"
 #include "scriptinterface/JSON.h"
+#include "scriptinterface/Object.h"
+#include "scriptinterface/ScriptInterface.h"
+#include "scriptinterface/ScriptRequest.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpOwnership.h"
-#include "simulation2/components/ICmpPlayer.h"
-#include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTemplateManager.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/components/ICmpVisual.h"
+#include "simulation2/helpers/Player.h"
 #include "simulation2/system/Component.h"
-#include "simulation2/system/ParamNode.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"

 #include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <iterator>
+#include <js/RootingAPI.h>
+#include <js/TypeDecls.h>
+#include <js/Value.h>
+#include <limits>
 #include <string>
+#include <utility>
 #include <vector>

+class CFileInfo;
+
 #ifdef _MSC_VER
 # pragma warning(disable: 4458) // Declaration hides class member.
 #endif
--- a/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
@ -18,23 +18,35 @@
 #include "precompiled.h"

 #include "MessageHandler.h"
-#include "../MessagePasserImpl.h"
-
-#include "../GameLoop.h"
-#include "../View.h"
-#include "graphics/GameView.h"
-#include "gui/GUIManager.h"
 #include "gui/CGUI.h"
+#include "gui/GUIManager.h"
 #include "lib/external_libraries/libsdl.h"
+#include "lib/input.h"
+#include "lib/path.h"
+#include "lib/types.h"
 #include "maths/MathUtil.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/Config.h"
-#include "ps/GameSetup/GameSetup.h"
 #include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpSoundManager.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/MessagePasser.h"
+#include "tools/atlas/GameInterface/MessagePasserImpl.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"
+
+#include <SDL_events.h>
+#include <SDL_keyboard.h>
+#include <SDL_keycode.h>
+#include <cstddef>
+#include <js/CallArgs.h>
+#include <js/RootingAPI.h>
+#include <memory>
+#include <string>

 extern void (*Atlas_GLSwapBuffers)(void* context);

--- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
@ -17,43 +17,57 @@

 #include "precompiled.h"

-#include <cfloat>
-#include <map>
-
 #include "MessageHandler.h"
-#include "../CommandProc.h"
-#include "../SimState.h"
-#include "../View.h"

+#include "graphics/Camera.h"
+#include "graphics/Color.h"
 #include "graphics/GameView.h"
-#include "graphics/Model.h"
-#include "graphics/ObjectBase.h"
-#include "graphics/ObjectEntry.h"
-#include "graphics/ObjectManager.h"
 #include "graphics/Terrain.h"
-#include "graphics/Unit.h"
+#include "lib/debug.h"
+#include "lib/types.h"
 #include "lib/utf8.h"
+#include "maths/Fixed.h"
+#include "maths/FixedVector3D.h"
 #include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector2D.h"
+#include "maths/Vector3D.h"
 #include "ps/CLogger.h"
+#include "ps/CStr.h"
 #include "ps/Game.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
-#include "renderer/WaterManager.h"
+#include "ps/XML/XMLWriter.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpObstruction.h"
-#include "simulation2/components/ICmpUnitMotion.h"
 #include "simulation2/components/ICmpOwnership.h"
-#include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpPlayer.h"
 #include "simulation2/components/ICmpPlayerManager.h"
+#include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/components/ICmpTemplateManager.h"
+#include "simulation2/components/ICmpUnitMotion.h"
 #include "simulation2/components/ICmpVisual.h"
+#include "simulation2/helpers/Player.h"
+#include "simulation2/helpers/Position.h"
 #include "simulation2/helpers/Selection.h"
 #include "simulation2/system/Component.h"
-#include "ps/XML/XMLWriter.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <cwchar>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>

 namespace AtlasMessage
 {
--- a/source/tools/atlas/GameInterface/Handlers/PlayerHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/PlayerHandlers.cpp
@ -23,6 +23,12 @@
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpTemplateManager.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+
+#include <string>
+#include <vector>

 namespace AtlasMessage {

--- a/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
@ -19,30 +19,47 @@

 #include "MessageHandler.h"

-#include "../CommandProc.h"
-
-#include "graphics/Patch.h"
-#include "graphics/TerrainTextureManager.h"
-#include "graphics/TerrainTextureEntry.h"
+#include "graphics/MiniPatch.h"
+#include "graphics/RenderableObject.h"
 #include "graphics/Terrain.h"
+#include "graphics/TerrainTextureEntry.h"
+#include "graphics/TerrainTextureManager.h"
 #include "graphics/TextureManager.h"
+#include "lib/debug.h"
+#include "lib/file/vfs/vfs.h"
+#include "lib/path.h"
+#include "lib/posix/posix_types.h"
+#include "lib/status.h"
+#include "lib/tex/tex.h"
+#include "lib/types.h"
+#include "maths/Vector3D.h"
+#include "ps/CStr.h"
+#include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/World.h"
-#include "lib/tex/tex.h"
-#include "ps/Filesystem.h"
 #include "renderer/Renderer.h"
-#include "renderer/backend/Sampler.h"
-#include "simulation2/Simulation2.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/components/ICmpPathfinder.h"
-#include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/helpers/Grid.h"
+#include "simulation2/helpers/Pathfinding.h"
 #include "simulation2/system/Component.h"
+#include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/Brushes.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/DeltaArray.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/Shareable.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"
+#include "tools/atlas/GameInterface/View.h"

-#include "../Brushes.h"
-#include "../DeltaArray.h"
-#include "../View.h"
-
+#include <algorithm>
+#include <cwchar>
+#include <map>
+#include <memory>
 #include <queue>
+#include <string>
+#include <utility>
+#include <vector>

 namespace AtlasMessage
 {
--- a/source/tools/atlas/GameInterface/InputProcessor.cpp
+++ b/source/tools/atlas/GameInterface/InputProcessor.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2010 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,15 @@

 #include "InputProcessor.h"

-#include "ps/Game.h"
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
+#include "maths/Matrix3D.h"
 #include "maths/Quaternion.h"
+#include "maths/Vector3D.h"
+#include "ps/Game.h"
+#include "tools/atlas/GameInterface/GameLoop.h"
+
+#include <cmath>

 static float g_ViewZoomSmoothness = 0.02f;
 static float g_ViewRotateScale = 0.02f;
--- a/source/tools/atlas/GameInterface/InputProcessor.h
+++ b/source/tools/atlas/GameInterface/InputProcessor.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
@ -18,7 +18,7 @@
 #ifndef INCLUDED_INPUTPROCESSOR
 #define INCLUDED_INPUTPROCESSOR

-#include "GameLoop.h"
+struct GameLoopState;

 class InputProcessor
 {
--- a/source/tools/atlas/GameInterface/MessagePasserImpl.h
+++ b/source/tools/atlas/GameInterface/MessagePasserImpl.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,8 @@
 #ifndef INCLUDED_MESSAGEPASSERIMPL
 #define INCLUDED_MESSAGEPASSERIMPL

-#include "MessagePasser.h"
+#include "lib/code_annotation.h"
+#include "tools/atlas/GameInterface/MessagePasser.h"

 class MessagePasserImpl : public AtlasMessage::MessagePasser
 {
--- a/source/tools/atlas/GameInterface/Misc.cpp
+++ b/source/tools/atlas/GameInterface/Misc.cpp
@ -19,13 +19,13 @@

 // TODO: organise things better, rather than sticking them in Misc

-#include "Messages.h"
-
+#include "graphics/Camera.h"
+#include "graphics/GameView.h"
+#include "lib/debug.h"
 #include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
 #include "ps/Game.h"
-#include "graphics/GameView.h"
-#include "graphics/Camera.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"

 CVector3D AtlasMessage::Position::GetWorldSpace(bool floating) const
 {
--- a/source/tools/atlas/GameInterface/Register.cpp
+++ b/source/tools/atlas/GameInterface/Register.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
@ -17,23 +17,19 @@

 #include "precompiled.h"

-#include "Messages.h"
-#include "Handlers/MessageHandler.h"
-#include "CommandProc.h"
+#include "tools/atlas/GameInterface/CommandProc.h"
+#include "tools/atlas/GameInterface/Handlers/MessageHandler.h"
+#include "tools/atlas/GameInterface/Messages.h"
+
+#include <string>
+#include <utility>
+
+namespace AtlasMessage { struct IMessage; }

 // We want to include Messages.h again below, with some different definitions,
 // so cheat and undefine its include-guard
 #undef INCLUDED_MESSAGES

-#include <map>
-#include <string>
-
-#include "SharedTypes.h"
-#include "Shareable.h"
-
-#include <map>
-#include <string>
-
 namespace AtlasMessage
 {

--- a/source/tools/atlas/GameInterface/SharedMemory.h
+++ b/source/tools/atlas/GameInterface/SharedMemory.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
@ -18,6 +18,8 @@
 #ifndef INCLUDED_SHAREDMEMORY
 #define INCLUDED_SHAREDMEMORY

+#include <cstddef>
+
 // we want to use placement new without grief
 // (Duplicated in Shareable.h)
 #undef new
--- a/source/tools/atlas/GameInterface/SimState.cpp
+++ b/source/tools/atlas/GameInterface/SimState.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2010 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
@ -29,7 +29,7 @@ SimState* SimState::Freeze()
 	if (! g_Game->GetSimulation2()->SerializeState(simState->stream))
 	{
 		delete simState;
-		return NULL;
+		return nullptr;
 	}

 	return simState;
--- a/source/tools/atlas/GameInterface/View.cpp
+++ b/source/tools/atlas/GameInterface/View.cpp
@ -19,35 +19,36 @@

 #include "View.h"

-#include "ActorViewer.h"
-#include "GameLoop.h"
-#include "Messages.h"
-#include "SimState.h"
-
 #include "graphics/Canvas2D.h"
 #include "graphics/CinemaManager.h"
+#include "graphics/Color.h"
 #include "graphics/GameView.h"
-#include "graphics/ParticleManager.h"
-#include "graphics/UnitManager.h"
-#include "lib/timer.h"
+#include "lib/debug.h"
 #include "lib/utf8.h"
 #include "maths/MathUtil.h"
+#include "maths/Matrix3D.h"
 #include "maths/Vector2D.h"
+#include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 #include "ps/Game.h"
-#include "ps/GameSetup/GameSetup.h"
 #include "ps/VideoMode.h"
-#include "ps/World.h"
-#include "renderer/backend/IDevice.h"
 #include "renderer/DebugRenderer.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
-#include "simulation2/components/ICmpObstructionManager.h"
+#include "renderer/backend/IDevice.h"
+#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpParticleManager.h"
 #include "simulation2/components/ICmpPathfinder.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/system/Component.h"
 #include "soundmanager/ISoundManager.h"
+#include "tools/atlas/GameInterface/ActorViewer.h"
+#include "tools/atlas/GameInterface/GameLoop.h"
+#include "tools/atlas/GameInterface/Messages.h"
+#include "tools/atlas/GameInterface/SimState.h"
+
+#include <sstream>
+#include <utility>
+#include <vector>

 extern void (*Atlas_GLSwapBuffers)(void* context);

--- a/source/tools/atlas/GameInterface/View.h
+++ b/source/tools/atlas/GameInterface/View.h
@ -18,20 +18,20 @@
 #ifndef INCLUDED_VIEW
 #define INCLUDED_VIEW

-#include <map>
-
 #include "graphics/Camera.h"
 #include "maths/Rect.h"
-
-#include "Messages.h"
+#include "maths/Vector3D.h"
 #include "simulation2/system/Entity.h"
+#include "tools/atlas/GameInterface/SharedTypes.h"

-class CCanvas2D;
-class CUnit;
-class CSimulation2;
+#include <cstddef>
+#include <map>
+#include <string>

-class AtlasViewGame;
 class AtlasViewActor;
+class AtlasViewGame;
+class CCanvas2D;
+class CSimulation2;

 /**
 * Superclass for all Atlas game views.