diff --git a/src/game/client/drawable/update/swayclientupdate.h b/src/game/client/drawable/update/swayclientupdate.h
index 4adc0c85a..e60dcc77e 100644
--- a/src/game/client/drawable/update/swayclientupdate.h
+++ b/src/game/client/drawable/update/swayclientupdate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bittype.h"
 #include "clientupdatemodule.h"
 #include "namekeygenerator.h"
diff --git a/src/game/client/fxlist.h b/src/game/client/fxlist.h
index 818425037..d890fac78 100644
--- a/src/game/client/fxlist.h
+++ b/src/game/client/fxlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "namekeygenerator.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"
diff --git a/src/game/client/globallanguage.h b/src/game/client/globallanguage.h
index 0ca9a420f..3f419c7d1 100644
--- a/src/game/client/globallanguage.h
+++ b/src/game/client/globallanguage.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "ini.h"
 #include "subsysteminterface.h"
diff --git a/src/game/client/maputil.h b/src/game/client/maputil.h
index 5a30de4a5..34581c1c1 100644
--- a/src/game/client/maputil.h
+++ b/src/game/client/maputil.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "ini.h"
diff --git a/src/game/client/terrain/terrainroads.h b/src/game/client/terrain/terrainroads.h
index 571d9a879..c11e6c3b6 100644
--- a/src/game/client/terrain/terrainroads.h
+++ b/src/game/client/terrain/terrainroads.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "color.h"
 #include "gametype.h"
 #include "ini.h"
diff --git a/src/game/client/w3dassetmanager.h b/src/game/client/w3dassetmanager.h
index 366fcbcb5..5f2be4865 100644
--- a/src/game/client/w3dassetmanager.h
+++ b/src/game/client/w3dassetmanager.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "assetmgr.h"
 #include "mempoolobj.h"
diff --git a/src/game/common/audio/audioeventinfo.h b/src/game/common/audio/audioeventinfo.h
index 351f4fd35..f788dbba0 100644
--- a/src/game/common/audio/audioeventinfo.h
+++ b/src/game/common/audio/audioeventinfo.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "ini.h"
 #include "mempoolobj.h"
diff --git a/src/game/common/audio/audioeventrts.h b/src/game/common/audio/audioeventrts.h
index aeac67216..416035c74 100644
--- a/src/game/common/audio/audioeventrts.h
+++ b/src/game/common/audio/audioeventrts.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "audioeventinfo.h"
 #include "coord.h"
 #include "gametype.h"
diff --git a/src/game/common/audio/gamesounds.h b/src/game/common/audio/gamesounds.h
index 700e2e8bb..d91d7debe 100644
--- a/src/game/common/audio/gamesounds.h
+++ b/src/game/common/audio/gamesounds.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "coord.h"
diff --git a/src/game/common/bezier/bezfwditerator.h b/src/game/common/bezier/bezfwditerator.h
index 7c5dbb7de..f516ee106 100644
--- a/src/game/common/bezier/bezfwditerator.h
+++ b/src/game/common/bezier/bezfwditerator.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "beziersegment.h"
 
 class BezFwdIterator
diff --git a/src/game/common/bezier/beziersegment.h b/src/game/common/bezier/beziersegment.h
index 1d3473efe..6baf9a539 100644
--- a/src/game/common/bezier/beziersegment.h
+++ b/src/game/common/bezier/beziersegment.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "coord.h"
 #include "matrix4.h"
 #include <vector>
diff --git a/src/game/common/commandlist.h b/src/game/common/commandlist.h
index 23f88f0a5..473385cda 100644
--- a/src/game/common/commandlist.h
+++ b/src/game/common/commandlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessagelist.h"
 
 class CommandList : public GameMessageList
diff --git a/src/game/common/gamemessage.h b/src/game/common/gamemessage.h
index 7c144ef2b..717808b62 100644
--- a/src/game/common/gamemessage.h
+++ b/src/game/common/gamemessage.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"
diff --git a/src/game/common/gamemessagelist.h b/src/game/common/gamemessagelist.h
index b05d49ca4..15abff050 100644
--- a/src/game/common/gamemessagelist.h
+++ b/src/game/common/gamemessagelist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamemessage.h"
 #include "subsysteminterface.h"
 
