diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp
index 94c1618f..d6e3751c 100644
--- a/Console/PoKeys55.cpp
+++ b/Console/PoKeys55.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstdlib>
 #include <string>
 #include <setupapi.h>
 #include "utilities/utilities_macros.h"
diff --git a/application/application.cpp b/application/application.cpp
index f8e55f84..e3854c40 100644
--- a/application/application.cpp
+++ b/application/application.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <cstdint>
 #include <array>
 #include <cstddef>
diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp
index 0bfe5233..76c0fda6 100644
--- a/application/editoruipanels.cpp
+++ b/application/editoruipanels.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <cstddef>
 #include <functional>
 #include <memory>
diff --git a/betterRenderer/eu07_source/register.cpp b/betterRenderer/eu07_source/register.cpp
index 33029d6b..6184a52c 100644
--- a/betterRenderer/eu07_source/register.cpp
+++ b/betterRenderer/eu07_source/register.cpp
@@ -1,5 +1,6 @@
 import eu07.utilities.logs;
 #include "nvrenderer/nvrenderer.h"
+#include <memory>
 
 namespace {
 std::unique_ptr<gfx_renderer> create_nvrenderer_for_d3d12() {
diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.cpp b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
index 20b3b0c3..6a6188e3 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.cpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
@@ -4,6 +4,12 @@
 #include <iostream>
 
 #include "utils.hpp"
+#include <cstdint>
+#include <filesystem>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 int MaShaderCompiler::Run() {
   ParseOptions();
diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.hpp b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
index f2d8ed49..12af5b0f 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.hpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
@@ -11,6 +11,9 @@
 #include <Windows.h>
 #endif
 #include <dxcapi.h>
+#include <string>
+#include <tuple>
+#include <vector>
 
 template <typename T>
 using RefCountPtr = nvrhi::RefCountPtr<T>;
diff --git a/betterRenderer/mashadercompiler/src/utils.hpp b/betterRenderer/mashadercompiler/src/utils.hpp
index 0e647d32..0dd83aa9 100644
--- a/betterRenderer/mashadercompiler/src/utils.hpp
+++ b/betterRenderer/mashadercompiler/src/utils.hpp
@@ -3,6 +3,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include <string>
+#include <cstdint>
 
 inline std::wstring ToWide(const std::string& str) {
   std::wstring wstr{};
diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
index 33b4c1ba..bd7aac05 100644
--- a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
+++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
@@ -38,6 +38,17 @@ import eu07.rendering.renderer;
 #include "resource_registry.h"
 import eu07.environment.sky;
 import eu07.glm;
+#include <array>
+#include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace Rt {
 struct IRtModel;
diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer_enums.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer_enums.h
index d78d2e67..8c29e513 100644
--- a/betterRenderer/renderer/include/nvrenderer/nvrenderer_enums.h
+++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer_enums.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace RendererEnums {
 
diff --git a/betterRenderer/renderer/include/nvrenderer/quadtree.h b/betterRenderer/renderer/include/nvrenderer/quadtree.h
index e913fa0b..5ae332ea 100644
--- a/betterRenderer/renderer/include/nvrenderer/quadtree.h
+++ b/betterRenderer/renderer/include/nvrenderer/quadtree.h
@@ -5,6 +5,8 @@
 #include <vector>
 import eu07.glm;
 #include <cstdint>
+#include <cstddef>
+#include <limits>
 
 struct QuadTreeLeave {
   QuadTreeLeave(const glm::dvec3& origin, const glm::dvec3& extent,
diff --git a/betterRenderer/renderer/include/nvrenderer/resource_registry.h b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
index 9a817b4b..4bb040f3 100644
--- a/betterRenderer/renderer/include/nvrenderer/resource_registry.h
+++ b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
@@ -4,6 +4,9 @@
 
 #include <entt/entt.hpp>
 import eu07.glm;
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 
 class NvTextureManager;
 class MaResourceRegistry;
diff --git a/betterRenderer/renderer/source/IntelTAA.h b/betterRenderer/renderer/source/IntelTAA.h
index 978f7f13..91e23f6c 100644
--- a/betterRenderer/renderer/source/IntelTAA.h
+++ b/betterRenderer/renderer/source/IntelTAA.h
@@ -19,6 +19,7 @@
 #ifdef __cplusplus
 
 #include <cmath>
+#include <cstdint>
 
 namespace IntelTAA
 {
diff --git a/betterRenderer/renderer/source/auto_exposure.cpp b/betterRenderer/renderer/source/auto_exposure.cpp
index c1a997dc..e3317a02 100644
--- a/betterRenderer/renderer/source/auto_exposure.cpp
+++ b/betterRenderer/renderer/source/auto_exposure.cpp
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <cstdint>
 
 MaAutoExposure::MaAutoExposure(NvRenderer *renderer)
     : MaResourceRegistry(renderer), m_backend(renderer->GetBackend()) {}
diff --git a/betterRenderer/renderer/source/auto_exposure.h b/betterRenderer/renderer/source/auto_exposure.h
index c9806a14..db77f069 100644
--- a/betterRenderer/renderer/source/auto_exposure.h
+++ b/betterRenderer/renderer/source/auto_exposure.h
@@ -3,6 +3,7 @@
 #include "nvrenderer/resource_registry.h"
 
 #include <nvrhi/nvrhi.h>
+#include <cstdint>
 
 class NvRenderer;
 class NvRendererBackend;
diff --git a/betterRenderer/renderer/source/bloom.h b/betterRenderer/renderer/source/bloom.h
index d312b3f7..23e0dd41 100644
--- a/betterRenderer/renderer/source/bloom.h
+++ b/betterRenderer/renderer/source/bloom.h
@@ -2,6 +2,7 @@
 
 #include <nvrhi/nvrhi.h>
 import eu07.glm;
+#include <vector>
 
 struct Bloom {
   struct BloomConstants {
diff --git a/betterRenderer/renderer/source/config.cpp b/betterRenderer/renderer/source/config.cpp
index 675fa4fb..96584dd3 100644
--- a/betterRenderer/renderer/source/config.cpp
+++ b/betterRenderer/renderer/source/config.cpp
@@ -2,6 +2,9 @@
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <filesystem>
+#include <string>
+#include <vector>
 
 void MaConfig::Init(const std::filesystem::path& config_file) {
   Init(YAML::LoadFile(config_file.generic_string()));
diff --git a/betterRenderer/renderer/source/config.h b/betterRenderer/renderer/source/config.h
index 51477471..346e1dad 100644
--- a/betterRenderer/renderer/source/config.h
+++ b/betterRenderer/renderer/source/config.h
@@ -3,6 +3,9 @@
 #include <yaml-cpp/yaml.h>
 
 #include <filesystem>
+#include <array>
+#include <string>
+#include <vector>
 
 struct MaConfig {
   enum MaTonemapType { Default_Srgb = 0, Linear_Rec2020 };
diff --git a/betterRenderer/renderer/source/contactshadows.cpp b/betterRenderer/renderer/source/contactshadows.cpp
index e83b461e..1630d4ef 100644
--- a/betterRenderer/renderer/source/contactshadows.cpp
+++ b/betterRenderer/renderer/source/contactshadows.cpp
@@ -5,6 +5,7 @@
 #include "gbuffer.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <cstdint>
 
 MaContactShadows::MaContactShadows(NvRenderer* renderer, NvGbuffer* gbuffer)
     : m_backend(renderer->GetBackend()),
diff --git a/betterRenderer/renderer/source/contactshadows.h b/betterRenderer/renderer/source/contactshadows.h
index 3a5ee271..54e95f0c 100644
--- a/betterRenderer/renderer/source/contactshadows.h
+++ b/betterRenderer/renderer/source/contactshadows.h
@@ -2,6 +2,7 @@
 
 #include <nvrhi/nvrhi.h>
 import eu07.glm;
+#include <cstdint>
 
 struct MaContactShadows {
   MaContactShadows(class NvRenderer* renderer, class NvGbuffer* gbuffer);
diff --git a/betterRenderer/renderer/source/csm.cpp b/betterRenderer/renderer/source/csm.cpp
index 83b611da..ccd799ac 100644
--- a/betterRenderer/renderer/source/csm.cpp
+++ b/betterRenderer/renderer/source/csm.cpp
@@ -5,6 +5,8 @@
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <limits>
+#include <vector>
 
 MaShadowMap::MaShadowMap(NvRenderer* renderer)
     : MaResourceRegistry(renderer), m_backend(renderer->m_backend.get()) {}
diff --git a/betterRenderer/renderer/source/csm.h b/betterRenderer/renderer/source/csm.h
index 97e7cb0a..4a7a0359 100644
--- a/betterRenderer/renderer/source/csm.h
+++ b/betterRenderer/renderer/source/csm.h
@@ -3,6 +3,8 @@
 #include <nvrhi/nvrhi.h>
 
 #include "nvrenderer/resource_registry.h"
+#include <array>
+#include <vector>
 
 struct MaShadowMap : public MaResourceRegistry {
   MaShadowMap(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/environment.cpp b/betterRenderer/renderer/source/environment.cpp
index ba2078e8..5277b456 100644
--- a/betterRenderer/renderer/source/environment.cpp
+++ b/betterRenderer/renderer/source/environment.cpp
@@ -10,6 +10,12 @@
 #include "nvtexture.h"
 import eu07.simulation.simulationenvironment;
 #include "sky.h"
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
 
 int MaEnvironment::GetCurrentSetIndex() {
   if (m_locked_set_index >= 0 && IsReady()) {
diff --git a/betterRenderer/renderer/source/environment.h b/betterRenderer/renderer/source/environment.h
index 920e5952..df5fdd6b 100644
--- a/betterRenderer/renderer/source/environment.h
+++ b/betterRenderer/renderer/source/environment.h
@@ -3,6 +3,10 @@
 #include "fullscreenpass.h"
 #include "nvrenderer/resource_registry.h"
 #include "nvrhi/nvrhi.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
 
 struct MaEnvironment : public MaResourceRegistry {
   nvrhi::TextureHandle m_skybox;
diff --git a/betterRenderer/renderer/source/fsr.h b/betterRenderer/renderer/source/fsr.h
index 6a8ac04d..80e02c57 100644
--- a/betterRenderer/renderer/source/fsr.h
+++ b/betterRenderer/renderer/source/fsr.h
@@ -4,6 +4,8 @@
 
 #include "nvrendererbackend.h"
 import eu07.glm;
+#include <cstddef>
+#include <string>
 
 struct NvFSR {
   NvFSR(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/fullscreenpass.cpp b/betterRenderer/renderer/source/fullscreenpass.cpp
index 43dfeeca..dd5f9f00 100644
--- a/betterRenderer/renderer/source/fullscreenpass.cpp
+++ b/betterRenderer/renderer/source/fullscreenpass.cpp
@@ -3,6 +3,7 @@
 #include "fullscreenpass.h"
 
 #include "nvrendererbackend.h"
+#include <cstring>
 
 FullScreenPass::FullScreenPass(NvRendererBackend* backend)
     : m_backend(backend) {}
diff --git a/betterRenderer/renderer/source/gbuffer.cpp b/betterRenderer/renderer/source/gbuffer.cpp
index c945eaa3..b3f58fe3 100644
--- a/betterRenderer/renderer/source/gbuffer.cpp
+++ b/betterRenderer/renderer/source/gbuffer.cpp
@@ -4,6 +4,7 @@
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <cstdint>
 
 NvGbuffer::NvGbuffer(NvRenderer* renderer)
     : m_backend(renderer->m_backend.get()) {}
diff --git a/betterRenderer/renderer/source/gbuffer.h b/betterRenderer/renderer/source/gbuffer.h
index 7152ea4a..537c2ab8 100644
--- a/betterRenderer/renderer/source/gbuffer.h
+++ b/betterRenderer/renderer/source/gbuffer.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <nvrhi/nvrhi.h>
+#include <cstdint>
+#include <vector>
 
 struct NvGbuffer {
   NvGbuffer(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/gbufferlighting.cpp b/betterRenderer/renderer/source/gbufferlighting.cpp
index 6ad80ff8..560cf7e9 100644
--- a/betterRenderer/renderer/source/gbufferlighting.cpp
+++ b/betterRenderer/renderer/source/gbufferlighting.cpp
@@ -8,6 +8,7 @@
 #include "ssao.h"
 #include "config.h"
 import eu07.glm;
+#include <cstdint>
 
 void GbufferLighting::Init() {
   auto fb_info = m_renderer->m_gbuffer->m_framebuffer->getFramebufferInfo();
diff --git a/betterRenderer/renderer/source/gbufferlighting.h b/betterRenderer/renderer/source/gbufferlighting.h
index d4f27421..0904f8db 100644
--- a/betterRenderer/renderer/source/gbufferlighting.h
+++ b/betterRenderer/renderer/source/gbufferlighting.h
@@ -3,6 +3,9 @@
 #include <nvrenderer/nvrenderer.h>
 #include <nvrhi/nvrhi.h>
 import eu07.glm;
+#include <cstddef>
+#include <cstdint>
+#include <vector>
 
 
 struct GbufferLighting : public MaResourceRegistry {
diff --git a/betterRenderer/renderer/source/imgui_nvrhi.cpp b/betterRenderer/renderer/source/imgui_nvrhi.cpp
index 70757c1f..d8f9529c 100644
--- a/betterRenderer/renderer/source/imgui_nvrhi.cpp
+++ b/betterRenderer/renderer/source/imgui_nvrhi.cpp
@@ -53,6 +53,9 @@ SOFTWARE.
 #include "imgui_nvrhi.h"
 #include "nvrendererbackend.h"
 #include "config.h"
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
 
 struct VERTEX_CONSTANT_BUFFER
 {
diff --git a/betterRenderer/renderer/source/imgui_nvrhi.h b/betterRenderer/renderer/source/imgui_nvrhi.h
index 93ce983c..4d232796 100644
--- a/betterRenderer/renderer/source/imgui_nvrhi.h
+++ b/betterRenderer/renderer/source/imgui_nvrhi.h
@@ -55,6 +55,7 @@ SOFTWARE.
 
 #include <imgui/imgui.h>
 #include "nvtexture.h"
+#include <cstddef>
 
 struct ImGui_NVRHI
 {
diff --git a/betterRenderer/renderer/source/instancecache.h b/betterRenderer/renderer/source/instancecache.h
index 089bdbe0..a26e0b83 100644
--- a/betterRenderer/renderer/source/instancecache.h
+++ b/betterRenderer/renderer/source/instancecache.h
@@ -1,6 +1,11 @@
 #pragma once
 
 #include "nvrenderer/nvrenderer.h"
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <unordered_map>
+#include <vector>
 
 struct InstanceCacheId {
   gfx::geometry_handle m_geometry;
diff --git a/betterRenderer/renderer/source/ma_dds.cpp b/betterRenderer/renderer/source/ma_dds.cpp
index c981b0ae..93a48da0 100644
--- a/betterRenderer/renderer/source/ma_dds.cpp
+++ b/betterRenderer/renderer/source/ma_dds.cpp
@@ -2,6 +2,10 @@
 #include "nvtexture.h"
 
 #include <sstream>
+#include <cstddef>
+#include <cstdint>
+#include <ios>
+#include <string>
 
 bool NvTexture::LoadDDS(std::string &data, int size_bias) {
   ddspp::Descriptor desc{};
diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp
index f1e451a0..c8760429 100644
--- a/betterRenderer/renderer/source/materialparser.cpp
+++ b/betterRenderer/renderer/source/materialparser.cpp
@@ -13,6 +13,10 @@ import eu07.utilities.utilities;
 #include <yaml-cpp/yaml.h>
 #include <string>
 #include <filesystem>
+#include <memory>
+#include <optional>
+#include <sstream>
+#include <utility>
 
 std::string_view MaterialAdapter::GetTexturePathForEntry(
     std::string_view key) const {
diff --git a/betterRenderer/renderer/source/motioncache.h b/betterRenderer/renderer/source/motioncache.h
index 5cb377f6..e18c012d 100644
--- a/betterRenderer/renderer/source/motioncache.h
+++ b/betterRenderer/renderer/source/motioncache.h
@@ -4,6 +4,8 @@
 #include <functional>
 import eu07.glm;
 #include <cassert>
+#include <cstddef>
+#include <unordered_map>
 
 struct MotionCacheId {
   union {
diff --git a/betterRenderer/renderer/source/nvmaterial.cpp b/betterRenderer/renderer/source/nvmaterial.cpp
index bb2af9d4..26e15d89 100644
--- a/betterRenderer/renderer/source/nvmaterial.cpp
+++ b/betterRenderer/renderer/source/nvmaterial.cpp
@@ -12,6 +12,12 @@ import eu07.utilities.logs;
 #include "nvrendererbackend.h"
 #include "nvtexture.h"
 #include "sky.h"
+#include <array>
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 bool NvRenderer::MaterialTemplate::CreateBindingSet(size_t pipeline_index,
                                                     MaterialCache &cache) {
diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp
index ea9e237a..f5722e36 100644
--- a/betterRenderer/renderer/source/nvrenderer.cpp
+++ b/betterRenderer/renderer/source/nvrenderer.cpp
@@ -41,6 +41,20 @@ import eu07.simulation.simulation;
 import eu07.glm;
 #include "utilities/utilities_macros.h"
 import eu07.utilities.utilities;
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 bool NvRenderer::Init(GLFWwindow *Window) {
   m_message_callback = std::make_shared<NvRendererMessageCallback>();
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
index 0e8b1818..0a91faf7 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
@@ -14,6 +14,10 @@ import eu07.utilities.logs;
 #include <nvrhi/validation.h>
 
 #include "nvrendererbackend.h"
+#include <fstream>
+#include <ios>
+#include <memory>
+#include <string>
 
 #define HR_RETURN(op)                                      \
   hr = (HRESULT)(op);                                      \
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.h b/betterRenderer/renderer/source/nvrenderer_d3d12.h
index f220a673..257919ff 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.h
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.h
@@ -11,6 +11,8 @@
 #include <dxgi1_6.h>
 #include <dxgidebug.h>
 #include <nvrhi/d3d12.h>
+#include <string>
+#include <vector>
 
 class NvRendererBackend_D3D12 : public NvRendererBackend {
   friend class NvRenderer;
diff --git a/betterRenderer/renderer/source/nvrenderer_imgui.h b/betterRenderer/renderer/source/nvrenderer_imgui.h
index de261b8b..151c4a39 100644
--- a/betterRenderer/renderer/source/nvrenderer_imgui.h
+++ b/betterRenderer/renderer/source/nvrenderer_imgui.h
@@ -2,6 +2,7 @@
 
 #include "imgui_nvrhi.h"
 #include "nvrenderer/nvrenderer.h"
+#include <memory>
 
 class NvImguiRenderer : public imgui_renderer {
   virtual bool Init() override;
diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
index 779fc6a0..f988bf2c 100644
--- a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
@@ -17,6 +17,16 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 
 #include "nvrendererbackend.h"
 #include <queue>
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
+#include <limits>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <unordered_set>
+#include <vector>
 
 #define MA_ERROR_LOG(fmt_str, ...) ErrorLog(fmt::format(fmt_str, __VA_ARGS__))
 #define MA_INFO_LOG(fmt_str, ...) WriteLog(fmt::format(fmt_str, __VA_ARGS__))
diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.h b/betterRenderer/renderer/source/nvrenderer_vulkan.h
index e4dd799c..bdfda5c6 100644
--- a/betterRenderer/renderer/source/nvrenderer_vulkan.h
+++ b/betterRenderer/renderer/source/nvrenderer_vulkan.h
@@ -12,6 +12,10 @@
 
 #include <vulkan/vulkan.hpp>
 #include <queue>
+#include <cstdint>
+#include <string>
+#include <unordered_set>
+#include <vector>
 
 class NvRendererBackend_Vulkan : public NvRendererBackend {
   friend class NvRenderer;
diff --git a/betterRenderer/renderer/source/nvrendererbackend.cpp b/betterRenderer/renderer/source/nvrendererbackend.cpp
index a26357bd..894ce302 100644
--- a/betterRenderer/renderer/source/nvrendererbackend.cpp
+++ b/betterRenderer/renderer/source/nvrendererbackend.cpp
@@ -2,6 +2,9 @@
 
 import eu07.utilities.logs;
 #include <fmt/format.h>
+#include <cstddef>
+#include <string>
+#include <unordered_map>
 
 void NvRendererMessageCallback::message(nvrhi::MessageSeverity severity,
                                         const char *messageText) {
diff --git a/betterRenderer/renderer/source/nvrendererbackend.h b/betterRenderer/renderer/source/nvrendererbackend.h
index 0c482cea..773d13ff 100644
--- a/betterRenderer/renderer/source/nvrendererbackend.h
+++ b/betterRenderer/renderer/source/nvrendererbackend.h
@@ -3,6 +3,10 @@
 #include <nvrhi/nvrhi.h>
 
 #include "nvrenderer/nvrenderer.h"
+#include <array>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 struct ShaderDefine {
   std::string m_name;
diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp
index 7c9316a8..c15fbc99 100644
--- a/betterRenderer/renderer/source/nvtexture.cpp
+++ b/betterRenderer/renderer/source/nvtexture.cpp
@@ -17,6 +17,16 @@ import eu07.utilities.logs;
 #define STB_IMAGE_RESIZE2_IMPLEMENTATION
 #include "stbi/stb_image_resize2.h"
 import eu07.model.texture;
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <ios>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <cstring>
 #undef STB_IMAGE_RESIZE2_IMPLEMENTATION
 
 uint64_t NvTexture::s_change_counter = 0;
diff --git a/betterRenderer/renderer/source/nvtexture.h b/betterRenderer/renderer/source/nvtexture.h
index 0400c8c9..dba80143 100644
--- a/betterRenderer/renderer/source/nvtexture.h
+++ b/betterRenderer/renderer/source/nvtexture.h
@@ -9,6 +9,11 @@
 import eu07.global_include.interfaces.itexture;
 #include "nvrenderer/nvrenderer_enums.h"
 import eu07.glm;
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <vector>
 
 enum MaTextureTraits {
   MaTextureTraits_Sharpen,
diff --git a/betterRenderer/renderer/source/quadtree.cpp b/betterRenderer/renderer/source/quadtree.cpp
index 51ddfdc7..b9f2759d 100644
--- a/betterRenderer/renderer/source/quadtree.cpp
+++ b/betterRenderer/renderer/source/quadtree.cpp
@@ -1,4 +1,7 @@
 #include "nvrenderer/quadtree.h"
+#include <cstdint>
+#include <limits>
+#include <memory>
 
 void QuadTreeBuilder::Node::Insert(uint32_t index, glm::dvec3 min_,
                                    glm::dvec3 max_, int level) {
diff --git a/betterRenderer/renderer/source/resource_registry.cpp b/betterRenderer/renderer/source/resource_registry.cpp
index dce9fa42..c45a4fcf 100644
--- a/betterRenderer/renderer/source/resource_registry.cpp
+++ b/betterRenderer/renderer/source/resource_registry.cpp
@@ -4,6 +4,11 @@ import eu07.utilities.logs;
 #include "fmt/compile.h"
 #include "nvtexture.h"
 #include "nvrenderer/nvrenderer.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+#include <string>
 
 MaResourceMappingSet& MaResourceMappingSet::Add(
     const MaResourceMapping& mapping) {
diff --git a/betterRenderer/renderer/source/rt_model.cpp b/betterRenderer/renderer/source/rt_model.cpp
index 73524abd..7319d1e8 100644
--- a/betterRenderer/renderer/source/rt_model.cpp
+++ b/betterRenderer/renderer/source/rt_model.cpp
@@ -10,6 +10,12 @@
 #include <vector>
 
 import eu07.simcore;
+#include <array>
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <tuple>
+#include <unordered_map>
 
 namespace Rt {
 
diff --git a/betterRenderer/renderer/source/shaders_d3d12.cpp b/betterRenderer/renderer/source/shaders_d3d12.cpp
index a7fad3c2..1959e78a 100644
--- a/betterRenderer/renderer/source/shaders_d3d12.cpp
+++ b/betterRenderer/renderer/source/shaders_d3d12.cpp
@@ -1,6 +1,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include "nvrenderer_d3d12.h"
+#include <string>
 
 #if LIBMANUL_WITH_D3D12
 
diff --git a/betterRenderer/renderer/source/shaders_vulkan.cpp b/betterRenderer/renderer/source/shaders_vulkan.cpp
index 570e43e5..9436d8c3 100644
--- a/betterRenderer/renderer/source/shaders_vulkan.cpp
+++ b/betterRenderer/renderer/source/shaders_vulkan.cpp
@@ -2,6 +2,7 @@
 
 #include "nvrenderer_vulkan.h"
 #include <queue>
+#include <string>
 
 #if LIBMANUL_WITH_VULKAN
 
diff --git a/betterRenderer/renderer/source/sky.cpp b/betterRenderer/renderer/source/sky.cpp
index 44bb338f..d1c6cf77 100644
--- a/betterRenderer/renderer/source/sky.cpp
+++ b/betterRenderer/renderer/source/sky.cpp
@@ -8,6 +8,9 @@ import eu07.simulation.simulationenvironment;
 import eu07.simulation.simulationtime;
 #include "imgui/imgui.h"
 import eu07.glm;
+#include <array>
+#include <limits>
+#include <memory>
 
 namespace {
 static const float PI = 3.14159265358979323846f;
diff --git a/betterRenderer/renderer/source/sky.h b/betterRenderer/renderer/source/sky.h
index 5b21f4a4..7aef2131 100644
--- a/betterRenderer/renderer/source/sky.h
+++ b/betterRenderer/renderer/source/sky.h
@@ -2,6 +2,7 @@
 
 #include "fullscreenpass.h"
 #include "nvrenderer/resource_registry.h"
+#include <memory>
 
 struct Sky : public MaResourceRegistry {
   Sky(class NvRenderer* renderer, struct MaEnvironment *environment);
diff --git a/betterRenderer/renderer/source/ssao.cpp b/betterRenderer/renderer/source/ssao.cpp
index 64759085..1f0cb7c0 100644
--- a/betterRenderer/renderer/source/ssao.cpp
+++ b/betterRenderer/renderer/source/ssao.cpp
@@ -10,6 +10,8 @@
 #include "nvrendererbackend.h"
 #include "imgui/imgui.h"
 import eu07.glm;
+#include <array>
+#include <cstddef>
 
 NvSsao::NvSsao(NvRenderer* renderer)
     : m_backend(renderer->m_backend.get()),
diff --git a/betterRenderer/renderer/source/ssao.h b/betterRenderer/renderer/source/ssao.h
index c5c14cad..a0e88a9a 100644
--- a/betterRenderer/renderer/source/ssao.h
+++ b/betterRenderer/renderer/source/ssao.h
@@ -6,6 +6,8 @@
 
 #include "XeGTAO.h"
 import eu07.glm;
+#include <array>
+#include <cstddef>
 
 struct NvSsao {
   NvSsao(class NvRenderer* renderer);
diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp
index 187f361b..d530b930 100644
--- a/betterRenderer/renderer/source/track_batching.cpp
+++ b/betterRenderer/renderer/source/track_batching.cpp
@@ -11,6 +11,15 @@ import eu07.glm;
 #include "utilities/utilities_macros.h"
 import eu07.utilities.utilities;
 import eu07.utilities.float3d;
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace BatchingUtils {
 
diff --git a/betterRenderer/renderer/source/windshield_rain.cpp b/betterRenderer/renderer/source/windshield_rain.cpp
index 33af7b01..d03fef63 100644
--- a/betterRenderer/renderer/source/windshield_rain.cpp
+++ b/betterRenderer/renderer/source/windshield_rain.cpp
@@ -5,6 +5,7 @@
 #include "nvrendererbackend.h"
 #include "nvrhi/utils.h"
 #include "nvtexture.h"
+#include <cstddef>
 
 void WindshieldRain::Init(NvRenderer* in_renderer) {
   renderer = in_renderer;
diff --git a/betterRenderer/renderer/source/windshield_rain.h b/betterRenderer/renderer/source/windshield_rain.h
index 47ee2fc6..32ad7c95 100644
--- a/betterRenderer/renderer/source/windshield_rain.h
+++ b/betterRenderer/renderer/source/windshield_rain.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include "nvrenderer/nvrenderer.h"
+#include <cstddef>
+#include <cstdint>
+#include <unordered_map>
 
 struct WindshieldRain {
   void Init(NvRenderer *in_renderer);
diff --git a/extras/piped_proc.cpp b/extras/piped_proc.cpp
index 3cebd0db..bdfa201f 100644
--- a/extras/piped_proc.cpp
+++ b/extras/piped_proc.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <cstdio>
 #include <cstddef>
 #include <string>
diff --git a/input/messaging.cpp b/input/messaging.cpp
index 7b509966..9089ab93 100644
--- a/input/messaging.cpp
+++ b/input/messaging.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include "winheaders.h"
 #include "utilities/utilities_macros.h"
 #include <typeinfo>
diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp
index 0be2335e..2a48198c 100644
--- a/rendering/opengl33renderer.cpp
+++ b/rendering/opengl33renderer.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <array>
 #include <unordered_map>
 #include "imgui/imgui.h"
diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp
index fcf0be27..73e1b2cc 100644
--- a/utilities/Logs.cpp
+++ b/utilities/Logs.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstdio>
 #include <chrono>
 #include <fstream>
 #include <ios>
diff --git a/utilities/crashreporter.cpp b/utilities/crashreporter.cpp
index 52698f90..10987896 100644
--- a/utilities/crashreporter.cpp
+++ b/utilities/crashreporter.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <map>
 #include <memory>
 #include <sstream>
diff --git a/utilities/uart.cpp b/utilities/uart.cpp
index fd7391c5..00a531c1 100644
--- a/utilities/uart.cpp
+++ b/utilities/uart.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstdio>
 #include <tuple>
 #include <vector>
 #include <libserialport.h>
diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp
index edd36425..e3f73ebf 100644
--- a/widgets/cameraview_extcam.cpp
+++ b/widgets/cameraview_extcam.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <cstddef>
 #include <cstdint>
 #include <atomic>
diff --git a/widgets/map.cpp b/widgets/map.cpp
index 67bd5417..d32c8c7c 100644
--- a/widgets/map.cpp
+++ b/widgets/map.cpp
@@ -1,4 +1,5 @@
 module;
+#include <cstring>
 #include <cstddef>
 #include <iterator>
 #include "utilities/translation_macros.h"