diff --git a/d2x-rebirth/include/args.h b/common/include/args.h
similarity index 89%
rename from d2x-rebirth/include/args.h
rename to common/include/args.h
index 7579046f7..f653b24ad 100644
--- a/d2x-rebirth/include/args.h
+++ b/common/include/args.h
@@ -36,6 +36,7 @@ extern void args_exit();
 //   Mpl - Multiplayer Options
 //   Edi - Editor Options
 //   Dbg - Debugging/Undocumented Options
+#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
 typedef struct Arg
 {
 	int SysShowCmdHelp;
@@ -49,7 +50,12 @@ typedef struct Arg
 	int SysWindow;
 	int SysNoBorders;
 	int SysAutoDemo;
+#ifdef DXX_BUILD_DESCENT_I
+	int SysNoTitles;
+#endif
+#ifdef DXX_BUILD_DESCENT_II
 	int SysNoMovies;
+#endif
 	int CtlNoCursor;
 	int CtlNoMouse;
 	int CtlNoJoystick;
@@ -57,9 +63,11 @@ typedef struct Arg
 	int SndNoSound;
 	int SndNoMusic;
 	int SndDisableSdlMixer;
+#ifdef DXX_BUILD_DESCENT_II
 	int SndDigiSampleRate;
 	int GfxMovieHires;
 	int GfxHiresGFXAvailable;
+#endif
 	int GfxHiresFNTAvailable;
 #ifdef OGL
 	int OglFixedFont;
@@ -71,9 +79,14 @@ typedef struct Arg
 	const char *MplTrackerAddr;
 	int MplTrackerPort;
 #endif
+#ifdef DXX_BUILD_DESCENT_I
+	int EdiNoBm;
+#endif
+#ifdef DXX_BUILD_DESCENT_II
 	char *EdiAutoLoad;
 	int EdiSaveHoardData;
 	int EdiMacData; // also used for some read routines in non-editor build
+#endif
 	int DbgVerbose;
 	int DbgSafelog;
 	int DbgNoRun;
@@ -96,6 +109,7 @@ typedef struct Arg
 	int DbgSdlASyncBlit;
 #endif
 } Arg;
+#endif
 
 extern struct Arg GameArg;
 
diff --git a/d1x-rebirth/include/args.h b/d1x-rebirth/include/args.h
deleted file mode 100644
index cd547f1c6..000000000
--- a/d1x-rebirth/include/args.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
-SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
-END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
-ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
-IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
-SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
-FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
-CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
-AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
-COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
-*/
-
-/*
- *
- * Prototypes for accessing arguments.
- *
- */
-
-
-
-#ifndef _ARGS_H
-#define _ARGS_H
-
-#include "pstypes.h"
-
-extern int Num_args;
-extern char *Args[];
-extern void InitArgs(int argc, char **argv);
-extern void args_exit();
-
-// Struct that keeps all variables used by FindArg
-//   Sys - System Options
-//   Ctl - Control Options
-//   Snd - Sound Options
-//   Gfx - Graphics Options
-//   Ogl - OpenGL Options
-//   Mpl - Multiplayer Options
-//   Edi - Editor Options
-//   Dbg - Debugging/Undocumented Options
-typedef struct Arg
-{
-	int SysShowCmdHelp;
-	int SysUseNiceFPS;
-	int SysMaxFPS;
-	char *SysHogDir;
-	int SysNoHogDir;
-	int SysUsePlayersDir;
-	int SysLowMem;
-	char *SysPilot;
-	int SysWindow;
-	int SysNoBorders;
-	int SysAutoDemo;
-	int SysNoTitles;
-	int CtlNoCursor;
-	int CtlNoMouse;
-	int CtlNoJoystick;
-	int CtlNoStickyKeys;
-	int SndNoSound;
-	int SndNoMusic;
-	int SndDisableSdlMixer;
-	int GfxHiresFNTAvailable;
-#ifdef OGL
-	int OglFixedFont;
-#endif
-	int EdiNoBm;
-	const char *MplUdpHostAddr;
-	int MplUdpHostPort;
-	int MplUdpMyPort;
-#ifdef USE_TRACKER
-	const char *MplTrackerAddr;
-	int MplTrackerPort;
-#endif
-	int DbgVerbose;
-	int DbgSafelog;
-	int DbgNoRun;
-	int DbgRenderStats;
-	char *DbgAltTex;
-	char *DbgTexMap;
-	int DbgShowMemInfo;
-	int DbgUseDoubleBuffer;
-	int DbgBigPig;
-	int DbgBpp;
-#ifdef OGL
-	int DbgAltTexMerge;
-	int DbgGlIntensity4Ok;
-	int DbgGlLuminance4Alpha4Ok;
-	int DbgGlRGBA2Ok;
-	int DbgGlReadPixelsOk;
-	int DbgGlGetTexLevelParamOk;
-#else
-	int DbgSdlHWSurface;
-	int DbgSdlASyncBlit;
-#endif
-} __pack__ Arg;
-
-extern struct Arg GameArg;
-
-#endif