remove mesa includes

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 8c29a51885ca4f2a39467d6359841212353d231d..292c509d196444f1f150c62c9a3a8d794fad10fd 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -26,10 +26,6 @@
  **************************************************************************/
 
 
-#include "glheader.h"
-#include "context.h"
-#include "framebuffer.h"
-
 #include "i830_dri.h"
 
 #include "intel_screen.h"

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 8f3ce026b6e28d828bc2c2ec4edc1c58fe634bb6..03c7fd263093a8efcde41188cab569f11d29120a 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -106,7 +106,7 @@ extern int __intel_debug;
 
 #define DBG(flag, ...)  do {                   \
    if (__intel_debug & (DEBUG_##flag))                 \
-      _mesa_printf(__VA_ARGS__);               \
+      printf(__VA_ARGS__);             \
 } while(0)
 
 #else

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index 9636fa998dfd8dd3a6353908d678be2971a4deff..af9b53a52b3bc4928ba9facd4fc02947d9106a3e 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -26,8 +26,6 @@
  **************************************************************************/
 
 
-#include "glheader.h"
-#include "context.h"
 #include "state_tracker/st_public.h"
 
 #include "intel_screen.h"

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index bcbb93ecb853c49b6a506138e0dc8fd84af3de85..423f126439187a75a7c3440fc029123271415b82 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -25,10 +25,6 @@
  * 
  **************************************************************************/
 
-#include "glheader.h"
-#include "context.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
 #include "utils.h"
 #include "vblank.h"
 #include "xmlpool.h"

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c
index f1358fef1a467c3c9ad7d7c9347aff950ee3bb53..5407973fba016f5c9a1b23ee399c61d77d4f0367 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c
@@ -29,12 +29,11 @@
  * Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com>
  */
 
-#include "imports.h"
 #include "intel_context.h"
 #include "intel_winsys.h"
 #include "pipe/softpipe/sp_winsys.h"
 #include "pipe/p_defines.h"
-
+#include "pipe/p_util.h"
 
 
 struct intel_softpipe_winsys {