From 4e0b38958d5227a20653fb37da8f7621afe6402c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 5 Nov 2007 08:47:48 -0700
Subject: remove mesa includes

---
 src/mesa/drivers/dri/intel_winsys/intel_context.c         | 4 ----
 src/mesa/drivers/dri/intel_winsys/intel_context.h         | 2 +-
 src/mesa/drivers/dri/intel_winsys/intel_lock.c            | 2 --
 src/mesa/drivers/dri/intel_winsys/intel_screen.c          | 4 ----
 src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c | 3 +--
 5 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/mesa/drivers')

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 8c29a51885..292c509d19 100644
--- 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 8f3ce026b6..03c7fd2630 100644
--- 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 9636fa998d..af9b53a52b 100644
--- 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 bcbb93ecb8..423f126439 100644
--- 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 f1358fef1a..5407973fba 100644
--- 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 {
-- 
cgit v1.2.3