6 files changed, 13 insertions, 18 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 81af5f60689..e6b556b0fce 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,4 +1,4 @@
-/* $Id: accum.c,v 1.13 1999/11/25 17:36:48 brianp Exp $ */
+/* $Id: accum.c,v 1.14 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -34,6 +34,7 @@
 #include "mem.h"
 #include "masking.h"
 #include "span.h"
+#include "state.h"
 #include "types.h"
 #endif
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index e8a6f86431a..6fe44c87964 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.13 1999/11/23 21:15:37 keithw Exp $ */
+/* $Id: attrib.c,v 1.14 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,8 +30,8 @@
 #else
 #include "glheader.h"
 #include "attrib.h"
+#include "buffers.h"
 #include "context.h"
-#include "glmisc.h"
 #include "enable.h"
 #include "enums.h"
 #include "mem.h"
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5e8aef88c22..c6153fdcd0a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.26 2000/01/31 23:09:51 brianp Exp $ */
+/* $Id: dlist.c,v 1.27 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,11 +30,10 @@
 #else
 #include "glheader.h"
 #include "accum.h"
-#include "alpha.h"
 #include "attrib.h"
 #include "bitmap.h"
 #include "bbox.h"
-#include "blend.h"
+#include "buffers.h"
 #include "clip.h"
 #include "colortab.h"
 #include "context.h"
@@ -42,36 +41,29 @@
 #include "cva.h"
 #include "depth.h"
 #include "dispatch.h"
-#include "drawpix.h"
 #include "enable.h"
 #include "enums.h"
 #include "eval.h"
 #include "extensions.h"
 #include "feedback.h"
-#include "fog.h"
 #include "get.h"
 #include "glapi.h"
-#include "glmisc.h"
 #include "hash.h"
 #include "image.h"
 #include "imaging.h"
 #include "light.h"
 #include "lines.h"
 #include "dlist.h"
-#include "logic.h"
 #include "macros.h"
-#include "masking.h"
 #include "matrix.h"
 #include "mem.h"
 #include "pipeline.h"
 #include "pixel.h"
 #include "points.h"
 #include "polygon.h"
-#include "rastpos.h"
 #include "readpix.h"
 #include "rect.h"
-#include "scissor.h"
-#include "stencil.h"
+#include "state.h"
 #include "texobj.h"
 #include "teximage.h"
 #include "texstate.h"
@@ -80,7 +72,6 @@
 #include "vb.h"
 #include "vbfill.h"
 #include "vbxform.h"
-#include "winpos.h"
 #include "xform.h"
 #endif
 
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 3bd164159d9..6724929be68 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.10 1999/11/26 16:27:05 brianp Exp $ */
+/* $Id: drawpix.c,v 1.11 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,6 +37,7 @@
 #include "mmath.h"
 #include "pixel.h"
 #include "span.h"
+#include "state.h"
 #include "stencil.h"
 #include "types.h"
 #include "zoom.h"
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 160c9e3ed13..9d852bd59dc 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,4 +1,4 @@
-/* $Id: rastpos.c,v 1.4 1999/11/11 01:22:27 brianp Exp $ */
+/* $Id: rastpos.c,v 1.5 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -38,6 +38,7 @@
 #include "mmath.h"
 #include "rastpos.h"
 #include "shade.h"
+#include "state.h"
 #include "types.h"
 #include "xform.h"
 #endif
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 5a520ca81d7..31c378aac08 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.18 2000/01/13 00:25:22 brianp Exp $ */
+/* $Id: varray.c,v 1.19 2000/02/02 19:17:57 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,6 +37,7 @@
 #include "macros.h"
 #include "mmath.h"
 #include "pipeline.h"
+#include "state.h"
 #include "texstate.h"
 #include "translate.h"
 #include "types.h"