From 6550c88536e10aa918185d86a0451ec161f50752 Mon Sep 17 00:00:00 2001
From: maj00r <maj00r@host>
Date: Thu, 10 Sep 2026 01:20:33 +0200
Subject: [PATCH] give importers the headers module templates need

A template defined in a module interface is instantiated in the importing
unit, where its body's types must be complete. A declaration reaching the
importer only through the interface's global module fragment is not
enough for MSVC: cParser::operator>> uses std::stringstream, and every
unit that parsed a float got an incomplete type.

526 headers across 161 units, derived from what each interface's template
bodies actually name.
---
 Console.cpp                               | 6 ++++++
 Console.cppm                              | 2 ++
 McZapkie/Mover.cpp                        | 2 ++
 McZapkie/Oerlikon_ESt.cpp                 | 5 +++++
 McZapkie/hamulce.cpp                      | 6 ++++++
 application/application.cpp               | 6 ++++++
 application/driverhints.cpp               | 7 +++++++
 application/drivermode.cpp                | 7 +++++++
 application/drivermode.cppm               | 2 ++
 application/driveruilayer.cpp             | 6 ++++++
 application/driveruilayer.cppm            | 2 ++
 application/driveruipanels.cpp            | 7 +++++++
 application/editormode.cpp                | 5 +++++
 application/editormode.cppm               | 2 ++
 application/editoruilayer.cpp             | 6 ++++++
 application/editoruipanels.cpp            | 6 ++++++
 application/scenarioloadermode.cpp        | 1 +
 application/scenarioloaderuilayer.cpp     | 5 +++++
 application/uilayer.cpp                   | 7 +++++++
 application/uilayer.cppm                  | 1 +
 application/uitranscripts.cpp             | 6 ++++++
 audio/audio.cpp                           | 6 ++++++
 audio/audiorenderer.cpp                   | 5 +++++
 audio/sound.cpp                           | 5 +++++
 audio/sound.cppm                          | 5 +++++
 editor/editorSettings.cpp                 | 5 +++++
 environment/moon.cpp                      | 7 +++++++
 environment/sky.cpp                       | 1 +
 environment/skydome.cpp                   | 2 ++
 environment/stars.cpp                     | 2 ++
 environment/sun.cpp                       | 7 +++++++
 gl/framebuffer.cpp                        | 5 +++++
 gl/framebuffer.cppm                       | 1 +
 gl/glsl_common.cpp                        | 6 ++++++
 gl/glsl_common.cppm                       | 1 +
 gl/postfx.cppm                            | 1 +
 gl/query.cpp                              | 2 ++
 gl/shader.cpp                             | 1 +
 input/command.cpp                         | 6 ++++++
 input/driverkeyboardinput.cpp             | 2 ++
 input/drivermouseinput.cpp                | 6 ++++++
 input/drivermouseinput.cppm               | 1 +
 input/editorkeyboardinput.cpp             | 2 ++
 input/editormouseinput.cppm               | 2 ++
 input/gamepadinput.cpp                    | 5 +++++
 input/gamepadinput.cppm                   | 2 ++
 input/keyboardinput.cpp                   | 6 ++++++
 input/keyboardinput.cppm                  | 1 +
 input/messaging.cpp                       | 8 ++++++++
 input/zmq_input.cpp                       | 1 +
 input/zmq_input.cppm                      | 1 +
 launcher/deferred_image.cppm              | 1 +
 launcher/keymapper.cpp                    | 6 ++++++
 launcher/keymapper.cppm                   | 2 ++
 launcher/launchermode.cpp                 | 2 ++
 launcher/launcheruilayer.cpp              | 2 ++
 launcher/launcheruilayer.cppm             | 2 ++
 launcher/scenery_list.cpp                 | 6 ++++++
 launcher/scenery_scanner.cpp              | 4 ++++
 launcher/scenery_scanner.cppm             | 2 ++
 launcher/textures_scanner.cpp             | 4 ++++
 launcher/vehicle_picker.cpp               | 4 ++++
 model/MdlMngr.cpp                         | 6 ++++++
 model/Model3d.cppm                        | 1 +
 model/Texture.cpp                         | 5 +++++
 model/Texture.cppm                        | 1 +
 model/material.cpp                        | 4 ++++
 model/material.cppm                       | 1 +
 network/manager.cppm                      | 2 ++
 network/message.cppm                      | 2 ++
 network/network.cpp                       | 1 +
 network/network.cppm                      | 1 +
 rendering/geometrybank.cppm               | 2 ++
 rendering/nullrenderer.cppm               | 1 +
 rendering/opengl33particles.cpp           | 4 ++++
 rendering/opengl33precipitation.cpp       | 1 +
 rendering/opengl33precipitation.cppm      | 1 +
 rendering/opengl33renderer.cpp            | 5 +++++
 rendering/opengl33renderer.cppm           | 1 +
 rendering/openglcolor.cppm                | 2 ++
 rendering/openglparticles.cpp             | 4 ++++
 rendering/openglprecipitation.cpp         | 1 +
 rendering/openglprecipitation.cppm        | 1 +
 rendering/openglrenderer.cpp              | 7 +++++++
 rendering/openglrenderer.cppm             | 1 +
 rendering/particles.cpp                   | 5 +++++
 rendering/particles.cppm                  | 1 +
 rendering/precipitation.cpp               | 7 +++++++
 rendering/renderer.cppm                   | 1 +
 rendering/screenshot.cpp                  | 1 +
 scene/scene.cppm                          | 5 +++++
 scene/sceneeditor.cpp                     | 6 ++++++
 scene/scenenode.cpp                       | 3 +++
 scene/scenenode.cppm                      | 1 +
 scripting/PyInt.cpp                       | 2 ++
 scripting/PyInt.cppm                      | 5 +++++
 scripting/ladderlogic.cpp                 | 5 +++++
 scripting/ladderlogic.cppm                | 1 +
 scripting/lua.cpp                         | 5 +++++
 scripting/pythonscreenviewer.cpp          | 1 +
 simulation/simulation.cpp                 | 7 +++++++
 simulation/simulation.cppm                | 3 +++
 simulation/simulationenvironment.cpp      | 6 ++++++
 simulation/simulationenvironment.cppm     | 1 +
 simulation/simulationsounds.cppm          | 1 +
 simulation/simulationstateserializer.cpp  | 4 ++++
 simulation/simulationstateserializer.cppm | 2 ++
 simulation/simulationtime.cpp             | 6 ++++++
 utilities/Globals.cppm                    | 3 +++
 utilities/Logs.cpp                        | 4 ++++
 utilities/Timer.cpp                       | 2 ++
 utilities/dictionary.cpp                  | 4 ++++
 utilities/headtrack.cpp                   | 1 +
 utilities/motiontelemetry.cpp             | 1 +
 utilities/parser.cpp                      | 5 +++++
 utilities/translation.cpp                 | 2 ++
 utilities/uart.cpp                        | 5 +++++
 utilities/uart.cppm                       | 2 ++
 utilities/utilities.cpp                   | 1 +
 vehicle/AirCoupler.cpp                    | 1 +
 vehicle/AirCoupler.cppm                   | 1 +
 vehicle/Button.cpp                        | 1 +
 vehicle/Button.cppm                       | 2 ++
 vehicle/Camera.cpp                        | 7 +++++++
 vehicle/Camera.cppm                       | 2 ++
 vehicle/Driver.cpp                        | 5 +++++
 vehicle/Driver.cppm                       | 5 +++++
 vehicle/DynObj.cpp                        | 1 +
 vehicle/DynObj.cppm                       | 1 +
 vehicle/Gauge.cpp                         | 1 +
 vehicle/Gauge.cppm                        | 3 +++
 vehicle/Train.cpp                         | 6 ++++++
 vehicle/Train.cppm                        | 3 +++
 vr/openvr_imp.cpp                         | 1 +
 vr/vr_interface.cppm                      | 1 +
 widgets/cameraview_extcam.cpp             | 1 +
 widgets/cameraview_extcam.cppm            | 1 +
 widgets/map.cpp                           | 5 +++++
 widgets/map.cppm                          | 3 +++
 widgets/map_objects.cppm                  | 1 +
 widgets/time.cpp                          | 2 ++
 widgets/time.cppm                         | 2 ++
 widgets/vehiclelist.cpp                   | 6 ++++++
 widgets/vehicleparams.cpp                 | 6 ++++++
 widgets/vehicleparams.cppm                | 2 ++
 world/EvLaunch.cpp                        | 5 +++++
 world/EvLaunch.cppm                       | 1 +
 world/Event.cpp                           | 4 ++++
 world/MemCell.cppm                        | 4 ++++
 world/Segment.cpp                         | 5 +++++
 world/Segment.cppm                        | 3 +++
 world/Track.cpp                           | 4 ++++
 world/Track.cppm                          | 2 ++
 world/Traction.cpp                        | 5 +++++
 world/Traction.cppm                       | 2 ++
 world/TractionPower.cpp                   | 1 +
 world/TractionPower.cppm                  | 5 +++++
 world/TrkFoll.cpp                         | 1 +
 world/mtable.cpp                          | 6 ++++++
 world/mtable.cppm                         | 2 ++
 world/station.cpp                         | 5 +++++
 161 files changed, 526 insertions(+)

