diff --git a/common/pr_cmds.c b/common/pr_cmds.c
index eaf00e9..8b2548a 100644
--- a/common/pr_cmds.c
+++ b/common/pr_cmds.c
@@ -20,23 +20,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#ifdef QUAKEWORLD
-#	include <qwsvdef.h>
-#elif UQUAKE
-#	include <client.h>
-#	include <server.h>
-#	include <world.h>
-#	include <progs.h>
-#	include <quakedef.h>
-#endif
 
+#include <ctype.h>
+#include <quakedef.h>
 #include <qtypes.h>
-#include <mathlib.h>
-#include <cvar.h>
-#include <protocol.h>
+#include <net.h>
 #include <cmd.h>
 #include <sys.h>
 #include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 
 #define	RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e))
diff --git a/common/pr_edict.c b/common/pr_edict.c
index a0cacf2..63fe162 100644
--- a/common/pr_edict.c
+++ b/common/pr_edict.c
@@ -22,24 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#ifdef QUAKEWORLD
-#include <qwsvdef.h>
-#elif UQUAKE
-#	include <client.h>
-#	include <server.h>
-#	include <world.h>
-#	include <progs.h>
-#	include <quakedef.h>
-#endif
-
+#include <ctype.h>
+#include <quakedef.h>
 #include <qtypes.h>
-#include <lib_replace.h>
-#include <mathlib.h>
-#include <sys.h>
+#include <net.h>
 #include <cmd.h>
-#include <crc.h>
-#include <cvar.h>
+#include <sys.h>
 #include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
+#include <crc.h>
 
 dprograms_t		*progs;
 dfunction_t		*pr_functions;
diff --git a/common/pr_exec.c b/common/pr_exec.c
index 974d27b..95ff543 100644
--- a/common/pr_exec.c
+++ b/common/pr_exec.c
@@ -20,18 +20,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#ifdef QUAKEWORLD
-#include <qwsvdef.h>
-#elif UQUAKE
-#	include <client.h>
-#	include <server.h>
-#	include <world.h>
-#	include <progs.h>
-#	include <quakedef.h>
-#endif
-
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
 #include <sys.h>
 #include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
+#include <crc.h>
 
 typedef struct
 {
diff --git a/common/qargs.h b/common/qargs.h
index 4848d57..9cbadf9 100644
--- a/common/qargs.h
+++ b/common/qargs.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // comndef.h  -- general definitions
 
-#ifndef _COMMON_H
-#define _COMMON_H
+#ifndef _QARGS_H
+#define _QARGS_H
 
 #include "qtypes.h"
 
@@ -35,4 +35,4 @@ void COM_AddParm (char *parm);
 void COM_Init (void);
 void COM_InitArgv (int argc, char **argv);
 
-#endif // _COMMON_H
+#endif // _QARGS_H
diff --git a/common/server.h b/common/server.h
index c9e3b46..8054171 100644
--- a/common/server.h
+++ b/common/server.h
@@ -55,6 +55,8 @@ typedef enum {
 // some qc commands are only valid before the server has finished
 // initializing (precache commands, static sounds / objects, etc)
 
+struct qsocket_s;
+
 #ifdef QUAKEWORLD
 typedef struct
 {
diff --git a/common/world.c b/common/world.c
index 0784c00..0351f00 100644
--- a/common/world.c
+++ b/common/world.c
@@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#ifdef SERVERONLY
-#include "qwsvdef.h"
-#endif
 #include <quakedef.h>
 #include <qtypes.h>
 #include <sys.h>
diff --git a/qw_server/model.c b/qw_server/model.c
index 449b299..5d4c5fb 100644
--- a/qw_server/model.c
+++ b/qw_server/model.c
@@ -25,7 +25,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "qwsvdef.h"
+#include <string.h>
+#include <model.h>
+#include <qendian.h>
+#include <quakefs.h>
+#include <common.h>
+#include <protocol.h>
+#include <server.h>
+#include <mathlib.h>
 
 model_t	*loadmodel;
 char	loadname[32];	// for hunk tags
diff --git a/qw_server/sv_ccmds.c b/qw_server/sv_ccmds.c
index 410c33a..630ef5c 100644
--- a/qw_server/sv_ccmds.c
+++ b/qw_server/sv_ccmds.c
@@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 qboolean	sv_allow_cheats;
 
diff --git a/qw_server/sv_ents.c b/qw_server/sv_ents.c
index d3f22ef..3e12dd6 100644
--- a/qw_server/sv_ents.c
+++ b/qw_server/sv_ents.c
@@ -20,7 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 /*
 =============================================================================
diff --git a/qw_server/sv_init.c b/qw_server/sv_init.c
index 5c71860..ea35257 100644
--- a/qw_server/sv_init.c
+++ b/qw_server/sv_init.c
@@ -21,7 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
+#include <crc.h>
 
 server_static_t	svs;				// persistant server info
 server_t		sv;					// local server
diff --git a/qw_server/sv_move.c b/qw_server/sv_move.c
index 05d758c..7d7e02c 100644
--- a/qw_server/sv_move.c
+++ b/qw_server/sv_move.c
@@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_move.c -- monster movement
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 #define	STEPSIZE	18
 
diff --git a/qw_server/sv_nchan.c b/qw_server/sv_nchan.c
index c200d9e..4b72c69 100644
--- a/qw_server/sv_nchan.c
+++ b/qw_server/sv_nchan.c
@@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_nchan.c, user reliable data stream writes
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 // check to see if client block will fit, if not, rotate buffers
 void ClientReliableCheckBlock(client_t *cl, int maxsize)
diff --git a/qw_server/sv_phys.c b/qw_server/sv_phys.c
index f5f8cc5..d87cd31 100644
--- a/qw_server/sv_phys.c
+++ b/qw_server/sv_phys.c
@@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_phys.c
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 /*
 
diff --git a/qw_server/sv_send.c b/qw_server/sv_send.c
index 528e960..9ebe43a 100644
--- a/qw_server/sv_send.c
+++ b/qw_server/sv_send.c
@@ -21,7 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_main.c -- server main program
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 #define CHAN_AUTO   0
 #define CHAN_WEAPON 1
diff --git a/qw_server/sv_user.c b/qw_server/sv_user.c
index ed3f16c..e88ea4a 100644
--- a/qw_server/sv_user.c
+++ b/qw_server/sv_user.c
@@ -22,7 +22,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_user.c -- server code for moving users
 
-#include "qwsvdef.h"
+#include <ctype.h>
+#include <quakedef.h>
+#include <qtypes.h>
+#include <net.h>
+#include <cmd.h>
+#include <sys.h>
+#include <console.h>
+#include <protocol.h>
+#include <server.h>
+#include <phys.h>
+#include <mathlib.h>
+#include <world.h>
 
 edict_t	*sv_player;
 
diff --git a/qw_server/sys_unix.c b/qw_server/sys_unix.c
index 4dd70a4..336d1e6 100644
--- a/qw_server/sys_unix.c
+++ b/qw_server/sys_unix.c
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include <sys/types.h>
-#include "qwsvdef.h"
 
 #ifdef NeXT
 #include <libc.h>
@@ -39,6 +38,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
+#include <stdarg.h>
+#include <malloc.h>
+
+#include <cvar.h>
+#include <qstructs.h>
+#include <qargs.h>
+#include <common.h>
+#include <protocol.h>
+#include <server.h>
+#include <sys.h>
 
 extern cvar_t	sys_nostdout;