remove mesa includes

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"

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

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"

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"

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 {