diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c
index 2da7bb880..a895d0acf 100644
--- a/arch/ogl/ogl.c
+++ b/arch/ogl/ogl.c
@@ -51,6 +51,7 @@
 #include "internal.h"
 #include "gauges.h"
 #include "playsave.h"
+#include "args.h"
 
 //change to 1 for lots of spew.
 #if 0
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index 8c0fea803..dd83a4f3b 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -17,6 +17,7 @@
 #include "console.h"
 #include "rbaudio.h"
 #include "jukebox.h"
+#include "args.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/arch/sdl/digi_audio.c b/arch/sdl/digi_audio.c
index 5c9e939cb..effda374b 100644
--- a/arch/sdl/digi_audio.c
+++ b/arch/sdl/digi_audio.c
@@ -22,6 +22,7 @@
 #include "newdemo.h"
 #include "kconfig.h"
 #include "config.h"
+#include "args.h"
 
 //changed on 980905 by adb to increase number of concurrent sounds
 #define MAX_SOUND_SLOTS 32
diff --git a/arch/sdl/digi_mixer.c b/arch/sdl/digi_mixer.c
index 61fe18ff7..85df5d370 100644
--- a/arch/sdl/digi_mixer.c
+++ b/arch/sdl/digi_mixer.c
@@ -28,6 +28,7 @@
 #include "digi_mixer_music.h"
 #include "console.h"
 #include "config.h"
+#include "args.h"
 
 #include "fix.h"
 #include "gr.h" // needed for piggy.h
diff --git a/arch/sdl/mouse.c b/arch/sdl/mouse.c
index 1b7ee5326..df384a5dc 100644
--- a/arch/sdl/mouse.c
+++ b/arch/sdl/mouse.c
@@ -13,6 +13,7 @@
 #include "window.h"
 #include "mouse.h"
 #include "playsave.h"
+#include "args.h"
 
 static struct mouseinfo {
 	ubyte  button_state[MOUSE_MAX_BUTTONS];
diff --git a/include/physfsx.h b/include/physfsx.h
index e23f8a9d7..3a6228ce1 100644
--- a/include/physfsx.h
+++ b/include/physfsx.h
@@ -24,7 +24,6 @@
 #include "u_mem.h"
 #include "dxxerror.h"
 #include "vecmat.h"
-#include "args.h"
 #include "ignorecase.h"
 #include "byteswap.h"
 
diff --git a/main/ai2.c b/main/ai2.c
index f46b98b95..feafc4dc1 100644
--- a/main/ai2.c
+++ b/main/ai2.c
@@ -56,6 +56,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "powerup.h"
 #include "gauges.h"
 #include "text.h"
+#include "args.h"
 
 #ifdef EDITOR
 #include "editor/editor.h"
diff --git a/main/automap.c b/main/automap.c
index 7e8b5956b..82b360700 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -71,6 +71,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "rbaudio.h"
 #include "window.h"
 #include "playsave.h"
+#include "args.h"
 
 #define LEAVE_TIME 0x4000
 
diff --git a/main/cntrlcen.c b/main/cntrlcen.c
index 02effc664..3f9d135a6 100644
--- a/main/cntrlcen.c
+++ b/main/cntrlcen.c
@@ -42,6 +42,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "endlevel.h"
 #include "state.h"
 #include "byteswap.h"
+#include "args.h"
 
 //@@vms_vector controlcen_gun_points[MAX_CONTROLCEN_GUNS];
 //@@vms_vector controlcen_gun_dirs[MAX_CONTROLCEN_GUNS];
diff --git a/main/credits.c b/main/credits.c
index e2e309be7..0e4bca089 100644
--- a/main/credits.c
+++ b/main/credits.c
@@ -44,6 +44,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "menu.h"
 #include "mission.h"
 #include "config.h"
+#include "args.h"
 
 #define ROW_SPACING			(SHEIGHT / 17)
 #define NUM_LINES			20 //14
diff --git a/main/gamerend.c b/main/gamerend.c
index 0e7f4f7f7..002e965d0 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -49,6 +49,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "automap.h"
 #include "mission.h"
 #include "gameseq.h"
+#include "args.h"
 
 #ifdef OGL
 #include "ogl_init.h"
diff --git a/main/gauges.c b/main/gauges.c
index 5ee17e91b..8b5672ea0 100644
--- a/main/gauges.c
+++ b/main/gauges.c
@@ -55,6 +55,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef OGL
 #include "ogl_init.h"
 #endif
+#include "args.h"
 
 //bitmap numbers for gauges
 #define GAUGE_SHIELDS			0		//0..9, in decreasing order (100%,90%...0%)
diff --git a/main/kmatrix.c b/main/kmatrix.c
index 5151b7092..e9012c8b3 100644
--- a/main/kmatrix.c
+++ b/main/kmatrix.c
@@ -48,6 +48,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "kmatrix.h"
 #include "gauges.h"
 #include "pcx.h"
+#include "args.h"
 
 #ifdef OGL
 #include "ogl_init.h"
diff --git a/main/movie.c b/main/movie.c
index 63b35510f..08f25e083 100644
--- a/main/movie.c
+++ b/main/movie.c
@@ -52,6 +52,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef OGL
 #include "ogl_init.h"
 #endif
+#include "args.h"
 
 extern char CDROM_dir[];
 
diff --git a/main/newmenu.c b/main/newmenu.c
index 1d39005d4..a4fa3f7ce 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -57,6 +57,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "playsave.h"
 #include "automap.h"
 #include "rbaudio.h"
+#include "args.h"
 
 #ifdef OGL
 #include "ogl_init.h"
diff --git a/main/playsave.c b/main/playsave.c
index 7783959ab..835d0e5c7 100644
--- a/main/playsave.c
+++ b/main/playsave.c
@@ -47,6 +47,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "strio.h"
 #include "physfsx.h"
+#include "args.h"
 #include "vers_id.h"
 #include "newdemo.h"
 #include "gauges.h"
diff --git a/main/render.c b/main/render.c
index 305362284..b0a811893 100644
--- a/main/render.c
+++ b/main/render.c
@@ -54,6 +54,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef OGL
 #include "ogl_init.h"
 #endif
+#include "args.h"
 
 #define INITIAL_LOCAL_LIGHT (F1_0/4)    // local light value in segment of occurence (of light emission)
 
diff --git a/main/songs.c b/main/songs.c
index 35934387b..0b7a5ab44 100644
--- a/main/songs.c
+++ b/main/songs.c
@@ -33,6 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 #include "config.h"
 #include "timer.h"
+#include "args.h"
 
 int Songs_initialized = 0;
 static int Song_playing = -1; // -1 if no song playing, else the Descent song number
diff --git a/main/titles.c b/main/titles.c
index f63c383dd..514145e48 100644
--- a/main/titles.c
+++ b/main/titles.c
@@ -52,6 +52,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "menu.h"
 #include "mouse.h"
 #include "console.h"
+#include "args.h"
 
 extern unsigned RobSX,RobSY,RobDX,RobDY; // Robot movie coords
 
diff --git a/misc/physfsx.c b/misc/physfsx.c
index ee1547d37..386aa0a90 100644
--- a/misc/physfsx.c
+++ b/misc/physfsx.c
@@ -15,6 +15,7 @@
 #endif
 
 #include "physfsx.h"
+#include "args.h"
 #include "object.h"
 #include "newdemo.h"