diff --git a/uquake/sys_null.c b/common/sys_null.c
similarity index 88%
rename from uquake/sys_null.c
rename to common/sys_null.c
index 48e0249..393596b 100644
--- a/uquake/sys_null.c
+++ b/common/sys_null.c
@@ -23,19 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "errno.h"
 
 /*
-===============================================================================
-
-FILE IO
-
-===============================================================================
+	File I/O
 */
 
 #define MAX_HANDLES             10
 FILE    *sys_handles[MAX_HANDLES];
 
-int             findhandle (void)
+int findhandle (void)
 {
-	int             i;
+	int	i;
 	
 	for (i=1 ; i<MAX_HANDLES ; i++)
 		if (!sys_handles[i])
@@ -117,7 +113,7 @@ int Sys_FileWrite (int handle, void *data, int count)
 	return fwrite (data, 1, count, sys_handles[handle]);
 }
 
-int     Sys_FileTime (char *path)
+int Sys_FileTime (char *path)
 {
 	FILE    *f;
 	
@@ -137,17 +133,16 @@ void Sys_mkdir (char *path)
 
 
 /*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
+	System I/O
 */
 
 void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
 {
 }
 
+void Sys_DebugLog(char *file, char *fmt, ...)
+{
+}
 
 void Sys_Error (char *error, ...)
 {
diff --git a/qw_client/sys_null.c b/qw_client/sys_null.c
deleted file mode 100644
index 30a49c3..0000000
--- a/qw_client/sys_null.c
+++ /dev/null
@@ -1,142 +0,0 @@
-// sys_null.h -- null system driver to aid porting efforts
-
-#include "quakedef.h"
-#include "errno.h"
-
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-	int		pos;
-	int		end;
-
-	pos = ftell (f);
-	fseek (f, 0, SEEK_END);
-	end = ftell (f);
-	fseek (f, pos, SEEK_SET);
-
-	return end;
-}
-
-
-int	Sys_FileTime (char *path)
-{
-	FILE	*f;
-	
-	f = fopen(path, "rb");
-	if (f)
-	{
-		fclose(f);
-		return 1;
-	}
-	
-	return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-}
-
-
-/*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
-*/
-
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-}
-
-
-void Sys_DebugLog(char *file, char *fmt, ...)
-{
-}
-
-void Sys_Error (char *error, ...)
-{
-	va_list		argptr;
-
-	printf ("I_Error: ");	
-	va_start (argptr,error);
-	vprintf (error,argptr);
-	va_end (argptr);
-	printf ("\n");
-
-	exit (1);
-}
-
-void Sys_Printf (char *fmt, ...)
-{
-	va_list		argptr;
-	
-	va_start (argptr,fmt);
-	vprintf (fmt,argptr);
-	va_end (argptr);
-}
-
-void Sys_Quit (void)
-{
-	exit (0);
-}
-
-double Sys_FloatTime (void)
-{
-	static double t;
-	
-	t += 0.1;
-	
-	return t;
-}
-
-char *Sys_ConsoleInput (void)
-{
-	return NULL;
-}
-
-void Sys_Sleep (void)
-{
-}
-
-void Sys_SendKeyEvents (void)
-{
-}
-
-void Sys_HighFPPrecision (void)
-{
-}
-
-void Sys_LowFPPrecision (void)
-{
-}
-
-//=============================================================================
-
-void main (int argc, char **argv)
-{
-	quakeparms_t	parms;
-
-	parms.memsize = 5861376;
-	parms.membase = malloc (parms.memsize);
-	parms.basedir = ".";
-
-	COM_InitArgv (argc, argv);
-
-	parms.argc = com_argc;
-	parms.argv = com_argv;
-
-	printf ("Host_Init\n");
-	Host_Init (&parms);
-	while (1)
-	{
-		Host_Frame (0.1);
-	}
-}
-
-