mesa: trim down some #includes

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 8a0852c429c20d828a4128be344db3dabaa70783..1ee20098d38cf36e75412e0e5eb80bc96ddd4496 100644 (file)
--- 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 cf93418d10f0b6196f479a282c475a707812d3a5..f7f15cf59942764ef2e89b9c12601fb961debf23 100644 (file)
--- 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 b13b89535964fe1bd68ca6f2710c2d7ec9d36636..83d590f4a48b43e91e23cd7a03a6e124ba3a3095 100644 (file)
--- 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 42793ff4cd854c50d4f8277fccc8c21ffbbbaa35..84cd7563be4ea7ba04c23046a77687060f9cd6ee 100644 (file)
--- 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 e751a3c1e3d2efe52ba9c6299f2324875bf2da16..9ea0b92f31fa9532e87e6c4c53393d461d6f46a6 100644 (file)
--- 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 89153912e235adb6e658b8969a35118452a21ffc..3bce289e7857ba5567477029a6c6cf72149d6e33 100644 (file)
--- 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 e6e6a6fd1b1b0991814a02be90b502126321c91f..5759763d4b3aa3f61eac40ee4e1ee5f6e2fb3029 100644 (file)
--- 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"