From ce5ee288ff65f4d9bab4cb376548df9571166340 Mon Sep 17 00:00:00 2001
From: maj00r <maj00r@host>
Date: Wed, 9 Sep 2026 22:52:28 +0200
Subject: [PATCH] fix the clang CI build

Every module unit now includes the standard headers it uses. Declarations
reaching a unit only through an imported module's global module fragment
are reachable but not visible, so ADL misses the free operators older
libstdc++ declares beside a type - reproduced on ubuntu 24.04 (libstdc++
13), where gl/vao.cpp could not compare vector iterators.

Also drops a stale editor/editorSettings.hpp from the MSVC source list,
which broke the Windows configure step, silences the deliberate
include-in-purview warning in the glm wrapper, and removes GCC support:
clang or MSVC only.
---
 CMakeLists.txt                            | 30 ++++++++---------------
 Console.cpp                               |  1 +
 Console/LPT.cpp                           |  1 +
 Console/PoKeys55.cpp                      |  1 +
 McZapkie/MOVER.cppm                       |  1 +
 McZapkie/Mover.cpp                        |  2 ++
 McZapkie/Oerlikon_ESt.cpp                 |  1 +
 McZapkie/Oerlikon_ESt.cppm                |  1 +
 application/application.cpp               | 10 ++++++++
 application/application.cppm              |  2 ++
 application/applicationmode.cppm          |  1 +
 application/drivermode.cpp                |  1 +
 application/driveruipanels.cpp            |  3 +++
 application/driveruipanels.cppm           |  2 ++
 application/editormode.cpp                |  3 +++
 application/editormode.cppm               |  2 ++
 application/editoruipanels.cpp            |  1 +
 application/editoruipanels.cppm           |  2 ++
 application/scenarioloadermode.cpp        |  1 +
 application/scenarioloaderuilayer.cpp     |  4 +++
 application/uilayer.cpp                   |  4 +++
 application/uitranscripts.cpp             |  1 +
 audio/audio.cpp                           |  4 +++
 audio/sound.cpp                           |  7 ++++++
 audio/sound.cppm                          |  3 +++
 editor/editorSettings.cpp                 |  2 ++
 editor/editorTerrain.cpp                  |  2 ++
 editor/editorTerrain.cppm                 |  1 +
 editor/editorTerrainStreamer.cpp          |  5 ++++
 editor/editorTerrainStreamer.cppm         |  2 ++
 environment/skydome.cpp                   |  1 +
 gl/postfx.cpp                             |  1 +
 gl/postfx.cppm                            |  1 +
 gl/query.cpp                              |  1 +
 gl/shader.cpp                             |  3 +++
 gl/shader.cppm                            |  1 +
 gl/vao.cpp                                |  1 +
 global_include/interfaces/ITexture.cppm   |  1 +
 input/command.cpp                         |  6 +++++
 input/command.cppm                        |  3 +++
 input/drivermouseinput.cpp                |  1 +
 input/drivermouseinput.cppm               |  1 +
 input/editormouseinput.cpp                |  1 +
 input/gamepadinput.cpp                    |  4 +++
 input/gamepadinput.cppm                   |  2 ++
 input/keyboardinput.cpp                   |  2 ++
 input/keyboardinput.cppm                  |  1 +
 input/zmq_input.cpp                       |  4 +++
 launcher/keymapper.cpp                    |  1 +
 launcher/scenery_list.cpp                 |  4 +++
 launcher/scenery_scanner.cpp              |  5 ++++
 launcher/scenery_scanner.cppm             |  3 +++
 launcher/textures_scanner.cpp             |  6 +++++
 launcher/textures_scanner.cppm            |  1 +
 launcher/vehicle_picker.cpp               |  3 +++
 model/AnimModel.cpp                       |  4 +++
 model/AnimModel.cppm                      |  4 +++
 model/MdlMngr.cpp                         |  2 ++
 model/Model3d.cpp                         |  7 ++++++
 model/Model3d.cppm                        |  6 +++++
 model/ResourceManager.cpp                 |  5 ++++
 model/ResourceManager.cppm                |  1 +
 model/Texture.cpp                         |  3 +++
 model/Texture.cppm                        |  4 +++
 model/material.cpp                        |  3 +++
 model/material.cppm                       |  4 +++
 network/backend/asio.cppm                 |  3 +++
 network/manager.cpp                       |  4 +++
 network/manager.cppm                      |  2 ++
 network/message.cpp                       |  3 +++
 network/network.cpp                       |  5 ++++
 network/network.cppm                      |  4 +++
 rendering/frustum.cpp                     |  2 ++
 rendering/frustum.cppm                    |  1 +
 rendering/geometrybank.cpp                |  3 +++
 rendering/lightarray.cpp                  |  1 +
 rendering/nullrenderer.cpp                |  6 +++++
 rendering/nullrenderer.cppm               |  2 ++
 rendering/opengl33geometrybank.cpp        |  2 ++
 rendering/opengl33particles.cpp           |  2 ++
 rendering/opengl33particles.cppm          |  2 ++
 rendering/opengl33precipitation.cpp       |  2 ++
 rendering/opengl33renderer.cpp            |  2 ++
 rendering/opengl33skydome.cpp             |  2 ++
 rendering/openglcamera.cpp                |  1 +
 rendering/openglmatrixstack.cpp           |  3 +++
 rendering/openglmatrixstack.cppm          |  1 +
 rendering/openglparticles.cpp             |  1 +
 rendering/openglparticles.cppm            |  1 +
 rendering/openglrenderer.cpp              |  1 +
 rendering/openglskydome.cpp               |  1 +
 rendering/particles.cpp                   |  3 +++
 rendering/renderer.cpp                    |  4 +++
 rendering/screenshot.cpp                  |  1 +
 scene/scene.cpp                           |  7 ++++++
 scene/scene.cppm                          |  6 +++++
 scene/sceneeditor.cpp                     |  1 +
 scene/scenenode.cpp                       |  1 +
 scene/scenenode.cppm                      |  2 ++
 scene/scenenodegroups.cpp                 |  2 ++
 scene/sn_utils.cpp                        |  2 ++
 scene/sn_utils.cppm                       |  2 ++
 scripting/PyInt.cpp                       |  6 +++++
 scripting/PyInt.cppm                      |  4 +++
 scripting/ladderlogic.cpp                 |  2 ++
 scripting/pythonscreenviewer.cpp          |  3 +++
 scripting/pythonscreenviewer.cppm         |  1 +
 simulation/simulationsounds.cpp           |  2 ++
 simulation/simulationstateserializer.cpp  |  4 +++
 simulation/simulationstateserializer.cppm |  2 ++
 simulation/simulationtime.cpp             |  1 +
 utilities/Globals.cpp                     | 10 ++++++++
 utilities/Globals.cppm                    |  7 ++++++
 utilities/Logs.cpp                        |  5 ++++
 utilities/Names.cppm                      |  1 +
 utilities/Timer.cpp                       |  1 +
 utilities/crashreporter.cpp               |  4 +++
 utilities/dictionary.cpp                  |  2 ++
 utilities/dictionary.cppm                 |  1 +
 utilities/glm_module.cppm                 |  9 +++++++
 utilities/motiontelemetry.cpp             |  1 +
 utilities/parser.cpp                      |  5 ++++
 utilities/parser.cppm                     |  2 ++
 utilities/translation.cpp                 |  2 ++
 utilities/translation.cppm                |  1 +
 utilities/uart.cpp                        |  2 ++
 utilities/uart.cppm                       |  4 +++
 utilities/utilities.cpp                   | 12 +++++++++
 utilities/utilities.cppm                  |  7 ++++++
 vehicle/Button.cpp                        |  1 +
 vehicle/Driver.cpp                        |  6 +++++
 vehicle/Driver.cppm                       |  5 ++++
 vehicle/DynObj.cpp                        |  8 ++++++
 vehicle/DynObj.cppm                       |  4 +++
 vehicle/Gauge.cppm                        |  1 +
 vehicle/Train.cpp                         |  4 +++
 vehicle/Train.cppm                        |  2 ++
 vr/openvr_imp.cpp                         |  3 +++
 vr/vr_interface.cpp                       |  2 ++
 widgets/cameraview_extcam.cpp             |  5 ++++
 widgets/cameraview_extcam.cppm            |  1 +
 widgets/map.cpp                           |  1 +
 widgets/map.cppm                          |  2 ++
 widgets/map_objects.cpp                   |  4 +++
 widgets/perfgraphs.cpp                    |  2 ++
 widgets/perfgraphs.cppm                   |  1 +
 widgets/trainingcard.cpp                  |  3 +++
 widgets/trainingcard.cppm                 |  1 +
 world/EvLaunch.cppm                       |  2 ++
 world/Event.cpp                           |  6 +++++
 world/Event.cppm                          |  6 +++++
 world/Segment.cpp                         |  1 +
 world/Segment.cppm                        |  2 ++
 world/Track.cpp                           |  3 +++
 world/Track.cppm                          |  3 +++
 world/Traction.cppm                       |  3 +++
 world/TractionPower.cpp                   |  1 +
 world/TrkFoll.cpp                         |  1 +
 world/mtable.cpp                          |  1 +
 159 files changed, 456 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e984853..e8155f4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,16 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake_modules/")
 set(DEPS_DIR ${DEPS_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/ref")
 project("eu07")
 
+# Clang is the only compiler this project is built and tested with on Linux
+# (Clang 22 in CI); MSVC covers Windows. GCC is not supported: its lazy loading
+# of module interfaces is broken here, and working around it costs roughly twice
+# the memory per compiler process.
+if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang|MSVC")
+	message(FATAL_ERROR
+		"Unsupported compiler: ${CMAKE_CXX_COMPILER_ID}. "
+		"Build with Clang (CI uses 22) or MSVC.")
+endif()
+
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined -Wformat")
 #set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -fsanitize=address -fsanitize=undefined")
@@ -428,8 +438,6 @@ configure_file(${CMAKE_SOURCE_DIR}/eu07.rc.in
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     set(SOURCES ${SOURCES} ${CMAKE_BINARY_DIR}/eu07.rc)
     set(SOURCES ${SOURCES} eu07.ico)
-    set(SOURCES ${SOURCES} eu07.ico
-			editor/editorSettings.hpp)
     add_compile_options("/utf-8")
 endif()
 
@@ -483,24 +491,6 @@ target_sources(${PROJECT_NAME}
 
 set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
 
-# Clang is the compiler this project is built and tested with (Clang 22 in CI);
-# it needs none of the workarounds below. GCC 16 still builds the tree, but only
-# with eager module loading: its lazy loading is broken here, reading
-# eu07.simcore:dynobj gives "Bad file data" and eu07.glm gives "recursive lazy
-# load" / "failed to load pendings for glm::vec". Eager loading costs roughly
-# twice the memory per compiler process. Drop this and the job pool below once
-# the compiler bug is fixed.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-	target_compile_options(${PROJECT_NAME} PRIVATE -fno-module-lazy)
-
-	# Eager loading makes each compiler process hold ~1 GB, so a plain -j16 needs
-	# far more RAM than most machines have. This pool caps how many compilations
-	# run at once no matter what -j the caller passes; raise it if you have memory
-	# to spare. Ninja only.
-	set(MODULE_COMPILE_JOBS "6" CACHE STRING "Concurrent compiles (bounds peak RAM; see -fno-module-lazy above)")
-	set_property(GLOBAL APPEND PROPERTY JOB_POOLS module_compile=${MODULE_COMPILE_JOBS})
-	set_property(TARGET ${PROJECT_NAME} PROPERTY JOB_POOL_COMPILE module_compile)
-endif()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINITIONS})
 
diff --git a/Console.cpp b/Console.cpp
index 9fe717c1..542c7195 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/utilities_macros.h"
 
diff --git a/Console/LPT.cpp b/Console/LPT.cpp
index f2fccf0f..441fcaa7 100644
--- a/Console/LPT.cpp
+++ b/Console/LPT.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 
 module eu07.console.lpt;
 /*
diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp
index 4263cecb..94c1618f 100644
--- a/Console/PoKeys55.cpp
+++ b/Console/PoKeys55.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <setupapi.h>
 #include "utilities/utilities_macros.h"
 
diff --git a/McZapkie/MOVER.cppm b/McZapkie/MOVER.cppm
index b92621b2..3254a692 100644
--- a/McZapkie/MOVER.cppm
+++ b/McZapkie/MOVER.cppm
@@ -76,6 +76,7 @@ zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona
 
 /// <summary>Global counter incremented when a string-to-numeric conversion fails during config parsing.</summary>
 module;
+#include <utility>
 #include "McZapkie/MOVER_macros.h"
 #include <map>
 #include <cmath>
diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index 2ccfd2b3..e261496a 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -1,4 +1,6 @@
 module;
+#include <array>
+#include <fstream>
 #include <memory>
 #include <cassert>
 #include <typeinfo>
diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp
index 26438a9c..1def057c 100644
--- a/McZapkie/Oerlikon_ESt.cpp
+++ b/McZapkie/Oerlikon_ESt.cpp
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <memory>
 #include <typeinfo>
 #include <algorithm>
diff --git a/McZapkie/Oerlikon_ESt.cppm b/McZapkie/Oerlikon_ESt.cppm
index 43537f2d..ad1c9006 100644
--- a/McZapkie/Oerlikon_ESt.cppm
+++ b/McZapkie/Oerlikon_ESt.cppm
@@ -39,6 +39,7 @@ Co brakuje:
 - PZZ dla dodatkowego
 */
 module;
+#include <string>
 #include <array>
 #include <memory>
 
diff --git a/application/application.cpp b/application/application.cpp
index b029c3cd..362d9416 100644
--- a/application/application.cpp
+++ b/application/application.cpp
@@ -1,4 +1,14 @@
 module;
+#include <array>
+#include <cstddef>
+#include <ios>
+#include <memory>
+#include <optional>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <utility>
+#include <vector>
 #include <filesystem>
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
diff --git a/application/application.cppm b/application/application.cppm
index d90f43a0..3a4b56d2 100644
--- a/application/application.cppm
+++ b/application/application.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <cstddef>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/application/applicationmode.cppm b/application/applicationmode.cppm
index 63f0b22e..e9d6f6b0 100644
--- a/application/applicationmode.cppm
+++ b/application/applicationmode.cppm
@@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/.
 // component implementing specific mode of application behaviour
 // base interface
 module;
+#include <string>
 #include <memory>
 
 export module eu07.application.applicationmode;
diff --git a/application/drivermode.cpp b/application/drivermode.cpp
index df5660e7..01b1d99a 100644
--- a/application/drivermode.cpp
+++ b/application/drivermode.cpp
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <GLFW/glfw3.h>
 #include <algorithm>
 #include <cmath>
diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp
index 90a85f97..f6f7b106 100644
--- a/application/driveruipanels.cpp
+++ b/application/driveruipanels.cpp
@@ -1,4 +1,7 @@
 module;
+#include <array>
+#include <cstddef>
+#include <utility>
 #include <GLFW/glfw3.h>
 #include <algorithm>
 #include <cmath>
diff --git a/application/driveruipanels.cppm b/application/driveruipanels.cppm
index d71f74ce..ffdcfe00 100644
--- a/application/driveruipanels.cppm
+++ b/application/driveruipanels.cppm
@@ -1,4 +1,6 @@
 module;
+#include <array>
+#include <limits>
 #include <string>
 #include <vector>
 
diff --git a/application/editormode.cpp b/application/editormode.cpp
index e1bdfdeb..6bf725d3 100644
--- a/application/editormode.cpp
+++ b/application/editormode.cpp
@@ -1,4 +1,7 @@
 module;
+#include <cstddef>
+#include <map>
+#include <utility>
 #include <GLFW/glfw3.h>
 #include <algorithm>
 #include <memory>
diff --git a/application/editormode.cppm b/application/editormode.cppm
index 67c23e7e..7dacee94 100644
--- a/application/editormode.cppm
+++ b/application/editormode.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <string>
+#include <utility>
 #include <map>
 #include <vector>
 #include <memory>
diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp
index ca76338f..7b536d3a 100644
--- a/application/editoruipanels.cpp
+++ b/application/editoruipanels.cpp
@@ -1,4 +1,5 @@
 module;
+#include <functional>
 #include <memory>
 #include <random>
 #include <algorithm>
diff --git a/application/editoruipanels.cppm b/application/editoruipanels.cppm
index a166d42f..0224619d 100644
--- a/application/editoruipanels.cppm
+++ b/application/editoruipanels.cppm
@@ -1,4 +1,6 @@
 module;
+#include <string>
+#include <utility>
 #include "global_include/interfaces/ITexture_macros.h"
 #include <memory>
 #include <vector>
diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp
index 82c5c1a5..8e26bb97 100644
--- a/application/scenarioloadermode.cpp
+++ b/application/scenarioloadermode.cpp
@@ -1,4 +1,5 @@
 module;
+#include <memory>
 #include <GLFW/glfw3.h>
 #include <chrono>
 #include <string>
diff --git a/application/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp
index 8503178e..0e74ba25 100644
--- a/application/scenarioloaderuilayer.cpp
+++ b/application/scenarioloaderuilayer.cpp
@@ -1,4 +1,8 @@
 module;
+#include <fstream>
+#include <ios>
+#include <string>
+#include <vector>
 #include "glad/glad.h"
 #include "imgui/imgui.h"
 #include "utilities/Globals_macros.h"
diff --git a/application/uilayer.cpp b/application/uilayer.cpp
index 76696278..ce185971 100644
--- a/application/uilayer.cpp
+++ b/application/uilayer.cpp
@@ -1,4 +1,8 @@
 module;
+#include <deque>
+#include <iterator>
+#include <list>
+#include <vector>
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #include <memory>
diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp
index 297a59ef..5fe77abe 100644
--- a/application/uitranscripts.cpp
+++ b/application/uitranscripts.cpp
@@ -1,4 +1,5 @@
 module;
+#include <deque>
 #include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/utilities_macros.h"
diff --git a/audio/audio.cpp b/audio/audio.cpp
index fe026d8e..68274b3c 100644
--- a/audio/audio.cpp
+++ b/audio/audio.cpp
@@ -1,4 +1,8 @@
 module;
+#include <cstddef>
+#include <stdexcept>
+#include <unordered_map>
+#include <vector>
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <cmath>
diff --git a/audio/sound.cpp b/audio/sound.cpp
index 141d500f..b895c8e3 100644
--- a/audio/sound.cpp
+++ b/audio/sound.cpp
@@ -1,4 +1,11 @@
 module;
+#include <utility>
+#include <atomic>
+#include <cstddef>
+#include <list>
+#include <optional>
+#include <ostream>
+#include <stack>
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <cmath>
diff --git a/audio/sound.cppm b/audio/sound.cppm
index 357dc586..ba115a18 100644
--- a/audio/sound.cppm
+++ b/audio/sound.cppm
@@ -1,4 +1,7 @@
 module;
+#include <array>
+#include <ostream>
+#include <utility>
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <AL/alext.h>
diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp
index 07f1c3e9..733a6f10 100644
--- a/editor/editorSettings.cpp
+++ b/editor/editorSettings.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ios>
+#include <string>
 #include "utilities/utilities_macros.h"
 #include <cstdlib>
 #include <filesystem>
diff --git a/editor/editorTerrain.cpp b/editor/editorTerrain.cpp
index 99abdaa6..82efebdd 100644
--- a/editor/editorTerrain.cpp
+++ b/editor/editorTerrain.cpp
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <functional>
 #include <string>
 #include <vector>
 #include "global_include/interfaces/ITexture_macros.h"
diff --git a/editor/editorTerrain.cppm b/editor/editorTerrain.cppm
index 98f9d37f..d62fc5d1 100644
--- a/editor/editorTerrain.cppm
+++ b/editor/editorTerrain.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
 #include <vector>
 #include <string>
 #include <functional>
diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp
index daf01ec4..bf9421cd 100644
--- a/editor/editorTerrainStreamer.cpp
+++ b/editor/editorTerrainStreamer.cpp
@@ -1,4 +1,9 @@
 module;
+#include <utility>
+#include <cstddef>
+#include <ios>
+#include <map>
+#include <memory>
 #include <vector>
 #include <algorithm>
 #include <cmath>
diff --git a/editor/editorTerrainStreamer.cppm b/editor/editorTerrainStreamer.cppm
index 5c554276..caa6be00 100644
--- a/editor/editorTerrainStreamer.cppm
+++ b/editor/editorTerrainStreamer.cppm
@@ -17,6 +17,8 @@ http://mozilla.org/MPL/2.0/.
 // geometry GC reclaims their GPU memory). Heights are flat + a gentle procedural roll so streaming
 // is observable. Phase 2 will add 16-bit on-disk chunk paging, per-chunk flag bits and persistence.
 module;
+#include <cstddef>
+#include <utility>
 #include <cstdint>
 #include <map>
 #include <memory>
diff --git a/environment/skydome.cpp b/environment/skydome.cpp
index c54bdc25..8bba366a 100644
--- a/environment/skydome.cpp
+++ b/environment/skydome.cpp
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
diff --git a/gl/postfx.cpp b/gl/postfx.cpp
index 44769ef2..7cc0e7ba 100644
--- a/gl/postfx.cpp
+++ b/gl/postfx.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include "glad/glad.h"
 #include <vector>
 #include <memory>
diff --git a/gl/postfx.cppm b/gl/postfx.cppm
index f2f65120..375ef05d 100644
--- a/gl/postfx.cppm
+++ b/gl/postfx.cppm
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <vector>
 #include <memory>
 
diff --git a/gl/query.cpp b/gl/query.cpp
index eb9991d6..2454d95d 100644
--- a/gl/query.cpp
+++ b/gl/query.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstdint>
 #include "glad/glad.h"
 #include <optional>
 #include "utilities/Globals_macros.h"
diff --git a/gl/shader.cpp b/gl/shader.cpp
index 561bd206..44329278 100644
--- a/gl/shader.cpp
+++ b/gl/shader.cpp
@@ -1,4 +1,7 @@
 module;
+#include <stdexcept>
+#include <string>
+#include <utility>
 #include "utilities/Globals_macros.h"
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/gl/shader.cppm b/gl/shader.cppm
index c4da6e03..41d8ca69 100644
--- a/gl/shader.cppm
+++ b/gl/shader.cppm
@@ -1,4 +1,5 @@
 module;
+#include <utility>
 #include "glad/glad.h"
 #include <stdexcept>
 #include <string>
diff --git a/gl/vao.cpp b/gl/vao.cpp
index 5f3b2a4a..28da5442 100644
--- a/gl/vao.cpp
+++ b/gl/vao.cpp
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 #include "glad/glad.h"
 #include <cstddef>
 
diff --git a/global_include/interfaces/ITexture.cppm b/global_include/interfaces/ITexture.cppm
index 328c24b5..30248bef 100644
--- a/global_include/interfaces/ITexture.cppm
+++ b/global_include/interfaces/ITexture.cppm
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include "global_include/interfaces/ITexture_macros.h"
 #include <cstddef>
 #include <cstdint>
diff --git a/input/command.cpp b/input/command.cpp
index 82400adc..0f1fc676 100644
--- a/input/command.cpp
+++ b/input/command.cpp
@@ -1,4 +1,10 @@
 module;
+#include <deque>
+#include <vector>
+#include <cstddef>
+#include <queue>
+#include <unordered_set>
+#include <utility>
 #include <GLFW/glfw3.h>
 #include <cstdint>
 #include <string>
diff --git a/input/command.cppm b/input/command.cppm
index c8fc36dd..67f4bd3c 100644
--- a/input/command.cppm
+++ b/input/command.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
+#include <utility>
+#include <vector>
 #include <unordered_map>
 #include <queue>
 #include <unordered_set>
diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp
index 52658bad..cecb3801 100644
--- a/input/drivermouseinput.cpp
+++ b/input/drivermouseinput.cpp
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <filesystem>
 #include <GLFW/glfw3.h>
 #include <algorithm>
diff --git a/input/drivermouseinput.cppm b/input/drivermouseinput.cppm
index 05f2d56d..ef7aca02 100644
--- a/input/drivermouseinput.cppm
+++ b/input/drivermouseinput.cppm
@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
 
 // virtual slider; value determined by position of the mouse
 module;
+#include <utility>
 #include <unordered_map>
 #include <GLFW/glfw3.h>
 #include <string>
diff --git a/input/editormouseinput.cpp b/input/editormouseinput.cpp
index 8b17d1a8..c00df812 100644
--- a/input/editormouseinput.cpp
+++ b/input/editormouseinput.cpp
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <GLFW/glfw3.h>
 
 module eu07.input.editormouseinput;
diff --git a/input/gamepadinput.cpp b/input/gamepadinput.cpp
index 376709eb..fa1973dd 100644
--- a/input/gamepadinput.cpp
+++ b/input/gamepadinput.cpp
@@ -1,4 +1,8 @@
 module;
+#include <cstddef>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 #include <filesystem>
 #include <cmath>
 #include <cstdlib>
diff --git a/input/gamepadinput.cppm b/input/gamepadinput.cppm
index da322d54..0b2c9ed5 100644
--- a/input/gamepadinput.cppm
+++ b/input/gamepadinput.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <functional>
+#include <tuple>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/input/keyboardinput.cpp b/input/keyboardinput.cpp
index 5f69b8ed..b3e0da26 100644
--- a/input/keyboardinput.cpp
+++ b/input/keyboardinput.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ios>
+#include <map>
 #include <filesystem>
 #include <array>
 #include <cstddef>
diff --git a/input/keyboardinput.cppm b/input/keyboardinput.cppm
index 890c25c1..48f1b4f2 100644
--- a/input/keyboardinput.cppm
+++ b/input/keyboardinput.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <tuple>
 #include <unordered_map>
 #include <array>
 #include <GLFW/glfw3.h>
diff --git a/input/zmq_input.cpp b/input/zmq_input.cpp
index a0b2d2f5..ed026773 100644
--- a/input/zmq_input.cpp
+++ b/input/zmq_input.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <map>
+#include <optional>
+#include <vector>
 #include "utilities/Globals_macros.h"
 #include <cstddef>
 #include <sstream>
diff --git a/launcher/keymapper.cpp b/launcher/keymapper.cpp
index b03f23ad..1e7dab3c 100644
--- a/launcher/keymapper.cpp
+++ b/launcher/keymapper.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include "utilities/translation_macros.h"
 #include <string>
 #include <tuple>
diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp
index fc714036..8561feee 100644
--- a/launcher/scenery_list.cpp
+++ b/launcher/scenery_list.cpp
@@ -1,4 +1,8 @@
 module;
+#include <array>
+#include <cstddef>
+#include <memory>
+#include <string>
 #include "utilities/Globals_macros.h"
 #include <vector>
 #include "global_include/interfaces/ITexture_macros.h"
diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp
index 0dc63ffb..46fcc461 100644
--- a/launcher/scenery_scanner.cpp
+++ b/launcher/scenery_scanner.cpp
@@ -1,4 +1,9 @@
 module;
+#include <fstream>
+#include <ios>
+#include <map>
+#include <utility>
+#include <vector>
 #include <algorithm>
 #include <cstddef>
 #include <filesystem>
diff --git a/launcher/scenery_scanner.cppm b/launcher/scenery_scanner.cppm
index f5a9d036..be68b711 100644
--- a/launcher/scenery_scanner.cppm
+++ b/launcher/scenery_scanner.cppm
@@ -1,4 +1,7 @@
 module;
+#include <memory>
+#include <string>
+#include <utility>
 #include <map>
 #include <vector>
 #include <filesystem>
diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp
index ba8926e1..c52bf3c6 100644
--- a/launcher/textures_scanner.cpp
+++ b/launcher/textures_scanner.cpp
@@ -1,4 +1,10 @@
 module;
+#include <utility>
+#include <ios>
+#include <map>
+#include <set>
+#include <sstream>
+#include <vector>
 #include <algorithm>
 #include <unordered_map>
 #include <filesystem>
diff --git a/launcher/textures_scanner.cppm b/launcher/textures_scanner.cppm
index 4fb7c944..8fc8dca9 100644
--- a/launcher/textures_scanner.cppm
+++ b/launcher/textures_scanner.cppm
@@ -1,4 +1,5 @@
 module;
+#include <utility>
 #include <filesystem>
 #include <map>
 #include <memory>
diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp
index 2104e554..c6d62e95 100644
--- a/launcher/vehicle_picker.cpp
+++ b/launcher/vehicle_picker.cpp
@@ -1,4 +1,7 @@
 module;
+#include <array>
+#include <map>
+#include <sstream>
 #include "glad/glad.h"
 #include "imgui/imgui.h"
 #include <algorithm>
diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp
index 0501b53f..cd7b3bd4 100644
--- a/model/AnimModel.cpp
+++ b/model/AnimModel.cpp
@@ -1,4 +1,8 @@
 module;
+#include <array>
+#include <istream>
+#include <ostream>
+#include <tuple>
 #include <iomanip>
 #include <algorithm>
 #include <cmath>
diff --git a/model/AnimModel.cppm b/model/AnimModel.cppm
index 30d07751..20f4d7d5 100644
--- a/model/AnimModel.cppm
+++ b/model/AnimModel.cppm
@@ -12,6 +12,10 @@ http://mozilla.org/MPL/2.0/.
 
 */
 module;
+#include <array>
+#include <istream>
+#include <ostream>
+#include <tuple>
 #include <optional>
 #include <list>
 #include <string>
diff --git a/model/MdlMngr.cpp b/model/MdlMngr.cpp
index 61ffd708..c92dc965 100644
--- a/model/MdlMngr.cpp
+++ b/model/MdlMngr.cpp
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <memory>
 #include <typeinfo>
 #include <vector>
diff --git a/model/Model3d.cpp b/model/Model3d.cpp
index 01478ff7..69cd484f 100644
--- a/model/Model3d.cpp
+++ b/model/Model3d.cpp
@@ -1,4 +1,11 @@
 module;
+#include <fstream>
+#include <ios>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <ostream>
 #include "utilities/utilities_macros.h"
 #include <algorithm>
 #include <stdexcept>
diff --git a/model/Model3d.cppm b/model/Model3d.cppm
index 217bc431..9766e9d9 100644
--- a/model/Model3d.cppm
+++ b/model/Model3d.cppm
@@ -7,6 +7,12 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <istream>
+#include <ostream>
+#include <string>
+#include <tuple>
+#include <utility>
 #include "global_include/interfaces/ITexture_macros.h"
 #include <cstdint>
 #include <optional>
diff --git a/model/ResourceManager.cpp b/model/ResourceManager.cpp
index 51071bc2..1876db06 100644
--- a/model/ResourceManager.cpp
+++ b/model/ResourceManager.cpp
@@ -1,4 +1,9 @@
 module;
+#include <utility>
+#include <chrono>
+#include <cstddef>
+#include <sstream>
+#include <string>
 
 module eu07.model.resourcemanager;
 /*
diff --git a/model/ResourceManager.cppm b/model/ResourceManager.cppm
index ccaf5f97..a6fd2af0 100644
--- a/model/ResourceManager.cppm
+++ b/model/ResourceManager.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <utility>
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
diff --git a/model/Texture.cpp b/model/Texture.cpp
index 992be6f9..d1186a42 100644
--- a/model/Texture.cpp
+++ b/model/Texture.cpp
@@ -1,4 +1,7 @@
 module;
+#include <atomic>
+#include <cstddef>
+#include <cstdint>
 #include "glad/glad.h"
 #include <algorithm>
 #include <array>
diff --git a/model/Texture.cppm b/model/Texture.cppm
index 8491d82c..2bd1bb72 100644
--- a/model/Texture.cppm
+++ b/model/Texture.cppm
@@ -7,6 +7,10 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <atomic>
+#include <cstddef>
+#include <utility>
 #include "glad/glad.h"
 #include <istream>
 #include "winheaders.h"
diff --git a/model/material.cpp b/model/material.cpp
index ff8257e6..b7488bb8 100644
--- a/model/material.cpp
+++ b/model/material.cpp
@@ -1,4 +1,7 @@
 module;
+#include <array>
+#include <optional>
+#include <unordered_map>
 #include <vector>
 #include "glad/glad.h"
 #include <cmath>
diff --git a/model/material.cppm b/model/material.cppm
index 73ebc0ad..a54ab1dc 100644
--- a/model/material.cppm
+++ b/model/material.cppm
@@ -1,4 +1,8 @@
 module;
+#include <array>
+#include <cstddef>
+#include <string>
+#include <utility>
 #include "global_include/interfaces/ITexture_macros.h"
 #include <optional>
 #include <unordered_map>
diff --git a/network/backend/asio.cppm b/network/backend/asio.cppm
index 7f7790a9..e2490761 100644
--- a/network/backend/asio.cppm
+++ b/network/backend/asio.cppm
@@ -1,4 +1,7 @@
 module;
+#include <fstream>
+#include <ios>
+#include <istream>
 #define ASIO_DISABLE_VISIBILITY
 #include <asio.hpp>
 #include <cstdint>
diff --git a/network/manager.cpp b/network/manager.cpp
index 93973073..b9a4bfca 100644
--- a/network/manager.cpp
+++ b/network/manager.cpp
@@ -1,4 +1,8 @@
 module;
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <vector>
 #include <fstream>
 #include <ios>
 #include <string>
diff --git a/network/manager.cppm b/network/manager.cppm
index 67ec6504..9eaf855d 100644
--- a/network/manager.cppm
+++ b/network/manager.cppm
@@ -1,4 +1,6 @@
 module;
+#include <fstream>
+#include <string>
 #include <optional>
 #include <vector>
 #include <memory>
diff --git a/network/message.cpp b/network/message.cpp
index 93f25265..db3ceed3 100644
--- a/network/message.cpp
+++ b/network/message.cpp
@@ -1,4 +1,7 @@
 module;
+#include <istream>
+#include <queue>
+#include <string>
 #include <cstdint>
 #include <memory>
 #include <ostream>
diff --git a/network/network.cpp b/network/network.cpp
index a6bdcdf1..9eb802b2 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -1,4 +1,9 @@
 module;
+#include <unordered_map>
+#include <fstream>
+#include <istream>
+#include <optional>
+#include <queue>
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
diff --git a/network/network.cppm b/network/network.cppm
index 777ebc29..d0bac467 100644
--- a/network/network.cppm
+++ b/network/network.cppm
@@ -1,4 +1,8 @@
 module;
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 #include <memory>
 #include <istream>
 #include <fstream>
diff --git a/rendering/frustum.cpp b/rendering/frustum.cpp
index c6271827..de427fbd 100644
--- a/rendering/frustum.cpp
+++ b/rendering/frustum.cpp
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <vector>
 #include <cmath>
 #include "glad/glad.h"
 #include "rendering/openglmatrixstack_macros.h"
diff --git a/rendering/frustum.cppm b/rendering/frustum.cppm
index 14561a72..4ee2577f 100644
--- a/rendering/frustum.cppm
+++ b/rendering/frustum.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
 #include <vector>
 
 export module eu07.rendering.frustum;
diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp
index 53cab6c1..5acbb086 100644
--- a/rendering/geometrybank.cpp
+++ b/rendering/geometrybank.cpp
@@ -1,4 +1,7 @@
 module;
+#include <deque>
+#include <string>
+#include <utility>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
diff --git a/rendering/lightarray.cpp b/rendering/lightarray.cpp
index 7192ffe2..ead1191b 100644
--- a/rendering/lightarray.cpp
+++ b/rendering/lightarray.cpp
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 #include <cmath>
 #include "vehicle/DynObj_macros.h"
 #include <algorithm>
diff --git a/rendering/nullrenderer.cpp b/rendering/nullrenderer.cpp
index af8d14bd..1b8c66b1 100644
--- a/rendering/nullrenderer.cpp
+++ b/rendering/nullrenderer.cpp
@@ -1,4 +1,10 @@
 module;
+#include <cstddef>
+#include <string>
+#include <functional>
+#include <optional>
+#include <stdexcept>
+#include <vector>
 #include <memory>
 
 module eu07.rendering.nullrenderer;
diff --git a/rendering/nullrenderer.cppm b/rendering/nullrenderer.cppm
index fab809c9..22ee975a 100644
--- a/rendering/nullrenderer.cppm
+++ b/rendering/nullrenderer.cppm
@@ -2,6 +2,8 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 module;
+#include <cstddef>
+#include <string>
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #include <functional>
diff --git a/rendering/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp
index 561b2311..32b21cba 100644
--- a/rendering/opengl33geometrybank.cpp
+++ b/rendering/opengl33geometrybank.cpp
@@ -1,4 +1,6 @@
 module;
+#include <optional>
+#include <vector>
 #include <new>
 #include "glad/glad.h"
 #include <cstddef>
diff --git a/rendering/opengl33particles.cpp b/rendering/opengl33particles.cpp
index d0cfae2c..94f00f91 100644
--- a/rendering/opengl33particles.cpp
+++ b/rendering/opengl33particles.cpp
@@ -1,4 +1,6 @@
 module;
+#include <optional>
+#include <utility>
 #include <memory>
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/rendering/opengl33particles.cppm b/rendering/opengl33particles.cppm
index 5fe1d770..5dd09b5b 100644
--- a/rendering/opengl33particles.cppm
+++ b/rendering/opengl33particles.cppm
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <utility>
 #include <vector>
 #include <memory>
 #include <optional>
diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp
index bf7cb6b5..f4a96be9 100644
--- a/rendering/opengl33precipitation.cpp
+++ b/rendering/opengl33precipitation.cpp
@@ -1,4 +1,6 @@
 module;
+#include <functional>
+#include <optional>
 #include "glad/glad.h"
 #include <cmath>
 #include <cstdint>
diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp
index 84594fc0..0be2335e 100644
--- a/rendering/opengl33renderer.cpp
+++ b/rendering/opengl33renderer.cpp
@@ -1,4 +1,6 @@
 module;
+#include <array>
+#include <unordered_map>
 #include "imgui/imgui.h"
 #include <random>
 #include <GLFW/glfw3.h>
diff --git a/rendering/opengl33skydome.cpp b/rendering/opengl33skydome.cpp
index 7531e330..27da1447 100644
--- a/rendering/opengl33skydome.cpp
+++ b/rendering/opengl33skydome.cpp
@@ -1,4 +1,6 @@
 module;
+#include <functional>
+#include <optional>
 #include "glad/glad.h"
 #include <vector>
 
diff --git a/rendering/openglcamera.cpp b/rendering/openglcamera.cpp
index f307ef64..98947c2d 100644
--- a/rendering/openglcamera.cpp
+++ b/rendering/openglcamera.cpp
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 #include <iterator>
 #include "glad/glad.h"
 #include "vehicle/DynObj_macros.h"
diff --git a/rendering/openglmatrixstack.cpp b/rendering/openglmatrixstack.cpp
index 4339d68c..4e12ddc7 100644
--- a/rendering/openglmatrixstack.cpp
+++ b/rendering/openglmatrixstack.cpp
@@ -1,4 +1,7 @@
 module;
+#include <deque>
+#include <stack>
+#include <vector>
 #include "rendering/openglmatrixstack_macros.h"
 
 module eu07.rendering.openglmatrixstack;
diff --git a/rendering/openglmatrixstack.cppm b/rendering/openglmatrixstack.cppm
index 71ca9a43..6a347898 100644
--- a/rendering/openglmatrixstack.cppm
+++ b/rendering/openglmatrixstack.cppm
@@ -1,4 +1,5 @@
 module;
+#include <deque>
 #include "rendering/openglmatrixstack_macros.h"
 #include <stack>
 #include <vector>
diff --git a/rendering/openglparticles.cpp b/rendering/openglparticles.cpp
index 8296fe2b..6e21f321 100644
--- a/rendering/openglparticles.cpp
+++ b/rendering/openglparticles.cpp
@@ -1,4 +1,5 @@
 module;
+#include <utility>
 #include <cstdint>
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/rendering/openglparticles.cppm b/rendering/openglparticles.cppm
index b32e9afe..d416eff7 100644
--- a/rendering/openglparticles.cppm
+++ b/rendering/openglparticles.cppm
@@ -1,4 +1,5 @@
 module;
+#include <utility>
 #include <cstddef>
 #include <cstdint>
 #include <vector>
diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp
index 13602a07..ae14864a 100644
--- a/rendering/openglrenderer.cpp
+++ b/rendering/openglrenderer.cpp
@@ -1,4 +1,5 @@
 module;
+#include <optional>
 #include "imgui/imgui.h"
 #include <GLFW/glfw3.h>
 #include <algorithm>
diff --git a/rendering/openglskydome.cpp b/rendering/openglskydome.cpp
index 41dd7454..d53d1d14 100644
--- a/rendering/openglskydome.cpp
+++ b/rendering/openglskydome.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include "glad/glad.h"
 
 module eu07.rendering.openglskydome;
diff --git a/rendering/particles.cpp b/rendering/particles.cpp
index 7eb38311..1d272e2b 100644
--- a/rendering/particles.cpp
+++ b/rendering/particles.cpp
@@ -1,4 +1,7 @@
 module;
+#include <cstddef>
+#include <limits>
+#include <vector>
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
diff --git a/rendering/renderer.cpp b/rendering/renderer.cpp
index 4335a77b..d89f643a 100644
--- a/rendering/renderer.cpp
+++ b/rendering/renderer.cpp
@@ -1,4 +1,8 @@
 module;
+#include <cstddef>
+#include <functional>
+#include <optional>
+#include <unordered_map>
 #include <memory>
 #include <string>
 
diff --git a/rendering/screenshot.cpp b/rendering/screenshot.cpp
index 4e6d139d..21df083e 100644
--- a/rendering/screenshot.cpp
+++ b/rendering/screenshot.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include "utilities/Globals_macros.h"
 #include <png.h>
 #include "glad/glad.h"
diff --git a/scene/scene.cpp b/scene/scene.cpp
index 7531a3a5..f97afe40 100644
--- a/scene/scene.cpp
+++ b/scene/scene.cpp
@@ -1,4 +1,11 @@
 module;
+#include <functional>
+#include <array>
+#include <fstream>
+#include <ios>
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
 #include "utilities/utilities_macros.h"
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
diff --git a/scene/scene.cppm b/scene/scene.cppm
index 34c32e6e..25ea9d93 100644
--- a/scene/scene.cppm
+++ b/scene/scene.cppm
@@ -1,4 +1,10 @@
 module;
+#include <cstddef>
+#include <functional>
+#include <istream>
+#include <ostream>
+#include <string>
+#include <tuple>
 #include <iosfwd>
 #include <cmath>
 #include <vector>
diff --git a/scene/sceneeditor.cpp b/scene/sceneeditor.cpp
index 283e13f8..33af88f7 100644
--- a/scene/sceneeditor.cpp
+++ b/scene/sceneeditor.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <algorithm>
 #include <cmath>
 #include <iterator>
diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp
index b31daf4f..1bebc05f 100644
--- a/scene/scenenode.cpp
+++ b/scene/scenenode.cpp
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include "glad/glad.h"
 #include <algorithm>
 #include <cmath>
diff --git a/scene/scenenode.cppm b/scene/scenenode.cppm
index aeea1c24..3c8b7c39 100644
--- a/scene/scenenode.cppm
+++ b/scene/scenenode.cppm
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <limits>
 #include "global_include/interfaces/ITexture_macros.h"
 #include <istream>
 #include <ostream>
diff --git a/scene/scenenodegroups.cpp b/scene/scenenodegroups.cpp
index 7fc65b36..d457463d 100644
--- a/scene/scenenodegroups.cpp
+++ b/scene/scenenodegroups.cpp
@@ -1,4 +1,6 @@
 module;
+#include <stack>
+#include <vector>
 #include <algorithm>
 #include "utilities/Globals_macros.h"
 #include <cstddef>
diff --git a/scene/sn_utils.cpp b/scene/sn_utils.cpp
index a617c3fc..49a16c03 100644
--- a/scene/sn_utils.cpp
+++ b/scene/sn_utils.cpp
@@ -1,4 +1,6 @@
 module;
+#include <limits>
+#include <string>
 #include <cstdint>
 #include <istream>
 #include <ostream>
diff --git a/scene/sn_utils.cppm b/scene/sn_utils.cppm
index 9e6f50f8..0c45009c 100644
--- a/scene/sn_utils.cppm
+++ b/scene/sn_utils.cppm
@@ -2,6 +2,8 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 module;
+#include <istream>
+#include <ostream>
 #include <string>
 #include <cstdint>
 
diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp
index 93c2afc1..c64c010b 100644
--- a/scripting/PyInt.cpp
+++ b/scripting/PyInt.cpp
@@ -1,4 +1,10 @@
 module;
+#include <array>
+#include <chrono>
+#include <deque>
+#include <fstream>
+#include <string>
+#include <unordered_map>
 #include <thread>
 #include <format>
 #include "Python.h"
diff --git a/scripting/PyInt.cppm b/scripting/PyInt.cppm
index 479031af..49473914 100644
--- a/scripting/PyInt.cppm
+++ b/scripting/PyInt.cppm
@@ -7,6 +7,10 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <atomic>
+#include <chrono>
+#include <string>
 #ifdef _POSIX_C_SOURCE
 #undef _POSIX_C_SOURCE
 #endif
diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp
index b07a746b..ed16bb61 100644
--- a/scripting/ladderlogic.cpp
+++ b/scripting/ladderlogic.cpp
@@ -1,4 +1,6 @@
 module;
+#include <cstdint>
+#include <vector>
 #include <variant>
 #include <map>
 #include "utilities/utilities_macros.h"
diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp
index d1b76d71..b936c014 100644
--- a/scripting/pythonscreenviewer.cpp
+++ b/scripting/pythonscreenviewer.cpp
@@ -1,4 +1,7 @@
 module;
+#include <atomic>
+#include <functional>
+#include <string>
 #include "utilities/Globals_macros.h"
 #include <GLFW/glfw3.h>
 #include <chrono>
diff --git a/scripting/pythonscreenviewer.cppm b/scripting/pythonscreenviewer.cppm
index 7b7bc15b..6e40e90e 100644
--- a/scripting/pythonscreenviewer.cppm
+++ b/scripting/pythonscreenviewer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <thread>
 #include <atomic>
 #include <chrono>
diff --git a/simulation/simulationsounds.cpp b/simulation/simulationsounds.cpp
index 70349d7f..0c783c58 100644
--- a/simulation/simulationsounds.cpp
+++ b/simulation/simulationsounds.cpp
@@ -1,4 +1,6 @@
 module;
+#include <string>
+#include <unordered_map>
 
 module eu07.simulation.simulationsounds;
 /*
diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp
index 67d8925c..5520d856 100644
--- a/simulation/simulationstateserializer.cpp
+++ b/simulation/simulationstateserializer.cpp
@@ -1,4 +1,8 @@
 module;
+#include <fstream>
+#include <ostream>
+#include <unordered_map>
+#include <utility>
 #include <chrono>
 #include <functional>
 #include <vector>
diff --git a/simulation/simulationstateserializer.cppm b/simulation/simulationstateserializer.cppm
index b20cd839..0e62359f 100644
--- a/simulation/simulationstateserializer.cppm
+++ b/simulation/simulationstateserializer.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <ostream>
+#include <string>
 #include <functional>
 #include <unordered_map>
 #include <memory>
diff --git a/simulation/simulationtime.cpp b/simulation/simulationtime.cpp
index 6d64d5d6..0b43ba20 100644
--- a/simulation/simulationtime.cpp
+++ b/simulation/simulationtime.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <cstring>
 #include <algorithm>
 #include "winheaders.h"
diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp
index aadce154..aa98379d 100644
--- a/utilities/Globals.cpp
+++ b/utilities/Globals.cpp
@@ -1,4 +1,14 @@
 module;
+#include <array>
+#include <limits>
+#include <utility>
+#include <map>
+#include <optional>
+#include <ostream>
+#include <random>
+#include <sstream>
+#include <thread>
+#include <unordered_map>
 #include <cmath>
 #include "glad/glad.h"
 #include <chrono>
diff --git a/utilities/Globals.cppm b/utilities/Globals.cppm
index 703205fa..2ba479ab 100644
--- a/utilities/Globals.cppm
+++ b/utilities/Globals.cppm
@@ -7,6 +7,13 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <chrono>
+#include <limits>
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 #include <optional>
 #include <unordered_map>
 #include "utilities/Globals_macros.h"
diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp
index 2affc652..fcf0be27 100644
--- a/utilities/Logs.cpp
+++ b/utilities/Logs.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <fstream>
+#include <ios>
+#include <string>
+#include <utility>
 #include <format>
 #include "utilities/Globals_macros.h"
 #include "winheaders.h"
diff --git a/utilities/Names.cppm b/utilities/Names.cppm
index 6d7601e7..cf2e0f17 100644
--- a/utilities/Names.cppm
+++ b/utilities/Names.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
 #include <unordered_map>
 #include <string>
 #include <deque>
diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp
index 0d5faca1..88bda2b0 100644
--- a/utilities/Timer.cpp
+++ b/utilities/Timer.cpp
@@ -1,4 +1,5 @@
 module;
+#include <chrono>
 #include <ctime>
 #include "utilities/Globals_macros.h"
 #include "winheaders.h"
diff --git a/utilities/crashreporter.cpp b/utilities/crashreporter.cpp
index 469c5eb4..52698f90 100644
--- a/utilities/crashreporter.cpp
+++ b/utilities/crashreporter.cpp
@@ -1,4 +1,8 @@
 module;
+#include <map>
+#include <memory>
+#include <sstream>
+#include <vector>
 #include <client/crash_report_database.h>
 #include <client/settings.h>
 #include <client/crashpad_client.h>
diff --git a/utilities/dictionary.cpp b/utilities/dictionary.cpp
index 617a2b27..d02461ee 100644
--- a/utilities/dictionary.cpp
+++ b/utilities/dictionary.cpp
@@ -1,4 +1,6 @@
 module;
+#include <utility>
+#include <vector>
 #include <string>
 #include <sstream>
 #include "vehicle/DynObj_macros.h"
diff --git a/utilities/dictionary.cppm b/utilities/dictionary.cppm
index c8b817ae..49a61f34 100644
--- a/utilities/dictionary.cppm
+++ b/utilities/dictionary.cppm
@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
 // collection of keyword-value pairs
 // NOTE: since our python dictionary operates on a few types, most of the class was hardcoded for simplicity
 module;
+#include <utility>
 #include <string>
 #include <vector>
 
diff --git a/utilities/glm_module.cppm b/utilities/glm_module.cppm
index fc8c0fea..a8cfeb6f 100644
--- a/utilities/glm_module.cppm
+++ b/utilities/glm_module.cppm
@@ -40,6 +40,12 @@ export module eu07.glm;
 // merge when the same glm declarations arrive from several different modules
 // ("conflicting imported declaration" on glm::detail::storage), so glm has to be
 // compiled into exactly one module.
+// Clang warns that including inside the purview attaches the declarations to
+// this module. That is exactly the point here, so silence it for this block.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
+#endif
 export {
 #include <glm/glm.hpp>
 #include <glm/fwd.hpp>
@@ -62,6 +68,9 @@ export {
 // call sites of glm::to_string include it in their own module fragment.
 #include <glm/gtx/transform.hpp>
 }
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 
 export {
 // 12-byte vec3 that stays packed regardless of GLM_FORCE_DEFAULT_ALIGNED_GENTYPES.
diff --git a/utilities/motiontelemetry.cpp b/utilities/motiontelemetry.cpp
index 26ac3e64..343886e6 100644
--- a/utilities/motiontelemetry.cpp
+++ b/utilities/motiontelemetry.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <chrono>
 #include <cmath>
 #include <cstring>
diff --git a/utilities/parser.cpp b/utilities/parser.cpp
index 7aad5b54..1e913ed9 100644
--- a/utilities/parser.cpp
+++ b/utilities/parser.cpp
@@ -1,4 +1,9 @@
 module;
+#include <istream>
+#include <deque>
+#include <fstream>
+#include <map>
+#include <sstream>
 #include <memory>
 #include "utilities/Globals_macros.h"
 #include <cstring>
diff --git a/utilities/parser.cppm b/utilities/parser.cppm
index e68ff68c..686f3ab4 100644
--- a/utilities/parser.cppm
+++ b/utilities/parser.cppm
@@ -12,6 +12,8 @@ http://mozilla.org/MPL/2.0/.
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 // cParser -- generic class for parsing text data, either from file or provided string
 module;
+#include <cstddef>
+#include <istream>
 #include <string>
 #include <sstream>
 #include <fstream>
diff --git a/utilities/translation.cpp b/utilities/translation.cpp
index 1f2c7c7c..a2b65695 100644
--- a/utilities/translation.cpp
+++ b/utilities/translation.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ios>
+#include <sstream>
 #include <unordered_map>
 #include <fstream>
 #include <istream>
diff --git a/utilities/translation.cppm b/utilities/translation.cppm
index f349eef9..51942d72 100644
--- a/utilities/translation.cppm
+++ b/utilities/translation.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <istream>
 #include "utilities/translation_macros.h"
 #include <string>
 #include <unordered_map>
diff --git a/utilities/uart.cpp b/utilities/uart.cpp
index 97921e7a..fd7391c5 100644
--- a/utilities/uart.cpp
+++ b/utilities/uart.cpp
@@ -1,4 +1,6 @@
 module;
+#include <tuple>
+#include <vector>
 #include <libserialport.h>
 #include "winheaders.h"
 #include <filesystem>
diff --git a/utilities/uart.cppm b/utilities/uart.cppm
index 6fde2322..ce7a9d77 100644
--- a/utilities/uart.cppm
+++ b/utilities/uart.cppm
@@ -1,4 +1,8 @@
 module;
+#include <array>
+#include <cstddef>
+#include <tuple>
+#include <vector>
 #include <libserialport.h>
 #include <chrono>
 #include <cstdint>
diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp
index 506814e2..862ccc9b 100644
--- a/utilities/utilities.cpp
+++ b/utilities/utilities.cpp
@@ -1,4 +1,16 @@
 module;
+#include <limits>
+#include <type_traits>
+#include <array>
+#include <condition_variable>
+#include <cstddef>
+#include <iomanip>
+#include <iterator>
+#include <mutex>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 #include <algorithm>
 #include <chrono>
 #include <unordered_map>
diff --git a/utilities/utilities.cppm b/utilities/utilities.cppm
index ab3a1145..556fec58 100644
--- a/utilities/utilities.cppm
+++ b/utilities/utilities.cppm
@@ -12,6 +12,13 @@ http://mozilla.org/MPL/2.0/.
 /*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/
 /*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/
 module;
+#include <cstddef>
+#include <limits>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
 #include "utilities/utilities_macros.h"
 #include <algorithm>
 #include <chrono>
diff --git a/vehicle/Button.cpp b/vehicle/Button.cpp
index 0e039d06..163a6285 100644
--- a/vehicle/Button.cpp
+++ b/vehicle/Button.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstdint>
 #include <array>
 #include <limits>
 #include <string>
diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp
index b5cc29c7..8ec1a9a0 100644
--- a/vehicle/Driver.cpp
+++ b/vehicle/Driver.cpp
@@ -1,4 +1,10 @@
 module;
+#include <fstream>
+#include <tuple>
+#include <utility>
+#include <functional>
+#include <list>
+#include <optional>
 #include <sys/stat.h>
 #include <cstdint>
 #include <algorithm>
diff --git a/vehicle/Driver.cppm b/vehicle/Driver.cppm
index 2fe66fc8..4ad3f629 100644
--- a/vehicle/Driver.cppm
+++ b/vehicle/Driver.cppm
@@ -7,6 +7,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <cstddef>
+#include <fstream>
+#include <tuple>
+#include <utility>
 #include <functional>
 #include <list>
 #include <optional>
diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp
index 79440677..e906c3d8 100644
--- a/vehicle/DynObj.cpp
+++ b/vehicle/DynObj.cpp
@@ -1,4 +1,12 @@
 module;
+#include <array>
+#include <cstddef>
+#include <deque>
+#include <fstream>
+#include <ios>
+#include <optional>
+#include <tuple>
+#include <utility>
 #include <functional>
 #include <unordered_map>
 #include <algorithm>
diff --git a/vehicle/DynObj.cppm b/vehicle/DynObj.cppm
index 066f992e..ba1e7a02 100644
--- a/vehicle/DynObj.cppm
+++ b/vehicle/DynObj.cppm
@@ -16,6 +16,10 @@ http://mozilla.org/MPL/2.0/.
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 module;
+#include <array>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
 #include <deque>
 #include <optional>
 #include "vehicle/DynObj_macros.h"
diff --git a/vehicle/Gauge.cppm b/vehicle/Gauge.cppm
index 5eae4f95..5fc9ed6f 100644
--- a/vehicle/Gauge.cppm
+++ b/vehicle/Gauge.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
 #include <map>
 #include <optional>
 
diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp
index 4738c18c..fc31d8f0 100644
--- a/vehicle/Train.cpp
+++ b/vehicle/Train.cpp
@@ -1,4 +1,8 @@
 module;
+#include <cstddef>
+#include <cstdint>
+#include <deque>
+#include <utility>
 #include <GLFW/glfw3.h>
 #include <array>
 #include <functional>
diff --git a/vehicle/Train.cppm b/vehicle/Train.cppm
index 71ecf0b4..26d3c298 100644
--- a/vehicle/Train.cppm
+++ b/vehicle/Train.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <tuple>
+#include <utility>
 #include "utilities/Globals_macros.h"
 #include <cstdint>
 #include <memory>
diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp
index fa8601fc..f3b51892 100644
--- a/vr/openvr_imp.cpp
+++ b/vr/openvr_imp.cpp
@@ -1,4 +1,7 @@
 module;
+#include <array>
+#include <cstddef>
+#include <cstdint>
 #include "global_include/interfaces/ITexture_macros.h"
 #include "utilities/Globals_macros.h"
 #include <filesystem>
diff --git a/vr/vr_interface.cpp b/vr/vr_interface.cpp
index ed8a4eab..1152a6a6 100644
--- a/vr/vr_interface.cpp
+++ b/vr/vr_interface.cpp
@@ -1,4 +1,6 @@
 module;
+#include <unordered_map>
+#include <vector>
 #include <memory>
 #include <string>
 
diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp
index d94393fa..422b6e67 100644
--- a/widgets/cameraview_extcam.cpp
+++ b/widgets/cameraview_extcam.cpp
@@ -1,4 +1,9 @@
 module;
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <optional>
+#include <string>
 #include "glad/glad.h"
 #include "stb/stb_image.h"
 #include "utilities/Globals_macros.h"
diff --git a/widgets/cameraview_extcam.cppm b/widgets/cameraview_extcam.cppm
index 770d9dc8..2946a770 100644
--- a/widgets/cameraview_extcam.cppm
+++ b/widgets/cameraview_extcam.cppm
@@ -2,6 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 module;
+#include <string>
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
diff --git a/widgets/map.cpp b/widgets/map.cpp
index f385b973..94b85bb3 100644
--- a/widgets/map.cpp
+++ b/widgets/map.cpp
@@ -1,4 +1,5 @@
 module;
+#include <iterator>
 #include "utilities/translation_macros.h"
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
diff --git a/widgets/map.cppm b/widgets/map.cppm
index e0dd18f4..caf8457a 100644
--- a/widgets/map.cppm
+++ b/widgets/map.cppm
@@ -1,4 +1,6 @@
 module;
+#include <string>
+#include <utility>
 #include <array>
 #include <memory>
 #include <vector>
diff --git a/widgets/map_objects.cpp b/widgets/map_objects.cpp
index 19f97b93..b07b4960 100644
--- a/widgets/map_objects.cpp
+++ b/widgets/map_objects.cpp
@@ -1,4 +1,8 @@
 module;
+#include <array>
+#include <map>
+#include <string>
+#include <vector>
 #include <memory>
 #include "vehicle/DynObj_macros.h"
 
diff --git a/widgets/perfgraphs.cpp b/widgets/perfgraphs.cpp
index 7d7a1adc..ec4c6055 100644
--- a/widgets/perfgraphs.cpp
+++ b/widgets/perfgraphs.cpp
@@ -1,4 +1,6 @@
 module;
+#include <array>
+#include <vector>
 #include <string>
 #include "utilities/translation_macros.h"
 #include "imgui/imgui.h"
diff --git a/widgets/perfgraphs.cppm b/widgets/perfgraphs.cppm
index 997da29b..fca46456 100644
--- a/widgets/perfgraphs.cppm
+++ b/widgets/perfgraphs.cppm
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <string>
 #include <vector>
 
diff --git a/widgets/trainingcard.cpp b/widgets/trainingcard.cpp
index 60215b59..9d0c5cc0 100644
--- a/widgets/trainingcard.cpp
+++ b/widgets/trainingcard.cpp
@@ -1,4 +1,7 @@
 module;
+#include <atomic>
+#include <ios>
+#include <optional>
 #include "imgui/imgui.h"
 #include <cmath>
 #include <fstream>
diff --git a/widgets/trainingcard.cppm b/widgets/trainingcard.cppm
index 90c905bb..31f14ed7 100644
--- a/widgets/trainingcard.cppm
+++ b/widgets/trainingcard.cppm
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <atomic>
 #include <optional>
 #include <thread>
diff --git a/world/EvLaunch.cppm b/world/EvLaunch.cppm
index 9b365aa1..7bcf857b 100644
--- a/world/EvLaunch.cppm
+++ b/world/EvLaunch.cppm
@@ -12,6 +12,8 @@ http://mozilla.org/MPL/2.0/.
 
 // radio-transmitted event launch messages
 module;
+#include <istream>
+#include <ostream>
 #include <string>
 
 export module eu07.simcore:evlaunch;
diff --git a/world/Event.cpp b/world/Event.cpp
index a3fbfde8..9d9bf77b 100644
--- a/world/Event.cpp
+++ b/world/Event.cpp
@@ -1,4 +1,10 @@
 module;
+#include <array>
+#include <cstddef>
+#include <tuple>
+#include <deque>
+#include <list>
+#include <unordered_map>
 #include <GLFW/glfw3.h>
 #include <lua.hpp>
 #include <algorithm>
diff --git a/world/Event.cppm b/world/Event.cppm
index a6004cf3..aae8389d 100644
--- a/world/Event.cppm
+++ b/world/Event.cppm
@@ -7,6 +7,12 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <cstddef>
+#include <limits>
+#include <ostream>
+#include <string>
+#include <tuple>
 #include <unordered_map>
 #include <list>
 #include <cstdint>
diff --git a/world/Segment.cpp b/world/Segment.cpp
index 42ba8167..3b927723 100644
--- a/world/Segment.cpp
+++ b/world/Segment.cpp
@@ -1,4 +1,5 @@
 module;
+#include <array>
 #include <string>
 #include <algorithm>
 #include <cmath>
diff --git a/world/Segment.cppm b/world/Segment.cppm
index fb2d31ac..bd42ad94 100644
--- a/world/Segment.cppm
+++ b/world/Segment.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <utility>
 #include <cmath>
 #include <vector>
 
diff --git a/world/Track.cpp b/world/Track.cpp
index d4ee9fa3..36e54fb6 100644
--- a/world/Track.cpp
+++ b/world/Track.cpp
@@ -1,4 +1,7 @@
 module;
+#include <deque>
+#include <iterator>
+#include <unordered_map>
 #include <memory>
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/world/Track.cppm b/world/Track.cppm
index a93d2175..df343097 100644
--- a/world/Track.cppm
+++ b/world/Track.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <istream>
+#include <ostream>
+#include <utility>
 #include <unordered_map>
 #include <string>
 #include <vector>
diff --git a/world/Traction.cppm b/world/Traction.cppm
index 1038cd4f..7e2724d5 100644
--- a/world/Traction.cppm
+++ b/world/Traction.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <istream>
+#include <ostream>
 #include <vector>
 #include <string>
 
diff --git a/world/TractionPower.cpp b/world/TractionPower.cpp
index 3483394e..930cd67e 100644
--- a/world/TractionPower.cpp
+++ b/world/TractionPower.cpp
@@ -1,4 +1,5 @@
 module;
+#include <string>
 #include <istream>
 #include <ostream>
 
diff --git a/world/TrkFoll.cpp b/world/TrkFoll.cpp
index a4894daf..3fc0be77 100644
--- a/world/TrkFoll.cpp
+++ b/world/TrkFoll.cpp
@@ -1,4 +1,5 @@
 module;
+#include <memory>
 #include <string>
 #include <cmath>
 #include "utilities/Globals_macros.h"
diff --git a/world/mtable.cpp b/world/mtable.cpp
index bc6a1b06..8c79fe6a 100644
--- a/world/mtable.cpp
+++ b/world/mtable.cpp
@@ -1,4 +1,5 @@
 module;
+#include <fstream>
 #include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/utilities_macros.h"