diff --git a/code/game/g_local.h b/code/game/g_local.h
index f7f24ce3..58a9ff1c 100644
--- a/code/game/g_local.h
+++ b/code/game/g_local.h
@@ -118,7 +118,6 @@ struct gentity_s {
 
 	int			timestamp;		// body queue sinking, etc
 
-	float		angle;			// set in editor, -1 = up, -2 = down
 	char		*target;
 	char		*targetname;
 	char		*team;
@@ -214,11 +213,6 @@ typedef struct {
 	float		lastfraggedcarrier;
 } playerTeamState_t;
 
-// the auto following clients don't follow a specific client
-// number, but instead follow the first two active players
-#define	FOLLOW_ACTIVE1	-1
-#define	FOLLOW_ACTIVE2	-2
-
 // client data that stays across multiple levels or tournament restarts
 // this is achieved by writing all the data to cvar strings at game shutdown
 // time and reading them back at connection time.  Anything added here
@@ -479,7 +473,6 @@ void	G_FreeEntity( gentity_t *e );
 qboolean	G_EntitiesFree( void );
 
 void	G_TouchTriggers (gentity_t *ent);
-void	G_TouchSolids (gentity_t *ent);
 
 float	*tv (float x, float y, float z);
 char	*vtos( const vec3_t v );
@@ -575,8 +568,6 @@ gentity_t *SelectSpawnPoint (vec3_t avoidPoint, vec3_t origin, vec3_t angles, qb
 void CopyToBodyQue( gentity_t *ent );
 void ClientRespawn(gentity_t *ent);
 void BeginIntermission (void);
-void InitClientPersistant (gclient_t *client);
-void InitClientResp (gclient_t *client);
 void InitBodyQue (void);
 void ClientSpawn( gentity_t *ent );
 void player_die (gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int mod);
@@ -599,25 +590,15 @@ void FireWeapon( gentity_t *ent );
 void G_StartKamikaze( gentity_t *ent );
 #endif
 
-//
-// p_hud.c
-//
-void MoveClientToIntermission (gentity_t *client);
-void G_SetStats (gentity_t *ent);
-void DeathmatchScoreboardMessage (gentity_t *client);
-
 //
 // g_cmds.c
 //
-
-//
-// g_pweapon.c
-//
-
+void DeathmatchScoreboardMessage( gentity_t *ent );
 
 //
 // g_main.c
 //
+void MoveClientToIntermission( gentity_t *ent );
 void FindIntermissionPoint( void );
 void SetLeader(int team, int client);
 void CheckTeamLeader( int team );
diff --git a/code/game/g_mover.c b/code/game/g_mover.c
index e124e2d4..7919e6fa 100644
--- a/code/game/g_mover.c
+++ b/code/game/g_mover.c
@@ -33,8 +33,6 @@ PUSHMOVE
 ===============================================================================
 */
 
-void MatchTeam( gentity_t *teamLeader, int moverState, int time );
-
 typedef struct {
 	gentity_t	*ent;
 	vec3_t	origin;