diff --git a/Console.cpp b/Console.cpp
index 542c7195..0ed8611e 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/utilities_macros.h"
diff --git a/Console.cppm b/Console.cppm
index bb2b57b3..2d225e26 100644
--- a/Console.cppm
+++ b/Console.cppm
@@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 //---------------------------------------------------------------------------
 module;
+#include <ostream>
+#include <string>
 #include "utilities/Globals_macros.h"
 #include <GLFW/glfw3.h>
 
diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index e261496a..e6542553 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <sstream>
 #include <array>
 #include <fstream>
 #include <memory>
diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp
index 1def057c..897e193c 100644
--- a/McZapkie/Oerlikon_ESt.cpp
+++ b/McZapkie/Oerlikon_ESt.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <array>
 #include <memory>
 #include <typeinfo>
diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp
index b85f975a..af87569a 100644
--- a/McZapkie/hamulce.cpp
+++ b/McZapkie/hamulce.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <memory>
 #include <algorithm>
 #include <cmath>
diff --git a/application/application.cpp b/application/application.cpp
index e3854c40..d1a00a75 100644
--- a/application/application.cpp
+++ b/application/application.cpp
@@ -1,4 +1,10 @@
 module;
+#include <deque>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
+#include <unordered_map>
 #include <cstring>
 #include <cstdint>
 #include <array>
diff --git a/application/driverhints.cpp b/application/driverhints.cpp
index 7eec0c20..e896c2fa 100644
--- a/application/driverhints.cpp
+++ b/application/driverhints.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <tuple>
 #include <utility>
 #include <memory>
diff --git a/application/drivermode.cpp b/application/drivermode.cpp
index 01b1d99a..fe5b18e7 100644
--- a/application/drivermode.cpp
+++ b/application/drivermode.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
+#include <vector>
 #include <array>
 #include <GLFW/glfw3.h>
 #include <algorithm>
diff --git a/application/drivermode.cppm b/application/drivermode.cppm
index e5c5feed..7d75f6cc 100644
--- a/application/drivermode.cppm
+++ b/application/drivermode.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <array>
 #include <memory>
 #include <string>
diff --git a/application/driveruilayer.cpp b/application/driveruilayer.cpp
index bd4c2b88..0781182a 100644
--- a/application/driveruilayer.cpp
+++ b/application/driveruilayer.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include "imgui/imgui.h"
 #include <GLFW/glfw3.h>
 #include <string>
diff --git a/application/driveruilayer.cppm b/application/driveruilayer.cppm
index 638f0f52..0b7620df 100644
--- a/application/driveruilayer.cppm
+++ b/application/driveruilayer.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 
 export module eu07.application.driveruilayer;
 import eu07.application.uilayer;
diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp
index f6f7b106..4c93429c 100644
--- a/application/driveruipanels.cpp
+++ b/application/driveruipanels.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <deque>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
+#include <unordered_map>
 #include <array>
 #include <cstddef>
 #include <utility>
diff --git a/application/editormode.cpp b/application/editormode.cpp
index 6bf725d3..7c27aa23 100644
--- a/application/editormode.cpp
+++ b/application/editormode.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include <map>
 #include <utility>
diff --git a/application/editormode.cppm b/application/editormode.cppm
index 7dacee94..1872ba18 100644
--- a/application/editormode.cppm
+++ b/application/editormode.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
+#include <unordered_map>
 #include <string>
 #include <utility>
 #include <map>
diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp
index 921f7610..2b237e33 100644
--- a/application/editoruilayer.cpp
+++ b/application/editoruilayer.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/utilities_macros.h"
diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp
index 76c0fda6..bc782d4e 100644
--- a/application/editoruipanels.cpp
+++ b/application/editoruipanels.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstring>
 #include <cstddef>
 #include <functional>
diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp
index 8e26bb97..9d9590be 100644
--- a/application/scenarioloadermode.cpp
+++ b/application/scenarioloadermode.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <memory>
 #include <GLFW/glfw3.h>
 #include <chrono>
