diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
index 12a1acb46..0f6d508bc 100644
--- a/engine/common/bothdefs.h
+++ b/engine/common/bothdefs.h
@@ -177,7 +177,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 		#define HUFFNETWORK		//huffman network compression
 		#define DOOMWADS		//doom wad/sprite support
-		#define MAP_DOOM		//doom map support
+//		#define MAP_DOOM		//doom map support
 		#define MAP_PROC		//doom3/quake4 map support
 		//#define WOLF3DSUPPORT	//wolfenstein3d map support (not started yet)
 		#define Q2BSPS			//quake 2 bsp support
diff --git a/engine/gl/gl_model.h b/engine/gl/gl_model.h
index cd53be110..baa7e1ba4 100644
--- a/engine/gl/gl_model.h
+++ b/engine/gl/gl_model.h
@@ -1009,6 +1009,18 @@ qbyte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
 
 
 
+//
+// gl_heightmap.c
+//
+#ifdef TERRAIN
+void Terr_DrawTerrainModel (batch_t **batch, entity_t *e);
+qboolean Terr_LoadTerrainModel (model_t *mod, void *buffer);
+void Terr_PurgeTerrainModel(model_t *mod, qboolean lightmapsonly);
+void *Mod_LoadTerrainInfo(model_t *mod, char *loadname);	//call this after loading a bsp
+qboolean Heightmap_Trace(model_t *model, int forcehullnum, int frame, vec3_t axis[3], vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, unsigned int contentmask, struct trace_s *trace);
+unsigned int Heightmap_PointContents(model_t *model, vec3_t axis[3], vec3_t org);
+#endif
+
 
 
 
diff --git a/engine/gl/glmod_doom.c b/engine/gl/glmod_doom.c
index 89b80f957..85daba62e 100644
--- a/engine/gl/glmod_doom.c
+++ b/engine/gl/glmod_doom.c
@@ -680,7 +680,7 @@ qboolean Doom_Trace(model_t *model, int hulloverride, int frame, vec3_t axis[3],
 
 
 
-
+#ifndef SERVERONLY
 qbyte doompalette[768];
 static qboolean paletteloaded;
 
@@ -708,9 +708,10 @@ void Doom_LoadPalette(void)
 		}
 	}
 }
-
+#endif
 int Doom_LoadFlat(char *flatname)
 {
+#ifndef SERVERONLY
 	char *file;
 	char texname[64];
 	int texnum;
@@ -746,8 +747,12 @@ int Doom_LoadFlat(char *flatname)
 	}
 
 	return texnum;
+#else
+	return 0;
+#endif
 }
 
+#ifndef SERVERONLY
 static void GLR_DrawWall(int texnum, int s, int t, float x1, float y1, float z1, float x2, float y2, float z2, qboolean unpegged, unsigned int colour4b)
 {
 	gldoomtexture_t *tex = gldoomtextures+texnum;
@@ -1130,7 +1135,7 @@ void GLR_DoomWorld(void)
 		}
 	}
 }
-
+#endif
 
 
 //find the first ssector, go through it's list/
diff --git a/engine/gl/glquake.h b/engine/gl/glquake.h
index fab40ba7a..f4c9f8e1e 100644
--- a/engine/gl/glquake.h
+++ b/engine/gl/glquake.h
@@ -403,18 +403,6 @@ void R_LoadRTLights(void);
 void R_ImportRTLights(char *entlump);
 void R_SaveRTLights_f(void);
 
-//
-// gl_heightmap.c
-//
-#ifdef TERRAIN
-void Terr_DrawTerrainModel (batch_t **batch, entity_t *e);
-qboolean Terr_LoadTerrainModel (model_t *mod, void *buffer);
-void Terr_PurgeTerrainModel(model_t *mod, qboolean lightmapsonly);
-void *Mod_LoadTerrainInfo(model_t *mod, char *loadname);	//call this after loading a bsp
-qboolean Heightmap_Trace(model_t *model, int forcehullnum, int frame, vec3_t axis[3], vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, unsigned int contentmask, trace_t *trace);
-unsigned int Heightmap_PointContents(model_t *model, vec3_t axis[3], vec3_t org);
-#endif
-
 //doom
 #ifdef MAP_DOOM
 void GLR_DoomWorld();