3 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/debug.h b/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
index edd47e423f1..204d637922c 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
@@ -1,4 +1,4 @@
-/* $Id: debug.h,v 1.3 2000/11/19 23:42:33 jtaylor Exp $
+/* $Id: debug.h,v 1.4 2000/11/23 02:50:57 jtaylor Exp $
 ******************************************************************************
 
    GGIMesa debugging macros
@@ -34,7 +34,9 @@
 #include <ggi/types.h>
 #include <ggi/gg.h>
 
+#ifndef DEBUG
 #define DEBUG
+#endif
 
 __BEGIN_DECLS
 
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 31e595bdb84..0f7baf3604b 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.29 2000/11/21 23:26:13 brianp Exp $ */
+/* $Id: colortab.c,v 1.30 2000/11/23 02:50:56 jtaylor Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -35,6 +35,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "mmath.h"
+#include "state.h"
 #include "swrast/s_span.h" /* XXX SWRAST hack */
 #endif
 
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 48fb0e1a58b..5bb4e82a843 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -1,4 +1,4 @@
-/* $Id: convolve.c,v 1.14 2000/11/22 07:32:16 joukj Exp $ */
+/* $Id: convolve.c,v 1.15 2000/11/23 02:50:56 jtaylor Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,6 +42,7 @@
 #include "context.h"
 #include "image.h"
 #include "mtypes.h"
+#include "state.h"
 #include "swrast/s_span.h" /* XXX SWRAST hack */
 #endif