#include clean-ups, fixes

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 281d68c..0686162 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -32,12 +32,9 @@
 
 #include "mtypes.h"
 #include "drm.h"
-#include "mm.h"
-#include "texmem.h"
 
 #include "intel_screen.h"
 #include "i915_drm.h"
-#include "i830_common.h"
 
 
 struct pipe_context;

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
index e07fadb..022fb66 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
@@ -38,6 +38,7 @@
 #include "intel_batchbuffer.h"
 #include "intel_winsys.h"
 
+#include "pipe/p_util.h"
 #include "pipe/i915simple/i915_winsys.h"
 
 

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index 7f788b8..9c3fd56 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -42,6 +42,7 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
+#include "pipe/p_util.h"