diff --git a/src/game/common/audio/audioeventinfo.h b/src/game/common/audio/audioeventinfo.h
index 6f0739fe2..351f4fd35 100644
--- a/src/game/common/audio/audioeventinfo.h
+++ b/src/game/common/audio/audioeventinfo.h
@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "asciistring.h"
 #include "bitflags.h"
 #include "ini.h"
 #include "mempoolobj.h"
diff --git a/src/game/common/bitflags.cpp b/src/game/common/bitflags.cpp
index 2c13da8d4..dc9bc15d4 100644
--- a/src/game/common/bitflags.cpp
+++ b/src/game/common/bitflags.cpp
@@ -186,6 +186,3 @@ const char *BitFlags<MODELCONDITION_COUNT>::s_bitNamesList[] = {
     "DISGUISED",
     nullptr,
 };
-
-// TODO Temp to force instantiation. Fixes issue with Parameter::Read_Parameter.
-// template class BitFlags<KIND_OF_COUNT>;
diff --git a/src/game/common/gamemain.cpp b/src/game/common/gamemain.cpp
index 0de374783..350fd7773 100644
--- a/src/game/common/gamemain.cpp
+++ b/src/game/common/gamemain.cpp
@@ -13,7 +13,6 @@
  *            LICENSE
  */
 #include "gamemain.h"
-#include "bitflags.h"
 #include "disabledtypes.h"
 #include "main.h"
 #include "win32gameengine.h"
diff --git a/src/game/logic/scriptengine/scriptparam.h b/src/game/logic/scriptengine/scriptparam.h
index 9a9c7009d..a97995e55 100644
--- a/src/game/logic/scriptengine/scriptparam.h
+++ b/src/game/logic/scriptengine/scriptparam.h
@@ -15,7 +15,6 @@
 #pragma once
 
 #include "always.h"
-#include "asciistring.h"
 #include "bitflags.h"
 #include "coord.h"
 #include "datachunk.h"
diff --git a/src/game/logic/system/gamelogic.h b/src/game/logic/system/gamelogic.h
index 58e932c78..9792edf72 100644
--- a/src/game/logic/system/gamelogic.h
+++ b/src/game/logic/system/gamelogic.h
@@ -15,7 +15,6 @@
 #pragma once
 
 #include "always.h"
-#include "asciistring.h"
 #include "bitflags.h"
 #include "gametype.h"
 #include "rtsutils.h"
diff --git a/src/w3d/renderer/rddesc.h b/src/w3d/renderer/rddesc.h
index 7ea94d05e..29a5fd6c6 100644
--- a/src/w3d/renderer/rddesc.h
+++ b/src/w3d/renderer/rddesc.h
@@ -19,10 +19,6 @@
 #include "w3dtypes.h"
 #include "wwstring.h"
 
-#ifdef BUILD_WITH_D3D8
-#include <d3d8.h>
-#endif
-
 class ResolutionDescClass
 {
 public: