diff --git a/quakespasm/Quake/console.c b/quakespasm/Quake/console.c
index 616c9b05..e8cdaefd 100644
--- a/quakespasm/Quake/console.c
+++ b/quakespasm/Quake/console.c
@@ -63,7 +63,6 @@ qboolean	con_debuglog = false;
 
 qboolean	con_initialized;
 
-extern void M_Menu_Main_f (void);
 
 /*
 ================
@@ -250,7 +249,6 @@ static void Con_MessageMode_f (void)
 	key_dest = key_message;
 }
 
-
 /*
 ================
 Con_MessageMode2_f
@@ -351,9 +349,6 @@ void Con_Init (void)
 
 	Con_Printf ("Console initialized.\n");
 
-//
-// register our commands
-//
 	Cvar_RegisterVariable (&con_notifytime);
 	Cvar_RegisterVariable (&con_logcenterprint); //johnfitz
 
@@ -407,8 +402,7 @@ static void Con_Print (const char *txt)
 	if (txt[0] == 1)
 	{
 		mask = 128;		// go to colored text
-		S_LocalSound ("misc/talk.wav");
-	// play talk wav
+		S_LocalSound ("misc/talk.wav");	// play talk wav
 		txt++;
 	}
 	else if (txt[0] == 2)
diff --git a/quakespasm/Quake/host.c b/quakespasm/Quake/host.c
index a3c7427b..e0f9e302 100644
--- a/quakespasm/Quake/host.c
+++ b/quakespasm/Quake/host.c
@@ -686,8 +686,7 @@ void _Host_Frame (float time)
 		return;			// don't run too fast, or packets will flood out
 
 // get new key events
-	Key_ForceDest ();
-	//IN_UpdateForKeydest ();
+	Key_UpdateForDest ();
 	Sys_SendKeyEvents ();
 
 // allow mice or other external controllers to add commands
diff --git a/quakespasm/Quake/keys.c b/quakespasm/Quake/keys.c
index 198f7b77..12bb4793 100644
--- a/quakespasm/Quake/keys.c
+++ b/quakespasm/Quake/keys.c
@@ -1047,7 +1047,7 @@ void Key_ClearStates (void)
 Key_ForceDest
 ===================
 */
-void Key_ForceDest (void)
+void Key_UpdateForDest (void)
 {
 	static qboolean forced = false;
 
diff --git a/quakespasm/Quake/keys.h b/quakespasm/Quake/keys.h
index ab483579..e3105732 100644
--- a/quakespasm/Quake/keys.h
+++ b/quakespasm/Quake/keys.h
@@ -158,16 +158,18 @@ extern	int		key_linepos;
 extern	int		key_insert;
 extern	double		key_blinktime;
 
-void Key_Event (int key, qboolean down);
+extern	qboolean	chat_team;
+
 void Key_Init (void);
-void Key_WriteBindings (FILE *f);
 void Key_ClearStates (void);
-void Key_ForceDest (void);
+void Key_UpdateForDest (void);
+
+void Key_Event (int key, qboolean down);
 
 void Key_SetBinding (int keynum, const char *binding);
 const char *Key_KeynumToString (int keynum);
+void Key_WriteBindings (FILE *f);
 
-extern	qboolean	chat_team;
 void Key_EndChat (void);
 const char *Key_GetChatBuffer (void);
 int Key_GetChatMsgLen (void);
diff --git a/quakespasm/Quake/menu.h b/quakespasm/Quake/menu.h
index ec3caed2..5f18ee4f 100644
--- a/quakespasm/Quake/menu.h
+++ b/quakespasm/Quake/menu.h
@@ -22,15 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _QUAKE_MENU_H
 #define _QUAKE_MENU_H
 
-//
-// the net drivers should just set the apropriate bits in m_activenet,
-// instead of having the menu code look through their internal tables
-//
-#define	MNET_IPX		1
-#define	MNET_TCP		2
-
-extern	int	m_activenet;
-
 enum m_state_e {
 	m_none,
 	m_main,
@@ -63,17 +54,20 @@ extern qboolean m_keys_bind_grab;
 //
 void M_Init (void);
 void M_Keydown (int key);
-void M_Draw (void);
-
 void M_ToggleMenu_f (void);
+
+void M_Menu_Main_f (void);
 void M_Menu_Options_f (void);
 void M_Menu_Quit_f (void);
 
 void M_Print (int cx, int cy, const char *str);
 void M_PrintWhite (int cx, int cy, const char *str);
+
+void M_Draw (void);
 void M_DrawCharacter (int cx, int line, int num);
-void M_DrawTransPic (int x, int y, qpic_t *pic);
+
 void M_DrawPic (int x, int y, qpic_t *pic);
+void M_DrawTransPic (int x, int y, qpic_t *pic);
 void M_DrawCheckbox (int x, int y, int on);
 
 #endif	/* _QUAKE_MENU_H */