diff --git a/quakespasm/Quake/menu.c b/quakespasm/Quake/menu.c
index d31e9922..41297fe0 100644
--- a/quakespasm/Quake/menu.c
+++ b/quakespasm/Quake/menu.c
@@ -87,7 +87,7 @@ qboolean	m_entersound;		// play after drawing a frame, so caching
 								// won't disrupt the sound
 qboolean	m_recursiveDraw;
 
-int			m_return_state;
+m_state_e	m_return_state;
 qboolean	m_return_onerror;
 char		m_return_reason [32];
 
@@ -1536,7 +1536,7 @@ void M_Help_Key (int key)
 /* QUIT MENU */
 
 int		msgNumber;
-int		m_quit_prevstate;
+m_state_e	m_quit_prevstate;
 qboolean	wasInMenus;
 
 void M_Menu_Quit_f (void)
diff --git a/quakespasm/Quake/menu.h b/quakespasm/Quake/menu.h
index 8cf24c45..8f943ac6 100644
--- a/quakespasm/Quake/menu.h
+++ b/quakespasm/Quake/menu.h
@@ -54,6 +54,7 @@ enum m_state_e {
 };
 
 extern enum m_state_e m_state;
+extern enum m_state_e m_return_state;
 
 //
 // menus
diff --git a/quakespasm/Quake/net_dgrm.c b/quakespasm/Quake/net_dgrm.c
index b8f095dc..a616a371 100644
--- a/quakespasm/Quake/net_dgrm.c
+++ b/quakespasm/Quake/net_dgrm.c
@@ -80,7 +80,6 @@ struct
 	byte			data[MAX_DATAGRAM];
 } packetBuffer;
 
-extern int m_return_state;
 extern qboolean m_return_onerror;
 extern char m_return_reason[32];