22 files changed, 34 insertions, 85 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 795728bcd8..68e567bdf1 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,4 +1,4 @@
-/* $Id: accum.c,v 1.9 1999/11/03 19:27:41 brianp Exp $ */
+/* $Id: accum.c,v 1.10 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
 #include "masking.h"
 #include "span.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index db11a3d221..669c4c2f74 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.8 1999/10/13 18:42:49 brianp Exp $ */
+/* $Id: attrib.c,v 1.9 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -45,10 +45,6 @@
 #include "simple_list.h"
 #include "texstate.h"
 #include "types.h"
-#ifdef XFree86Server
-#undef MISC_H
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index a8365a5e32..fb5336a816 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -1,4 +1,4 @@
-/* $Id: blend.c,v 1.5 1999/10/21 12:26:21 brianp Exp $ */
+/* $Id: blend.c,v 1.6 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,8 +29,8 @@
 #ifdef PC_HEADER
 #include "all.h"
 #else
-#include <stdio.h>
 #ifndef XFree86Server
+#include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #else
@@ -44,9 +44,6 @@
 #include "pb.h"
 #include "span.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 85cbd066ff..d93e50958a 100644
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -1,4 +1,4 @@
-/* $Id: clip.c,v 1.3 1999/10/08 09:27:10 keithw Exp $ */
+/* $Id: clip.c,v 1.4 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -45,9 +45,6 @@
 #include "types.h"
 #include "vb.h"
 #include "xform.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 7d167e1bea..f0744ae1cf 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */
+/* $Id: colortab.c,v 1.3 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -38,9 +38,6 @@
 #include "colortab.h"
 #include "context.h"
 #include "macros.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b269f5e8da..628e734191 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.17 1999/10/30 08:22:45 brianp Exp $ */
+/* $Id: context.c,v 1.18 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -92,9 +92,6 @@
 #include "vbxform.h"
 #include "vertices.h"
 #include "xform.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index e3dbf77b85..e05f1f45eb 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,4 +1,4 @@
-/* $Id: depth.c,v 1.7 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: depth.c,v 1.8 1999/11/08 07:36:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
 #include "depth.h"
 #include "macros.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5729851df3..ca8aa207fd 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.13 1999/11/03 17:27:05 brianp Exp $ */
+/* $Id: dlist.c,v 1.14 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -87,10 +87,6 @@
 #include "vbxform.h"
 #include "winpos.h"
 #include "xform.h"
-#ifdef XFree86Server
-#undef MISC_H
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 0b49428621..c5bdb6fcba 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.4 1999/10/19 20:33:57 brianp Exp $ */
+/* $Id: drawpix.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -49,9 +49,6 @@
 #include "stencil.h"
 #include "types.h"
 #include "zoom.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index d6e63f5ae6..aa66290077 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.7 1999/10/20 22:16:45 brianp Exp $ */
+/* $Id: enable.c,v 1.8 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
 #include "vbfill.h"
 #include "xform.h"
 #include "enums.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index b1b40a95ca..695af735fa 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1,4 +1,4 @@
-/* $Id: enums.c,v 1.3 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: enums.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -24,12 +24,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef XFree86Server
+#include <stdlib.h>
+#include <string.h>
+#else
+#include "GL/xf86glx.h"
+#endif
 
 #include "GL/gl.h"
 #include "enums.h"
 #include "macros.h"
-#include <stdlib.h>
-#include <string.h>
 
 
 typedef struct { 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b233d1483e..80918ca185 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.9 1999/10/16 11:30:31 brianp Exp $ */
+/* $Id: extensions.c,v 1.10 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -25,7 +25,11 @@
  */
 
 
+#ifndef XFree86Server
 #include <stdlib.h>
+#else
+#include "GL/xf86glx.h"
+#endif
 #include "context.h"
 #include "extensions.h"
 #include "simple_list.h"
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index ae5943c6da..d377bd8a7e 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,4 +1,4 @@
-/* $Id: feedback.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */
+/* $Id: feedback.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
 #include "mmath.h"
 #include "types.h"
 #include "triangle.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 26da3f7f14..211454b112 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -1,4 +1,4 @@
-/* $Id: fog.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */
+/* $Id: fog.c,v 1.3 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -41,9 +41,6 @@
 #include "macros.h"
 #include "mmath.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 075ad16a9c..582fa5c147 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.12 1999/11/03 18:24:05 brianp Exp $ */
+/* $Id: image.c,v 1.13 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,9 +42,6 @@
 #include "mmath.h"
 #include "pixel.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index dbbe618e12..9712866032 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.6 1999/10/19 20:32:40 brianp Exp $ */
+/* $Id: light.c,v 1.7 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,10 +37,10 @@
 #include <float.h>
 #include <math.h>
 #include <stdlib.h>
+#include <stdio.h>
 #else
 #include "GL/xf86glx.h"
 #endif
-#include <stdio.h>
 #include "context.h"
 #include "enums.h"
 #include "light.h"
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 505bf46382..50b13e83f2 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -1,4 +1,4 @@
-/* $Id: lines.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */
+/* $Id: lines.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -46,9 +46,6 @@
 #include "texstate.h"
 #include "types.h"
 #include "vb.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index ebf55c37c8..fea77709a9 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.7 1999/10/13 18:42:50 brianp Exp $ */
+/* $Id: matrix.c,v 1.8 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -57,9 +57,6 @@
 #include "matrix.h"
 #include "mmath.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 0952f8cbe9..2bc9520803 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,4 +1,4 @@
-/* $Id: pixel.c,v 1.3 1999/10/30 08:20:57 brianp Exp $ */
+/* $Id: pixel.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
 #include "macros.h"
 #include "pixel.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 00fe2f1e39..ca284c2fff 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -1,4 +1,4 @@
-/* $Id: polygon.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */
+/* $Id: polygon.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
 #include "macros.h"
 #include "polygon.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 599fbeede0..e2644b733a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.10 1999/11/05 06:43:11 brianp Exp $ */
+/* $Id: teximage.c,v 1.11 1999/11/08 07:36:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
 #include "teximage.h"
 #include "texstate.h"
 #include "types.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 02aca61e4f..26baa21ae1 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.7 1999/11/05 06:43:11 brianp Exp $ */
+/* $Id: varray.c,v 1.8 1999/11/08 07:36:45 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -54,9 +54,6 @@
 #include "vbindirect.h"
 #include "vbxform.h"
 #include "xform.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
 #endif
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) && !defined(GLX_USE_DLOPEN)