diff --git a/quakespasm/Quake/client.h b/quakespasm/Quake/client.h
index a87f98a8..f1f903fc 100644
--- a/quakespasm/Quake/client.h
+++ b/quakespasm/Quake/client.h
@@ -24,16 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // client.h
 
-typedef struct
-{
-	vec3_t	viewangles;
-
-// intended velocities
-	float	forwardmove;
-	float	sidemove;
-	float	upmove;
-} usercmd_t;
-
 typedef struct
 {
 	int		length;
@@ -361,12 +351,21 @@ void V_Register (void);
 void V_ParseDamage (void);
 void V_SetContentsColor (int contents);
 
-
 //
 // cl_tent
 //
 void CL_InitTEnts (void);
 void CL_SignonReply (void);
 
+//
+// chase
+//
+extern	cvar_t	chase_active;
+
+void Chase_Init (void);
+void TraceLine (vec3_t start, vec3_t end, vec3_t impact);
+void Chase_UpdateForClient (void);	//johnfitz
+void Chase_UpdateForDrawing (void);	//johnfitz
+
 #endif	/* _CLIENT_H_ */
 
diff --git a/quakespasm/Quake/protocol.h b/quakespasm/Quake/protocol.h
index 5322539c..63400371 100644
--- a/quakespasm/Quake/protocol.h
+++ b/quakespasm/Quake/protocol.h
@@ -219,5 +219,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define TE_BEAM				13
 // PGM 01/21/97
 
+typedef struct
+{
+	vec3_t		origin;
+	vec3_t		angles;
+	unsigned short 	modelindex;	//johnfitz -- was int
+	unsigned short 	frame;		//johnfitz -- was int
+	unsigned char 	colormap;	//johnfitz -- was int
+	unsigned char 	skin;		//johnfitz -- was int
+	unsigned char	alpha;		//johnfitz -- added
+	int		effects;
+} entity_state_t;
+
+typedef struct
+{
+	vec3_t	viewangles;
+
+// intended velocities
+	float	forwardmove;
+	float	sidemove;
+	float	upmove;
+} usercmd_t;
+
 #endif	/* _QUAKE_PROTOCOL_H */
 
diff --git a/quakespasm/Quake/quakedef.h b/quakespasm/Quake/quakedef.h
index c121ae75..336ff988 100644
--- a/quakespasm/Quake/quakedef.h
+++ b/quakespasm/Quake/quakedef.h
@@ -204,54 +204,43 @@ typedef struct
 
 #include "common.h"
 #include "bspfile.h"
-#include "vid.h"
 #include "sys.h"
 #include "zone.h"
 #include "mathlib.h"
+#include "cvar.h"
+
+#include "protocol.h"
+#include "net.h"
+
+#include "cmd.h"
+#include "crc.h"
+
+#include "progs.h"
+#include "server.h"
 
 #include "platform.h"
-
 #include "SDL.h"
 #include "SDL_opengl.h"
 
-typedef struct
-{
-	vec3_t		origin;
-	vec3_t		angles;
-	unsigned short 	modelindex;	//johnfitz -- was int
-	unsigned short 	frame;		//johnfitz -- was int
-	unsigned char 	colormap;	//johnfitz -- was int
-	unsigned char 	skin;		//johnfitz -- was int
-	unsigned char	alpha;		//johnfitz -- added
-	int		effects;
-} entity_state_t;
-
-
+#include "console.h"
 #include "wad.h"
-#include "cvar.h"
+#include "vid.h"
 #include "screen.h"
 #include "draw.h"
-#include "net.h"
-#include "protocol.h"
-#include "cmd.h"
+#include "render.h"
+#include "view.h"
 #include "sbar.h"
 #include "q_sound.h"
-#include "render.h"
 #include "client.h"
-#include "progs.h"
-#include "server.h"
+
 #include "gl_model.h"
+#include "world.h"
 
 #include "image.h"	//johnfitz
 #include "gl_texmgr.h"	//johnfitz
-
 #include "input.h"
-#include "world.h"
 #include "keys.h"
-#include "console.h"
-#include "view.h"
 #include "menu.h"
-#include "crc.h"
 #include "cdaudio.h"
 #include "glquake.h"
 
@@ -306,15 +295,5 @@ extern qboolean		isDedicated;
 
 extern int		minimum_memory;
 
-//
-// chase
-//
-extern	cvar_t	chase_active;
-
-void Chase_Init (void);
-void TraceLine (vec3_t start, vec3_t end, vec3_t impact);
-void Chase_UpdateForClient (void);	//johnfitz
-void Chase_UpdateForDrawing (void);	//johnfitz
-
 #endif	/* __QUAKEDEFS_H */