diff --git a/src/game/common/globaldata.h b/src/game/common/globaldata.h
index 692b627b1..3e33d4ce6 100644
--- a/src/game/common/globaldata.h
+++ b/src/game/common/globaldata.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "color.h"
 #include "coord.h"
diff --git a/src/game/common/multiplayersettings.h b/src/game/common/multiplayersettings.h
index 0c7f260b6..5c6447005 100644
--- a/src/game/common/multiplayersettings.h
+++ b/src/game/common/multiplayersettings.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #ifdef GAME_DLL
 #include "hooker.h"
 #endif
diff --git a/src/game/common/namekeygenerator.h b/src/game/common/namekeygenerator.h
index 77efad54e..6abf456e4 100644
--- a/src/game/common/namekeygenerator.h
+++ b/src/game/common/namekeygenerator.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "bittype.h"
 #include "ini.h"
diff --git a/src/game/common/overridable.h b/src/game/common/overridable.h
index fea5d4905..c96b04395 100644
--- a/src/game/common/overridable.h
+++ b/src/game/common/overridable.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 
 template<class T> class Override
diff --git a/src/game/common/randomvalue.h b/src/game/common/randomvalue.h
index 18774a85b..d39600216 100644
--- a/src/game/common/randomvalue.h
+++ b/src/game/common/randomvalue.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bittype.h"
 
 class INI;
diff --git a/src/game/common/rts/money.h b/src/game/common/rts/money.h
index d005cefc3..cd028f28d 100644
--- a/src/game/common/rts/money.h
+++ b/src/game/common/rts/money.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "snapshot.h"
 
 class INI;
diff --git a/src/game/common/rts/player.h b/src/game/common/rts/player.h
index cecc0ba9e..915932bbb 100644
--- a/src/game/common/rts/player.h
+++ b/src/game/common/rts/player.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "academystats.h"
 #include "energy.h"
 #include "handicap.h"
diff --git a/src/game/common/rts/playerlist.h b/src/game/common/rts/playerlist.h
index f9fdc62d0..8422ea020 100644
--- a/src/game/common/rts/playerlist.h
+++ b/src/game/common/rts/playerlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "player.h"
 #include "snapshot.h"
 #include "subsysteminterface.h"
diff --git a/src/game/common/rts/scorekeeper.h b/src/game/common/rts/scorekeeper.h
index 51ba400be..0ced3301f 100644
--- a/src/game/common/rts/scorekeeper.h
+++ b/src/game/common/rts/scorekeeper.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "bitflags.h"
 #include "gametype.h"
 #include "snapshot.h"
diff --git a/src/game/common/system/disabledtypes.h b/src/game/common/system/disabledtypes.h
index d2e9e83a4..626d1dfe1 100644
--- a/src/game/common/system/disabledtypes.h
+++ b/src/game/common/system/disabledtypes.h
@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 template<int> class BitFlags;
 
 enum DisabledType
diff --git a/src/game/common/system/file.h b/src/game/common/system/file.h
index 034dd2de5..0b0d9f06a 100644
--- a/src/game/common/system/file.h
+++ b/src/game/common/system/file.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gamememory.h"
 #include "mempoolobj.h"
diff --git a/src/game/common/system/filesystem.h b/src/game/common/system/filesystem.h
index bcfbe6807..778353b2f 100644
--- a/src/game/common/system/filesystem.h
+++ b/src/game/common/system/filesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "file.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"
diff --git a/src/game/common/system/functionlexicon.h b/src/game/common/system/functionlexicon.h
index 3439656ad..628b63aa6 100644
--- a/src/game/common/system/functionlexicon.h
+++ b/src/game/common/system/functionlexicon.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamewindow.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"
diff --git a/src/game/common/system/localfilesystem.h b/src/game/common/system/localfilesystem.h
index 28ae71cc8..e0dcedc1c 100644
--- a/src/game/common/system/localfilesystem.h
+++ b/src/game/common/system/localfilesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "rtsutils.h"
 #include "subsysteminterface.h"
 #include <set>
diff --git a/src/game/common/system/memblob.h b/src/game/common/system/memblob.h
index 8cc71913a..7d7edef0f 100644
--- a/src/game/common/system/memblob.h
+++ b/src/game/common/system/memblob.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "memblock.h"
 #include "rawalloc.h"
 