diff --git a/application/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp
index 57d16e57..a7b72b89 100644
--- a/application/scenarioloaderuilayer.cpp
+++ b/application/scenarioloaderuilayer.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
 #include <cstddef>
 #include <cstdint>
 #include <fstream>
diff --git a/application/uilayer.cpp b/application/uilayer.cpp
index ce185971..9c8c156c 100644
--- a/application/uilayer.cpp
+++ b/application/uilayer.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
+#include <unordered_map>
 #include <deque>
 #include <iterator>
 #include <list>
diff --git a/application/uilayer.cppm b/application/uilayer.cppm
index 82c1bb9e..94d80839 100644
--- a/application/uilayer.cppm
+++ b/application/uilayer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include "global_include/interfaces/ITexture_macros.h"
 #include "glad/glad.h"
 #include <string>
diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp
index 5fe77abe..76c89ab2 100644
--- a/application/uitranscripts.cpp
+++ b/application/uitranscripts.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <deque>
 #include <string>
 #include "utilities/Globals_macros.h"
diff --git a/audio/audio.cpp b/audio/audio.cpp
index 8ad89319..a00c3894 100644
--- a/audio/audio.cpp
+++ b/audio/audio.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstdint>
 #include <cstddef>
 #include <stdexcept>
diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp
index 22a009e0..91f9769c 100644
--- a/audio/audiorenderer.cpp
+++ b/audio/audiorenderer.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <AL/alext.h>
 #include <cmath>
 #include <AL/al.h>
diff --git a/audio/sound.cpp b/audio/sound.cpp
index b895c8e3..fd1c9ff6 100644
--- a/audio/sound.cpp
+++ b/audio/sound.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <utility>
 #include <atomic>
 #include <cstddef>
diff --git a/audio/sound.cppm b/audio/sound.cppm
index ba115a18..d830e5e5 100644
--- a/audio/sound.cppm
+++ b/audio/sound.cppm
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <cstddef>
+#include <deque>
+#include <sstream>
+#include <unordered_map>
 #include <array>
 #include <ostream>
 #include <utility>
diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp
index 733a6f10..378b3eb7 100644
--- a/editor/editorSettings.cpp
+++ b/editor/editorSettings.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <ios>
 #include <string>
 #include "utilities/utilities_macros.h"
diff --git a/environment/moon.cpp b/environment/moon.cpp
index 0b0ced96..54b15338 100644
--- a/environment/moon.cpp
+++ b/environment/moon.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <ctime>
 #include "winheaders.h"
 #include <algorithm>
diff --git a/environment/sky.cpp b/environment/sky.cpp
index 1c29af62..0d77a7ab 100644
--- a/environment/sky.cpp
+++ b/environment/sky.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <string>
 #include "utilities/Globals_macros.h"
 
diff --git a/environment/skydome.cpp b/environment/skydome.cpp
index 8bba366a..5ed59738 100644
--- a/environment/skydome.cpp
+++ b/environment/skydome.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include <vector>
 #include <algorithm>
 #include <cmath>
diff --git a/environment/stars.cpp b/environment/stars.cpp
index fa684de6..ae71b632 100644
--- a/environment/stars.cpp
+++ b/environment/stars.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include "utilities/Globals_macros.h"
 
 module eu07.environment.stars;
diff --git a/environment/sun.cpp b/environment/sun.cpp
index cba0206c..89fd0ede 100644
--- a/environment/sun.cpp
+++ b/environment/sun.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <ctime>
 #include "winheaders.h"
 #include <algorithm>
diff --git a/gl/framebuffer.cpp b/gl/framebuffer.cpp
index 38d84de8..d8e2d5bb 100644
--- a/gl/framebuffer.cpp
+++ b/gl/framebuffer.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <string>
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/gl/framebuffer.cppm b/gl/framebuffer.cppm
index a0706955..46d84095 100644
--- a/gl/framebuffer.cppm
+++ b/gl/framebuffer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include "glad/glad.h"
 
 export module eu07.gl.framebuffer;
diff --git a/gl/glsl_common.cpp b/gl/glsl_common.cpp
index 8b334a20..2f6d24e4 100644
--- a/gl/glsl_common.cpp
+++ b/gl/glsl_common.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include "utilities/Globals_macros.h"
 #include <string>
 
diff --git a/gl/glsl_common.cppm b/gl/glsl_common.cppm
index 72cb57e9..0970ae09 100644
--- a/gl/glsl_common.cppm
+++ b/gl/glsl_common.cppm
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <string>
 #include "utilities/Globals_macros.h"
 
diff --git a/gl/postfx.cppm b/gl/postfx.cppm
index 375ef05d..1b403253 100644
--- a/gl/postfx.cppm
+++ b/gl/postfx.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/gl/query.cpp b/gl/query.cpp
index 2454d95d..ed2292c4 100644
--- a/gl/query.cpp
+++ b/gl/query.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include <cstdint>
 #include "glad/glad.h"
 #include <optional>
diff --git a/gl/shader.cpp b/gl/shader.cpp
index f8b79bd8..89cfe5ed 100644
--- a/gl/shader.cpp
+++ b/gl/shader.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstddef>
 #include <stdexcept>
 #include <string>
diff --git a/input/command.cpp b/input/command.cpp
index 0f1fc676..c1f101e9 100644
--- a/input/command.cpp
+++ b/input/command.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <deque>
 #include <vector>
 #include <cstddef>
diff --git a/input/driverkeyboardinput.cpp b/input/driverkeyboardinput.cpp
index f59b89aa..23489e79 100644
--- a/input/driverkeyboardinput.cpp
+++ b/input/driverkeyboardinput.cpp
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <GLFW/glfw3.h>
 
 module eu07.input.driverkeyboardinput;
diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp
index cecb3801..4b7c73a1 100644
--- a/input/drivermouseinput.cpp
+++ b/input/drivermouseinput.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <array>
 #include <filesystem>
 #include <GLFW/glfw3.h>
diff --git a/input/drivermouseinput.cppm b/input/drivermouseinput.cppm
index ef7aca02..71cdb958 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 <deque>
 #include <utility>
 #include <unordered_map>
 #include <GLFW/glfw3.h>
diff --git a/input/editorkeyboardinput.cpp b/input/editorkeyboardinput.cpp
index 2f9e810d..0b799f6d 100644
--- a/input/editorkeyboardinput.cpp
+++ b/input/editorkeyboardinput.cpp
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <GLFW/glfw3.h>
 
 module eu07.input.editorkeyboardinput;
diff --git a/input/editormouseinput.cppm b/input/editormouseinput.cppm
index 2b8fafd4..b48eb25d 100644
--- a/input/editormouseinput.cppm
+++ b/input/editormouseinput.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
+#include <unordered_map>
 #include <GLFW/glfw3.h>
 #include <array>
 
