diff --git a/betterRenderer/eu07_source/register.cpp b/betterRenderer/eu07_source/register.cpp
index dcf44537..dcd58bfb 100644
--- a/betterRenderer/eu07_source/register.cpp
+++ b/betterRenderer/eu07_source/register.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <memory>
 #include "nvrenderer/nvrenderer.h"
 
diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
index bf3beb0c..2c7fb321 100644
--- a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
+++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 //STL includes required by EU07 includes
 #include <array>
diff --git a/betterRenderer/renderer/include/nvrenderer/quadtree.h b/betterRenderer/renderer/include/nvrenderer/quadtree.h
index c54b2123..ba0d0fe2 100644
--- a/betterRenderer/renderer/include/nvrenderer/quadtree.h
+++ b/betterRenderer/renderer/include/nvrenderer/quadtree.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <array>
 #include <memory>
diff --git a/betterRenderer/renderer/include/nvrenderer/resource_registry.h b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
index 3ee802fa..829f13aa 100644
--- a/betterRenderer/renderer/include/nvrenderer/resource_registry.h
+++ b/betterRenderer/renderer/include/nvrenderer/resource_registry.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <cstddef>
 #include <cstdint>
diff --git a/betterRenderer/renderer/source/bloom.h b/betterRenderer/renderer/source/bloom.h
index d1e5cf2e..15668ce5 100644
--- a/betterRenderer/renderer/source/bloom.h
+++ b/betterRenderer/renderer/source/bloom.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <vector>
 #include <nvrhi/nvrhi.h>
diff --git a/betterRenderer/renderer/source/contactshadows.h b/betterRenderer/renderer/source/contactshadows.h
index 52859c8a..458c607a 100644
--- a/betterRenderer/renderer/source/contactshadows.h
+++ b/betterRenderer/renderer/source/contactshadows.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <cstdint>
 #include <nvrhi/nvrhi.h>
diff --git a/betterRenderer/renderer/source/environment.cpp b/betterRenderer/renderer/source/environment.cpp
index bb26917d..085c80e0 100644
--- a/betterRenderer/renderer/source/environment.cpp
+++ b/betterRenderer/renderer/source/environment.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <cstddef>
 #include <cstdint>
 #include <map>
diff --git a/betterRenderer/renderer/source/fsr.cpp b/betterRenderer/renderer/source/fsr.cpp
index 23efa31b..985e8ee0 100644
--- a/betterRenderer/renderer/source/fsr.cpp
+++ b/betterRenderer/renderer/source/fsr.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <queue>
 #include "fsr.h"
 
diff --git a/betterRenderer/renderer/source/fsr.h b/betterRenderer/renderer/source/fsr.h
index f6c9c1fe..fdcbcb3e 100644
--- a/betterRenderer/renderer/source/fsr.h
+++ b/betterRenderer/renderer/source/fsr.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <cstddef>
 #include <string>
diff --git a/betterRenderer/renderer/source/gbufferblitpass.cpp b/betterRenderer/renderer/source/gbufferblitpass.cpp
index 10af4864..1848ef9c 100644
--- a/betterRenderer/renderer/source/gbufferblitpass.cpp
+++ b/betterRenderer/renderer/source/gbufferblitpass.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <chrono>
 #include "gbufferblitpass.h"
 
diff --git a/betterRenderer/renderer/source/gbufferlighting.cpp b/betterRenderer/renderer/source/gbufferlighting.cpp
index b886014c..5ee1ea9b 100644
--- a/betterRenderer/renderer/source/gbufferlighting.cpp
+++ b/betterRenderer/renderer/source/gbufferlighting.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <cstdint>
 #include "gbufferlighting.h"
 
diff --git a/betterRenderer/renderer/source/gbufferlighting.h b/betterRenderer/renderer/source/gbufferlighting.h
index cebe3052..a6ef58af 100644
--- a/betterRenderer/renderer/source/gbufferlighting.h
+++ b/betterRenderer/renderer/source/gbufferlighting.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <cstddef>
 #include <cstdint>
diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp
index 91572042..330fb1d1 100644
--- a/betterRenderer/renderer/source/materialparser.cpp
+++ b/betterRenderer/renderer/source/materialparser.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <filesystem>
 #include <memory>
 #include <optional>
diff --git a/betterRenderer/renderer/source/materialparser.h b/betterRenderer/renderer/source/materialparser.h
index 3efe3f07..283d6e52 100644
--- a/betterRenderer/renderer/source/materialparser.h
+++ b/betterRenderer/renderer/source/materialparser.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <memory>
 #include <optional>
diff --git a/betterRenderer/renderer/source/motioncache.h b/betterRenderer/renderer/source/motioncache.h
index cba5c4f1..7a13a08a 100644
--- a/betterRenderer/renderer/source/motioncache.h
+++ b/betterRenderer/renderer/source/motioncache.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <cstdint>
 #include <functional>
