diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp
index 16ea0df45..44b205cdd 100644
--- a/source/blood/src/actor.cpp
+++ b/source/blood/src/actor.cpp
@@ -30,31 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "pragmas.h"
 #include "mmulti.h"
 #include "savegamehelp.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
-#include "aiunicult.h"
 #include "blood.h"
-#include "callback.h"
-#include "db.h"
-#include "endgame.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "gib.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
-#include "view.h"
-#include "nnexts.h"
-#include "player.h"
-#include "misc.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/actor.h b/source/blood/src/actor.h
index a0aabd6df..de2f2788c 100644
--- a/source/blood/src/actor.h
+++ b/source/blood/src/actor.h
@@ -21,12 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 #pragma once
-#include "build.h"
-#include "common_game.h"
-#include "blood.h"
-#include "db.h"
-#include "fx.h"
-#include "gameutil.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/ai.cpp b/source/blood/src/ai.cpp
index 2c39f942d..50b4bf4f4 100644
--- a/source/blood/src/ai.cpp
+++ b/source/blood/src/ai.cpp
@@ -27,27 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "pragmas.h"
 #include "savegamehelp.h"
 #include "mmulti.h"
-#include "common_game.h"
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
-#include "aiunicult.h"
+
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "gib.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
-#include "view.h"
-#include "nnexts.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aibat.cpp b/source/blood/src/aibat.cpp
index 70ed2d63b..590521ba5 100644
--- a/source/blood/src/aibat.cpp
+++ b/source/blood/src/aibat.cpp
@@ -27,16 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "player.h"
-#include "seq.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aibeast.cpp b/source/blood/src/aibeast.cpp
index 813220be3..f94d2ec8c 100644
--- a/source/blood/src/aibeast.cpp
+++ b/source/blood/src/aibeast.cpp
@@ -27,18 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aiboneel.cpp b/source/blood/src/aiboneel.cpp
index eea78ddfc..6a6d31518 100644
--- a/source/blood/src/aiboneel.cpp
+++ b/source/blood/src/aiboneel.cpp
@@ -26,18 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aiburn.cpp b/source/blood/src/aiburn.cpp
index 05019a471..0f684ee44 100644
--- a/source/blood/src/aiburn.cpp
+++ b/source/blood/src/aiburn.cpp
@@ -27,20 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "nnexts.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aicaleb.cpp b/source/blood/src/aicaleb.cpp
index 8f66d6504..4f6609533 100644
--- a/source/blood/src/aicaleb.cpp
+++ b/source/blood/src/aicaleb.cpp
@@ -27,18 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aicerber.cpp b/source/blood/src/aicerber.cpp
index 036318ca9..fb6398429 100644
--- a/source/blood/src/aicerber.cpp
+++ b/source/blood/src/aicerber.cpp
@@ -27,18 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aicult.cpp b/source/blood/src/aicult.cpp
index ca8b6d7d8..512513241 100644
--- a/source/blood/src/aicult.cpp
+++ b/source/blood/src/aicult.cpp
@@ -27,20 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aigarg.cpp b/source/blood/src/aigarg.cpp
index 81b1dab30..1d6b9014b 100644
--- a/source/blood/src/aigarg.cpp
+++ b/source/blood/src/aigarg.cpp
@@ -27,21 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "nnexts.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aighost.cpp b/source/blood/src/aighost.cpp
index 6170b64de..b8fe9e7d8 100644
--- a/source/blood/src/aighost.cpp
+++ b/source/blood/src/aighost.cpp
@@ -27,21 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "nnexts.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aigilbst.cpp b/source/blood/src/aigilbst.cpp
index cf21bcfbd..6c55ece42 100644
--- a/source/blood/src/aigilbst.cpp
+++ b/source/blood/src/aigilbst.cpp
@@ -27,19 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aihand.cpp b/source/blood/src/aihand.cpp
index 6301bd004..69dd9e4ff 100644
--- a/source/blood/src/aihand.cpp
+++ b/source/blood/src/aihand.cpp
@@ -27,19 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aihound.cpp b/source/blood/src/aihound.cpp
index d202c01b3..285afb799 100644
--- a/source/blood/src/aihound.cpp
+++ b/source/blood/src/aihound.cpp
@@ -27,21 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "nnexts.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aiinnoc.cpp b/source/blood/src/aiinnoc.cpp
index a58c9f265..ae2c3f193 100644
--- a/source/blood/src/aiinnoc.cpp
+++ b/source/blood/src/aiinnoc.cpp
@@ -27,19 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aipod.cpp b/source/blood/src/aipod.cpp
index 8eaf871be..212a1c517 100644
--- a/source/blood/src/aipod.cpp
+++ b/source/blood/src/aipod.cpp
@@ -27,21 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/airat.cpp b/source/blood/src/airat.cpp
index 443d8d70d..6fb833e9a 100644
--- a/source/blood/src/airat.cpp
+++ b/source/blood/src/airat.cpp
@@ -27,19 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aispid.cpp b/source/blood/src/aispid.cpp
index 672d6aaa2..c43048b9a 100644
--- a/source/blood/src/aispid.cpp
+++ b/source/blood/src/aispid.cpp
@@ -27,20 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "endgame.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aitchern.cpp b/source/blood/src/aitchern.cpp
index ee7100daf..13149ec3f 100644
--- a/source/blood/src/aitchern.cpp
+++ b/source/blood/src/aitchern.cpp
@@ -27,20 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aiunicult.cpp b/source/blood/src/aiunicult.cpp
index d8b38409f..c9a548459 100644
--- a/source/blood/src/aiunicult.cpp
+++ b/source/blood/src/aiunicult.cpp
@@ -24,35 +24,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "ns.h"	// Must come before everything else!
 