diff --git a/src/game/common/system/mempoolobj.h b/src/game/common/system/mempoolobj.h
index df84df1cd..a0eede6fb 100644
--- a/src/game/common/system/mempoolobj.h
+++ b/src/game/common/system/mempoolobj.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "errorcodes.h"
 #include "mempool.h"
 #include "mempoolfact.h"
@@ -47,14 +48,20 @@ class MemoryPoolObject
 #ifdef __SANITIZE_ADDRESS__
 #define IMPLEMENT_NAMED_POOL(classname, poolname) \
 private: \
-    virtual MemoryPool *Get_Object_Pool() override { return nullptr; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        return nullptr; \
+    } \
 \
 public: \
     enum classname##MagicEnum{ classname##_GLUE_NOT_IMPLEMENTED = 0 };
 
 #define IMPLEMENT_ABSTRACT_POOL(classname) \
 protected: \
-    virtual MemoryPool *Get_Object_Pool() override { throw CODE_01; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        throw CODE_01; \
+    } \
 \
 private:
 #else
@@ -79,12 +86,18 @@ private: \
             The##classname##Pool->Get_Alloc_Size()); \
         return The##classname##Pool; \
     } \
-    virtual MemoryPool *Get_Object_Pool() override { return Get_Class_Pool(); } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        return Get_Class_Pool(); \
+    } \
 \
 public: \
     enum classname##MagicEnum{ classname##_GLUE_NOT_IMPLEMENTED = 0 }; \
 \
