diff --git a/engine/Makefile b/engine/Makefile
index 380b95cb8..f894009da 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -434,6 +434,9 @@ COMMON_OBJS = $(COMMON_ASM_OBJS) \
 	cmd.o 		\
 	crc.o 		\
 	fs.o			\
+	fs_stdio.o		\
+	fs_pak.o		\
+	fs_zip.o		\
 	mathlib.o 		\
 	huff.o		\
 	md4.o 		\
diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 721ceb385..ab817c464 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -1595,7 +1595,9 @@ void CL_LinkPacketEntities (void)
 
 	autorotate = anglemod(100*servertime);
 
+#ifdef CSQC_DAT
 	CLCSQC_DeltaStart();
+#endif
 
 	for (newpnum=0 ; newpnum<pack->num_entities ; newpnum++)
 	{
@@ -1609,8 +1611,10 @@ void CL_LinkPacketEntities (void)
 			break;
 		}
 
+#ifdef CSQC_DAT
 		if (CLCSQC_DeltaUpdate(state))
 			continue;
+#endif
 
 		ent = &cl_visedicts[cl_numvisedicts];
 #ifdef Q3SHADERS
@@ -1874,7 +1878,9 @@ void CL_LinkPacketEntities (void)
 
 		}
 	}
+#ifdef CSQC_DAT
 	CLCSQC_DeltaEnd();
+#endif
 }
 #else
 
@@ -2773,12 +2779,16 @@ void CL_LinkPlayers (void)
 	{
 		if (state->messagenum != cl.validsequence)
 		{
+#ifdef CSQC_DAT
 			CLCSQC_DeltaPlayer(j, NULL);
+#endif
 			continue;	// not present this frame
 		}
 
+#ifdef CSQC_DAT
 		if (CLCSQC_DeltaPlayer(j, state))
 			continue;
+#endif
 
 		// spawn light flashes, even ones coming from invisible objects
 		if (r_powerupglow.value && !(r_powerupglow.value == 2 && j == cl.playernum[0]))
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index b1e4d8104..c608e3c0b 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -3731,8 +3731,10 @@ void Host_Shutdown(void)
 	Cmd_Shutdown();
 	Memory_DeInit();
 
+#ifndef CLIENTONLY
 	memset(&sv, 0, sizeof(sv));
 	memset(&svs, 0, sizeof(svs));
+#endif
 }
 
 #ifdef CLIENTONLY
diff --git a/engine/client/in_win.c b/engine/client/in_win.c
index 2c05dc462..18ec79eb7 100644
--- a/engine/client/in_win.c
+++ b/engine/client/in_win.c
@@ -1389,7 +1389,7 @@ void IN_MouseEvent (int mstate)
 			if ( !(mstate & (1<<i)) &&
 				(sysmouse.oldbuttons & (1<<i)) )
 			{
-					Key_Event (K_MOUSE1 + i, false);
+				Key_Event (K_MOUSE1 + i, false);
 			}
 		}	
 			
@@ -1420,10 +1420,11 @@ static void ProcessMouse(mouse_t *mouse, usercmd_t *cmd, int pnum)
 		if ( !(mouse->buttons & (1<<i)) &&
 			(mouse->oldbuttons & (1<<i)) )
 		{
-				Key_Event (K_MOUSE1 + i, false);
+			Key_Event (K_MOUSE1 + i, false);
 		}
 	}
 	mouse->oldbuttons = mouse->buttons;
+
 	if (m_forcewheel.value)
 	{
 		mfwt = (int)m_forcewheel_threshold.value;
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index 8010fecb0..7939ebdcb 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -5157,6 +5157,7 @@ void CSQC_Shutdown(void)
 	}
 	csqcprogs = NULL;
 
+	memset(&deltafunction, 0, sizeof(deltafunction));
 	in_sensitivityscale = 1;
 
 	csqc_usinglistener = false;
diff --git a/engine/client/snd_dma.c b/engine/client/snd_dma.c
index 8765c9059..6c427668c 100644
--- a/engine/client/snd_dma.c
+++ b/engine/client/snd_dma.c
@@ -1172,7 +1172,7 @@ void S_Music_Seek(float time)
 S_UpdateAmbientSounds
 ===================
 */
-char *Media_NextTrack(void);
+char *Media_NextTrack(int musicchannelnum);
 mleaf_t *Q1BSP_LeafForPoint (model_t *model, vec3_t p);
 void S_UpdateAmbientSounds (soundcardinfo_t *sc)
 {
diff --git a/engine/client/sys_linux.c b/engine/client/sys_linux.c
index b23ae0237..b28d9e8a4 100644
--- a/engine/client/sys_linux.c
+++ b/engine/client/sys_linux.c
@@ -242,7 +242,7 @@ int Sys_DebugLog(char *file, char *fmt, ...)
 	return 1;
 }
 
