diff --git a/src/game/common/audio/audiomanager.cpp b/src/game/common/audio/audiomanager.cpp
index 5d7a46414..84690eb54 100644
--- a/src/game/common/audio/audiomanager.cpp
+++ b/src/game/common/audio/audiomanager.cpp
@@ -16,6 +16,7 @@
 #include "filesystem.h"
 #include "gamemusic.h"
 #include "gamesounds.h"
+#include "matrix3d.h"
 #include "terrainlogic.h"
 #include "w3dview.h"
 #include <algorithm>
diff --git a/src/game/common/system/xfer.cpp b/src/game/common/system/xfer.cpp
index 1ebfe0fa8..86026ca6d 100644
--- a/src/game/common/system/xfer.cpp
+++ b/src/game/common/system/xfer.cpp
@@ -12,8 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
-#include "xfer.h"
 #include "bitflags.h"
+#include "color.h"
 #include "endiantype.h"
 #include "gamestate.h"
 #include "matrix3d.h"
diff --git a/src/game/common/system/xfer.h b/src/game/common/system/xfer.h
index bd281a063..800611d74 100644
--- a/src/game/common/system/xfer.h
+++ b/src/game/common/system/xfer.h
@@ -15,18 +15,27 @@
 #pragma once
 
 #include "asciistring.h"
-#include "color.h"
-#include "coord.h"
 #include "gametype.h"
 #include "kindof.h"
-#include "matrix3d.h"
 #include "science.h"
-#include "snapshot.h"
-#include "unicodestring.h"
 #include <list>
 #include <vector>
 
 template<int bits> class BitFlags;
+class Coord3D;
+class Coord2D;
+class ICoord2D;
+class ICoord3D;
+class IRegion2D;
+class IRegion3D;
+class Matrix3D;
+class Region2D;
+class Region3D;
+class RGBColor;
+class RGBAColorReal;
+class RGBAColorInt;
+class Utf16String;
+class SnapShot;
 
 struct RealRange
 {
diff --git a/src/game/common/system/xfercrc.cpp b/src/game/common/system/xfercrc.cpp
index 3de17154a..91f65a1d0 100644
--- a/src/game/common/system/xfercrc.cpp
+++ b/src/game/common/system/xfercrc.cpp
@@ -14,6 +14,7 @@
  */
 #include "xfercrc.h"
 #include "endiantype.h"
+#include "snapshot.h"
 
 // \brief Adds val to rotl m_crc
 void XferCRC::Add_CRC(uint32_t val)
diff --git a/src/game/logic/object/helper/objectdefectionhelper.cpp b/src/game/logic/object/helper/objectdefectionhelper.cpp
index dfe060826..f1d7e1f5e 100644
--- a/src/game/logic/object/helper/objectdefectionhelper.cpp
+++ b/src/game/logic/object/helper/objectdefectionhelper.cpp
@@ -15,6 +15,7 @@
 #include "objectdefectionhelper.h"
 #include "audioeventrts.h"
 #include "audiomanager.h"
+#include "color.h"
 #include "drawable.h"
 #include "gamelogic.h"
 
diff --git a/src/game/logic/object/update/laserupdate.h b/src/game/logic/object/update/laserupdate.h
index 02f0e188a..9cbd50e11 100644
--- a/src/game/logic/object/update/laserupdate.h
+++ b/src/game/logic/object/update/laserupdate.h
@@ -15,6 +15,7 @@
 #pragma once
 #include "always.h"
 #include "clientupdatemodule.h"
+#include "coord.h"
 #include "particlesysmanager.h"
 
 class LaserUpdateModuleData : public ModuleData
diff --git a/src/game/logic/object/update/mobmemberslavedupdate.h b/src/game/logic/object/update/mobmemberslavedupdate.h
index 8aebea535..6e698eac7 100644
--- a/src/game/logic/object/update/mobmemberslavedupdate.h
+++ b/src/game/logic/object/update/mobmemberslavedupdate.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include "always.h"
+#include "color.h"
 #include "updatemodule.h"
 
 class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface
diff --git a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h
index 0806f4862..b28eedd6c 100644
--- a/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h
+++ b/src/platform/w3dengine/client/drawable/draw/w3dropedraw.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 #include "always.h"
+#include "color.h"
 #include "w3dmodeldraw.h"
 
 class Line3DClass;
diff --git a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h
index 3565a5d81..9c5018d65 100644
--- a/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h
+++ b/src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 #include "always.h"
+#include "color.h"
 #include "w3dmodeldraw.h"
 
 class Line3DClass;