diff --git a/input/gamepadinput.cpp b/input/gamepadinput.cpp
index fa1973dd..7993b6e6 100644
--- a/input/gamepadinput.cpp
+++ b/input/gamepadinput.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include <tuple>
 #include <unordered_map>
diff --git a/input/gamepadinput.cppm b/input/gamepadinput.cppm
index 0b2c9ed5..ce834ab8 100644
--- a/input/gamepadinput.cppm
+++ b/input/gamepadinput.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
+#include <sstream>
 #include <functional>
 #include <tuple>
 #include <string>
diff --git a/input/keyboardinput.cpp b/input/keyboardinput.cpp
index b3e0da26..b0805964 100644
--- a/input/keyboardinput.cpp
+++ b/input/keyboardinput.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <ios>
 #include <map>
 #include <filesystem>
diff --git a/input/keyboardinput.cppm b/input/keyboardinput.cppm
index 48f1b4f2..cc1e9d23 100644
--- a/input/keyboardinput.cppm
+++ b/input/keyboardinput.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
 #include <tuple>
 #include <unordered_map>
 #include <array>
diff --git a/input/messaging.cpp b/input/messaging.cpp
index 9089ab93..2cb34eea 100644
--- a/input/messaging.cpp
+++ b/input/messaging.cpp
@@ -1,4 +1,12 @@
 module;
+#include <chrono>
+#include <deque>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
+#include <unordered_map>
 #include <cstring>
 #include "winheaders.h"
 #include "utilities/utilities_macros.h"
diff --git a/input/zmq_input.cpp b/input/zmq_input.cpp
index b50e71d3..6033ed96 100644
--- a/input/zmq_input.cpp
+++ b/input/zmq_input.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstdint>
 #include <chrono>
 #include <map>
diff --git a/input/zmq_input.cppm b/input/zmq_input.cppm
index e3f94f09..3f361224 100644
--- a/input/zmq_input.cppm
+++ b/input/zmq_input.cppm
@@ -1,4 +1,5 @@
 module;
+#include <deque>
 #include <cstdint>
 #include <zmq_addon.hpp>
 #include <chrono>
diff --git a/launcher/deferred_image.cppm b/launcher/deferred_image.cppm
index 801e9e50..3521a507 100644
--- a/launcher/deferred_image.cppm
+++ b/launcher/deferred_image.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include "glad/glad.h"
 #include <string>
 #include "global_include/interfaces/ITexture_macros.h"
diff --git a/launcher/keymapper.cpp b/launcher/keymapper.cpp
index 1e7dab3c..bb1ac5be 100644
--- a/launcher/keymapper.cpp
+++ b/launcher/keymapper.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include "utilities/translation_macros.h"
 #include <string>
diff --git a/launcher/keymapper.cppm b/launcher/keymapper.cppm
index b4934865..7fea0259 100644
--- a/launcher/keymapper.cppm
+++ b/launcher/keymapper.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <string>
 
 export module eu07.launcher.keymapper;
diff --git a/launcher/launchermode.cpp b/launcher/launchermode.cpp
index 0c9fca9a..b004dec4 100644
--- a/launcher/launchermode.cpp
+++ b/launcher/launchermode.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include <GLFW/glfw3.h>
 #include <memory>
 #include "utilities/Globals_macros.h"
diff --git a/launcher/launcheruilayer.cpp b/launcher/launcheruilayer.cpp
index e4d3c4b6..775a8842 100644
--- a/launcher/launcheruilayer.cpp
+++ b/launcher/launcheruilayer.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include "utilities/Globals_macros.h"
 #include "utilities/translation_macros.h"
 #include "imgui/imgui.h"
diff --git a/launcher/launcheruilayer.cppm b/launcher/launcheruilayer.cppm
index bdc694e3..08bdb841 100644
--- a/launcher/launcheruilayer.cppm
+++ b/launcher/launcheruilayer.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <array>
+#include <string>
 
 export module eu07.launcher.launcheruilayer;
 import eu07.application.uilayer;
diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp
index d8b2cfe7..56104f38 100644
--- a/launcher/scenery_list.cpp
+++ b/launcher/scenery_list.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstdint>
 #include <array>
 #include <cstddef>
diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp
index 46fcc461..603cf8c3 100644
--- a/launcher/scenery_scanner.cpp
+++ b/launcher/scenery_scanner.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <type_traits>
 #include <fstream>
 #include <ios>
 #include <map>
diff --git a/launcher/scenery_scanner.cppm b/launcher/scenery_scanner.cppm
index be68b711..d816c319 100644
--- a/launcher/scenery_scanner.cppm
+++ b/launcher/scenery_scanner.cppm
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <sstream>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp
index 41cde3d5..ec61cc98 100644
--- a/launcher/textures_scanner.cpp
+++ b/launcher/textures_scanner.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <type_traits>
 #include <cstddef>
 #include <utility>
 #include <ios>
diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp
index d488e2b6..b3540c6b 100644
--- a/launcher/vehicle_picker.cpp
+++ b/launcher/vehicle_picker.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <type_traits>
 #include <cstddef>
 #include <array>
 #include <map>
diff --git a/model/MdlMngr.cpp b/model/MdlMngr.cpp
index c92dc965..90fa386b 100644
--- a/model/MdlMngr.cpp
+++ b/model/MdlMngr.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <deque>
 #include <unordered_map>
 #include <memory>
diff --git a/model/Model3d.cppm b/model/Model3d.cppm
index 9766e9d9..659fe4f1 100644
--- a/model/Model3d.cppm
+++ b/model/Model3d.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <sstream>
 #include <cstddef>
 #include <istream>
 #include <ostream>
diff --git a/model/Texture.cpp b/model/Texture.cpp
index d1186a42..cf4c8340 100644
--- a/model/Texture.cpp
+++ b/model/Texture.cpp
@@ -1,4 +1,9 @@
 module;
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
diff --git a/model/Texture.cppm b/model/Texture.cppm
index a186587d..c749089f 100644
--- a/model/Texture.cppm
+++ b/model/Texture.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <chrono>
 #include <cstdint>
 #include <array>
 #include <atomic>
diff --git a/model/material.cpp b/model/material.cpp
index b7488bb8..1a5c1374 100644
--- a/model/material.cpp
+++ b/model/material.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
 #include <array>
 #include <optional>
 #include <unordered_map>
diff --git a/model/material.cppm b/model/material.cppm
index a54ab1dc..10f6a963 100644
--- a/model/material.cppm
+++ b/model/material.cppm
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <array>
 #include <cstddef>
 #include <string>