-int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void *), void *parm)
+int Sys_EnumerateFiles (const char *gpath, const char *match, int (*func)(const char *, int, void *), void *parm)
 {
 #include <dirent.h>
 	DIR *dir, *dir2;
diff --git a/engine/common/common.h b/engine/common/common.h
index a19d750fa..ccef722c9 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -281,7 +281,7 @@ extern char	com_homedir[MAX_OSPATH];
 extern char	com_configdir[MAX_OSPATH];	//dir to put cfg_save configs in
 //extern	char	*com_basedir;
 
-void COM_WriteFile (char *filename, void *data, int len);
+void COM_WriteFile (const char *filename, const void *data, int len);
 FILE *COM_WriteFileOpen (char *filename);
 
 typedef struct {
@@ -350,7 +350,7 @@ void FS_FlushFSHash(void);
 void FS_CreatePath(const char *pname, enum fs_relative relativeto);
 int FS_Rename(const char *oldf, const char *newf, enum fs_relative relativeto);	//0 on success, non-0 on error
 int FS_Rename2(const char *oldf, const char *newf, enum fs_relative oldrelativeto, enum fs_relative newrelativeto);
-int FS_Remove(const char *fname, int relativeto);	//0 on success, non-0 on error
+int FS_Remove(const char *fname, enum fs_relative relativeto);	//0 on success, non-0 on error
 qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen);	//if you really need to fopen yourself
 qboolean FS_WriteFile (const char *filename, const void *data, int len, enum fs_relative relativeto);
 vfsfile_t *FS_OpenVFS(const char *filename, const char *mode, enum fs_relative relativeto);
diff --git a/engine/common/fs.c b/engine/common/fs.c
index bd7e01d80..3b437752d 100644
--- a/engine/common/fs.c
+++ b/engine/common/fs.c
@@ -303,7 +303,7 @@ COM_WriteFile
 The filename will be prefixed by the current game directory
 ============
 */
-void COM_WriteFile (char *filename, void *data, int len)
+void COM_WriteFile (const char *filename, const void *data, int len)
 {
 	vfsfile_t *vfs;
 
@@ -721,7 +721,7 @@ static const char *FS_GetCleanPath(const char *pattern, char *outbuf, int outlen
 		pattern = outbuf;
 
 		Con_Printf("Warning: // characters in filename %s\n", pattern);
-		while (s=strstr(pattern, "//"))
+		while ((s=strstr(pattern, "//")))
 		{
 			s++;
 			while (*s)
@@ -1096,7 +1096,7 @@ void FS_CreatePath(const char *pname, enum fs_relative relativeto)
 	COM_CreatePath(fullname);
 }
 
-qboolean FS_WriteFile (const char *filename, void *data, int len, enum fs_relative relativeto)
+qboolean FS_WriteFile (const char *filename, const void *data, int len, enum fs_relative relativeto)
 {
 	vfsfile_t *f;
 	FS_CreatePath(filename, relativeto);
@@ -2110,7 +2110,7 @@ qboolean Sys_FindGameData(const char *gamename, char *basepath, int basepathlen)
 	return false;
 }
 #else
-qboolean Sys_FindGameData(char *gamename, char *basepath, int basepathlen)
+qboolean Sys_FindGameData(const char *gamename, char *basepath, int basepathlen)
 {
 	return false;
 }
@@ -2428,4 +2428,4 @@ void FS_RegisterDefaultFileSystems(void)
 #ifdef DOOMWADS
 	FS_RegisterFileSystemType("wad", &doomwadfilefuncs);
 #endif
-}
\ No newline at end of file
+}
diff --git a/engine/common/fs.h b/engine/common/fs.h
index 7f3cd65c5..d73216e3a 100644
--- a/engine/common/fs.h
+++ b/engine/common/fs.h
@@ -27,4 +27,4 @@ extern searchpathfuncs_t osfilefuncs;
 vfsfile_t *VFSOS_Open(const char *osname, const char *mode);
 
 int FS_RegisterFileSystemType(const char *extension, searchpathfuncs_t *funcs);
-void FS_UnRegisterFileSystemType(int idx);
\ No newline at end of file
+void FS_UnRegisterFileSystemType(int idx);
diff --git a/engine/common/fs_pak.c b/engine/common/fs_pak.c
index abe4fc388..2e33669e6 100644
--- a/engine/common/fs_pak.c
+++ b/engine/common/fs_pak.c
@@ -541,4 +541,4 @@ searchpathfuncs_t doomwadfilefuncs = {
 	NULL,
 	FSPAK_OpenVFS
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/engine/common/fs_zip.c b/engine/common/fs_zip.c
index 1919ae141..9969b05d3 100644
--- a/engine/common/fs_zip.c
+++ b/engine/common/fs_zip.c
@@ -458,4 +458,4 @@ searchpathfuncs_t zipfilefuncs = {
 	FSZIP_OpenVFS
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engine/common/zone.c b/engine/common/zone.c
index 782476eb3..53394e419 100644
--- a/engine/common/zone.c
+++ b/engine/common/zone.c
@@ -81,6 +81,7 @@ zone_t *zone_head;
 void *zonelock;
 #endif
 
+#if 0
 static void Z_DumpTree(void)
 {
 	zone_t *zone;
@@ -116,6 +117,7 @@ static void Z_DumpTree(void)
 		zone = nextlist;
 	}
 }
+#endif
 
 void *VARGS Z_TagMalloc(int size, int tag)
 {
@@ -2166,7 +2168,9 @@ void Memory_Init (void *buf, int size)
 
 void Memory_DeInit(void)
 {
+#ifdef NOHIGH
 	Hunk_TempFree();
+#endif
 	Cache_Flush();
 
 #ifdef MULTITHREAD
diff --git a/engine/gl/gl_vidnt.c b/engine/gl/gl_vidnt.c
index 8a5e3218d..e5407db8e 100644
--- a/engine/gl/gl_vidnt.c
+++ b/engine/gl/gl_vidnt.c
@@ -922,7 +922,6 @@ void VID_Wait_Override_Callback(struct cvar_s *var, char *oldvalue)
 qboolean screenflush;
 void GL_DoSwap (void)
 {
-	extern int mouseusedforgui;
 	if (!screenflush)
 		return;
 	screenflush = 0;
diff --git a/engine/server/sv_sys_unix.c b/engine/server/sv_sys_unix.c
index 0fac601e5..aba86331f 100644
--- a/engine/server/sv_sys_unix.c
+++ b/engine/server/sv_sys_unix.c
@@ -98,36 +98,6 @@ qboolean Sys_remove (char *path)
 	return system(va("rm \"%s\"", path));
 }
 
-#ifdef SHADERS
-int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void *), void *parm)
-{
-#include <dirent.h>
-	DIR *dir;
-	struct dirent *ent;
-	dir = opendir(gpath);
-	if (!dir)
-	{
-		Con_Printf("Failed to open dir %s\n", gpath);
-		return true;
-	}
-	do
-	{
-		ent = readdir(dir);	//FIXME: no wild card comparisons.
-		if (!ent)
-			break;
-		if (*ent->d_name != '.')
-			if (!func(ent->d_name, -2, parm))
-			{
-				closedir(dir);
-				return false;
-			}
-	} while(1);
-	closedir(dir);
-
-	return true;
-}
-#endif
-
 int Sys_DebugLog(char *file, char *fmt, ...)
 {
 	va_list argptr;
@@ -725,7 +695,7 @@ int main(int argc, char *argv[])
 
 
 
-int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void *), void *parm)
+int Sys_EnumerateFiles (const char *gpath, const char *match, int (*func)(const char *, int, void *), void *parm)
 {
 #include <dirent.h>
 	DIR *dir, *dir2;
diff --git a/engine/sw/sw_model.c b/engine/sw/sw_model.c
index d0102fa28..9f2a289f5 100644
--- a/engine/sw/sw_model.c
+++ b/engine/sw/sw_model.c
@@ -1551,7 +1551,6 @@ void *suplementryclipnodes;
 void *suplementryplanes;
 void *crouchhullfile;
 
-qbyte *COM_LoadMallocFile (char *path);
 void SWMod_LoadCrouchHull(void)
 {
 	int i;
diff --git a/engine/sw/vid_x.c b/engine/sw/vid_x.c
index 99219f135..1fa2a643c 100644
--- a/engine/sw/vid_x.c
+++ b/engine/sw/vid_x.c
@@ -880,9 +880,13 @@ void SWVID_SetPalette(unsigned char *palette)
 void	SWVID_Shutdown (void)
 {
 	Con_Printf("VID_Shutdown\n");
-	XUngrabPointer(vid_dpy,CurrentTime);
-	XAutoRepeatOn(vid_dpy);
-	XDestroyWindow(vid_dpy, x_win);
+	if (vid_dpy)
+	{
+		XUngrabPointer(vid_dpy,CurrentTime);
+		XAutoRepeatOn(vid_dpy);
+		if (x_win)
+			XDestroyWindow(vid_dpy, x_win);
+	}
 //	XCloseDisplay(vid_dpy);
 //	vid_dpy = NULL;
 }