diff --git a/src/common/engine/printf.h b/src/common/engine/printf.h
index 900eb4f74..ef107ae64 100644
--- a/src/common/engine/printf.h
+++ b/src/common/engine/printf.h
@@ -39,6 +39,12 @@ extern "C" int myvsnprintf(char* buffer, size_t count, const char* format, va_li
 #define TEXTCOLOR_SAPPHIRE		"\034Y"
 #define TEXTCOLOR_TEAL			"\034Z"
 
+#define TEXTCOLOR_NORMAL		"\034-"
+#define TEXTCOLOR_BOLD			"\034+"
+
+#define TEXTCOLOR_CHAT			"\034*"
+#define TEXTCOLOR_TEAMCHAT		"\034!"
+
 // game print flags
 enum
 {
diff --git a/src/console/c_dispatch.cpp b/src/console/c_dispatch.cpp
index 98e22e1f5..520ab0fad 100644
--- a/src/console/c_dispatch.cpp
+++ b/src/console/c_dispatch.cpp
@@ -40,22 +40,20 @@
 #include <ctype.h>
 
 #include "templates.h"
-#include "doomtype.h"
 #include "cmdlib.h"
 #include "c_console.h"
 #include "c_dispatch.h"
 #include "m_argv.h"
-#include "g_game.h"
-#include "d_player.h"
+#include "gamestate.h"
 #include "configfile.h"
-#include "v_text.h"
+#include "printf.h"
+#include "c_cvars.h"
+#include "c_buttons.h"
+
+// Todo: Get rid of
 #include "d_net.h"
 #include "d_main.h"
-#include "serializer.h"
-#include "menu/menu.h"
-#include "vm.h"
-#include "g_levellocals.h"
-#include "c_buttons.h"
+
 
 // MACROS ------------------------------------------------------------------
 
@@ -1089,7 +1087,7 @@ bool C_ExecFile (const char *file)
 		exec->ExecCommands();
 		if (exec->Pullins.Size() > 0)
 		{
-			Printf(TEXTCOLOR_BOLD "Notice: Pullin files were ignored.\n");
+			Printf(TEXTCOLOR_RED "Notice: Pullin files were ignored.\n");
 		}
 		delete exec;
 	}
diff --git a/src/console/c_dispatch.h b/src/console/c_dispatch.h
index 417bae3f7..b1f5e6564 100644
--- a/src/console/c_dispatch.h
+++ b/src/console/c_dispatch.h
@@ -56,6 +56,7 @@ struct FExecList
 };
 
 extern bool ParsingKeyConf, UnsafeExecutionContext;
+extern	FString			StoredWarp;			// [RH] +warp at the command line
 
 
 extern bool CheckCheatmode (bool printmsg = true);
diff --git a/src/doomstat.h b/src/doomstat.h
index 4ec924959..879dcd83a 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -64,8 +64,6 @@ extern	FString			startmap;			// [RH] Actual map name now
 
 extern	bool 			autostart;
 
-extern	FString			StoredWarp;			// [RH] +warp at the command line
-
 // Selected by user. 
 EXTERN_CVAR (Int, gameskill);
 extern	int				NextSkill;			// [RH] Skill to use at next level load
diff --git a/src/g_game.h b/src/g_game.h
index 28788f77e..4edd33c58 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -32,28 +32,8 @@ struct event_t;
 
 #include "dobjgc.h"
 #include "name.h"
+#include "gamestate.h"
 
-// The current state of the game: whether we are
-// playing, gazing at the intermission screen,
-// the game final animation, or a demo. 
-enum gamestate_t : int
-{
-	GS_LEVEL,
-	GS_INTERMISSION,
-	GS_FINALE,
-	GS_DEMOSCREEN,
-	GS_FULLCONSOLE,		// [RH]	Fullscreen console
-	GS_HIDECONSOLE,		// [RH] The menu just did something that should hide fs console
-	GS_STARTUP,			// [RH] Console is fullscreen, and game is just starting
-	GS_TITLELEVEL,		// [RH] A combination of GS_LEVEL and GS_DEMOSCREEN
-
-	GS_FORCEWIPE = -1,
-	GS_FORCEWIPEFADE = -2,
-	GS_FORCEWIPEBURN = -3,
-	GS_FORCEWIPEMELT = -4
-};
-
-extern	gamestate_t 	gamestate;
 
 // wipegamestate can be set to -1
 //	to force a wipe on the next draw
diff --git a/src/gamedata/fonts/v_text.h b/src/gamedata/fonts/v_text.h
index df38043d2..e16482fd4 100644
--- a/src/gamedata/fonts/v_text.h
+++ b/src/gamedata/fonts/v_text.h
@@ -46,11 +46,6 @@ struct FBrokenLines
 #define TEXTCOLOR_ESCAPE		'\034'
 #define TEXTCOLOR_ESCAPESTR		"\034"
 
-#define TEXTCOLOR_NORMAL		"\034-"
-#define TEXTCOLOR_BOLD			"\034+"
-
-#define TEXTCOLOR_CHAT			"\034*"
-#define TEXTCOLOR_TEAMCHAT		"\034!"
 
 TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *str, bool preservecolor = false);
 inline TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const char *str, bool preservecolor = false)
diff --git a/src/gamestate.h b/src/gamestate.h
new file mode 100644
index 000000000..112592f41
--- /dev/null
+++ b/src/gamestate.h
@@ -0,0 +1,23 @@
+#pragma once
+
+// The current state of the game: whether we are
+// playing, gazing at the intermission screen,
+// the game final animation, or a demo. 
+enum gamestate_t : int
+{
+	GS_LEVEL,
+	GS_INTERMISSION,
+	GS_FINALE,
+	GS_DEMOSCREEN,
+	GS_FULLCONSOLE,		// [RH]	Fullscreen console
+	GS_HIDECONSOLE,		// [RH] The menu just did something that should hide fs console
+	GS_STARTUP,			// [RH] Console is fullscreen, and game is just starting
+	GS_TITLELEVEL,		// [RH] A combination of GS_LEVEL and GS_DEMOSCREEN
+
+	GS_FORCEWIPE = -1,
+	GS_FORCEWIPEFADE = -2,
+	GS_FORCEWIPEBURN = -3,
+	GS_FORCEWIPEMELT = -4
+};
+
+extern	gamestate_t 	gamestate;