diff --git a/source/sw/src/ai.cpp b/source/sw/src/ai.cpp
index 313c6681e..201bf3024 100644
--- a/source/sw/src/ai.cpp
+++ b/source/sw/src/ai.cpp
@@ -35,7 +35,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sprite.h"
 
 // temp - should be moved
-#include "ninja.h"
 #include "ai.h"
 
 #include "network.h"
diff --git a/source/sw/src/cache.cpp b/source/sw/src/cache.cpp
index 8dc0868bf..dfd62bd55 100644
--- a/source/sw/src/cache.cpp
+++ b/source/sw/src/cache.cpp
@@ -36,7 +36,6 @@ not load" error messages.
 #include "game.h"
 #include "tags.h"
 #include "break.h"
-#include "quake.h"
 #include "pal.h"
 #include "misc.h"
 #include "sounds.h"
diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 01a1c6254..cacdb0fd6 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "names2.h"
 #include "panel.h"
 #include "game.h"
-#include "quake.h"
 
 #include "jsector.h"
 
@@ -46,7 +45,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "parent.h"
 
 #include "misc.h"
-#include "reserve.h"
 
 #include "menus.h"
 #include "interp.h"
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index f03620ff0..27fecd5cd 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -58,7 +58,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "misc.h"
 #include "break.h"
-#include "ninja.h"
 #include "light.h"
 #include "misc.h"
 #include "jsector.h"
@@ -77,7 +76,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "raze_sound.h"
 #include "secrets.h"
 
-#include "osdcmds.h"
 #include "screenjob.h"
 #include "inputstate.h"
 #include "gamestate.h"
diff --git a/source/sw/src/game.h b/source/sw/src/game.h
index 5781439b1..65c598ca3 100644
--- a/source/sw/src/game.h
+++ b/source/sw/src/game.h
@@ -43,7 +43,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "mytypes.h"
 #include "sounds.h"
-#include "settings.h"
 #include "pragmas.h"
 #include "gamecvars.h"
 #include "raze_sound.h"
@@ -56,6 +55,23 @@ EXTERN_CVAR(Bool, sw_darts)
 
 BEGIN_SW_NS
 