-    void *operator new(size_t size) { return operator new(size, classname##_GLUE_NOT_IMPLEMENTED); } \
+    void *operator new(size_t size) \
+    { \
+        return operator new(size, classname##_GLUE_NOT_IMPLEMENTED); \
+    } \
     void *operator new(size_t size, classname##MagicEnum) \
     { \
         captainslog_dbgassert(size == sizeof(classname), \
@@ -92,13 +105,19 @@ public: \
             "correctly"); \
         return Get_Class_Pool()->Allocate_Block(); \
     } \
-    void operator delete(void *ptr) { operator delete(ptr, classname##_GLUE_NOT_IMPLEMENTED); } \
+    void operator delete(void *ptr) \
+    { \
+        operator delete(ptr, classname##_GLUE_NOT_IMPLEMENTED); \
+    } \
     void operator delete(void *ptr, classname##MagicEnum) \
     { \
         captainslog_dbgassert(0, "Please call Delete_Instance instead of delete."); \
         Get_Class_Pool()->Free_Block(ptr); \
     } \
-    void *operator new(size_t size, void *where) { return where; } \
+    void *operator new(size_t size, void *where) \
+    { \
+        return where; \
+    } \
     void operator delete(void *ptr, void *where) {}
 
 /* NOTE: Operator delete above must exist because of the pairing operator new. However, it should never be called directly.
@@ -108,7 +127,10 @@ public: \
  */
 #define IMPLEMENT_ABSTRACT_POOL(classname) \
 protected: \
-    virtual MemoryPool *Get_Object_Pool() override { throw CODE_01; } \
+    virtual MemoryPool *Get_Object_Pool() override \
+    { \
+        throw CODE_01; \
+    } \
     void *operator new(size_t size) = delete; \
     void operator delete(void *ptr) \
     { \
diff --git a/src/game/common/system/savegame/gamestate.h b/src/game/common/system/savegame/gamestate.h
index dcc1af216..bc2104bad 100644
--- a/src/game/common/system/savegame/gamestate.h
+++ b/src/game/common/system/savegame/gamestate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "snapshot.h"
 #include "subsysteminterface.h"
diff --git a/src/game/common/system/streamingarchivefile.h b/src/game/common/system/streamingarchivefile.h
index 193d61b61..64e41c617 100644
--- a/src/game/common/system/streamingarchivefile.h
+++ b/src/game/common/system/streamingarchivefile.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gamememory.h"
 #include "ramfile.h"
 
diff --git a/src/game/common/system/subsysteminterface.h b/src/game/common/system/subsysteminterface.h
index 0d2360e25..038ca5dd2 100644
--- a/src/game/common/system/subsysteminterface.h
+++ b/src/game/common/system/subsysteminterface.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <vector>
 
diff --git a/src/game/common/system/xfer.h b/src/game/common/system/xfer.h
index 800611d74..8dad6ace1 100644
--- a/src/game/common/system/xfer.h
+++ b/src/game/common/system/xfer.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "gametype.h"
 #include "kindof.h"
diff --git a/src/game/common/system/xfercrc.h b/src/game/common/system/xfercrc.h
index d3f0a6dae..53f10d611 100644
--- a/src/game/common/system/xfercrc.h
+++ b/src/game/common/system/xfercrc.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "xfer.h"
 
 class XferCRC : public Xfer
diff --git a/src/game/common/userpreferences.h b/src/game/common/userpreferences.h
index 81a2fa78e..8b6d2dd0c 100644
--- a/src/game/common/userpreferences.h
+++ b/src/game/common/userpreferences.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include <map>
 
diff --git a/src/game/crashwrapper.h b/src/game/crashwrapper.h
index 217b95a17..45515fe82 100644
--- a/src/game/crashwrapper.h
+++ b/src/game/crashwrapper.h
@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
+
 class CrashPreferences;
 
 class CrashPrefWrapper
diff --git a/src/game/logic/map/terrainlogic.h b/src/game/logic/map/terrainlogic.h
index 47f48845d..10350b7f7 100644
--- a/src/game/logic/map/terrainlogic.h
+++ b/src/game/logic/map/terrainlogic.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"
diff --git a/src/game/logic/object/objectcreationlist.h b/src/game/logic/object/objectcreationlist.h
index 72c686a35..4f345bd6d 100644
--- a/src/game/logic/object/objectcreationlist.h
+++ b/src/game/logic/object/objectcreationlist.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "mempoolobj.h"
 #include "namekeygenerator.h"
 #include "subsysteminterface.h"
diff --git a/src/game/logic/object/objecttypes.h b/src/game/logic/object/objecttypes.h
index 2cdb62857..a14f18340 100644
--- a/src/game/logic/object/objecttypes.h
+++ b/src/game/logic/object/objecttypes.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "mempoolobj.h"
 #include "snapshot.h"
diff --git a/src/game/logic/object/partitionmanager.h b/src/game/logic/object/partitionmanager.h
index 737c353f9..2e5c2479e 100644
--- a/src/game/logic/object/partitionmanager.h
+++ b/src/game/logic/object/partitionmanager.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "bitflags.h"
 #include "coord.h"
 #include "gametype.h"
diff --git a/src/game/logic/object/weapon.h b/src/game/logic/object/weapon.h
index 0e27440fd..867a2b3ad 100644
--- a/src/game/logic/object/weapon.h
+++ b/src/game/logic/object/weapon.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "audioeventrts.h"
 #include "coord.h"
diff --git a/src/game/logic/scriptengine/scriptengine.h b/src/game/logic/scriptengine/scriptengine.h
index 0a2292be4..2ab82e492 100644
--- a/src/game/logic/scriptengine/scriptengine.h
+++ b/src/game/logic/scriptengine/scriptengine.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "coord.h"
 #include "gametype.h"
diff --git a/src/game/logic/scriptengine/scripttemplate.h b/src/game/logic/scriptengine/scripttemplate.h
index f6e5932ca..c68c89231 100644
--- a/src/game/logic/scriptengine/scripttemplate.h
+++ b/src/game/logic/scriptengine/scripttemplate.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "mempoolobj.h"
 #include "namekeygenerator.h"
diff --git a/src/game/logic/scriptengine/sequentialscript.h b/src/game/logic/scriptengine/sequentialscript.h
index 9560bc444..265f4ebd8 100644
--- a/src/game/logic/scriptengine/sequentialscript.h
+++ b/src/game/logic/scriptengine/sequentialscript.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gametype.h"
 #include "mempoolobj.h"
 #include "snapshot.h"
diff --git a/src/game/logic/system/cavesystem.h b/src/game/logic/system/cavesystem.h
index a35affa77..b863dd93a 100644
--- a/src/game/logic/system/cavesystem.h
+++ b/src/game/logic/system/cavesystem.h
@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include "always.h"
 #include "gametype.h"
 #include "mempoolobj.h"
 #include "snapshot.h"
diff --git a/src/platform/sdl2/sdl2gameengine.h b/src/platform/sdl2/sdl2gameengine.h
index ef3fce5f5..f5cbe829a 100644
--- a/src/platform/sdl2/sdl2gameengine.h
+++ b/src/platform/sdl2/sdl2gameengine.h
@@ -14,12 +14,13 @@
  */
 #pragma once
 
-#include "gameengine.h"
-
 #ifndef BUILD_WITH_SDL2
 #error Only include sdl2gameengine.h when building with SDL2
 #endif
 
+#include "always.h"
+#include "gameengine.h"
+
 #include <SDL.h>
 
 namespace Thyme
diff --git a/src/platform/sdl2/sdl2mouse.h b/src/platform/sdl2/sdl2mouse.h
index a1e3f7a8a..868b7c64f 100644
--- a/src/platform/sdl2/sdl2mouse.h
+++ b/src/platform/sdl2/sdl2mouse.h
@@ -18,6 +18,7 @@
 #error Only include sdl2mouse.h when building with SDL2
 #endif
 
+#include "always.h"
 #include "mouse.h"
 
 #include <SDL.h>
diff --git a/src/platform/standardfile.h b/src/platform/standardfile.h
index ccf36cd0f..d5e33cb08 100644
--- a/src/platform/standardfile.h
+++ b/src/platform/standardfile.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "localfile.h"
 #include <cstdio>
 
diff --git a/src/platform/stdlocalfilesystem.h b/src/platform/stdlocalfilesystem.h
index 1ee7c4183..65164f6ef 100644
--- a/src/platform/stdlocalfilesystem.h
+++ b/src/platform/stdlocalfilesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "localfilesystem.h"
 #include "win32localfile.h"
 #include <captainslog.h>
diff --git a/src/platform/w3dengine/client/gui/w3dgamefont.h b/src/platform/w3dengine/client/gui/w3dgamefont.h
index a59388a46..df291f60c 100644
--- a/src/platform/w3dengine/client/gui/w3dgamefont.h
+++ b/src/platform/w3dengine/client/gui/w3dgamefont.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "gamefont.h"
 
 class W3DFontLibrary : public FontLibrary
diff --git a/src/platform/w3dengine/client/w3ddisplay.h b/src/platform/w3dengine/client/w3ddisplay.h
index 7cbfd6338..be457b8dc 100644
--- a/src/platform/w3dengine/client/w3ddisplay.h
+++ b/src/platform/w3dengine/client/w3ddisplay.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "coord.h"
 #include "display.h"
 #include "light.h"
diff --git a/src/platform/w3dengine/client/w3dmouse.h b/src/platform/w3dengine/client/w3dmouse.h
index 66ebd6111..bec26319a 100644
--- a/src/platform/w3dengine/client/w3dmouse.h
+++ b/src/platform/w3dengine/client/w3dmouse.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "image.h"
 #include "rendobj.h"
 #include "surfaceclass.h"
diff --git a/src/platform/w3dengine/client/w3dpoly.h b/src/platform/w3dengine/client/w3dpoly.h
index 9a5176b0e..a4e0ee838 100644
--- a/src/platform/w3dengine/client/w3dpoly.h
+++ b/src/platform/w3dengine/client/w3dpoly.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "simplevec.h"
 
 class PlaneClass;
diff --git a/src/platform/w3dengine/common/system/w3dfunctionlexicon.h b/src/platform/w3dengine/common/system/w3dfunctionlexicon.h
index 00c2ca401..fae24cf6c 100644
--- a/src/platform/w3dengine/common/system/w3dfunctionlexicon.h
+++ b/src/platform/w3dengine/common/system/w3dfunctionlexicon.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "functionlexicon.h"
 
 class W3DFunctionLexicon : public FunctionLexicon
diff --git a/src/platform/w3dengine/common/win32bigfile.h b/src/platform/w3dengine/common/win32bigfile.h
index 3777bcd6c..c48fd9440 100644
--- a/src/platform/w3dengine/common/win32bigfile.h
+++ b/src/platform/w3dengine/common/win32bigfile.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "archivefile.h"
 
 class Win32BIGFile : public ArchiveFile
diff --git a/src/platform/w3dengine/common/win32bigfilesystem.h b/src/platform/w3dengine/common/win32bigfilesystem.h
index a58a5954e..44a768280 100644
--- a/src/platform/w3dengine/common/win32bigfilesystem.h
+++ b/src/platform/w3dengine/common/win32bigfilesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "archivefilesystem.h"
 
 class Win32BIGFileSystem : public ArchiveFileSystem
diff --git a/src/platform/w3dengine/common/win32gameengine.h b/src/platform/w3dengine/common/win32gameengine.h
index 1289ba3da..33f48f8ed 100644
--- a/src/platform/w3dengine/common/win32gameengine.h
+++ b/src/platform/w3dengine/common/win32gameengine.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "gameengine.h"
 
 class Win32GameEngine : public GameEngine
diff --git a/src/platform/w3dengine/common/win32localfile.h b/src/platform/w3dengine/common/win32localfile.h
index c324c04a1..a21e14637 100644
--- a/src/platform/w3dengine/common/win32localfile.h
+++ b/src/platform/w3dengine/common/win32localfile.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "localfile.h"
 
 namespace Thyme
diff --git a/src/platform/w3dengine/common/win32localfilesystem.h b/src/platform/w3dengine/common/win32localfilesystem.h
index c1de9afce..3ea929ebb 100644
--- a/src/platform/w3dengine/common/win32localfilesystem.h
+++ b/src/platform/w3dengine/common/win32localfilesystem.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "localfilesystem.h"
 #include "win32localfile.h"
 #include <captainslog.h>
diff --git a/src/w3d/lib/ffactory.h b/src/w3d/lib/ffactory.h
index 20f76c4a5..0dd1d7714 100644
--- a/src/w3d/lib/ffactory.h
+++ b/src/w3d/lib/ffactory.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "critsection.h"
 #include "wwfile.h"
 #include "wwstring.h"
diff --git a/src/w3d/lib/rawfile.h b/src/w3d/lib/rawfile.h
index e7d811326..ff18fac2f 100644
--- a/src/w3d/lib/rawfile.h
+++ b/src/w3d/lib/rawfile.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "wwfile.h"
 #include "wwstring.h"
 
diff --git a/src/w3d/renderer/boxrobj.h b/src/w3d/renderer/boxrobj.h
index 62633f53c..9e40c3a0b 100644
--- a/src/w3d/renderer/boxrobj.h
+++ b/src/w3d/renderer/boxrobj.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "aabox.h"
 #include "obbox.h"
 #include "proto.h"
diff --git a/src/w3d/renderer/lightenv.h b/src/w3d/renderer/lightenv.h
index 4ac1d1d80..9c7212a22 100644
--- a/src/w3d/renderer/lightenv.h
+++ b/src/w3d/renderer/lightenv.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "vector3.h"
 
 class Matrix3D;
diff --git a/src/w3d/renderer/matpass.h b/src/w3d/renderer/matpass.h
index c1fbe22f1..4aa8d7d66 100644
--- a/src/w3d/renderer/matpass.h
+++ b/src/w3d/renderer/matpass.h
@@ -13,6 +13,8 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
 #include "refcount.h"
 #include "shader.h"
 
diff --git a/src/w3d/renderer/part_buf.h b/src/w3d/renderer/part_buf.h
index fab05f075..2b9ed7edb 100644
--- a/src/w3d/renderer/part_buf.h
+++ b/src/w3d/renderer/part_buf.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "linegrp.h"
 #include "pointgr.h"
 #include "rendobj.h"
diff --git a/src/w3d/renderer/part_emt.h b/src/w3d/renderer/part_emt.h
index 69ebc8c45..7fe9c6e47 100644
--- a/src/w3d/renderer/part_emt.h
+++ b/src/w3d/renderer/part_emt.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "part_buf.h"
 #include "quat.h"
 #include "random.h"
diff --git a/src/w3d/renderer/part_ldr.h b/src/w3d/renderer/part_ldr.h
index 33a55984f..e08e2a111 100644
--- a/src/w3d/renderer/part_ldr.h
+++ b/src/w3d/renderer/part_ldr.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "part_emt.h"
 #include "proto.h"
 #include "rendobj.h"
diff --git a/src/w3d/renderer/proto.h b/src/w3d/renderer/proto.h
index 031d0ed70..f7ab644f8 100644
--- a/src/w3d/renderer/proto.h
+++ b/src/w3d/renderer/proto.h
@@ -13,6 +13,9 @@
  *            LICENSE
  */
 #pragma once
+
+#include "always.h"
+
 class ChunkLoadClass;
 class PrototypeClass;
 class RenderObjClass;