diff --git a/network/manager.cppm b/network/manager.cppm
index 9eaf855d..863fe2aa 100644
--- a/network/manager.cppm
+++ b/network/manager.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <fstream>
 #include <string>
 #include <optional>
diff --git a/network/message.cppm b/network/message.cppm
index e0b134d6..99fb89cc 100644
--- a/network/message.cppm
+++ b/network/message.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <queue>
 #include <cstdint>
 #include <istream>
diff --git a/network/network.cpp b/network/network.cpp
index 9eb802b2..fcc8b844 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <unordered_map>
 #include <fstream>
 #include <istream>
diff --git a/network/network.cppm b/network/network.cppm
index 487f1ab1..c3a5361d 100644
--- a/network/network.cppm
+++ b/network/network.cppm
@@ -1,4 +1,5 @@
 module;
+#include <deque>
 #include <cstddef>
 #include <string>
 #include <tuple>
diff --git a/rendering/geometrybank.cppm b/rendering/geometrybank.cppm
index aebcd494..0c8c1a6e 100644
--- a/rendering/geometrybank.cppm
+++ b/rendering/geometrybank.cppm
@@ -1,4 +1,6 @@
 module;
+#include <chrono>
+#include <string>
 #include <cstddef>
 #include <cstdint>
 #include <deque>
diff --git a/rendering/nullrenderer.cppm b/rendering/nullrenderer.cppm
index 22ee975a..e0aa1221 100644
--- a/rendering/nullrenderer.cppm
+++ b/rendering/nullrenderer.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 <ostream>
 #include <cstddef>
 #include <string>
 #include "glad/glad.h"
diff --git a/rendering/opengl33particles.cpp b/rendering/opengl33particles.cpp
index 94f00f91..da039be8 100644
--- a/rendering/opengl33particles.cpp
+++ b/rendering/opengl33particles.cpp
@@ -1,4 +1,8 @@
 module;
+#include <limits>
+#include <ostream>
+#include <string>
+#include <unordered_map>
 #include <optional>
 #include <utility>
 #include <memory>
diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp
index f4a96be9..52a3c9f2 100644
--- a/rendering/opengl33precipitation.cpp
+++ b/rendering/opengl33precipitation.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <functional>
 #include <optional>
 #include "glad/glad.h"
diff --git a/rendering/opengl33precipitation.cppm b/rendering/opengl33precipitation.cppm
index 6f0a4d76..2fbbe223 100644
--- a/rendering/opengl33precipitation.cppm
+++ b/rendering/opengl33precipitation.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 #include <optional>
diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp
index 2a48198c..197fe5af 100644
--- a/rendering/opengl33renderer.cpp
+++ b/rendering/opengl33renderer.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstring>
 #include <array>
 #include <unordered_map>
diff --git a/rendering/opengl33renderer.cppm b/rendering/opengl33renderer.cppm
index 656a302c..1f95c7c9 100644
--- a/rendering/opengl33renderer.cppm
+++ b/rendering/opengl33renderer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #include <array>
diff --git a/rendering/openglcolor.cppm b/rendering/openglcolor.cppm
index d9b32c1d..a43e3399 100644
--- a/rendering/openglcolor.cppm
+++ b/rendering/openglcolor.cppm
@@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/.
 
 // encapsulation of the fixed pipeline opengl color
 module;
+#include <ostream>
+#include <string>
 #include <glad/glad.h>
 #include "utilities/Globals_macros.h"
 
diff --git a/rendering/openglparticles.cpp b/rendering/openglparticles.cpp
index 6e21f321..d9f6051e 100644
--- a/rendering/openglparticles.cpp
+++ b/rendering/openglparticles.cpp
@@ -1,4 +1,8 @@
 module;
+#include <limits>
+#include <ostream>
+#include <string>
+#include <unordered_map>
 #include <utility>
 #include <cstdint>
 #include "glad/glad.h"
diff --git a/rendering/openglprecipitation.cpp b/rendering/openglprecipitation.cpp
index cad329ab..9db552e3 100644
--- a/rendering/openglprecipitation.cpp
+++ b/rendering/openglprecipitation.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include "glad/glad.h"
 #include <cmath>
 #include <cstdint>
diff --git a/rendering/openglprecipitation.cppm b/rendering/openglprecipitation.cppm
index eaa83356..fc84b072 100644
--- a/rendering/openglprecipitation.cppm
+++ b/rendering/openglprecipitation.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
 #include "global_include/interfaces/ITexture_macros.h"
 #include "glad/glad.h"
 #include <cstdint>
diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp
index ae14864a..d8c153bf 100644
--- a/rendering/openglrenderer.cpp
+++ b/rendering/openglrenderer.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
+#include <unordered_map>
 #include <optional>
 #include "imgui/imgui.h"
 #include <GLFW/glfw3.h>
diff --git a/rendering/openglrenderer.cppm b/rendering/openglrenderer.cppm
index 667ededc..602967e3 100644
--- a/rendering/openglrenderer.cppm
+++ b/rendering/openglrenderer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #include <cstddef>
diff --git a/rendering/particles.cpp b/rendering/particles.cpp
index 1d272e2b..8bb0cba5 100644
--- a/rendering/particles.cpp
+++ b/rendering/particles.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include <limits>
 #include <vector>
diff --git a/rendering/particles.cppm b/rendering/particles.cppm
index cc9e7fc4..7de3cb84 100644
--- a/rendering/particles.cppm
+++ b/rendering/particles.cppm
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <cstddef>
 #include <limits>
 #include <string>
diff --git a/rendering/precipitation.cpp b/rendering/precipitation.cpp
index 6d959103..c30bbead 100644
--- a/rendering/precipitation.cpp
+++ b/rendering/precipitation.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <algorithm>
 #include <cmath>
 #include "utilities/Globals_macros.h"
diff --git a/rendering/renderer.cppm b/rendering/renderer.cppm
index 68145c42..84e371c3 100644
--- a/rendering/renderer.cppm
+++ b/rendering/renderer.cppm
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include "glad/glad.h"
 #include <cstddef>
 #include <functional>
diff --git a/rendering/screenshot.cpp b/rendering/screenshot.cpp
index 3e7c34fa..d0595faf 100644
--- a/rendering/screenshot.cpp
+++ b/rendering/screenshot.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstdint>
 #include <string>
 #include "utilities/Globals_macros.h"
diff --git a/scene/scene.cppm b/scene/scene.cppm
index 25ea9d93..476ef032 100644
--- a/scene/scene.cppm
+++ b/scene/scene.cppm
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include <functional>
 #include <istream>
diff --git a/scene/sceneeditor.cpp b/scene/sceneeditor.cpp
index 33af88f7..e9944791 100644
--- a/scene/sceneeditor.cpp
+++ b/scene/sceneeditor.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <string>
 #include <algorithm>
 #include <cmath>
diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp
index 1bebc05f..6667fcfd 100644
--- a/scene/scenenode.cpp
+++ b/scene/scenenode.cpp
@@ -1,4 +1,7 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <type_traits>
 #include <sstream>
 #include "glad/glad.h"
 #include <algorithm>
diff --git a/scene/scenenode.cppm b/scene/scenenode.cppm
index 3c8b7c39..3b47e93d 100644
--- a/scene/scenenode.cppm
+++ b/scene/scenenode.cppm
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <cstddef>
 #include <limits>
 #include "global_include/interfaces/ITexture_macros.h"
diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp
index 68b153fc..148fdb4a 100644
--- a/scripting/PyInt.cpp
+++ b/scripting/PyInt.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <utility>
 #include <cstddef>
 #include <cstdint>
 #include <array>
diff --git a/scripting/PyInt.cppm b/scripting/PyInt.cppm
index 49473914..e25af1bb 100644
--- a/scripting/PyInt.cppm
+++ b/scripting/PyInt.cppm
@@ -7,6 +7,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <limits>
+#include <sstream>
+#include <type_traits>
+#include <utility>
 #include <array>
 #include <atomic>
 #include <chrono>
diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp
index ed16bb61..4573ba11 100644
--- a/scripting/ladderlogic.cpp
+++ b/scripting/ladderlogic.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <cstdint>
 #include <vector>
 #include <variant>
diff --git a/scripting/ladderlogic.cppm b/scripting/ladderlogic.cppm
index 75251c73..0cc23cc0 100644
--- a/scripting/ladderlogic.cppm
+++ b/scripting/ladderlogic.cppm
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <cstdint>
 #include <map>
 #include <string>
diff --git a/scripting/lua.cpp b/scripting/lua.cpp
index d9a86047..952f38c6 100644
--- a/scripting/lua.cpp
+++ b/scripting/lua.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <lua.hpp>
 #include <stdexcept>
 #include <string>
diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp
index b936c014..14584e37 100644
--- a/scripting/pythonscreenviewer.cpp
+++ b/scripting/pythonscreenviewer.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <atomic>
 #include <functional>
 #include <string>
diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp
index 1ec3d7d1..6817f310 100644
--- a/simulation/simulation.cpp
+++ b/simulation/simulation.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <deque>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
+#include <unordered_map>
 #include <GLFW/glfw3.h>
 #include <algorithm>
 #include <cmath>
diff --git a/simulation/simulation.cppm b/simulation/simulation.cppm
index 6e0e4834..b392b86c 100644
--- a/simulation/simulation.cppm
+++ b/simulation/simulation.cppm
@@ -1,4 +1,7 @@
 module;
+#include <limits>
+#include <unordered_map>
+#include <vector>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp
index 43a2937b..73189a64 100644
--- a/simulation/simulationenvironment.cpp
+++ b/simulation/simulationenvironment.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <algorithm>
 #include <cmath>
 #include <iterator>
diff --git a/simulation/simulationenvironment.cppm b/simulation/simulationenvironment.cppm
index 15e0a4ac..fba3d2e5 100644
--- a/simulation/simulationenvironment.cppm
+++ b/simulation/simulationenvironment.cppm
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 
 export module eu07.simulation.simulationenvironment;
 import eu07.audio.sound;
diff --git a/simulation/simulationsounds.cppm b/simulation/simulationsounds.cppm
index af18c1ba..1f849040 100644
--- a/simulation/simulationsounds.cppm
+++ b/simulation/simulationsounds.cppm
@@ -1,4 +1,5 @@
 module;
+#include <vector>
 #include <string>
 #include <unordered_map>
 
diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp
index 5520d856..a2b79242 100644
--- a/simulation/simulationstateserializer.cpp
+++ b/simulation/simulationstateserializer.cpp
@@ -1,4 +1,8 @@
 module;
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <fstream>
 #include <ostream>
 #include <unordered_map>
diff --git a/simulation/simulationstateserializer.cppm b/simulation/simulationstateserializer.cppm
index 0e62359f..c720ce38 100644
--- a/simulation/simulationstateserializer.cppm
+++ b/simulation/simulationstateserializer.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <sstream>
+#include <vector>
 #include <ostream>
 #include <string>
 #include <functional>
diff --git a/simulation/simulationtime.cpp b/simulation/simulationtime.cpp
index 0b43ba20..b40b94ab 100644
--- a/simulation/simulationtime.cpp
+++ b/simulation/simulationtime.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <string>
 #include <cstring>
 #include <algorithm>
diff --git a/utilities/Globals.cppm b/utilities/Globals.cppm
index 4d5b9ef4..fb8301bb 100644
--- a/utilities/Globals.cppm
+++ b/utilities/Globals.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <cstdint>
 #include <array>
 #include <chrono>
diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp
index 73e1b2cc..4c3156ac 100644
--- a/utilities/Logs.cpp
+++ b/utilities/Logs.cpp
@@ -1,4 +1,8 @@
 module;
+#include <limits>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstdio>
 #include <chrono>
 #include <fstream>
diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp
index 3362f462..93908401 100644
--- a/utilities/Timer.cpp
+++ b/utilities/Timer.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include <cstdint>
 #include <chrono>
 #include <ctime>
diff --git a/utilities/dictionary.cpp b/utilities/dictionary.cpp
index d02461ee..e22bbdc2 100644
--- a/utilities/dictionary.cpp
+++ b/utilities/dictionary.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <type_traits>
 #include <utility>
 #include <vector>
 #include <string>
diff --git a/utilities/headtrack.cpp b/utilities/headtrack.cpp
index 72e34184..d2c9f887 100644
--- a/utilities/headtrack.cpp
+++ b/utilities/headtrack.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstddef>
 #include <string>
 #include "utilities/Globals_macros.h"
diff --git a/utilities/motiontelemetry.cpp b/utilities/motiontelemetry.cpp
index 343886e6..73e29f90 100644
--- a/utilities/motiontelemetry.cpp
+++ b/utilities/motiontelemetry.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <string>
 #include <chrono>
 #include <cmath>
diff --git a/utilities/parser.cpp b/utilities/parser.cpp
index 1e913ed9..464a32d4 100644
--- a/utilities/parser.cpp
+++ b/utilities/parser.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
 #include <istream>
 #include <deque>
 #include <fstream>
diff --git a/utilities/translation.cpp b/utilities/translation.cpp
index a2b65695..4cd49db4 100644
--- a/utilities/translation.cpp
+++ b/utilities/translation.cpp
@@ -1,4 +1,6 @@
 module;