+typedef struct
+{
+    // Net Options from Menus
+    uint8_t NetGameType;   // 0=DeathMatch [spawn], 1=Cooperative 2=DeathMatch [no spawn]
+    uint8_t NetMonsters;   // Cycle skill levels
+    SWBOOL NetHurtTeammate;  // Allow friendly kills
+    SWBOOL NetSpawnMarkers;    // Respawn markers on/off
+    SWBOOL NetTeamPlay;   // Team play
+    uint8_t NetKillLimit;  // Number of frags at which game ends
+    uint8_t NetTimeLimit;  // Limit time of game
+    uint8_t NetColor;      // Chosen color for player
+    SWBOOL NetNuke;
+} GAME_SET, * GAME_SETp;
+
+extern const GAME_SET gs_defaults;
+extern GAME_SET gs;
+
 enum GameFunction_t
 {
     gamefunc_Move_Forward,
@@ -98,6 +114,12 @@ enum
 {
     DREALMSPAL = 1,
     THREED_REALMS_PIC = 2325,
+
+    MAXMIRRORS          = 8,
+    // This is just some, high, blank tile number not used
+    // by real graphics to put the MAXMIRRORS mirrors in
+    MIRRORLABEL         = 6000,
+
 };
 
 //#define SW_SHAREWARE 1     // This determines whether game is shareware compile or not!
@@ -2310,6 +2332,7 @@ void LoadSaveMsg(const char *msg);
 
 void UpdateStatusBar(ClockTicks arg);
 void InitFonts();
+int32_t registerosdcommands(void);
 void registerinputcommands();
 void SW_InitMultiPsky(void);
 
diff --git a/source/sw/src/jsector.cpp b/source/sw/src/jsector.cpp
index fe515fdf9..9e57829e1 100644
--- a/source/sw/src/jsector.cpp
+++ b/source/sw/src/jsector.cpp
@@ -37,7 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sector.h"
 #include "player.h"
 #include "sprite.h"
-#include "reserve.h"
 #include "jsector.h"
 #include "jtags.h"
 #include "lists.h"
diff --git a/source/sw/src/jsector.h b/source/sw/src/jsector.h
index 71e660bab..73f30acf8 100644
--- a/source/sw/src/jsector.h
+++ b/source/sw/src/jsector.h
@@ -27,7 +27,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef JSECTOR_H
 #define JSECTOR_H
 
-#include "reserve.h"
 
 BEGIN_SW_NS
 
diff --git a/source/sw/src/jweapon.cpp b/source/sw/src/jweapon.cpp
index 961fe24f0..fa4e3c9ed 100644
--- a/source/sw/src/jweapon.cpp
+++ b/source/sw/src/jweapon.cpp
@@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "misc.h"
 #include "tags.h"
 #include "break.h"
-#include "quake.h"
 #include "network.h"
 #include "pal.h"
 
diff --git a/source/sw/src/misc.h b/source/sw/src/misc.h
index f697a5f54..257262ea4 100644
--- a/source/sw/src/misc.h
+++ b/source/sw/src/misc.h
@@ -74,4 +74,24 @@ void KeepActorOnFloor(short SpriteNum);
 int DoActorSlide(short SpriteNum);
 int DoActorSectorDamage(short SpriteNum);
 int DoScaleSprite(short SpriteNum);
+
+void InitPlayerSprite(PLAYERp pp);
+void InitAllPlayerSprites(void);
+void PlayerPanelSetup(void);
+void PlayerDeathReset(PLAYERp pp);
+void SpawnPlayerUnderSprite(PLAYERp pp);
+
+void DoQuakeMatch(short match);
+void ProcessQuakeOn(void);
+void ProcessQuakeSpot(void);
+void QuakeViewChange(PLAYERp pp, int* z_diff, int* x_diff, int* y_diff, short* ang_diff);
+void DoQuake(PLAYERp pp);
+SWBOOL SetQuake(PLAYERp pp, short tics, short amt);
+int SetExpQuake(int16_t Weapon);
+int SetGunQuake(int16_t SpriteNum);
+int SetPlayerQuake(PLAYERp mpp);
+int SetNuclearQuake(int16_t Weapon);
+int SetSumoQuake(int16_t SpriteNum);
+int SetSumoFartQuake(int16_t SpriteNum);
+
 END_SW_NS
diff --git a/source/sw/src/miscactr.cpp b/source/sw/src/miscactr.cpp
index 88b905ea1..a9835ff39 100644
--- a/source/sw/src/miscactr.cpp
+++ b/source/sw/src/miscactr.cpp
@@ -32,7 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "misc.h"
 #include "tags.h"
 #include "ai.h"
-#include "quake.h"
 #include "sector.h"
 #include "sprite.h"
 
diff --git a/source/sw/src/ninja.cpp b/source/sw/src/ninja.cpp
index 3bbcb1e5d..e04755bfd 100644
--- a/source/sw/src/ninja.cpp
+++ b/source/sw/src/ninja.cpp
@@ -43,7 +43,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "network.h"
 #include "weapon.h"
 #include "misc.h"
-#include "ninja.h"
 #include "sprite.h"
 
 BEGIN_SW_NS
diff --git a/source/sw/src/ninja.h b/source/sw/src/ninja.h
deleted file mode 100644
index 94a483c06..000000000
--- a/source/sw/src/ninja.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 1997, 2005 - 3D Realms Entertainment
-
-This file is part of Shadow Warrior version 1.2
-
-Shadow Warrior is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Original Source: 1997 - Frank Maddin and Jim Norwood
-Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
-*/
-//-------------------------------------------------------------------------
-
-#ifndef NINJA_H
-#define NINJA_H
-
-BEGIN_SW_NS
-
-#define NINJA_NORMAL_SPEED          60
-#define NINJA_RUN_AWAY_SPEED        130
-#define NINJA_FIND_PLAYER_SPEED     100
-#define NINJA_CRAWL_SPEED           50
-#define NINJA_SWIM_SPEED            50
-
-void InitPlayerSprite(PLAYERp pp);
-void InitAllPlayerSprites(void);
-void PlayerPanelSetup(void);
-void PlayerDeathReset(PLAYERp pp);
-void SpawnPlayerUnderSprite(PLAYERp pp);
-
-END_SW_NS
-
-#endif
diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp
index a6db63a55..93e4dd73f 100644
--- a/source/sw/src/osdcmds.cpp
+++ b/source/sw/src/osdcmds.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "ns.h"	// Must come before everything else!
 
-#include "osdcmds.h"
-
 #include "ns.h"
 
 #include "build.h"
diff --git a/source/sw/src/osdcmds.h b/source/sw/src/osdcmds.h
deleted file mode 100644
index 64ec7e0b4..000000000
--- a/source/sw/src/osdcmds.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2010 EDuke32 developers and contributors
-Modified by Raze developers and contributors
-
-This file was part of EDuke32.
-
-EDuke32 is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-
-#ifndef osdcmds_h_
-#define osdcmds_h_
-
-#include <inttypes.h>
-BEGIN_SW_NS
-
-struct osdcmd_cheatsinfo {
-	int32_t cheatnum;	// -1 = none, else = see DoCheats()
-	int32_t volume,level;
-};
-
-int32_t registerosdcommands(void);
-
-
-extern const char *const ConsoleButtons[];
-
-
-END_SW_NS
-
-#endif	// osdcmds_h_
-
diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp
index ef8bb6fa6..833cf1b9f 100644
--- a/source/sw/src/player.cpp
+++ b/source/sw/src/player.cpp
@@ -35,7 +35,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "tags.h"
 #include "player.h"
 #include "lists.h"
-#include "quake.h"
 
 #include "gamecontrol.h"
 
@@ -46,7 +45,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "sprite.h"
 #include "weapon.h"
-#include "ninja.h"
 #include "break.h"
 #include "jsector.h"
 #include "sector.h"
diff --git a/source/sw/src/quake.cpp b/source/sw/src/quake.cpp
index 53304c8b5..15f7edc68 100644
--- a/source/sw/src/quake.cpp
+++ b/source/sw/src/quake.cpp
@@ -34,7 +34,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "game.h"
 #include "tags.h"
 #include "break.h"
-#include "quake.h"
 #include "sprite.h"
 
 BEGIN_SW_NS
diff --git a/source/sw/src/quake.h b/source/sw/src/quake.h
deleted file mode 100644
index 9c9b6826c..000000000
--- a/source/sw/src/quake.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 1997, 2005 - 3D Realms Entertainment
-
-This file is part of Shadow Warrior version 1.2
-
-Shadow Warrior is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Original Source: 1997 - Frank Maddin and Jim Norwood
-Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
-*/
-//-------------------------------------------------------------------------
-BEGIN_SW_NS
-
-void DoQuakeMatch(short match);
-void ProcessQuakeOn(void);
-void ProcessQuakeSpot(void);
-void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *ang_diff);
-void DoQuake(PLAYERp pp);
-SWBOOL SetQuake(PLAYERp pp, short tics, short amt);
-int SetExpQuake(int16_t Weapon);
-int SetGunQuake(int16_t SpriteNum);
-int SetPlayerQuake(PLAYERp mpp);
-int SetNuclearQuake(int16_t Weapon);
-int SetSumoQuake(int16_t SpriteNum);
-int SetSumoFartQuake(int16_t SpriteNum);
-
-END_SW_NS
diff --git a/source/sw/src/reserve.h b/source/sw/src/reserve.h
deleted file mode 100644
index b896f9a91..000000000
--- a/source/sw/src/reserve.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 1997, 2005 - 3D Realms Entertainment
-
-This file is part of Shadow Warrior version 1.2
-
-Shadow Warrior is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Original Source: 1997 - Frank Maddin and Jim Norwood
-Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
-*/
-//-------------------------------------------------------------------------
-
-#ifndef RESERVE_H
-#define RESERVE_H
-
-// This header is used for reserving tile space for programatic purposes
-// MAXTILES is currently at 6144 in size - anything under this is ok
-
-#define MAXMIRRORS          8
-// This is just some, high, blank tile number not used
-// by real graphics to put the MAXMIRRORS mirrors in
-#define MIRRORLABEL         6000
-
-#define TILT_TILE           6016
-
-// save screen and tilt tile stuff
-#define SAVE_SCREEN_TILE    6017
-#define SAVE_SCREEN_XSIZE 160L
-#define SAVE_SCREEN_YSIZE 100L
-#endif
-
diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp
index 25eae0a5b..ddc3eb384 100644
--- a/source/sw/src/save.cpp
+++ b/source/sw/src/save.cpp
@@ -41,7 +41,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "network.h"
 #include "jsector.h"
 #include "parent.h"
