diff --git a/include/pmove.h b/include/pmove.h
index 59ef63d..2839603 100644
--- a/include/pmove.h
+++ b/include/pmove.h
@@ -32,6 +32,7 @@
 #include "protocol.h"
 #include "mathlib.h"
 #include "model.h"
+#include "progs.h"
 
 #define STOP_EPSILON 0.1
 
@@ -39,19 +40,24 @@ typedef struct
 {
 	vec3_t	normal;
 	float	dist;
-} pmplane_t;
+} plane_t;
 
 typedef struct
 {
-	qboolean	allsolid;	// if true, plane is not valid
-	qboolean	startsolid;	// if true, the initial point was in a solid area
+	qboolean	allsolid;		// if true, plane is not valid
+	qboolean	startsolid;		// if true, the initial point was in a solid area
 	qboolean	inopen, inwater;
 	float		fraction;		// time completed, 1.0 = didn't hit anything
 	vec3_t		endpos;			// final position
-	pmplane_t		plane;			// surface normal at impact
-	int			ent;			// entity the surface is on
-} pmtrace_t;
+	plane_t		plane;			// surface normal at impact
 
+// Dabb: only difference between server and client
+//	int			ent;		// vs servers edict_t *ent;
+
+	int			entnum;
+
+	edict_t		*ent;			// entity the surface is on
+} trace_t;
 
 #define	MAX_PHYSENTS	32
 typedef struct
@@ -62,7 +68,6 @@ typedef struct
 	int		info;		// for client or server to identify
 } physent_t;
 
-
 typedef struct
 {
 	int		sequence;	// just for debugging prints
@@ -113,10 +118,10 @@ void PlayerMove (void);
 void Pmove_Init (void);
 void Pmove_Init_Cvars (void);
 
-int PM_HullPointContents (hull_t *hull, int num, vec3_t p);
+int HullPointContents (hull_t *hull, int num, vec3_t p);
 
 int PM_PointContents (vec3_t point);
 qboolean PM_TestPlayerPosition (vec3_t point);
-pmtrace_t PM_PlayerMove (vec3_t start, vec3_t stop);
+trace_t PM_PlayerMove (vec3_t start, vec3_t stop);
 
 #endif // _PMOVE_H
diff --git a/include/world.h b/include/world.h
index 4f0be41..b949c00 100644
--- a/include/world.h
+++ b/include/world.h
@@ -33,23 +33,7 @@
 #include "mathlib.h"
 #include "model.h"
 #include "progs.h"
-
-typedef struct
-{
-	vec3_t	normal;
-	float	dist;
-} plane_t;
-
-typedef struct
-{
-	qboolean	allsolid;		// if true, plane is not valid
-	qboolean	startsolid;		// if true, the initial point was in a solid area
-	qboolean	inopen, inwater;
-	float		fraction;		// time completed, 1.0 = didn't hit anything
-	vec3_t		endpos;			// final position
-	plane_t		plane;			// surface normal at impact
-	edict_t		*ent;			// entity the surface is on
-} trace_t;
+#include "pmove.h"
 
 #define	MOVE_NORMAL		0
 #define	MOVE_NOMONSTERS	1