gallium: Remove unnecessary includes. Add others to compensate.

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 6a9018aa3a021b24f21210ae6691513bb468cf69..b02d3ffe437b2285af596c86e8f30f31bb8a7f1c 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -38,6 +38,7 @@
 #include "xf86_ansic.h"
 #include "xf86_libc.h"
 #endif
+#include <stddef.h>
 
 
 #if defined(_WIN32) && !defined(__WIN32__)

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 6bfff1cc59ca847c10c891e87087c5c8efb24175..2894e13e7dff63fe44db2183562e0080d1f9b89c 100644 (file)
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -31,10 +31,6 @@
 
 #include "p_compiler.h"
 
-/* FIXME: remove these header dependencies */
-#include "util/u_debug.h"
-#include "util/u_string.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/gallium/include/pipe/p_refcnt.h b/src/gallium/include/pipe/p_refcnt.h
index c1c7415e023f974370b09e95ab67d129e952a63d..468e8d87f9e695417855564136a0edfe85105add 100644 (file)
--- a/src/gallium/include/pipe/p_refcnt.h
+++ b/src/gallium/include/pipe/p_refcnt.h
@@ -31,6 +31,7 @@
 
 #include "p_defines.h"
 #include "p_atomic.h"
+#include "util/u_debug.h" /* FIXME: remove this */
 
 
 #ifdef __cplusplus

diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index b85f01c2b02c66fb4843ca895f0b8dc733980949..86293821192b9b3d09e1afc459fa5c8e9a2731cc 100644 (file)
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -30,7 +30,6 @@
 
 /* u_reduce_video_profile() needs these */
 #include <pipe/p_compiler.h>
-#include <util/u_debug.h>
 
 #include <pipe/p_defines.h>
 #include <pipe/p_format.h>