-#include "reserve.h"
 
 //#define FILE_TYPE 1
 
diff --git a/source/sw/src/sector.cpp b/source/sw/src/sector.cpp
index 920649a78..7d5c4092f 100644
--- a/source/sw/src/sector.cpp
+++ b/source/sw/src/sector.cpp
@@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "tags.h"
 #include "sector.h"
 #include "player.h"
-#include "quake.h"
 #include "weapon.h"
 #include "jtags.h"
 
diff --git a/source/sw/src/settings.h b/source/sw/src/settings.h
deleted file mode 100644
index ea5fc03bc..000000000
--- a/source/sw/src/settings.h
+++ /dev/null
@@ -1,48 +0,0 @@
-    //-------------------------------------------------------------------------
-/*
-Copyright (C) 1997, 2005 - 3D Realms Entertainment
-
-This file is part of Shadow Warrior version 1.2
-
-Shadow Warrior is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Original Source: 1997 - Frank Maddin and Jim Norwood
-Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
-*/
-//-------------------------------------------------------------------------
-#include "mytypes.h"
-// Only ad to the end. These currently have to be in this order because of the
-// way they are initilized.
-BEGIN_SW_NS
-
-typedef struct
-{
-// Net Options from Menus
-    uint8_t NetGameType;   // 0=DeathMatch [spawn], 1=Cooperative 2=DeathMatch [no spawn]
-    uint8_t NetMonsters;   // Cycle skill levels
-    SWBOOL NetHurtTeammate;  // Allow friendly kills
-    SWBOOL NetSpawnMarkers;    // Respawn markers on/off
-    SWBOOL NetTeamPlay;   // Team play
-    uint8_t NetKillLimit;  // Number of frags at which game ends
-    uint8_t NetTimeLimit;  // Limit time of game
-    uint8_t NetColor;      // Chosen color for player
-    SWBOOL NetNuke;
-} GAME_SET, *GAME_SETp;
-
-extern const GAME_SET gs_defaults;
-extern GAME_SET gs;
-
-END_SW_NS
diff --git a/source/sw/src/sumo.cpp b/source/sw/src/sumo.cpp
index 9a09dcdb5..478bebe9f 100644
--- a/source/sw/src/sumo.cpp
+++ b/source/sw/src/sumo.cpp
@@ -31,7 +31,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "game.h"
 #include "tags.h"
 #include "ai.h"