+#include <cstddef>
+#include <ostream>
 #include <ios>
 #include <sstream>
 #include <unordered_map>
diff --git a/utilities/uart.cpp b/utilities/uart.cpp
index 00a531c1..bf64b868 100644
--- a/utilities/uart.cpp
+++ b/utilities/uart.cpp
@@ -1,4 +1,9 @@
 module;
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstdio>
 #include <tuple>
 #include <vector>
diff --git a/utilities/uart.cppm b/utilities/uart.cppm
index ce7a9d77..ac4d5252 100644
--- a/utilities/uart.cppm
+++ b/utilities/uart.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <array>
 #include <cstddef>
 #include <tuple>
diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp
index ab4b7393..f7f2d4be 100644
--- a/utilities/utilities.cpp
+++ b/utilities/utilities.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstdint>
 #include <limits>
 #include <type_traits>
diff --git a/vehicle/AirCoupler.cpp b/vehicle/AirCoupler.cpp
index 8e503982..2fc702bd 100644
--- a/vehicle/AirCoupler.cpp
+++ b/vehicle/AirCoupler.cpp
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <string>
 
 module eu07.simcore;
diff --git a/vehicle/AirCoupler.cppm b/vehicle/AirCoupler.cppm
index 5cc2892c..444dae76 100644
--- a/vehicle/AirCoupler.cppm
+++ b/vehicle/AirCoupler.cppm
@@ -7,6 +7,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <sstream>
 #include <string>
 
 export module eu07.simcore:aircoupler;
diff --git a/vehicle/Button.cpp b/vehicle/Button.cpp
index 163a6285..ec1ad61d 100644
--- a/vehicle/Button.cpp
+++ b/vehicle/Button.cpp
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <cstdint>
 #include <array>
 #include <limits>
diff --git a/vehicle/Button.cppm b/vehicle/Button.cppm
index 382a4e95..67158e2b 100644
--- a/vehicle/Button.cppm
+++ b/vehicle/Button.cppm
@@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/.
 
 // animacja dwustanowa, włącza jeden z dwóch submodeli (jednego z nich może nie być)
 module;
+#include <sstream>
+#include <vector>
 #include <cstdint>
 #include <string>
 
diff --git a/vehicle/Camera.cpp b/vehicle/Camera.cpp
index b5e18921..8f289e7f 100644
--- a/vehicle/Camera.cpp
+++ b/vehicle/Camera.cpp
@@ -1,4 +1,11 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
diff --git a/vehicle/Camera.cppm b/vehicle/Camera.cppm
index 16bddc1d..f5c0b6ca 100644
--- a/vehicle/Camera.cppm
+++ b/vehicle/Camera.cppm
@@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/.
 
 //---------------------------------------------------------------------------
 module;
+#include <deque>
+#include <unordered_map>
 #include "vehicle/DynObj_macros.h"
 
 export module eu07.vehicle.camera;
diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp
index 8ec1a9a0..f063ce81 100644
--- a/vehicle/Driver.cpp
+++ b/vehicle/Driver.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <fstream>
 #include <tuple>
 #include <utility>
diff --git a/vehicle/Driver.cppm b/vehicle/Driver.cppm
index 4ad3f629..e15dfb4b 100644
--- a/vehicle/Driver.cppm
+++ b/vehicle/Driver.cppm
@@ -7,6 +7,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <array>
 #include <cstddef>
 #include <fstream>
diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp
index e906c3d8..66aef4ea 100644
--- a/vehicle/DynObj.cpp
+++ b/vehicle/DynObj.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <array>
 #include <cstddef>
 #include <deque>
diff --git a/vehicle/DynObj.cppm b/vehicle/DynObj.cppm
index ba1e7a02..bcae6703 100644
--- a/vehicle/DynObj.cppm
+++ b/vehicle/DynObj.cppm
@@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/.
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 module;
+#include <sstream>
 #include <array>
 #include <tuple>
 #include <unordered_map>
diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp
index 7a07d51d..eb897f16 100644
--- a/vehicle/Gauge.cpp
+++ b/vehicle/Gauge.cpp
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <algorithm>
 #include <array>
 #include <cctype>
diff --git a/vehicle/Gauge.cppm b/vehicle/Gauge.cppm
index 5fc9ed6f..f5ae330f 100644
--- a/vehicle/Gauge.cppm
+++ b/vehicle/Gauge.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <sstream>
+#include <string>
+#include <vector>
 #include <array>
 #include <map>
 #include <optional>
diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp
index fc31d8f0..0e83dbe5 100644
--- a/vehicle/Train.cpp
+++ b/vehicle/Train.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <cstddef>
 #include <cstdint>
 #include <deque>
diff --git a/vehicle/Train.cppm b/vehicle/Train.cppm
index 26d3c298..94a5e8de 100644
--- a/vehicle/Train.cppm
+++ b/vehicle/Train.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <ostream>
+#include <sstream>
 #include <tuple>
 #include <utility>
 #include "utilities/Globals_macros.h"
diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp
index f3b51892..d9d1b80a 100644
--- a/vr/openvr_imp.cpp
+++ b/vr/openvr_imp.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <array>
 #include <cstddef>
 #include <cstdint>
diff --git a/vr/vr_interface.cppm b/vr/vr_interface.cppm
index 96c640be..2f7e8e03 100644
--- a/vr/vr_interface.cppm
+++ b/vr/vr_interface.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp
index e3f73ebf..1571d207 100644
--- a/widgets/cameraview_extcam.cpp
+++ b/widgets/cameraview_extcam.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <cstring>
 #include <cstddef>
 #include <cstdint>
diff --git a/widgets/cameraview_extcam.cppm b/widgets/cameraview_extcam.cppm
index f52113c3..c5fca24d 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 <cstddef>
 #include <cstdint>
 #include <string>
 #include <atomic>
diff --git a/widgets/map.cpp b/widgets/map.cpp
index d32c8c7c..18b7b37e 100644
--- a/widgets/map.cpp
+++ b/widgets/map.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <type_traits>
 #include <cstring>
 #include <cstddef>
 #include <iterator>
diff --git a/widgets/map.cppm b/widgets/map.cppm
index caf8457a..02d9613a 100644
--- a/widgets/map.cppm
+++ b/widgets/map.cppm
@@ -1,4 +1,7 @@
 module;
+#include <cstddef>
+#include <deque>
+#include <unordered_map>
 #include <string>
 #include <utility>
 #include <array>
diff --git a/widgets/map_objects.cppm b/widgets/map_objects.cppm
index 28a60866..85ae1475 100644
--- a/widgets/map_objects.cppm
+++ b/widgets/map_objects.cppm
@@ -1,4 +1,5 @@
 module;
+#include <cstddef>
 #include <memory>
 #include <array>
 #include <map>
