diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c
index 8b07102f..af6ca4be 100644
--- a/engine/common/com_mesh.c
+++ b/engine/common/com_mesh.c
@@ -1,5 +1,5 @@
 #include "quakedef.h"
-#if defined(D3DQUAKE) || defined(RGLQUAKE)
+#if defined(D3DQUAKE) || defined(RGLQUAKE) || defined(SERVERONLY)
 
 #ifdef D3DQUAKE
 #include "d3dquake.h"
@@ -211,7 +211,7 @@ static void R_BuildSkeletalMesh(mesh_t *mesh, float *plerp, float **pose, int po
 
 
 
-
+#if defined(D3DQUAKE) || defined(RGLQUAKE)
 
 extern entity_t *currententity;
 int numTempColours;
@@ -530,7 +530,7 @@ qboolean R_GAliasBuildMesh(mesh_t *mesh, galiasinfo_t *inf, int frame1, int fram
 	return true;	//to allow the mesh to be dlighted.
 }
 
-
+#endif
 
 
 
@@ -740,6 +740,7 @@ void Mod_CompileTriangleNeighbours(galiasinfo_t *galias)
 #endif
 }
 
+#if defined(D3DQUAKE) || defined(RGLQUAKE)
 /*
 =================
 Mod_FloodFillSkin
@@ -813,7 +814,7 @@ void Mod_FloodFillSkin( qbyte *skin, int skinwidth, int skinheight )
 		skin[x + skinwidth * y] = fdc;
 	}
 }
-
+#endif
 
 //additional skin loading
 char **skinfilelist;
@@ -989,6 +990,8 @@ void Mod_ParseQ3SkinFile(char *out, char *surfname, char *modelname, int skinnum
 			break;
 	}
 }
+
+#if defined(D3DQUAKE) || defined(RGLQUAKE)
 void Mod_LoadSkinFile(galiastexnum_t *texnum, char *surfacename, int skinnumber, unsigned char *rawdata, int width, int height, unsigned char *palette)
 {
 	char shadername[MAX_QPATH];
@@ -1002,7 +1005,7 @@ void Mod_LoadSkinFile(galiastexnum_t *texnum, char *surfacename, int skinnumber,
 
 	texnum->base = Mod_LoadHiResTexture(shadername, "models", true, true, true);
 }
-
+#endif
 
 
 
diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c
index 81072384..499beeea 100644
--- a/engine/server/svmodel.c
+++ b/engine/server/svmodel.c
@@ -28,11 +28,11 @@ char	loadname[32];	// for hunk tags
 qboolean Mod_LoadBrushModel (model_t *mod, void *buffer);
 qboolean Mod_LoadQ2BrushModel (model_t *mod, void *buffer);
 
-qboolean GL_LoadQ1Model (model_t *mod, void *buffer);
-qboolean GL_LoadQ2Model (model_t *mod, void *buffer);
-qboolean GL_LoadQ3Model (model_t *mod, void *buffer);
-qboolean GLMod_LoadZymoticModel (model_t *mod, void *buffer);
-qboolean GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer);
+qboolean Mod_LoadQ1Model (model_t *mod, void *buffer);
+qboolean Mod_LoadQ2Model (model_t *mod, void *buffer);
+qboolean Mod_LoadQ3Model (model_t *mod, void *buffer);
+qboolean Mod_LoadZymoticModel (model_t *mod, void *buffer);
+qboolean Mod_LoadDarkPlacesModel(model_t *mod, void *buffer);
 
 qbyte	mod_novis[MAX_MAP_LEAFS/8];
 
@@ -441,30 +441,30 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
 
 
 	case IDPOLYHEADER:
-		if (!GL_LoadQ1Model(mod, buf))
+		if (!Mod_LoadQ1Model(mod, buf))
 			goto couldntload;
 		break;
 #ifdef MD2MODELS
 	case MD2IDALIASHEADER:
-		if (!GL_LoadQ2Model(mod, buf))
+		if (!Mod_LoadQ2Model(mod, buf))
 			goto couldntload;
 		break;
 #endif
 #ifdef MD3MODELS
 	case MD3_IDENT:
-		if (!GL_LoadQ3Model (mod, buf))
+		if (!Mod_LoadQ3Model (mod, buf))
 			goto couldntload;
 		break;
 #endif
 #ifdef ZYMOTICMODELS
 	case (('O'<<24)+('M'<<16)+('Y'<<8)+'Z'):
-		if (!GLMod_LoadZymoticModel(mod, buf))
+		if (!Mod_LoadZymoticModel(mod, buf))
 			goto couldntload;
 		break;
 #endif
 #ifdef ZYMOTICMODELS
 	case (('K'<<24)+('R'<<16)+('A'<<8)+'D'):
-		if (!GLMod_LoadDarkPlacesModel(mod, buf))
+		if (!Mod_LoadDarkPlacesModel(mod, buf))
 			goto couldntload;
 		break;
 #endif