diff --git a/source/duke3d/src/cmdline.h b/source/duke3d/src/cmdline.h
index 14f5896f4..cd3b18bcd 100644
--- a/source/duke3d/src/cmdline.h
+++ b/source/duke3d/src/cmdline.h
@@ -20,6 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
+#ifndef cmdline_h__
+#define cmdline_h__
+
+#include "compat.h"
+
 extern void G_CheckCommandLine(int32_t argc, char const * const * argv);
 extern void G_ShowParameterHelp(void);
 extern void G_ShowDebugHelp(void);
@@ -33,3 +38,4 @@ extern const char *CommandMap;
 extern const char *CommandName;
 extern int32_t g_forceWeaponChoice;
 extern int32_t g_fakeMultiMode;
+#endif // cmdline_h__
diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index fff5aef78..5ebffda3b 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -318,8 +318,6 @@ extern int32_t g_cameraDistance;
 #endif
 extern int32_t g_crosshairSum;
 extern int32_t g_doQuickSave;
-extern int32_t g_forceWeaponChoice;
-extern int32_t g_fakeMultiMode;
 extern int32_t g_levelTextTime;
 extern int32_t g_quitDeadline;
 extern int32_t g_restorePalette;
diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp
index 66976006d..7a33ca33a 100644
--- a/source/duke3d/src/gameexec.cpp
+++ b/source/duke3d/src/gameexec.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 
 #include "anim.h"
+#include "cmdline.h"
 #include "colmatch.h"
 #include "compat.h"
 #include "debugbreak.h"
diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp
index c53624586..0731e2d42 100644
--- a/source/duke3d/src/osdcmds.cpp
+++ b/source/duke3d/src/osdcmds.cpp
@@ -20,14 +20,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
-#include "duke3d.h"
-#include "osdcmds.h"
-#include "menus.h"
-#include "osdfuncs.h"
-#include "demo.h"  // g_firstDemoFile[]
 #include "cheats.h"
-#include "sbar.h"
+#include "cmdline.h"
+#include "demo.h"  // g_firstDemoFile[]
+#include "duke3d.h"
+#include "menus.h"
+#include "osdcmds.h"
+#include "osdfuncs.h"
 #include "savegame.h"
+#include "sbar.h"
 
 #ifdef LUNATIC
 # include "lunatic_game.h"
diff --git a/source/duke3d/src/premap.cpp b/source/duke3d/src/premap.cpp
index 4a944e1a1..15cb343c1 100644
--- a/source/duke3d/src/premap.cpp
+++ b/source/duke3d/src/premap.cpp
@@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 //-------------------------------------------------------------------------
 
-#include "duke3d.h"
 #include "anim.h"
-#include "menus.h"
+#include "cmdline.h"
 #include "demo.h"
+#include "duke3d.h"
+#include "menus.h"
 #include "savegame.h"
 
 #ifdef LUNATIC
diff --git a/source/duke3d/src/startgtk.game.cpp b/source/duke3d/src/startgtk.game.cpp
index 4298de0c4..7e90c64ee 100644
--- a/source/duke3d/src/startgtk.game.cpp
+++ b/source/duke3d/src/startgtk.game.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 
 #include "build.h"
+#include "cmdline.h"
 #include "common.h"
 #include "common_game.h"
 #include "compat.h"