Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / mesa / main / convolve.h

diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 0277917433dafb3839b53a2da799764c54c15927..7dc0a48b74d8cc2d7f89dcd87050fd5aca090077 100644 (file)
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -28,7 +28,10 @@
 #define CONVOLVE_H
 
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
 
 
 #if FEATURE_convolve
@@ -38,8 +41,6 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_convolve */
 
-#include "main/compiler.h"
-
 static INLINE void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 {