Mesa (master): softpipe: fix up #includes

[Brian Paul]

Module: Mesa
Branch: master
Commit: 298a0352862e748078c7c56acd2cfc96c67373d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=298a0352862e748078c7c56acd2cfc96c67373d4

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Feb 26 10:43:56 2010 -0700

softpipe: fix up #includes

---

 src/gallium/drivers/softpipe/sp_video_context.c |    8 +++++---
 src/gallium/drivers/softpipe/sp_winsys.c        |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c
index 7a3a636..272ad40 100644
--- a/src/gallium/drivers/softpipe/sp_video_context.c
+++ b/src/gallium/drivers/softpipe/sp_video_context.c
@@ -25,10 +25,12 @@
  * 
  **************************************************************************/
 
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+
 #include "sp_video_context.h"
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
-#include "softpipe/sp_texture.h"
+#include "sp_texture.h"
+
 
 static void
 sp_mpeg12_destroy(struct pipe_video_context *vpipe)
diff --git a/src/gallium/drivers/softpipe/sp_winsys.c b/src/gallium/drivers/softpipe/sp_winsys.c
index f659892..0a6245e 100644
--- a/src/gallium/drivers/softpipe/sp_winsys.c
+++ b/src/gallium/drivers/softpipe/sp_winsys.c
@@ -37,13 +37,13 @@
 
 
 #include "util/u_simple_screen.h"/* port to just p_screen */
-#include "pipe/p_format.h"
-#include "pipe/p_context.h"
 #include "util/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "softpipe/sp_winsys.h"
+#include "pipe/p_format.h"
+#include "pipe/p_context.h"
+#include "sp_winsys.h"
 
 
 struct st_softpipe_buffer