From ccc104dbb1a2fb0434b9b159eb12de4ad246c201 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 3 Mar 2013 19:41:09 +0000
Subject: [PATCH] Push down inclusion "args.h" from physfsx.h into sources

This is not needed for the header, and makes the header non-common.
---
 arch/ogl/ogl.c        | 1 +
 arch/sdl/digi_mixer.c | 1 +
 arch/sdl/mouse.c      | 1 +
 include/physfsx.h     | 1 -
 main/automap.c        | 1 +
 main/gamerend.c       | 1 +
 main/multi.c          | 1 +
 main/playsave.c       | 1 +
 main/render.c         | 1 +
 main/songs.c          | 1 +
 main/titles.c         | 1 +
 misc/physfsx.c        | 1 +
 12 files changed, 11 insertions(+), 1 deletion(-)

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_mixer.c b/arch/sdl/digi_mixer.c
index dc25200a1..d1637bc1d 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/automap.c b/main/automap.c
index 740301aac..f80b07a0e 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -70,6 +70,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/gamerend.c b/main/gamerend.c
index b624966d7..bb93327db 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -50,6 +50,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/multi.c b/main/multi.c
index 2bdf6fd24..ddb11ca7f 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -62,6 +62,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef USE_UDP
 #include "net_udp.h"
 #endif
+#include "args.h"
 
 //
 // Local macros and prototypes
diff --git a/main/playsave.c b/main/playsave.c
index 1041cbc22..cc426725d 100644
--- a/main/playsave.c
+++ b/main/playsave.c
@@ -43,6 +43,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "physfsx.h"
 #include "newdemo.h"
 #include "gauges.h"
+#include "args.h"
 
 //version 5  ->  6: added new highest level information
 //version 6  ->  7: stripped out the old saved_game array.
diff --git a/main/render.c b/main/render.c
index 5c985624b..13ef97417 100644
--- a/main/render.c
+++ b/main/render.c
@@ -54,6 +54,7 @@ COPYRIGHT 1993-1998 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 82fee0af6..fcf6ff402 100644
--- a/main/songs.c
+++ b/main/songs.c
@@ -33,6 +33,7 @@ COPYRIGHT 1993-1998 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 ddf1b7927..8eb9c0b5f 100644
--- a/main/titles.c
+++ b/main/titles.c
@@ -51,6 +51,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "menu.h"
 #include "mouse.h"
 #include "console.h"
+#include "args.h"
 
 void set_briefing_fontcolor ();
 
diff --git a/misc/physfsx.c b/misc/physfsx.c
index c7cdc0f24..3702ec983 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"