diff --git a/neo/d3xp/ai/AI_pathing.cpp b/neo/d3xp/ai/AI_pathing.cpp
index 886d5942..600a92b4 100644
--- a/neo/d3xp/ai/AI_pathing.cpp
+++ b/neo/d3xp/ai/AI_pathing.cpp
@@ -1332,6 +1332,7 @@ HeightForTrajectory
 Returns the maximum hieght of a given trajectory
 =====================
 */
+#if 0
 static float HeightForTrajectory( const idVec3 &start, float zVel, float gravity ) {
 	float maxHeight, t;
 
@@ -1341,6 +1342,7 @@ static float HeightForTrajectory( const idVec3 &start, float zVel, float gravity
 
 	return maxHeight;
 }
+#endif
 
 /*
 =====================
diff --git a/neo/framework/Session.cpp b/neo/framework/Session.cpp
index abe005a9..a4f7d9ab 100644
--- a/neo/framework/Session.cpp
+++ b/neo/framework/Session.cpp
@@ -76,6 +76,7 @@ void Session_RescanSI_f( const idCmdArgs &args ) {
 	}
 }
 
+#ifndef	ID_DEDICATED
 /*
 ==================
 Session_Map_f
@@ -180,6 +181,7 @@ static void Session_TestMap_f( const idCmdArgs &args ) {
 	sprintf( string, "devmap %s", map.c_str() );
 	cmdSystem->BufferCommandText( CMD_EXEC_NOW, string );
 }
+#endif
 
 /*
 ==================
@@ -598,6 +600,7 @@ static void Session_DemoShot_f( const idCmdArgs &args ) {
 	}
 }
 
+#ifndef	ID_DEDICATED
 /*
 ================
 Session_RecordDemo_f
@@ -731,6 +734,7 @@ Session_TimeCmdDemo_f
 static void Session_TimeCmdDemo_f( const idCmdArgs &args ) {
 	sessLocal.TimeCmdDemo( args.Argv(1) );
 }
+#endif
 
 /*
 ================
@@ -745,6 +749,7 @@ static void Session_Disconnect_f( const idCmdArgs &args ) {
 	}
 }
 
+#ifndef	ID_DEDICATED
 #ifdef ID_DEMO_BUILD
 /*
 ================
@@ -777,6 +782,7 @@ static void Session_ExitCmdDemo_f( const idCmdArgs &args ) {
 	common->Printf( "Command demo exited at logIndex %i\n", sessLocal.logIndex );
 	sessLocal.cmdDemoFile = NULL;
 }
+#endif
 
 /*
 ================
diff --git a/neo/game/ai/AI_pathing.cpp b/neo/game/ai/AI_pathing.cpp
index c67135a3..3a48505f 100644
--- a/neo/game/ai/AI_pathing.cpp
+++ b/neo/game/ai/AI_pathing.cpp
@@ -1331,6 +1331,7 @@ HeightForTrajectory
 Returns the maximum hieght of a given trajectory
 =====================
 */
+#if 0
 static float HeightForTrajectory( const idVec3 &start, float zVel, float gravity ) {
 	float maxHeight, t;
 
@@ -1340,6 +1341,7 @@ static float HeightForTrajectory( const idVec3 &start, float zVel, float gravity
 
 	return maxHeight;
 }
+#endif
 
 /*
 =====================
diff --git a/neo/renderer/Image_init.cpp b/neo/renderer/Image_init.cpp
index c3614695..e91673b7 100644
--- a/neo/renderer/Image_init.cpp
+++ b/neo/renderer/Image_init.cpp
@@ -223,6 +223,7 @@ R_AlphaRampImage
 Creates a 0-255 ramp image
 ================
 */
+#if 0
 static void R_AlphaRampImage( idImage *image ) {
 	int		x;
 	byte	data[256][4];
@@ -237,6 +238,7 @@ static void R_AlphaRampImage( idImage *image ) {
 	image->GenerateImage( (byte *)data, 256, 1,
 		TF_NEAREST, false, TR_CLAMP, TD_HIGH_QUALITY );
 }
+#endif
 
 
 
@@ -382,6 +384,7 @@ static void R_RGBA8Image( idImage *image ) {
 		TF_DEFAULT, false, TR_REPEAT, TD_HIGH_QUALITY );
 }
 
+#if 0
 static void R_RGB8Image( idImage *image ) {
 	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
 
@@ -394,6 +397,7 @@ static void R_RGB8Image( idImage *image ) {
 	image->GenerateImage( (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE,
 		TF_DEFAULT, false, TR_REPEAT, TD_HIGH_QUALITY );
 }
+#endif
 
 static void R_AlphaNotchImage( idImage *image ) {
 	byte	data[2][4];
@@ -448,6 +452,7 @@ static void R_AmbientNormalImage( idImage *image ) {
 }
 
 
+#if 0
 static void CreateSquareLight( void ) {
 	byte		*buffer;
 	int			x, y;
@@ -520,6 +525,7 @@ static void CreateFlashOff( void ) {
 
 	R_StaticFree( buffer );
 }
+#endif
 
 
 /*
diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
index 5efd9b60..bc133dbb 100644
--- a/neo/renderer/RenderSystem_init.cpp
+++ b/neo/renderer/RenderSystem_init.cpp
@@ -40,8 +40,6 @@ If you have questions concerning this license or the applicable additional terms
 
 glconfig_t	glConfig;
 
-static void GfxInfo_f( void );
-
 const char *r_rendererArgs[] = { "best", "arb", "arb2", "Cg", "exp", "nv10", "nv20", "r200", NULL };
 
 idCVar r_inhibitFragmentProgram( "r_inhibitFragmentProgram", "0", CVAR_RENDERER | CVAR_BOOL, "ignore the fragment program extension" );
@@ -1773,7 +1771,7 @@ void R_SetColorMappings( void ) {
 GfxInfo_f
 ================
 */
-void GfxInfo_f( const idCmdArgs &args ) {
+static void GfxInfo_f( const idCmdArgs &args ) {
 	const char *fsstrings[] =
 	{
 		"windowed",
diff --git a/neo/renderer/draw_arb2.cpp b/neo/renderer/draw_arb2.cpp
index 8c80068f..fd82bf91 100644
--- a/neo/renderer/draw_arb2.cpp
+++ b/neo/renderer/draw_arb2.cpp
@@ -35,10 +35,12 @@ If you have questions concerning this license or the applicable additional terms
 
 CGcontext cg_context;
 
+#if 0
 static void cg_error_callback( void ) {
 	CGerror i = cgGetError();
 	common->Printf( "Cg error (%d): %s\n", i, cgGetErrorString(i) );
 }
+#endif
 
 /*
 =========================================================================================
diff --git a/neo/renderer/tr_rendertools.cpp b/neo/renderer/tr_rendertools.cpp
index c8684491..68bd45e0 100644
--- a/neo/renderer/tr_rendertools.cpp
+++ b/neo/renderer/tr_rendertools.cpp
@@ -1223,6 +1223,7 @@ RB_ShowNormals
 Debugging tool
 =====================
 */
+#if 0
 static void RB_AltShowNormals( drawSurf_t **drawSurfs, int numDrawSurfs ) {
 	int			i, j, k;
 	drawSurf_t	*drawSurf;
@@ -1290,6 +1291,7 @@ static void RB_AltShowNormals( drawSurf_t **drawSurfs, int numDrawSurfs ) {
 	qglEnable( GL_DEPTH_TEST );
 	qglEnable( GL_STENCIL_TEST );
 }
+#endif
 
 
 
diff --git a/neo/sys/linux/glimp_logging.cpp.m4 b/neo/sys/linux/glimp_logging.cpp.m4
index f8de0a30..3748ecfa 100644
--- a/neo/sys/linux/glimp_logging.cpp.m4
+++ b/neo/sys/linux/glimp_logging.cpp.m4
@@ -66,6 +66,7 @@ static const char *EnumString( GLenum t )
 FloatData
 ======================
 */
+#if 0
 static const char *FloatData( const GLfloat *v, int count ) {
 	static char buffer[8][1024];
 	static int index = 0;
@@ -86,7 +87,8 @@ static const char *FloatData( const GLfloat *v, int count ) {
 
 	return name;
 }
-
+#endif
+#
 #include "glimp_logfuncs.cpp"
 
 dnl define(`log_func', `static `$1' APIENTRY log`$2'(`$3') {
diff --git a/neo/sys/win32/win_qgl.cpp b/neo/sys/win32/win_qgl.cpp
index d667e996..9ae02d7d 100644
--- a/neo/sys/win32/win_qgl.cpp
+++ b/neo/sys/win32/win_qgl.cpp
@@ -1247,6 +1247,7 @@ static const char *EnumString( GLenum t )
 	return buffer[oldIndex];
 }
 
+#if 0
 static const char *FloatData( const GLfloat *v, int count ) {
 	static char buffer[8][1024];
 	static int index = 0;
@@ -1268,8 +1269,6 @@ static const char *FloatData( const GLfloat *v, int count ) {
 	return name;
 }
 
-#if 0
-
 // TODO: support GLbitfield
 
 static void APIENTRY logClear(GLbitfield mask)
diff --git a/neo/tools/compilers/dmap/map.cpp b/neo/tools/compilers/dmap/map.cpp
index 17486a42..098747d9 100644
--- a/neo/tools/compilers/dmap/map.cpp
+++ b/neo/tools/compilers/dmap/map.cpp
@@ -201,6 +201,7 @@ static uBrush_t *FinishBrush( void ) {
 AdjustEntityForOrigin
 ================
 */
+#if 0
 static void AdjustEntityForOrigin( uEntity_t *ent ) {
 	primitive_t	*prim;
 	uBrush_t	*b;
@@ -232,6 +233,7 @@ static void AdjustEntityForOrigin( uEntity_t *ent ) {
 		CreateBrushWindings(b);
 	}
 }
+#endif
 
 /*
 =================
diff --git a/neo/tools/compilers/dmap/optimize.cpp b/neo/tools/compilers/dmap/optimize.cpp
index 811e5f3b..f8063ea0 100644
--- a/neo/tools/compilers/dmap/optimize.cpp
+++ b/neo/tools/compilers/dmap/optimize.cpp
@@ -1058,6 +1058,7 @@ static void CreateOptTri( optVertex_t *first, optEdge_t *e1, optEdge_t *e2, optI
 }
 
 // debugging tool
+#if 0
 static void ReportNearbyVertexes( const optVertex_t *v, const optIsland_t *island ) {
 	const optVertex_t	*ov;
 	float		d;
@@ -1077,6 +1078,7 @@ static void ReportNearbyVertexes( const optVertex_t *v, const optIsland_t *islan
 		}
 	}
 }
+#endif
 
 /*
 ====================
@@ -1749,6 +1751,7 @@ static void OptimizeIsland( optIsland_t *island ) {
 AddVertexToIsland_r
 ================
 */
+#if 0
 static void AddVertexToIsland_r( optVertex_t *vert, optIsland_t *island ) {
 	optEdge_t	*e;
 
@@ -1783,6 +1786,7 @@ static void AddVertexToIsland_r( optVertex_t *vert, optIsland_t *island ) {
 	}
 
 }
+#endif
 
 /*
 ====================
@@ -1798,6 +1802,7 @@ doing this, because PointInSourceTris() can give a bad answer if
 the source list has triangles not used in the optimization
 ====================
 */
+#if 0
 static void SeparateIslands( optimizeGroup_t *opt ) {
 	int		i;
 	optIsland_t	island;
@@ -1820,6 +1825,7 @@ static void SeparateIslands( optimizeGroup_t *opt ) {
 		common->Printf( "%6i islands\n", numIslands );
 	}
 }
+#endif
 
 static void DontSeparateIslands( optimizeGroup_t *opt ) {
 	int		i;
@@ -1852,6 +1858,7 @@ PointInSourceTris
 This is a sloppy bounding box check
 ====================
 */
+#if 0
 static bool PointInSourceTris( float x, float y, float z, optimizeGroup_t *opt ) {
 	mapTri_t	*tri;
 	idBounds	b;
@@ -1876,6 +1883,7 @@ static bool PointInSourceTris( float x, float y, float z, optimizeGroup_t *opt )
 	}
 	return false;
 }
+#endif
 
 /*
 ====================