diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 90bd9126e..82688547c 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -91,10 +91,14 @@ qboolean CL_FilterModelindex(int modelindex, int frame)
 
 void CL_FreeDlights(void)
 {
+#if defined(GLQUAKE) || defined(D3DQUAKE)
+#ifdef RTLIGHTS
 	int i;
 	for (i = 0; i < rtlights_max; i++)
 		if (cl_dlights[i].worldshadowmesh)
 			SH_FreeShadowMesh(cl_dlights[i].worldshadowmesh);
+#endif
+#endif
 
 	rtlights_max = cl_maxdlights = 0;
 	BZ_Free(cl_dlights);
diff --git a/engine/client/cl_pred.c b/engine/client/cl_pred.c
index 6b2a2e996..0de3a538c 100644
--- a/engine/client/cl_pred.c
+++ b/engine/client/cl_pred.c
@@ -764,6 +764,7 @@ static void CL_DecodeStateSize(unsigned short solid, int modelindex, vec3_t mins
 }
 
 /*called on packet reception*/
+#include "pr_common.h"
 void CL_PlayerFrameUpdated(player_state_t *plstate, entity_state_t *state, int sequence)
 {
 	/*update the prediction info*/
diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index 108d9e19d..ba0fd3cee 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -2095,12 +2095,14 @@ void Surf_DrawWorld (void)
 		}
 		else
 #endif
+#ifdef MAP_DOOM
 			if (currentmodel->fromgame == fg_doom)
 		{
 			vis = NULL;
 			GLR_DoomWorld();
 		}
 		else
+#endif
 #ifdef TERRAIN
 		if (currentmodel->type == mod_heightmap)
 		{
diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c
index 30673d5e1..a8bae039e 100644
--- a/engine/common/com_mesh.c
+++ b/engine/common/com_mesh.c
@@ -5053,7 +5053,7 @@ qboolean Mod_LoadPSKModel(model_t *mod, void *buffer)
 		gmdl[i].ofs_st_array = (char*)stcoord - (char*)&gmdl[i];
 		gmdl[i].numverts = num_vtxw;
 #else
-	for (i = 0; i < num_matt; i++, skin++, gshaders++)
+	for (i = 0; i < num_matt; i++)
 	{
 #endif
 
diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c
index 949d32629..91aa77a51 100644
--- a/engine/common/net_chan.c
+++ b/engine/common/net_chan.c
@@ -688,8 +688,10 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 
 				*(int*)&send.data[(offset - hsz) + 0] = LittleLong(w1);
 				*(int*)&send.data[(offset - hsz) + 4] = LittleLong(w2);
+#ifndef SERVERONLY
 				if (chan->sock == NS_CLIENT)
 					*(short*)&send.data[offset - 4] = LittleShort(cls.qport);
+#endif
 				*(short*)&send.data[offset - 2] = LittleShort(((offset-hsz)>>2) | (more?1:0));
 
 				NET_SendPacket (chan->sock, (no - offset) + hsz, send.data + offset - hsz, chan->remote_address);
diff --git a/engine/common/protocol.h b/engine/common/protocol.h
index 2ea758be7..fe65f949f 100644
--- a/engine/common/protocol.h
+++ b/engine/common/protocol.h
@@ -800,9 +800,9 @@ typedef struct entity_state_s
 
 	vec3_t	origin;
 	vec3_t	angles;
-#if defined(Q2CLIENT) || defined(Q2SERVER)
 	union
 	{
+#if defined(Q2CLIENT) || defined(Q2SERVER)
 		struct
 		{
 			int		renderfx;		//q2
@@ -812,6 +812,7 @@ typedef struct entity_state_s
 			qbyte		sound;			//q2
 			qbyte		event;			//q2
 		} q2;
+#endif
 		struct
 		{
 			/*info to predict other players, so I don't get yelled at if fte were to stop supporting it*/
@@ -821,7 +822,6 @@ typedef struct entity_state_s
 			short velocity[3]; // 1/8th
 		} q1;
 	} u;
-#endif
 	unsigned short		modelindex2;	//q2/vweps
 	unsigned short		frame;
 
diff --git a/engine/qclib/initlib.c b/engine/qclib/initlib.c
index 070764776..e630395a4 100644
--- a/engine/qclib/initlib.c
+++ b/engine/qclib/initlib.c
@@ -658,7 +658,7 @@ string_t PR_AllocTempString			(progfuncs_t *progfuncs, char *str)
 
 	return (string_t)((unsigned int)i | 0x40000000);
 }
-string_t PR_AllocTempStringLen			(progfuncs_t *progfuncs, char **str, int len)
+string_t PR_AllocTempStringLen			(progfuncs_t *progfuncs, char **str, unsigned int len)
 {
 	char **ntable;
 	int newmax;
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index cc12e7da9..d1cd4130f 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -309,6 +309,7 @@ void SV_New_f (void)
 			split->connection_started = realtime;
 		#ifdef SVRANKING
 			split->stats_started = realtime;
+		#endif
 			splitnum++;
 		}
 	}