-#include "quake.h"
 #include "misc.h"
 #include "weapon.h"
 #include "sector.h"
diff --git a/source/sw/src/vis.cpp b/source/sw/src/vis.cpp
index 094763701..617fab6dd 100644
--- a/source/sw/src/vis.cpp
+++ b/source/sw/src/vis.cpp
@@ -32,7 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "game.h"
 #include "tags.h"
 #include "break.h"
-#include "quake.h"
 #include "pal.h"
 #include "sprite.h"
 
diff --git a/source/sw/src/weapon.cpp b/source/sw/src/weapon.cpp
index ac210711a..70efc063a 100644
--- a/source/sw/src/weapon.cpp
+++ b/source/sw/src/weapon.cpp
@@ -34,7 +34,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "interpso.h"
 #include "tags.h"
 #include "break.h"
-#include "quake.h"
 #include "network.h"
 #include "pal.h"
 
diff --git a/source/sw/src/zilla.cpp b/source/sw/src/zilla.cpp
index f26db1a35..65d12a03b 100644
--- a/source/sw/src/zilla.cpp
+++ b/source/sw/src/zilla.cpp
@@ -31,7 +31,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "game.h"
 #include "tags.h"
 #include "ai.h"
-#include "quake.h"
 #include "misc.h"
 #include "gamecontrol.h"
 #include "mapinfo.h"