diff --git a/engine/client/cl_tent.c b/engine/client/cl_tent.c
index 21c307346..abe91bb8c 100644
--- a/engine/client/cl_tent.c
+++ b/engine/client/cl_tent.c
@@ -1437,13 +1437,6 @@ typedef struct {
 	vec3_t dlightcfade;
 } clcustomtents_t;
 
-#define CTE_CUSTOMCOUNT		1
-#define CTE_CUSTOMDIRECTION	2
-#define CTE_STAINS			4
-#define CTE_GLOWS			8
-#define CTE_CHANNELFADE		16
-#define CTE_ISBEAM			128
-
 clcustomtents_t customtenttype[255];	//network based.
 void CL_ParseCustomTEnt(void)
 {
diff --git a/engine/common/protocol.h b/engine/common/protocol.h
index 52aef18ba..e82a1699f 100644
--- a/engine/common/protocol.h
+++ b/engine/common/protocol.h
@@ -678,6 +678,15 @@ enum {
 	TEDP_TEI_PLASMAHIT	= 79,
 };
 
+
+#define CTE_CUSTOMCOUNT		1
+#define CTE_CUSTOMDIRECTION	2
+#define CTE_STAINS			4
+#define CTE_GLOWS			8
+#define CTE_CHANNELFADE		16
+#define CTE_CUSTOMVELOCITY	32
+#define CTE_ISBEAM			128
+
 //FTE's version of TEI_SHOWLMP2
 #define SL_ORG_NW	0
 #define SL_ORG_NE	1
diff --git a/engine/gl/shader.h b/engine/gl/shader.h
index 8fddd8135..1c3d5215e 100644
--- a/engine/gl/shader.h
+++ b/engine/gl/shader.h
@@ -429,9 +429,8 @@ void Sh_Shutdown(void);
 void BE_BaseEntShadowDepth(void);
 //Sets the given light+colour to be the current one that everything is to be lit/culled by.
 void BE_SelectDLight(dlight_t *dl, vec3_t colour);
-
-void BE_SelectEntity(entity_t *ent);
 //Returns true if the mesh is not lit by the current light
 qboolean BE_LightCullModel(vec3_t org, model_t *model);
 #endif
+void BE_SelectEntity(entity_t *ent);
 #endif
diff --git a/engine/server/server.h b/engine/server/server.h
index 6251cc18f..48b91ef70 100644
--- a/engine/server/server.h
+++ b/engine/server/server.h
@@ -73,14 +73,6 @@ typedef struct {
 	qbyte dlighttime;
 	qbyte dlightcfade[3];
 } svcustomtents_t;
-#define CTE_CUSTOMCOUNT		1
-#define CTE_CUSTOMDIRECTION	2
-#define CTE_STAINS			4
-#define CTE_GLOWS			8
-#define CTE_CHANNELFADE     16
-#define CTE_CUSTOMVELOCITY	32
-#define CTE_UNUSED2			64
-#define CTE_ISBEAM			128
 
 typedef struct laggedpacket_s
 {