diff --git a/betterRenderer/renderer/source/nvmaterial.cpp b/betterRenderer/renderer/source/nvmaterial.cpp
index 4ad279bf..c9d7c87d 100644
--- a/betterRenderer/renderer/source/nvmaterial.cpp
+++ b/betterRenderer/renderer/source/nvmaterial.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <array>
 #include <cstddef>
 #include <memory>
diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp
index e904c2a7..53b852d2 100644
--- a/betterRenderer/renderer/source/nvrenderer.cpp
+++ b/betterRenderer/renderer/source/nvrenderer.cpp
@@ -1,4 +1,7 @@
-#include <array>
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
index c9c4f375..cb5610a1 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <fstream>
 #include <ios>
 #include <memory>
diff --git a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
index 10654d9c..3afccc55 100644
--- a/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_vulkan.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
diff --git a/betterRenderer/renderer/source/nvrendererbackend.cpp b/betterRenderer/renderer/source/nvrendererbackend.cpp
index c228b5ae..cb343498 100644
--- a/betterRenderer/renderer/source/nvrendererbackend.cpp
+++ b/betterRenderer/renderer/source/nvrendererbackend.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <cstddef>
 #include <string>
 #include <unordered_map>
diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp
index 595cf01b..adbb88fe 100644
--- a/betterRenderer/renderer/source/nvtexture.cpp
+++ b/betterRenderer/renderer/source/nvtexture.cpp
@@ -1,4 +1,7 @@
-#include <array>
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <fstream>
diff --git a/betterRenderer/renderer/source/nvtexture.h b/betterRenderer/renderer/source/nvtexture.h
index 2d86ef99..0ca220d2 100644
--- a/betterRenderer/renderer/source/nvtexture.h
+++ b/betterRenderer/renderer/source/nvtexture.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <bitset>
 #include <cstddef>
diff --git a/betterRenderer/renderer/source/resource_registry.cpp b/betterRenderer/renderer/source/resource_registry.cpp
index d83b7757..35fe34b6 100644
--- a/betterRenderer/renderer/source/resource_registry.cpp
+++ b/betterRenderer/renderer/source/resource_registry.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <cstddef>
 #include <cstdint>
 #include <memory>
diff --git a/betterRenderer/renderer/source/rt_model.cpp b/betterRenderer/renderer/source/rt_model.cpp
index a818e7db..bbe1713e 100644
--- a/betterRenderer/renderer/source/rt_model.cpp
+++ b/betterRenderer/renderer/source/rt_model.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <array>
 #include <cstddef>
 #include <limits>
diff --git a/betterRenderer/renderer/source/rt_model.h b/betterRenderer/renderer/source/rt_model.h
index cce1ead8..768117f0 100644
--- a/betterRenderer/renderer/source/rt_model.h
+++ b/betterRenderer/renderer/source/rt_model.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <memory>
 
diff --git a/betterRenderer/renderer/source/sky.cpp b/betterRenderer/renderer/source/sky.cpp
index adf30e71..4ac5be1d 100644
--- a/betterRenderer/renderer/source/sky.cpp
+++ b/betterRenderer/renderer/source/sky.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <array>
 #include <limits>
 #include <memory>
diff --git a/betterRenderer/renderer/source/ssao.cpp b/betterRenderer/renderer/source/ssao.cpp
index 0b50b89f..84ab9990 100644
--- a/betterRenderer/renderer/source/ssao.cpp
+++ b/betterRenderer/renderer/source/ssao.cpp
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 #include <array>
 #include <cstddef>
 #include "ssao.h"
diff --git a/betterRenderer/renderer/source/ssao.h b/betterRenderer/renderer/source/ssao.h
index 367ee619..8d911ba0 100644
--- a/betterRenderer/renderer/source/ssao.h
+++ b/betterRenderer/renderer/source/ssao.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 #include <array>
 #include <cstddef>
diff --git a/betterRenderer/renderer/source/topo_utils.h b/betterRenderer/renderer/source/topo_utils.h
index 90cb6471..0f4dfa73 100644
--- a/betterRenderer/renderer/source/topo_utils.h
+++ b/betterRenderer/renderer/source/topo_utils.h
@@ -1,4 +1,7 @@
 #pragma once
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
 
 
 #include <array>
diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp
index b50ec8a3..b43208bd 100644
--- a/betterRenderer/renderer/source/track_batching.cpp
+++ b/betterRenderer/renderer/source/track_batching.cpp
@@ -1,4 +1,7 @@
-#include <cstddef>
+#ifdef _WIN32
+#include <windows.h>   // before any import: its guard must be set here
+#endif
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <limits>