diff --git a/source/duke3d/src/cmdline.cpp b/source/duke3d/src/cmdline.cpp
index 12039a7af..dc682480b 100644
--- a/source/duke3d/src/cmdline.cpp
+++ b/source/duke3d/src/cmdline.cpp
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "demo.h"
 #include "screens.h"
 #include "renderlayer.h"
+#include "cmdline.h"
 
 #ifdef LUNATIC
 char const * const * g_argv;
diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp
index 7e9ffd03a..709298a1e 100644
--- a/source/duke3d/src/config.cpp
+++ b/source/duke3d/src/config.cpp
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "scriplib.h"
 #include "osdcmds.h"
 #include "renderlayer.h"
+#include "cmdline.h"
 
 #ifdef __ANDROID__
 #include "android.h"
diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index 6d21524cf..7d5d8eb42 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -272,7 +272,6 @@ extern int32_t g_doQuickSave;
 extern int32_t g_forceWeaponChoice;
 extern int32_t g_fakeMultiMode;
 extern int32_t g_levelTextTime;
-extern int32_t g_noSetup;
 extern int32_t g_quitDeadline;
 extern int32_t g_restorePalette;
 extern int32_t hud_glowingquotes;
diff --git a/source/duke3d/src/startwin.game.cpp b/source/duke3d/src/startwin.game.cpp
index 94847c9b6..a84eacc12 100644
--- a/source/duke3d/src/startwin.game.cpp
+++ b/source/duke3d/src/startwin.game.cpp
@@ -55,6 +55,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "game.h"
 
 #include "common_game.h"
+#include "cmdline.h"
 
 #define TAB_CONFIG 0
 // #define TAB_GAME 1
@@ -98,8 +99,6 @@ static inline int32_t getfilenames(char const *path)
 #define POPULATE_GAME 4
 #define POPULATE_GAMEDIRS 8
 
-extern int32_t g_noSetup;
-
 #ifdef INPUT_MOUSE
 #undef INPUT_MOUSE
 #endif