From fa9584fdc0d3db89fea3add85ff60c802eb41931 Mon Sep 17 00:00:00 2001
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Date: Thu, 11 Jun 2026 17:54:24 +0200
Subject: [PATCH] Fix some Atlas header includes

iwyu 0.26 now want's full declaration of TYPE in case of
std::vector<TYPE>, which is good as it allows the header to be
self standing.

There are some other changes suggested in part of the headers not being
updated when they should have been and some due to changes in iwyu
itself.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
 source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp          | 6 ++++--
 source/tools/atlas/AtlasObject/AtlasObjectImpl.h            | 3 ++-
 .../CustomControls/EditableListCtrl/EditableListCtrl.h      | 3 +--
 .../EditableListCtrl/EditableListCtrlCommands.h             | 1 -
 .../AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.h | 1 -
 .../CustomControls/MapResizeDialog/MapResizeDialog.cpp      | 3 +--
 .../atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h      | 1 -
 .../atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp    | 5 ++---
 .../atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h      | 2 --
 source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h     | 1 -
 .../tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp   | 3 +--
 .../ScenarioEditor/Sections/Environment/Environment.cpp     | 2 --
 .../ScenarioEditor/Sections/Environment/LightControl.cpp    | 1 -
 .../tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp | 1 -
 .../atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp | 3 +--
 .../ScenarioEditor/Sections/Object/VariationControl.cpp     | 1 -
 .../atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp | 2 +-
 .../atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h   | 1 -
 .../AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp     | 2 +-
 .../atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp  | 1 -
 .../AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp  | 3 +--
 .../atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp     | 3 +--
 .../atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp     | 1 -
 .../atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp      | 2 --
 .../atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp  | 1 -
 source/tools/atlas/GameInterface/ActorViewer.cpp            | 1 -
 .../atlas/GameInterface/Handlers/EnvironmentHandlers.cpp    | 1 -
 .../atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp  | 4 ++--
 source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp   | 1 +
 source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp  | 1 -
 source/tools/atlas/GameInterface/View.cpp                   | 1 -
 31 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp b/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp
index 8f6965e03d..d9db34c22f 100644
--- a/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp
+++ b/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2026 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 @@
 #include "AtlasObject.h"
 #include "AtlasObjectImpl.h"
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <iterator>
 #include <sstream>
 
 #define ATSMARTPTR_IMPL(T) \
diff --git a/source/tools/atlas/AtlasObject/AtlasObjectImpl.h b/source/tools/atlas/AtlasObject/AtlasObjectImpl.h
index dd93fb4aba..f846091456 100644
--- a/source/tools/atlas/AtlasObject/AtlasObjectImpl.h
+++ b/source/tools/atlas/AtlasObject/AtlasObjectImpl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2026 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 @@
 #include "AtlasObject.h"
 
 #include <string>
+#include <utility>
 
 #ifdef _MSC_VER
  // Avoid complaints about unreachable code; the optimiser is realising
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h
index 545b9bb1eb..86e11b0e6d 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_EDITABLELISTCTRL
 #define INCLUDED_EDITABLELISTCTRL
 
+#include "tools/atlas/AtlasObject/AtlasObject.h"
 #include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h"
 
 #include <vector>
@@ -27,8 +28,6 @@
 #include <wx/toolbar.h>
 #include <wx/validate.h>
 
-class AtIter;
-class AtObj;
 class FieldEditCtrl;
 class wxPoint;
 class wxRect;
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
index 3e52efccf5..9bc71bcfa3 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
@@ -23,7 +23,6 @@
 #include <wx/string.h>
 
 class EditableListCtrl;
