diff --git a/Quake/net.h b/Quake/net.h
index 7dcc99ed..30b8c761 100644
--- a/Quake/net.h
+++ b/Quake/net.h
@@ -213,8 +213,6 @@ extern int			net_hostport;
 
 extern int net_driverlevel;
 extern cvar_t		hostname;
-extern char			playername[];
-extern int			playercolor;
 
 extern int		messagesSent;
 extern int		messagesReceived;
diff --git a/Quake/r_sprite.c b/Quake/r_sprite.c
index ed12d5c8..2d9e3349 100644
--- a/Quake/r_sprite.c
+++ b/Quake/r_sprite.c
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 R_GetSpriteFrame
 ================
 */
-mspriteframe_t *R_GetSpriteFrame (entity_t *currententity)
+mspriteframe_t *R_GetSpriteFrame (entity_t *currentent)
 {
 	msprite_t		*psprite;
 	mspritegroup_t	*pspritegroup;
@@ -35,8 +35,8 @@ mspriteframe_t *R_GetSpriteFrame (entity_t *currententity)
 	int				i, numframes, frame;
 	float			*pintervals, fullinterval, targettime, time;
 
-	psprite = (msprite_t *) currententity->model->cache.data;
-	frame = currententity->frame;
+	psprite = (msprite_t *) currentent->model->cache.data;
+	frame = currentent->frame;
 
 	if ((frame >= psprite->numframes) || (frame < 0))
 	{
@@ -55,7 +55,7 @@ mspriteframe_t *R_GetSpriteFrame (entity_t *currententity)
 		numframes = pspritegroup->numframes;
 		fullinterval = pintervals[numframes-1];
 
-		time = cl.time + currententity->syncbase;
+		time = cl.time + currentent->syncbase;
 
 	// when loading in Mod_LoadSpriteGroup, we guaranteed all interval values
 	// are positive, so we don't have to worry about division by 0
diff --git a/Quake/sv_user.c b/Quake/sv_user.c
index da26a4b5..ec5e7948 100644
--- a/Quake/sv_user.c
+++ b/Quake/sv_user.c
@@ -228,7 +228,8 @@ void SV_WaterMove (void)
 {
 	int		i;
 	vec3_t	wishvel;
-	float	speed, newspeed, wishspeed, addspeed, accelspeed;
+	float	speed, newspeed, addspeed, accelspeed;
+	//float	wishspeed;
 
 //
 // user intentions
@@ -483,7 +484,7 @@ Returns false if the client should be killed
 qboolean SV_ReadClientMessage (void)
 {
 	int		ret;
-	int		cmd;
+	int		ccmd;
 	char		*s;
 
 	do
@@ -511,9 +512,9 @@ nextmsg:
 				return false;
 			}
 
-			cmd = MSG_ReadChar ();
+			ccmd = MSG_ReadChar ();
 
-			switch (cmd)
+			switch (ccmd)
 			{
 			case -1:
 				goto nextmsg;		// end of message
diff --git a/Quake/view.c b/Quake/view.c
index 13503566..bf7fcfc7 100644
--- a/Quake/view.c
+++ b/Quake/view.c
@@ -73,10 +73,9 @@ V_CalcRoll
 Used by view and sv_user
 ===============
 */
-vec3_t	forward, right, up;
-
 float V_CalcRoll (vec3_t angles, vec3_t velocity)
 {
+	vec3_t	forward, right, up;
 	float	sign;
 	float	side;
 	float	value;