header includes clean-up (Daryll)
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index eee7a84..36f0616 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -1,4 +1,4 @@
-/* $Id: eval.c,v 1.5 1999/10/19 18:37:03 keithw Exp $ */
+/* $Id: eval.c,v 1.6 1999/11/08 15:30:05 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -56,9 +56,6 @@
#include "vbcull.h"
#include "vbfill.h"
#include "vbxform.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
#endif
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index a9443c5..bba0983 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -1,4 +1,4 @@
-/* $Id: macros.h,v 1.5 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: macros.h,v 1.6 1999/11/08 15:29:43 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -36,16 +36,16 @@
#ifndef MACROS_H
#define MACROS_H
-#if defined( XFree86LOADER ) && defined( XFree86Server )
-#include <GL/glx_ansic.h>
-#else
+#ifndef XFree86Server
+#include <assert.h>
#include <math.h>
#include <string.h>
+#else
+#include <GL/glx_ansic.h>
#endif
#ifdef DEBUG
-# include <assert.h>
# define ASSERT(X) assert(X)
#else
# define ASSERT(X)