- Blood: header dependency cleanup.

These are extremely ordering dependent so now blood.h serves as an umbrella header for most.

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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);

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
 

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
 

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"

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

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

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"

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 {

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
 

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
 

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

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

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();
 

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
 

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
 

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
 

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
 

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"
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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

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

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"

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
 

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
 

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"
 

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"
 

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"
 

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
 

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"

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"

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

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
 

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;
 

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
 

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"

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

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"
 
 

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

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)

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
 

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
 

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
 

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"

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"

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
 

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