-#include "common_game.h"
-#include "nnexts.h"
-#ifdef NOONE_EXTENSIONS
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
-#include "aiunicult.h"
-#include "blood.h"
-#include "db.h"
-#include "dude.h"
-
-#include "eventq.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
-#include "endgame.h"
-#include "view.h"
 #include "raze_sound.h"
-#include "bloodactor.h"
 
-#include "gib.h"
+#include "blood.h"
+
+#ifdef NOONE_EXTENSIONS
+
 
 BEGIN_BLD_NS
 static void ThrowThing(DBloodActor*, bool);
diff --git a/source/blood/src/aizomba.cpp b/source/blood/src/aizomba.cpp
index 978ac688e..fe0baf4ce 100644
--- a/source/blood/src/aizomba.cpp
+++ b/source/blood/src/aizomba.cpp
@@ -27,20 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
-#include "aistate.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/aizombf.cpp b/source/blood/src/aizombf.cpp
index f40cb1c31..fa9ea9443 100644
--- a/source/blood/src/aizombf.cpp
+++ b/source/blood/src/aizombf.cpp
@@ -27,19 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "pragmas.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/animatesprite.cpp b/source/blood/src/animatesprite.cpp
index ea2920257..c62382cbc 100644
--- a/source/blood/src/animatesprite.cpp
+++ b/source/blood/src/animatesprite.cpp
@@ -31,12 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "v_font.h"
 
-#include "endgame.h"
-#include "aistate.h"
-#include "sectorfx.h"
-#include "choke.h"
-#include "view.h"
-#include "nnexts.h"
+#include "blood.h"
+
 #include "zstring.h"
 #include "razemenu.h"
 #include "gstrings.h"
diff --git a/source/blood/src/asound.cpp b/source/blood/src/asound.cpp
index c59ae1359..c5544cefc 100644
--- a/source/blood/src/asound.cpp
+++ b/source/blood/src/asound.cpp
@@ -24,13 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "build.h"
-#include "common_game.h"
-//#include "blood.h"
-#include "view.h"
-#include "globals.h"
-#include "db.h"
-#include "player.h"
-#include "sound.h"
+#include "blood.h"
 #include "raze_sound.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/barf.cpp b/source/blood/src/barf.cpp
index b2cd86fb9..f5f6f6381 100644
--- a/source/blood/src/barf.cpp
+++ b/source/blood/src/barf.cpp
@@ -24,10 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "compat.h"
-#include "common_game.h"
-#include "misc.h"
-#include "globals.h"
-#include "sound.h"
+#include "blood.h"
 #include "filesystem.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 3980f5395..a8160dd74 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -26,24 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "mmulti.h"
 #include "compat.h"
