diff --git a/engine/client/cl_cam.c b/engine/client/cl_cam.c
index a776dad24..08405f098 100644
--- a/engine/client/cl_cam.c
+++ b/engine/client/cl_cam.c
@@ -112,6 +112,13 @@ qboolean Cam_DrawPlayer(int pnum, int playernum)
 	return true;
 }
 
+int Cam_TrackNum(int pnum)
+{
+	if (!autocam[pnum])
+		return -1;
+	return spec_track[pnum];
+}
+
 void Cam_Unlock(int pnum)
 {
 	if (autocam[pnum])
diff --git a/engine/client/quakedef.h b/engine/client/quakedef.h
index a55cbfc80..c705f1f52 100644
--- a/engine/client/quakedef.h
+++ b/engine/client/quakedef.h
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
+#include "bothdefs.h"	//first thing included by ALL files.
 
 
 #if _MSC_VER
@@ -101,7 +102,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bothdefs.h"	//we need to know if png is available
 #if defined(AVAIL_PNGLIB) && defined(PNG_SUCKS_WITH_SETJMP)
 #include <png.h>
 #else
diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
index ffbc051fe..f8923f864 100644
--- a/engine/common/bothdefs.h
+++ b/engine/common/bothdefs.h
@@ -171,7 +171,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //remove any options that depend upon GL.
 #ifndef SERVERONLY
-	#if defined(SWQUAKE) && !defined(RGLQUAKE) && !defined(GLQUAKE)
+	#if defined(SWQUAKE) && !defined(GLQUAKE)
 		#undef DOOMWADS
 		#undef HALFLIFEMODELS
 		#undef Q3BSPS
@@ -180,7 +180,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#endif
 #endif
 
-#if !defined(RGLQUAKE)
+#if !defined(GLQUAKE)
 	#undef Q3BSPS
 #endif
 #if !defined(Q3BSPS)