diff --git a/widgets/time.cpp b/widgets/time.cpp
index 8e7e5794..0a2b1a25 100644
--- a/widgets/time.cpp
+++ b/widgets/time.cpp
@@ -1,4 +1,6 @@
 module;
+#include <ostream>
+#include <string>
 #include "utilities/Globals_macros.h"
 #include "imgui/imgui.h"
 #include "utilities/translation_macros.h"
diff --git a/widgets/time.cppm b/widgets/time.cppm
index a69e5f4e..63e95bab 100644
--- a/widgets/time.cppm
+++ b/widgets/time.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include "utilities/translation_macros.h"
 
 export module eu07.widgets.time;
diff --git a/widgets/vehiclelist.cpp b/widgets/vehiclelist.cpp
index bdfb242e..e0faf4be 100644
--- a/widgets/vehiclelist.cpp
+++ b/widgets/vehiclelist.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include "imgui/imgui.h"
 #include "utilities/translation_macros.h"
 #include <string>
diff --git a/widgets/vehicleparams.cpp b/widgets/vehicleparams.cpp
index f9aa9432..5537b633 100644
--- a/widgets/vehicleparams.cpp
+++ b/widgets/vehicleparams.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include "utilities/translation_macros.h"
 #include <GLFW/glfw3.h>
 #include <array>
diff --git a/widgets/vehicleparams.cppm b/widgets/vehicleparams.cppm
index 676e505a..fa03b5ed 100644
--- a/widgets/vehicleparams.cppm
+++ b/widgets/vehicleparams.cppm
@@ -1,4 +1,6 @@
 module;
+#include <deque>
+#include <unordered_map>
 #include <string>
 #include "utilities/translation_macros.h"
 #include "imgui/imgui.h"
diff --git a/world/EvLaunch.cpp b/world/EvLaunch.cpp
index fa928463..6fbab8f2 100644
--- a/world/EvLaunch.cpp
+++ b/world/EvLaunch.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <cmath>
 #include <istream>
 #include <map>
diff --git a/world/EvLaunch.cppm b/world/EvLaunch.cppm
index 7bcf857b..98f40d13 100644
--- a/world/EvLaunch.cppm
+++ b/world/EvLaunch.cppm
@@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/.
 
 // radio-transmitted event launch messages
 module;
+#include <sstream>
 #include <istream>
 #include <ostream>
 #include <string>
diff --git a/world/Event.cpp b/world/Event.cpp
index 9d9bf77b..87bb8fdb 100644
--- a/world/Event.cpp
+++ b/world/Event.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <array>
 #include <cstddef>
 #include <tuple>
diff --git a/world/MemCell.cppm b/world/MemCell.cppm
index 25d43c71..0c0f0d55 100644
--- a/world/MemCell.cppm
+++ b/world/MemCell.cppm
@@ -7,6 +7,10 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <deque>
+#include <sstream>
+#include <unordered_map>
 #include <istream>
 #include <ostream>
 #include <string>
diff --git a/world/Segment.cpp b/world/Segment.cpp
index 3b927723..a61063ae 100644
--- a/world/Segment.cpp
+++ b/world/Segment.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <array>
 #include <string>
 #include <algorithm>
diff --git a/world/Segment.cppm b/world/Segment.cppm
index bd42ad94..43e9c4e5 100644
--- a/world/Segment.cppm
+++ b/world/Segment.cppm
@@ -7,6 +7,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <sstream>
+#include <string>
 #include <array>
 #include <utility>
 #include <cmath>
diff --git a/world/Track.cpp b/world/Track.cpp
index 36e54fb6..494c8d8b 100644
--- a/world/Track.cpp
+++ b/world/Track.cpp
@@ -1,4 +1,8 @@
 module;
+#include <chrono>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <deque>
 #include <iterator>
 #include <unordered_map>
diff --git a/world/Track.cppm b/world/Track.cppm
index df343097..8e10cc42 100644
--- a/world/Track.cppm
+++ b/world/Track.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <sstream>
 #include <istream>
 #include <ostream>
 #include <utility>
diff --git a/world/Traction.cpp b/world/Traction.cpp
index 00774c79..753db8ca 100644
--- a/world/Traction.cpp
+++ b/world/Traction.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include "glad/glad.h"
 #include <cmath>
 #include <cstddef>
diff --git a/world/Traction.cppm b/world/Traction.cppm
index 7e2724d5..30462a0c 100644
--- a/world/Traction.cppm
+++ b/world/Traction.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <deque>
+#include <unordered_map>
 #include <cstddef>
 #include <istream>
 #include <ostream>
diff --git a/world/TractionPower.cpp b/world/TractionPower.cpp
index 930cd67e..8e353b76 100644
--- a/world/TractionPower.cpp
+++ b/world/TractionPower.cpp
@@ -1,4 +1,5 @@
 module;
+#include <sstream>
 #include <string>
 #include <istream>
 #include <ostream>
diff --git a/world/TractionPower.cppm b/world/TractionPower.cppm
index ad7f464e..8748dd28 100644
--- a/world/TractionPower.cppm
+++ b/world/TractionPower.cppm
@@ -7,6 +7,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <cstddef>
+#include <deque>
+#include <sstream>
+#include <string>
+#include <unordered_map>
 #include <istream>
 #include <ostream>
 
diff --git a/world/TrkFoll.cpp b/world/TrkFoll.cpp
index 3fc0be77..a4e6b292 100644
--- a/world/TrkFoll.cpp
+++ b/world/TrkFoll.cpp
@@ -1,4 +1,5 @@
 module;
+#include <ostream>
 #include <memory>
 #include <string>
 #include <cmath>
diff --git a/world/mtable.cpp b/world/mtable.cpp
index 8c79fe6a..370ab386 100644
--- a/world/mtable.cpp
+++ b/world/mtable.cpp
@@ -1,4 +1,10 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <ostream>
+#include <sstream>
+#include <type_traits>
 #include <fstream>
 #include <string>
 #include "utilities/Globals_macros.h"
diff --git a/world/mtable.cppm b/world/mtable.cppm
index 6d85db02..c8559c6c 100644
--- a/world/mtable.cppm
+++ b/world/mtable.cppm
@@ -7,6 +7,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 module;
+#include <utility>
+#include <vector>
 #include <string>
 
 export module eu07.world.mtable;
diff --git a/world/station.cpp b/world/station.cpp
index 84398305..c7747b01 100644
--- a/world/station.cpp
+++ b/world/station.cpp
@@ -1,4 +1,9 @@
 module;
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <sstream>
+#include <type_traits>
 #include <algorithm>
 #include <string>
 #include "utilities/utilities_macros.h"