7 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 8a0852c429c..1ee20098d38 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -32,7 +32,6 @@
 
 #include "glheader.h"
 #include "buffers.h"
-#include "colormac.h"
 #include "context.h"
 #include "enums.h"
 #include "fbobject.h"
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index cf93418d10f..f7f15cf5994 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -33,7 +33,6 @@
 #include "glheader.h"
 #include "clear.h"
 #include "context.h"
-#include "colormac.h"
 #include "enums.h"
 #include "macros.h"
 #include "mtypes.h"
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index b13b8953596..83d590f4a48 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -32,11 +32,8 @@
 
 
 #include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
+#include "context.h"
 #include "convolve.h"
-#include "macros.h"
-#include "mtypes.h"
 #include "main/dispatch.h"
 
 
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 42793ff4cd8..84cd7563be4 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -39,7 +39,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "context.h"
 #include "eval.h"
 #include "macros.h"
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index e751a3c1e3d..9ea0b92f31f 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -30,7 +30,6 @@
 
 
 #include "glheader.h"
-#include "colormac.h"
 #include "context.h"
 #include "enums.h"
 #include "feedback.h"
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 89153912e23..3bce289e785 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -24,7 +24,6 @@
 
 
 #include "glheader.h"
-#include "colormac.h"
 #include "context.h"
 #include "fog.h"
 #include "macros.h"
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index e6e6a6fd1b1..5759763d4b3 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -24,10 +24,8 @@
 
 
 #include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
+#include "context.h"
 #include "histogram.h"
-#include "macros.h"
 #include "main/dispatch.h"