-class wxClassInfo;
 
 class EditCommand_Dialog : public AtlasWindowCommand
 {
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.h
index 68456148b3..041d3c27d0 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.h
@@ -20,7 +20,6 @@
 #include <wx/validate.h>
 
 class wxButton;
-class wxClassInfo;
 class wxRect;
 class wxString;
 class wxTextCtrl;
diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
index 28afc50f3f..72aa7f9516 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include "tools/atlas/GameInterface/Messages.h"
 #include "tools/atlas/GameInterface/Shareable.h"
 
-#include <string>
 #include <wx/button.h>
 #include <wx/clntdata.h>
 #include <wx/gdicmn.h>
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
index eceb2a55b6..6115dbedec 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
@@ -25,7 +25,6 @@
 #include <wx/event.h>
 #include <wx/object.h>
 
-class wxClassInfo;
 class wxPanel;
 class wxSize;
 class wxString;
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
index c9ce2756a4..c1bee79115 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,12 +25,11 @@
 #include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h"
 #include "tools/atlas/AtlasUI/General/Datafile.h"
 
-#include <boost/signals2/optional_last_value.hpp>
 #include <cassert>
-#include <list>
 #include <string>
 #include <wx/artprov.h>
 #include <wx/bitmap.h>
+#include <wx/bmpbndl.h>
 #include <wx/button.h>
 #include <wx/chartype.h>
 #include <wx/config.h>
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
index dd0cafa46a..790e761d0a 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
@@ -22,7 +22,6 @@
 #include "tools/atlas/AtlasUI/General/AtlasWindowCommandProc.h"
 #include "tools/atlas/AtlasUI/General/IAtlasSerialiser.h"
 
-#include <boost/function.hpp>
 #include <boost/signals2/signal.hpp>
 #include <wx/event.h>
 #include <wx/filename.h>
@@ -30,7 +29,6 @@
 #include <wx/object.h>
 #include <wx/string.h>
 
-class wxClassInfo;
 class wxMenu;
 class wxMenuBar;
 class wxMenuItem;
diff --git a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
index 971499c082..d6c799d650 100644
--- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
+++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
@@ -26,7 +26,6 @@
 #include <wx/string.h>
 
 class IAtlasSerialiser;
-class wxClassInfo;
 
 class AtlasWindowCommand : public wxCommand
 {
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
index 785bbdf3ca..02133d5df3 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -40,7 +40,6 @@
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
 #include <cstddef>
-#include <list>
 #include <string>
 #include <utility>
 #include <wx/busyinfo.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
index ea9e021f6c..33205092d6 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
@@ -29,9 +29,7 @@
 #include "tools/atlas/GameInterface/Shareable.h"
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
-#include <cmath>
 #include <cstddef>
-#include <list>
 #include <numbers>
 #include <string>
 #include <vector>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp
index cc8bc88b2f..9af1ee4e2c 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <list>
 #include <wx/bitmap.h>
 #include <wx/control.h>
 #include <wx/dcclient.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
index 7485ff1336..d7227ac29b 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
@@ -33,7 +33,6 @@
 #include <algorithm>
 #include <cstdint>
 #include <ctime>
-#include <list>
 #include <map>
 #include <random>
 #include <set>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
index dc5588826b..679d895737 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -35,7 +35,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <list>
 #include <string>
 #include <vector>
 #include <wx/arrstr.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.cpp
index fde60bb438..eff3a98671 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/VariationControl.cpp
@@ -23,7 +23,6 @@
 #include "tools/atlas/AtlasUI/General/Observable.h"
 
 #include <cstddef>
-#include <list>
 #include <set>
 #include <wx/arrstr.h>
 #include <wx/combobox.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
index 6787c66bfa..e5409f52ed 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
@@ -31,7 +31,7 @@
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
 #include <climits>
-#include <list>
+#include <cstddef>
 #include <string>
 #include <vector>
 #include <wx/arrstr.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h
index e874a0303b..a9d1026271 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h
@@ -18,7 +18,6 @@
 #include "tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h"
 #include "tools/atlas/GameInterface/SharedMemory.h"
 
-#include <cstdlib>
 #include <wx/dynarray.h>
 #include <wx/event.h>
 #include <wx/string.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
index a182e245e3..7b99397589 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
@@ -34,13 +34,13 @@
 #include <chrono>
 #include <cstdlib>
 #include <cstring>
-#include <list>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 #include <wx/arrstr.h>
 #include <wx/bitmap.h>
+#include <wx/bmpbndl.h>
 #include <wx/bmpbuttn.h>
 #include <wx/bookctrl.h>
 #include <wx/busyinfo.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
index 279838132b..5c43a82aa1 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
@@ -28,7 +28,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <list>
 #include <numbers>
 #include <vector>
 #include <wx/event.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp
index 55f5595217..6f9c6612d8 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
 #include <cstddef>
-#include <list>
 #include <string>
 
 ObjectSettings::ObjectSettings(Observable<std::vector<AtlasMessage::ObjectID> >& selectedObjects, int view)
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
index fc4f37a7eb..9755ce9c78 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include "tools/atlas/GameInterface/MessagePasser.h"
 #include "tools/atlas/GameInterface/Messages.h"
 
-#include <list>
 #include <vector>
 #include <wx/object.h>
 #include <wx/string.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
index 1e0181ef3b..85c0de873d 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
@@ -28,7 +28,6 @@
 #include "tools/atlas/GameInterface/Shareable.h"
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
-#include <list>
 #include <string>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
index 066188b041..cd7fe05d59 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
@@ -25,9 +25,7 @@
 #include "tools/atlas/GameInterface/Messages.h"
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
-#include <cmath>
 #include <ctime>
-#include <list>
 #include <numbers>
 #include <random>
 #include <string>
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
index 028b110c6b..faba3dd607 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
@@ -31,7 +31,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <limits>
-#include <list>
 #include <string>
 #include <vector>
 #include <wx/chartype.h>
diff --git a/source/tools/atlas/GameInterface/ActorViewer.cpp b/source/tools/atlas/GameInterface/ActorViewer.cpp
index eced3819b9..7882172ff3 100644
--- a/source/tools/atlas/GameInterface/ActorViewer.cpp
+++ b/source/tools/atlas/GameInterface/ActorViewer.cpp
@@ -57,7 +57,6 @@
 #include "renderer/SceneRenderer.h"
 #include "renderer/SkyManager.h"
 #include "renderer/WaterManager.h"
-#include "renderer/backend/IDevice.h"
 #include "renderer/backend/IDeviceCommandContext.h"
 #include "renderer/backend/IFramebuffer.h"
 #include "renderer/backend/ISwapChain.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
index 115f87a107..2ca2b6241a 100644
--- a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
@@ -41,7 +41,6 @@
 #include "tools/atlas/GameInterface/Shareable.h"
 #include "tools/atlas/GameInterface/SharedTypes.h"
 
-#include <cmath>
 #include <numbers>
 #include <string>
 #include <vector>
diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
index fb2c9b67c2..c369b49cb6 100644
--- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@@ -21,7 +21,6 @@
 
 #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"
@@ -34,7 +33,7 @@
 #include "ps/VideoMode.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
-#include "renderer/backend/IDevice.h"
+#include "scriptinterface/ScriptForward.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "tools/atlas/GameInterface/ActorViewer.h"
 #include "tools/atlas/GameInterface/CommandProc.h"
@@ -47,6 +46,7 @@
 
 #include <SDL.h>
 #include <SDL_error.h>
+#include <SDL_events.h>
 #include <SDL_video.h>
 #include <memory>
 #include <optional>
diff --git a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
index d5c1ba46b9..539101eff8 100644
--- a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
@@ -74,6 +74,7 @@
 #include <cstdint>
 #include <exception>
 #include <iterator>
+#include <js/Array.h>
 #include <js/RootingAPI.h>
 #include <js/TypeDecls.h>
 #include <js/Value.h>
diff --git a/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
index ef9fe0e6d5..f042936fc7 100644
--- a/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
@@ -20,7 +20,6 @@
 #include "MessageHandler.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"
diff --git a/source/tools/atlas/GameInterface/View.cpp b/source/tools/atlas/GameInterface/View.cpp
index 3b4b4ecb75..03c6478520 100644
--- a/source/tools/atlas/GameInterface/View.cpp
+++ b/source/tools/atlas/GameInterface/View.cpp
@@ -36,7 +36,6 @@
 #include "renderer/DebugRenderer.h"
 #include "renderer/Renderer.h"
 #include "renderer/SceneRenderer.h"
-#include "renderer/backend/IDevice.h"
 #include "renderer/backend/ISwapChain.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpParticleManager.h"