10 files changed, 12 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/gamma/gamma_context.c b/src/mesa/drivers/dri/gamma/gamma_context.c
index 004139d4f7..5e666c5c8c 100644
--- a/src/mesa/drivers/dri/gamma/gamma_context.c
+++ b/src/mesa/drivers/dri/gamma/gamma_context.c
@@ -49,6 +49,7 @@
 
 #include "gamma_vb.h"
 #include "gamma_tris.h"
+#include "gamma_macros.h"
 
 extern const struct tnl_pipeline_stage _gamma_render_stage;
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_dd.c b/src/mesa/drivers/dri/gamma/gamma_dd.c
index c1c371fa7c..389d2231e7 100644
--- a/src/mesa/drivers/dri/gamma/gamma_dd.c
+++ b/src/mesa/drivers/dri/gamma/gamma_dd.c
@@ -26,6 +26,7 @@
 #include "gamma_context.h"
 #include "gamma_vb.h"
 #include "gamma_lock.h"
+#include "gamma_macros.h"
 #if defined(USE_X86_ASM)
 #include "x86/common_x86_asm.h"
 #endif
diff --git a/src/mesa/drivers/dri/gamma/gamma_inithw.c b/src/mesa/drivers/dri/gamma/gamma_inithw.c
index 79b54aacb5..735acb7a57 100644
--- a/src/mesa/drivers/dri/gamma/gamma_inithw.c
+++ b/src/mesa/drivers/dri/gamma/gamma_inithw.c
@@ -25,6 +25,7 @@
  */
 
 #include "gamma_context.h"
+#include "gamma_macros.h"
 #include "glint_dri.h"
 
 void gammaInitHW( gammaContextPtr gmesa )
diff --git a/src/mesa/drivers/dri/gamma/gamma_render.c b/src/mesa/drivers/dri/gamma/gamma_render.c
index 0138ec3004..3c2fa507a9 100644
--- a/src/mesa/drivers/dri/gamma/gamma_render.c
+++ b/src/mesa/drivers/dri/gamma/gamma_render.c
@@ -31,9 +31,10 @@
 #include "main/imports.h"
 #include "main/mtypes.h"
 
-#include "tnl/tcontext.h"
+#include "tnl/t_context.h"
 
 #include "gamma_context.h"
+#include "gamma_macros.h"
 #include "gamma_tris.h"
 #include "gamma_vb.h"
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_span.c b/src/mesa/drivers/dri/gamma/gamma_span.c
index b96e49eadc..00160f760b 100644
--- a/src/mesa/drivers/dri/gamma/gamma_span.c
+++ b/src/mesa/drivers/dri/gamma/gamma_span.c
@@ -1,6 +1,7 @@
 
 #include "gamma_context.h"
 #include "gamma_lock.h"
+#include "gamma_macros.h"
 #include "main/colormac.h"
 
 #include "swrast/swrast.h"
diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 45ba521d70..c628457fba 100644
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -25,8 +25,7 @@
  */
 
 #include "gamma_context.h"
-#include "gamma_main/macros.h"
-#include "buffers.h"
+#include "gamma_macros.h"
 #include "main/macros.h"
 #include "glint_dri.h"
 #include "main/colormac.h"
diff --git a/src/mesa/drivers/dri/gamma/gamma_texmem.c b/src/mesa/drivers/dri/gamma/gamma_texmem.c
index 7df001ff6d..45a0c0148e 100644
--- a/src/mesa/drivers/dri/gamma/gamma_texmem.c
+++ b/src/mesa/drivers/dri/gamma/gamma_texmem.c
@@ -13,6 +13,7 @@
 #include "glint_dri.h"
 #include "gamma_context.h"
 #include "gamma_lock.h"
+#include "gamma_macros.h"
 
 void gammaDestroyTexObj(gammaContextPtr gmesa, gammaTextureObjectPtr t)
 {
diff --git a/src/mesa/drivers/dri/gamma/gamma_tris.c b/src/mesa/drivers/dri/gamma/gamma_tris.c
index 7899afd673..b7eab34d52 100644
--- a/src/mesa/drivers/dri/gamma/gamma_tris.c
+++ b/src/mesa/drivers/dri/gamma/gamma_tris.c
@@ -26,6 +26,7 @@
  */
 
 #include "gamma_context.h"
+#include "gamma_macros.h"
 #include "gamma_vb.h"
 #include "gamma_tris.h"
 
@@ -37,7 +38,7 @@
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tnl.h"
-#include "tnl/tcontext.h"
+#include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"
 
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_vb.c b/src/mesa/drivers/dri/gamma/gamma_vb.c
index 013f856dcd..c9c1ebf62a 100644
--- a/src/mesa/drivers/dri/gamma/gamma_vb.c
+++ b/src/mesa/drivers/dri/gamma/gamma_vb.c
@@ -32,7 +32,7 @@
 #include "main/colormac.h"
 
 #include "swrast_setup/swrast_setup.h"
-#include "tnl/tcontext.h"
+#include "tnl/t_context.h"
 #include "tnl/tnl.h"
 
 #include "gamma_context.h"
diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
index 430511e353..622121eed4 100644
--- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@ -25,6 +25,7 @@
  */
 
 #include "gamma_context.h"
+#include "gamma_macros.h"
 #include "gamma_vb.h"
 #include "main/context.h"
 #include "main/matrix.h"