-#include "common_game.h"
 #include "g_input.h"
 #include "automap.h"
 
-#include "db.h"
 #include "blood.h"
 #include "choke.h"
-#include "dude.h"
-#include "endgame.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gib.h"
-#include "globals.h"
-#include "levels.h"
-#include "sectorfx.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
+
 #include "view.h"
 #include "misc.h"
 #include "gameconfigfile.h"
@@ -52,12 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "statistics.h"
 #include "razemenu.h"
 #include "raze_sound.h"
-#include "nnexts.h"
 #include "secrets.h"
 #include "gamestate.h"
 #include "screenjob.h"
 #include "mapinfo.h"
-#include "choke.h"
 #include "d_net.h"
 #include "v_video.h"
 #include "v_draw.h"
diff --git a/source/blood/src/blood.h b/source/blood/src/blood.h
index 788841e26..b1ae46cb0 100644
--- a/source/blood/src/blood.h
+++ b/source/blood/src/blood.h
@@ -22,13 +22,40 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 #pragma once
 
-#include "levels.h"
-#include "misc.h"
-#include "db.h"
-#include "mapinfo.h"
+#include "build.h"
 #include "gamestruct.h"
 #include "mapinfo.h"
 
+#include "common_game.h"
+#include "fx.h"
+#include "gameutil.h"
+#include "db.h"
+
+#include "actor.h"
+#include "ai.h"
+#include "aistate.h"
+#include "aiunicult.h"
+#include "blood.h"
+#include "callback.h"
+#include "db.h"
+#include "endgame.h"
+#include "eventq.h"
+#include "gib.h"
+#include "globals.h"
+#include "levels.h"
+#include "misc.h"
+#include "player.h"
+#include "seq.h"
+#include "sound.h"
+#include "triggers.h"
+#include "view.h"
+#include "nnexts.h"
+#include "player.h"
+#include "misc.h"
+#include "sectorfx.h"
+#include "bloodactor.h"
+
+
 BEGIN_BLD_NS
 
 struct INIDESCRIPTION {
diff --git a/source/blood/src/callback.cpp b/source/blood/src/callback.cpp
index 59c911c42..318a608f0 100644
--- a/source/blood/src/callback.cpp
+++ b/source/blood/src/callback.cpp
@@ -24,26 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "build.h"
-#include "common_game.h"
-
-#include "actor.h"
-#include "ai.h"
 #include "blood.h"
-#include "callback.h"
-#include "db.h"
-#include "dude.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
-#include "view.h"
-#include "nnexts.h"
-#include "aiunicult.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/choke.cpp b/source/blood/src/choke.cpp
index 4e6af0fe2..fb758f547 100644
--- a/source/blood/src/choke.cpp
+++ b/source/blood/src/choke.cpp
@@ -25,13 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "build.h"
 #include "compat.h"
-#include "common_game.h"
 #include "blood.h"
 #include "choke.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "qav.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/controls.cpp b/source/blood/src/controls.cpp
index 194a82b8e..23f4c76cc 100644
--- a/source/blood/src/controls.cpp
+++ b/source/blood/src/controls.cpp
@@ -1,3 +1,4 @@
+#pragma once
 //-------------------------------------------------------------------------
 /*
 Copyright (C) 2020 Christoph Oelckers & Mitchell Richters
@@ -24,8 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "mmulti.h"
-#include "view.h"
+#include "blood.h"
 #include "gamestate.h"
+#include "inputstate.h"
+#include "gamestruct.h"
 #include "razemenu.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/credits.cpp b/source/blood/src/credits.cpp
index 40d53543b..9d0b44025 100644
--- a/source/blood/src/credits.cpp
+++ b/source/blood/src/credits.cpp
@@ -26,18 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "compat.h"
 #include "SmackerDecoder.h"
-#include "common_game.h"
 #include "blood.h"
-#include "globals.h"
-#include "sound.h"
-#include "view.h"
 #include "animtexture.h"
 #include "../glbackend/glbackend.h"
 #include "raze_sound.h"
 #include "v_2ddrawer.h"
 #include "screenjob.h"
 #include "gamestate.h"
-#include "seq.h"
 #include "razemenu.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/d_menu.cpp b/source/blood/src/d_menu.cpp
index 3dfdcc3ce..7b4c6f185 100644
--- a/source/blood/src/d_menu.cpp
+++ b/source/blood/src/d_menu.cpp
@@ -24,23 +24,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "ns.h"	// Must come before everything else!
 
-#include "bloodactor.h"
-
 #include "build.h"
 #include "compat.h"
 #include "mmulti.h"
 #include "c_bind.h"
 #include "razemenu.h"
 #include "gamestate.h"
-
-#include "blood.h"
-#include "globals.h"
-#include "qav.h"
-#include "view.h"
-#include "sound.h"
 #include "v_video.h"
 #include "v_draw.h"
 #include "vm.h"
+#include "blood.h"
 
 bool ShowOptionMenu();
 
diff --git a/source/blood/src/db.cpp b/source/blood/src/db.cpp
index cfb50137d..20d48d82f 100644
--- a/source/blood/src/db.cpp
+++ b/source/blood/src/db.cpp
@@ -32,12 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "automap.h"
 #include "raze_sound.h"
 
-//#include "actor.h"
-#include "globals.h"
-#include "db.h"
-#include "eventq.h"
-#include "nnexts.h"
-#include "bloodactor.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/dude.cpp b/source/blood/src/dude.cpp
index 44256df39..7007da4ef 100644
--- a/source/blood/src/dude.cpp
+++ b/source/blood/src/dude.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "compat.h"
 #include "blood.h"
-#include "dude.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/dude.h b/source/blood/src/dude.h
index da4c728ef..dd899dd0f 100644
--- a/source/blood/src/dude.h
+++ b/source/blood/src/dude.h
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 #pragma once
-#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/endgame.cpp b/source/blood/src/endgame.cpp
index 1046449fa..41b2cc422 100644
--- a/source/blood/src/endgame.cpp
+++ b/source/blood/src/endgame.cpp
@@ -26,21 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "v_draw.h"
 #include "mmulti.h"
-#include "common_game.h"
-#include "blood.h"
-#include "endgame.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "sound.h"
-#include "view.h"
-#include "messages.h"
 #include "statistics.h"
 #include "gstrings.h"
 #include "gamestate.h"
 #include "raze_sound.h"
 #include "d_net.h"
 #include "screenjob.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/eventq.cpp b/source/blood/src/eventq.cpp
index 076e46314..992b1d69c 100644
--- a/source/blood/src/eventq.cpp
+++ b/source/blood/src/eventq.cpp
@@ -26,13 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <set>
 #include "build.h"
 #include "printf.h"
-#include "common_game.h"
-#include "eventq.h"
-#include "db.h"
-#include "levels.h"
-#include "triggers.h"
-#include "view.h"
-#include "nnexts.h"
+#include "blood.h"
 #include "secrets.h"
 #include "serializer.h"
 
diff --git a/source/blood/src/fire.cpp b/source/blood/src/fire.cpp
index c860c5d1a..de4f759cb 100644
--- a/source/blood/src/fire.cpp
+++ b/source/blood/src/fire.cpp
@@ -27,10 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <string.h>
 #include "build.h"
-#include "common_game.h"
 #include "blood.h"
-#include "globals.h"
-#include "misc.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/fx.cpp b/source/blood/src/fx.cpp
index e9de692c6..8e1b0e1ae 100644
--- a/source/blood/src/fx.cpp
+++ b/source/blood/src/fx.cpp
@@ -24,19 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "build.h"
-#include "common_game.h"
-
-#include "actor.h"
 #include "blood.h"
-#include "callback.h"
-#include "globals.h"
-#include "db.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "levels.h"
-#include "seq.h"
-#include "view.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/gameutil.cpp b/source/blood/src/gameutil.cpp
index f6b8385c8..e90cde62a 100644
--- a/source/blood/src/gameutil.cpp
+++ b/source/blood/src/gameutil.cpp
@@ -28,12 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 
 #include "build.h"
-#include "common_game.h"
+#include "blood.h"
 
-#include "actor.h"
-#include "db.h"
-#include "gameutil.h"
-#include "globals.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/gib.cpp b/source/blood/src/gib.cpp
index eba2289bd..8d10b9cd0 100644
--- a/source/blood/src/gib.cpp
+++ b/source/blood/src/gib.cpp
@@ -26,17 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"
-#include "common_game.h"
-#include "actor.h"
+
 #include "blood.h"
-#include "db.h"
-#include "callback.h"
-#include "globals.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gib.h"
-#include "levels.h"
-#include "sound.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/globals.cpp b/source/blood/src/globals.cpp
index cb234ba7e..01d373c64 100644
--- a/source/blood/src/globals.cpp
+++ b/source/blood/src/globals.cpp
@@ -27,8 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "compat.h"
 #include "build.h"
-#include "common_game.h"
-#include "globals.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/hudsprites.cpp b/source/blood/src/hudsprites.cpp
index d9456d2b8..577aa6e2d 100644
--- a/source/blood/src/hudsprites.cpp
+++ b/source/blood/src/hudsprites.cpp
@@ -31,18 +31,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "v_font.h"
 
-#include "endgame.h"
-#include "aistate.h"
-#include "sectorfx.h"
-#include "choke.h"
-#include "view.h"
-#include "nnexts.h"
+#include "blood.h"
+
 #include "zstring.h"
 #include "razemenu.h"
 #include "gstrings.h"
 #include "v_2ddrawer.h"
 #include "v_video.h"
-#include "v_font.h"
 #include "glbackend/glbackend.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/inifile.cpp b/source/blood/src/inifile.cpp
index d682040d6..6f3c37dd6 100644
--- a/source/blood/src/inifile.cpp
+++ b/source/blood/src/inifile.cpp
@@ -28,10 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include "common_game.h"
+#include "blood.h"
 
 #include "inifile.h"
-#include "misc.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/levels.cpp b/source/blood/src/levels.cpp
index 3369789d4..ad1cd6ad9 100644
--- a/source/blood/src/levels.cpp
+++ b/source/blood/src/levels.cpp
@@ -25,18 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <string.h>
 #include "compat.h"
-#include "common_game.h"
 
 #include "blood.h"
-#include "globals.h"
-#include "endgame.h"
 #include "inifile.h"
-#include "levels.h"
-#include "messages.h"
-#include "seq.h"
-#include "sound.h"
-#include "view.h"
-#include "eventq.h"
 #include "razemenu.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/loadsave.cpp b/source/blood/src/loadsave.cpp
index 48cfbc765..425beb218 100644
--- a/source/blood/src/loadsave.cpp
+++ b/source/blood/src/loadsave.cpp
@@ -26,27 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "compat.h"
 #include "mmulti.h"
-#include "common_game.h"
-#include "ai.h"
+
 #include "blood.h"
-#include "globals.h"
-#include "db.h"
-#include "messages.h"
-#include "sectorfx.h"
-#include "seq.h"
-#include "sound.h"
 #include "i_specialpaths.h"
-#include "view.h"
-#include "nnexts.h"
 #include "savegamehelp.h"
 #include "raze_music.h"
 #include "mapinfo.h"
 #include "gamestate.h"
 #include "d_net.h"
-#include "bloodactor.h"
-
-#include "aistate.h"
-#include "aiunicult.h"
 
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/messages.cpp b/source/blood/src/messages.cpp
index bc0c40e6c..3fc2fd938 100644
--- a/source/blood/src/messages.cpp
+++ b/source/blood/src/messages.cpp
@@ -26,14 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "compat.h"
 #include "gamecontrol.h"
-#include "common_game.h"
+
 #include "blood.h"
-#include "eventq.h"
-#include "globals.h"
-#include "levels.h"
-#include "messages.h"
-#include "player.h"
-#include "view.h"
 #include "gstrings.h"
 #include "cheathandler.h"
 #include "d_protocol.h"
diff --git a/source/blood/src/mirrors.cpp b/source/blood/src/mirrors.cpp
index c14f67882..5441ff082 100644
--- a/source/blood/src/mirrors.cpp
+++ b/source/blood/src/mirrors.cpp
@@ -24,12 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "build.h"
 #include "compat.h"
-#include "common_game.h"
 #include "blood.h"
-#include "db.h"
-#include "gameutil.h"
-#include "player.h"
-#include "view.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/misc.cpp b/source/blood/src/misc.cpp
index 6d5ac38a3..35e4b58b0 100644
--- a/source/blood/src/misc.cpp
+++ b/source/blood/src/misc.cpp
@@ -24,9 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <stdio.h>
 #include <string.h>
-#include "common_game.h"
-
-#include "misc.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/misc.h b/source/blood/src/misc.h
index 7ca3e24bb..0e5b404e7 100644
--- a/source/blood/src/misc.h
+++ b/source/blood/src/misc.h
@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 #pragma once
 
-#include "build.h"
 #include "m_fixed.h"
 #include "filesystem.h"
 
diff --git a/source/blood/src/nnexts.cpp b/source/blood/src/nnexts.cpp
index d3ff6d91e..6be409f9a 100644
--- a/source/blood/src/nnexts.cpp
+++ b/source/blood/src/nnexts.cpp
@@ -29,21 +29,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////
 #include "ns.h"
 
-#include "nnexts.h"
 #ifdef NOONE_EXTENSIONS
 #include <random>
-#include "player.h"
-#include "aiunicult.h"
-#include "triggers.h"
-#include "sectorfx.h"
-#include "globals.h"
-#include "endgame.h"
-#include "misc.h"
 #include "mmulti.h"
-#include "view.h"
-#include "sound.h"
-#include "seq.h"
-#include "ai.h"
+#include "blood.h"
 #include "savegamehelp.h"
 #include "bloodactor.h"
 
diff --git a/source/blood/src/osdcmd.cpp b/source/blood/src/osdcmd.cpp
index 69f72714d..e64343488 100644
--- a/source/blood/src/osdcmd.cpp
+++ b/source/blood/src/osdcmd.cpp
@@ -26,13 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "compat.h"
 #include "mmulti.h"
-#include "common_game.h"
+
 #include "blood.h"
-#include "globals.h"
-#include "levels.h"
-#include "messages.h"
-#include "sound.h"
-#include "view.h"
 #include "mapinfo.h"
 #include "gamestate.h"
 
diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp
index 01430d369..516da43a0 100644
--- a/source/blood/src/player.cpp
+++ b/source/blood/src/player.cpp
@@ -28,26 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "build.h"
 #include "mmulti.h"
-#include "actor.h"
+
 #include "blood.h"
-#include "callback.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gib.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "sound.h"
-#include "triggers.h"
-#include "view.h"
-#include "common_game.h"
-#include "messages.h"
-#include "nnexts.h"
 #include "gstrings.h"
 #include "gamestate.h"
 #include "automap.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/player.h b/source/blood/src/player.h
index 7e575fb80..e4e408ed9 100644
--- a/source/blood/src/player.h
+++ b/source/blood/src/player.h
@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 #pragma once
 #include "actor.h"
-#include "blood.h"
 #include "build.h"
 #include "common_game.h"
 #include "compat.h"
diff --git a/source/blood/src/prediction.cpp b/source/blood/src/prediction.cpp
index c2f45c9ac..0379319ee 100644
--- a/source/blood/src/prediction.cpp
+++ b/source/blood/src/prediction.cpp
@@ -31,12 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "v_font.h"
 
-#include "endgame.h"
-#include "aistate.h"
-#include "sectorfx.h"
+#include "blood.h"
 #include "choke.h"
-#include "view.h"
-#include "nnexts.h"
 #include "zstring.h"
 #include "razemenu.h"
 #include "gstrings.h"
diff --git a/source/blood/src/preload.cpp b/source/blood/src/preload.cpp
index e225a1e9d..5c998974e 100644
--- a/source/blood/src/preload.cpp
+++ b/source/blood/src/preload.cpp
@@ -23,12 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "ns.h"	// Must come before everything else!
 #include "build.h"
-#include "common_game.h"
-#include "dude.h"
-#include "seq.h"
+#include "blood.h"
 #include "view.h"
-#include "fx.h"
-#include "gib.h"
 #include "g_input.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/qav.cpp b/source/blood/src/qav.cpp
index 1b5d22f61..9fd8d3566 100644
--- a/source/blood/src/qav.cpp
+++ b/source/blood/src/qav.cpp
@@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "v_2ddrawer.h"
 #include "compat.h"
 #include "common_game.h"
-#include "qav.h"
-#include "sound.h"
 #include "v_draw.h"
 #include "glbackend/glbackend.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/qav.h b/source/blood/src/qav.h
index 1bea64fa6..d858a042b 100644
--- a/source/blood/src/qav.h
+++ b/source/blood/src/qav.h
@@ -22,9 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 #pragma once
 #include "build.h"
-#include "common_game.h"
-#include "blood.h"
-#include "misc.h"
 
 class F2DDrawer;
 
diff --git a/source/blood/src/replace.cpp b/source/blood/src/replace.cpp
index 663c00368..44029a6ac 100644
--- a/source/blood/src/replace.cpp
+++ b/source/blood/src/replace.cpp
@@ -23,10 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ns.h"	// Must come before everything else!
 
 #include "compat.h"
-#include "common_game.h"
+#include "blood.h"
 #include "m_crc32.h"
 
-#include "globals.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/sbar.cpp b/source/blood/src/sbar.cpp
index 70770c1f5..1c8819983 100644
--- a/source/blood/src/sbar.cpp
+++ b/source/blood/src/sbar.cpp
@@ -31,12 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "v_font.h"
 
-#include "endgame.h"
-#include "aistate.h"
-#include "sectorfx.h"
-#include "choke.h"
-#include "view.h"
-#include "nnexts.h"
+#include "blood.h"
 #include "zstring.h"
 #include "razemenu.h"
 #include "gstrings.h"
diff --git a/source/blood/src/sectorfx.cpp b/source/blood/src/sectorfx.cpp
index ee9f2d9ac..4acaf54d1 100644
--- a/source/blood/src/sectorfx.cpp
+++ b/source/blood/src/sectorfx.cpp
@@ -25,13 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "build.h"
 #include "pragmas.h"
-#include "common_game.h"
 
 #include "blood.h"
-#include "db.h"
-#include "gameutil.h"
-#include "globals.h"
-#include "sectorfx.h"
 #include "interpolate.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/seq.cpp b/source/blood/src/seq.cpp
index 63b02c195..9af81bfc2 100644
--- a/source/blood/src/seq.cpp
+++ b/source/blood/src/seq.cpp
@@ -27,24 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "tarray.h"
 
 #include "build.h"
-#include "common_game.h"
 
 #include "blood.h"
-#include "db.h"
-#include "eventq.h"
-#include "globals.h"
-#include "levels.h"
-#include "sound.h"
-#include "seq.h"
-#include "gameutil.h"
-#include "actor.h"
-#include "view.h"
-#include "raze_sound.h"
-#include "actor.h"
-#include "seq.h"
-#include "bloodactor.h"
-
-
 #include "files.h"
 
 
diff --git a/source/blood/src/sfx.cpp b/source/blood/src/sfx.cpp
index 824b331db..aa841ac84 100644
--- a/source/blood/src/sfx.cpp
+++ b/source/blood/src/sfx.cpp
@@ -25,11 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 #include "build.h"
 #include "compat.h"
-#include "common_game.h"
-
-#include "gameutil.h"
-#include "player.h"
-#include "sound.h"
+#include "blood.h"
 #include "raze_sound.h"
 
 BEGIN_BLD_NS
diff --git a/source/blood/src/sound.cpp b/source/blood/src/sound.cpp
index 72ce19c21..eb67e2082 100644
--- a/source/blood/src/sound.cpp
+++ b/source/blood/src/sound.cpp
@@ -24,9 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "build.h"
 #include "compat.h"
-#include "common_game.h"
-#include "levels.h"
-#include "sound.h"
+#include "blood.h"
 #include "raze_music.h"
 #include "raze_sound.h"
 #include "gamecontrol.h"
@@ -48,7 +46,6 @@ int soundRates[13] = {
     44100,
     44100,
 };
-enum { kChannelMax = 32 };
 
 
 void ByteSwapSFX(SFX* pSFX)
@@ -160,7 +157,6 @@ void sndStartSample(const char *pzSound, int nVolume, int nChannel)
         return;
     if (!strlen(pzSound))
         return;
-    assert(nChannel >= -1 && nChannel < kChannelMax);
     auto snd = soundEngine->FindSound(pzSound);
     if (snd > 0)
     {
@@ -172,7 +168,6 @@ void sndStartSample(unsigned int nSound, int nVolume, int nChannel, bool bLoop,
 {
     if (!SoundEnabled())
         return;
-    assert(nChannel >= -1 && nChannel < kChannelMax);
     if (nChannel >= 7) nChannel = -1;
     auto snd = soundEngine->FindSoundByResID(nSound);
     if (snd > 0)
diff --git a/source/blood/src/tile.cpp b/source/blood/src/tile.cpp
index 94ceb86a3..b9d35aad6 100644
--- a/source/blood/src/tile.cpp
+++ b/source/blood/src/tile.cpp
@@ -27,11 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 #include "compat.h"
 #include "build.h"
-#include "common_game.h"
 
 #include "blood.h"
-#include "globals.h"
-#include "view.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/trig.cpp b/source/blood/src/trig.cpp
index 5a27fcf83..0dae47c76 100644
--- a/source/blood/src/trig.cpp
+++ b/source/blood/src/trig.cpp
@@ -1,9 +1,6 @@
 #include "ns.h"	// Must come before everything else!
 
-#include "build.h"
-#include "pragmas.h"
-#include "common_game.h"
-//-------------------------------------------------------------------------
+//----------------------------------------------------------------------
 /*
 Copyright (C) 2010-2019 EDuke32 developers and contributors
 Copyright (C) 2019 Nuke.YKT
@@ -27,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 #include "build.h"
 #include "pragmas.h"
-#include "common_game.h"
+#include "blood.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/triggers.cpp b/source/blood/src/triggers.cpp
index 055a049d5..33b8559ed 100644
--- a/source/blood/src/triggers.cpp
+++ b/source/blood/src/triggers.cpp
@@ -27,30 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "compat.h"
 #include "mmulti.h"
-#include "common_game.h"
 
-#include "ai.h"
-#include "actor.h"
 #include "blood.h"
-#include "db.h"
-#include "endgame.h"
-#include "eventq.h"
-#include "aiunicult.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "gib.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "seq.h"
-#include "qav.h"
-#include "sound.h"
-#include "triggers.h"
-#include "view.h"
-#include "messages.h"
-#include "nnexts.h"
 #include "d_net.h"
-#include "bloodactor.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/triggers.h b/source/blood/src/triggers.h
index 14e195d4a..17336e2ef 100644
--- a/source/blood/src/triggers.h
+++ b/source/blood/src/triggers.h
@@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "build.h"
 #include "common_game.h"
 
-#include "blood.h"
 #include "db.h"
 #include "eventq.h"
 #include "dude.h"
diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp
index d6685510d..701144193 100644
--- a/source/blood/src/view.cpp
+++ b/source/blood/src/view.cpp
@@ -31,12 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "v_font.h"
 
-#include "endgame.h"
-#include "aistate.h"
-#include "sectorfx.h"
+#include "blood.h"
 #include "choke.h"
-#include "view.h"
-#include "nnexts.h"
 #include "zstring.h"
 #include "razemenu.h"
 #include "gstrings.h"
diff --git a/source/blood/src/warp.cpp b/source/blood/src/warp.cpp
index 17572618f..f13197a02 100644
--- a/source/blood/src/warp.cpp
+++ b/source/blood/src/warp.cpp
@@ -24,13 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "build.h"
 #include "compat.h"
-#include "common_game.h"
+
 #include "blood.h"
-#include "db.h"
-#include "gameutil.h"
-#include "levels.h"
-#include "view.h"
-#include "nnexts.h"
 
 BEGIN_BLD_NS
 
diff --git a/source/blood/src/weapon.cpp b/source/blood/src/weapon.cpp
index b8ae7cc0b..646db4042 100644
--- a/source/blood/src/weapon.cpp
+++ b/source/blood/src/weapon.cpp
@@ -28,22 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "build.h"
 #include "mmulti.h"
-#include "common_game.h"
-#include "actor.h"
+
 #include "blood.h"
-#include "db.h"
-#include "callback.h"
-#include "eventq.h"
-#include "fx.h"
-#include "gameutil.h"
-#include "globals.h"
-#include "levels.h"
-#include "player.h"
-#include "qav.h"
-#include "seq.h"
-#include "sound.h"
-#include "nnexts.h"
-#include "view.h"
 
 BEGIN_BLD_NS