84 files changed, 70 insertions, 66 deletions
diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
index c0345a9cb54..58df6c50093 100644
--- a/src/gallium/drivers/Makefile
+++ b/src/gallium/drivers/Makefile
@@ -6,7 +6,8 @@ ifeq ($(CONFIG_NAME), linux-cell)
 CELL_DIR = cell
 endif
 
-SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
+SUBDIRS = softpipe i915simple i965simple nv30 nv40 nv50 \
+	  failover pipebuffer $(CELL_DIR)
 
 
 default: subdirs
diff --git a/src/mesa/pipe/nouveau/nouveau_bo.h b/src/gallium/drivers/nouveau/nouveau_bo.h
index 18020e9c652..18020e9c652 100644
--- a/src/mesa/pipe/nouveau/nouveau_bo.h
+++ b/src/gallium/drivers/nouveau/nouveau_bo.h
diff --git a/src/mesa/pipe/nouveau/nouveau_channel.h b/src/gallium/drivers/nouveau/nouveau_channel.h
index b99de9add86..b99de9add86 100644
--- a/src/mesa/pipe/nouveau/nouveau_channel.h
+++ b/src/gallium/drivers/nouveau/nouveau_channel.h
diff --git a/src/mesa/pipe/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
index 5998945677b..5998945677b 100644
--- a/src/mesa/pipe/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
diff --git a/src/mesa/pipe/nouveau/nouveau_gldefs.h b/src/gallium/drivers/nouveau/nouveau_gldefs.h
index e1015c93a27..e1015c93a27 100644
--- a/src/mesa/pipe/nouveau/nouveau_gldefs.h
+++ b/src/gallium/drivers/nouveau/nouveau_gldefs.h
diff --git a/src/mesa/pipe/nouveau/nouveau_grobj.h b/src/gallium/drivers/nouveau/nouveau_grobj.h
index 8f5abf90514..8f5abf90514 100644
--- a/src/mesa/pipe/nouveau/nouveau_grobj.h
+++ b/src/gallium/drivers/nouveau/nouveau_grobj.h
diff --git a/src/mesa/pipe/nouveau/nouveau_notifier.h b/src/gallium/drivers/nouveau/nouveau_notifier.h
index 35adde1e324..35adde1e324 100644
--- a/src/mesa/pipe/nouveau/nouveau_notifier.h
+++ b/src/gallium/drivers/nouveau/nouveau_notifier.h
diff --git a/src/mesa/pipe/nouveau/nouveau_push.h b/src/gallium/drivers/nouveau/nouveau_push.h
index 679472669b9..c5c5d988d58 100644
--- a/src/mesa/pipe/nouveau/nouveau_push.h
+++ b/src/gallium/drivers/nouveau/nouveau_push.h
@@ -1,7 +1,7 @@
 #ifndef __NOUVEAU_PUSH_H__
 #define __NOUVEAU_PUSH_H__
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 
 #ifndef NOUVEAU_PUSH_CONTEXT
 #error undefined push context
diff --git a/src/mesa/pipe/nouveau/nouveau_pushbuf.h b/src/gallium/drivers/nouveau/nouveau_pushbuf.h
index 19097650982..19097650982 100644
--- a/src/mesa/pipe/nouveau/nouveau_pushbuf.h
+++ b/src/gallium/drivers/nouveau/nouveau_pushbuf.h
diff --git a/src/mesa/pipe/nouveau/nouveau_resource.h b/src/gallium/drivers/nouveau/nouveau_resource.h
index 1af7961d301..1af7961d301 100644
--- a/src/mesa/pipe/nouveau/nouveau_resource.h
+++ b/src/gallium/drivers/nouveau/nouveau_resource.h
diff --git a/src/mesa/pipe/nouveau/nouveau_stateobj.h b/src/gallium/drivers/nouveau/nouveau_stateobj.h
index 07c31b014a5..07c31b014a5 100644
--- a/src/mesa/pipe/nouveau/nouveau_stateobj.h
+++ b/src/gallium/drivers/nouveau/nouveau_stateobj.h
diff --git a/src/mesa/pipe/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 818ae9afae2..b5e470cfaa4 100644
--- a/src/mesa/pipe/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -5,13 +5,13 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 
-#include "pipe/nouveau/nouveau_bo.h"
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_class.h"
-#include "pipe/nouveau/nouveau_grobj.h"
-#include "pipe/nouveau/nouveau_notifier.h"
-#include "pipe/nouveau/nouveau_resource.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_bo.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_class.h"
+#include "nouveau/nouveau_grobj.h"
+#include "nouveau/nouveau_notifier.h"
+#include "nouveau/nouveau_resource.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 struct nouveau_winsys {
 	struct nouveau_context *nv;
diff --git a/src/mesa/pipe/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index dd4b7e73cda..b7c252fc986 100644
--- a/src/mesa/pipe/nv30/Makefile
+++ b/src/gallium/drivers/nv30/Makefile
@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 
diff --git a/src/mesa/pipe/nv30/nv30_clear.c b/src/gallium/drivers/nv30/nv30_clear.c
index 71f413588ee..71f413588ee 100644
--- a/src/mesa/pipe/nv30/nv30_clear.c
+++ b/src/gallium/drivers/nv30/nv30_clear.c
diff --git a/src/mesa/pipe/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index d12aab85d8c..e9afeb80176 100644
--- a/src/mesa/pipe/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_context.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"
diff --git a/src/mesa/pipe/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index f6c69545991..d6d16ee8686 100644
--- a/src/mesa/pipe/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -5,14 +5,14 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv30_context *ctx = nv30
-#include "pipe/nouveau/nouveau_push.h"
+#include "nouveau/nouveau_push.h"
 
 #include "nv30_state.h"
 
diff --git a/src/mesa/pipe/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
index bdeb975ca1e..59a72657996 100644
--- a/src/mesa/pipe/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nv30/nv30_draw.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv30_context.h"
diff --git a/src/mesa/pipe/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
index 0db1ac868c7..09ad555c324 100644
--- a/src/mesa/pipe/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -4,8 +4,8 @@
 #include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
-#include "pipe/tgsi/util/tgsi_util.h"
+#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_util.h"
 
 #include "nv30_context.h"
 
diff --git a/src/mesa/pipe/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
index 45ee6db8d6a..45ee6db8d6a 100644
--- a/src/mesa/pipe/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
diff --git a/src/mesa/pipe/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index 5fb89f4cfdc..5fb89f4cfdc 100644
--- a/src/mesa/pipe/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
diff --git a/src/mesa/pipe/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
index 71fdcfa24df..71fdcfa24df 100644
--- a/src/mesa/pipe/nv30/nv30_query.c
+++ b/src/gallium/drivers/nv30/nv30_query.c
diff --git a/src/mesa/pipe/nv30/nv30_shader.h b/src/gallium/drivers/nv30/nv30_shader.h
index dd3a36f78f3..dd3a36f78f3 100644
--- a/src/mesa/pipe/nv30/nv30_shader.h
+++ b/src/gallium/drivers/nv30/nv30_shader.h
diff --git a/src/mesa/pipe/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 53368561e07..53368561e07 100644
--- a/src/mesa/pipe/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
diff --git a/src/mesa/pipe/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index 233600f69ab..233600f69ab 100644
--- a/src/mesa/pipe/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
diff --git a/src/mesa/pipe/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index 70b98836f0f..70b98836f0f 100644
--- a/src/mesa/pipe/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
diff --git a/src/mesa/pipe/nv30/nv30_surface.c b/src/gallium/drivers/nv30/nv30_surface.c
index 31745e3d6e8..974965679f5 100644
--- a/src/mesa/pipe/nv30/nv30_surface.c
+++ b/src/gallium/drivers/nv30/nv30_surface.c
@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static boolean
 nv30_surface_format_supported(struct pipe_context *pipe,
@@ -104,9 +104,10 @@ nv30_get_tex_surface(struct pipe_context *pipe, struct pipe_texture *pt,
 }
 
 static void
-nv30_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv30_surface_copy(struct pipe_context *pipe, unsigned do_flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
 	struct nouveau_winsys *nvws = nv30->nvws;
diff --git a/src/mesa/pipe/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index 57fb9bc8a57..9e00cdac3fb 100644
--- a/src/mesa/pipe/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -5,8 +5,8 @@
 #include "nv30_context.h"
 #include "nv30_state.h"
 
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 static INLINE int
 nv30_vbo_ncomp(uint format)
diff --git a/src/mesa/pipe/nv30/nv30_vertprog.c b/src/gallium/drivers/nv30/nv30_vertprog.c
index c96210d3fa7..4a8269d5dd7 100644
--- a/src/mesa/pipe/nv30/nv30_vertprog.c
+++ b/src/gallium/drivers/nv30/nv30_vertprog.c
@@ -4,7 +4,7 @@
 #include "pipe/p_util.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_parse.h"
 
 #include "nv30_context.h"
 #include "nv30_state.h"
diff --git a/src/mesa/pipe/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
index c9c3a8032e5..2a9de4a2dcb 100644
--- a/src/mesa/pipe/nv40/Makefile
+++ b/src/gallium/drivers/nv40/Makefile
@@ -23,7 +23,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 
diff --git a/src/mesa/pipe/nv40/nv40_clear.c b/src/gallium/drivers/nv40/nv40_clear.c
index 2c4e8f01fda..2c4e8f01fda 100644
--- a/src/mesa/pipe/nv40/nv40_clear.c
+++ b/src/gallium/drivers/nv40/nv40_clear.c
diff --git a/src/mesa/pipe/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index 6e86ca00816..8b5cc693de0 100644
--- a/src/mesa/pipe/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"
diff --git a/src/mesa/pipe/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index cf2a14405a4..f511759e3be 100644
--- a/src/mesa/pipe/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -5,15 +5,15 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv40_channel_context *ctx = nv40->hw
-#include "pipe/nouveau/nouveau_push.h"
-#include "pipe/nouveau/nouveau_stateobj.h"
+#include "nouveau/nouveau_push.h"
+#include "nouveau/nouveau_stateobj.h"
 
 #include "nv40_state.h"
 
diff --git a/src/mesa/pipe/nv40/nv40_dma.h b/src/gallium/drivers/nv40/nv40_dma.h
index 1fb82677689..1fb82677689 100644
--- a/src/mesa/pipe/nv40/nv40_dma.h
+++ b/src/gallium/drivers/nv40/nv40_dma.h
diff --git a/src/mesa/pipe/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index d361d5f07d9..a39bb85e99b 100644
--- a/src/mesa/pipe/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv40_context.h"
diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/gallium/drivers/nv40/nv40_fragprog.c
index 7487fb896f3..07a418c1e9f 100644
--- a/src/mesa/pipe/nv40/nv40_fragprog.c
+++ b/src/gallium/drivers/nv40/nv40_fragprog.c
@@ -3,8 +3,8 @@
 #include "pipe/p_state.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
-#include "pipe/tgsi/util/tgsi_util.h"
+#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_util.h"
 
 #include "nv40_context.h"
 
diff --git a/src/mesa/pipe/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c
index 5af5fbe7465..5af5fbe7465 100644
--- a/src/mesa/pipe/nv40/nv40_fragtex.c
+++ b/src/gallium/drivers/nv40/nv40_fragtex.c
diff --git a/src/mesa/pipe/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index 92e6b3a43df..92e6b3a43df 100644
--- a/src/mesa/pipe/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
diff --git a/src/mesa/pipe/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
index 8bca2788b93..8bca2788b93 100644
--- a/src/mesa/pipe/nv40/nv40_query.c
+++ b/src/gallium/drivers/nv40/nv40_query.c
diff --git a/src/mesa/pipe/nv40/nv40_shader.h b/src/gallium/drivers/nv40/nv40_shader.h
index 5909c70713c..5909c70713c 100644
--- a/src/mesa/pipe/nv40/nv40_shader.h
+++ b/src/gallium/drivers/nv40/nv40_shader.h
diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index 713f31dbb12..713f31dbb12 100644
--- a/src/mesa/pipe/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
diff --git a/src/mesa/pipe/nv40/nv40_state.h b/src/gallium/drivers/nv40/nv40_state.h
index e82ab9de98a..e82ab9de98a 100644
--- a/src/mesa/pipe/nv40/nv40_state.h
+++ b/src/gallium/drivers/nv40/nv40_state.h
diff --git a/src/mesa/pipe/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index a10c9955480..a10c9955480 100644
--- a/src/mesa/pipe/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
diff --git a/src/mesa/pipe/nv40/nv40_surface.c b/src/gallium/drivers/nv40/nv40_surface.c
index d8f87d9adc2..9726ab4e4dc 100644
--- a/src/mesa/pipe/nv40/nv40_surface.c
+++ b/src/gallium/drivers/nv40/nv40_surface.c
@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static boolean
 nv40_surface_format_supported(struct pipe_context *pipe,
@@ -104,9 +104,10 @@ nv40_get_tex_surface(struct pipe_context *pipe, struct pipe_texture *pt,
 }
 
 static void
-nv40_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv40_surface_copy(struct pipe_context *pipe, unsigned do_flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv40_context *nv40 = nv40_context(pipe);
 	struct nouveau_winsys *nvws = nv40->nvws;
diff --git a/src/mesa/pipe/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
index 6b1ac65b49e..fa827ef0c5d 100644
--- a/src/mesa/pipe/nv40/nv40_vbo.c
+++ b/src/gallium/drivers/nv40/nv40_vbo.c
@@ -5,8 +5,8 @@
 #include "nv40_context.h"
 #include "nv40_state.h"
 
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 static INLINE int
 nv40_vbo_ncomp(uint format)
diff --git a/src/mesa/pipe/nv40/nv40_vertprog.c b/src/gallium/drivers/nv40/nv40_vertprog.c
index d57e3ca350b..9f4738b8308 100644
--- a/src/mesa/pipe/nv40/nv40_vertprog.c
+++ b/src/gallium/drivers/nv40/nv40_vertprog.c
@@ -3,7 +3,7 @@
 #include "pipe/p_state.h"
 
 #include "pipe/p_shader_tokens.h"
-#include "pipe/tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_parse.h"
 
 #include "nv40_context.h"
 #include "nv40_state.h"
diff --git a/src/mesa/pipe/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
index d3d011b14b7..68eb49ff2a3 100644
--- a/src/mesa/pipe/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -19,7 +19,7 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-include ../Makefile.template
+include ../../Makefile.template
 
 symlinks:
 
diff --git a/src/mesa/pipe/nv50/nv50_clear.c b/src/gallium/drivers/nv50/nv50_clear.c
index 552b92f72e2..552b92f72e2 100644
--- a/src/mesa/pipe/nv50/nv50_clear.c
+++ b/src/gallium/drivers/nv50/nv50_clear.c
diff --git a/src/mesa/pipe/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 33c8eebb0bc..3c5a54bfd38 100644
--- a/src/mesa/pipe/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_context.h"
+#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_util.h"
diff --git a/src/mesa/pipe/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 5491c0cbb5d..b99254f6191 100644
--- a/src/mesa/pipe/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -5,14 +5,14 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 
-#include "pipe/draw/draw_vertex.h"
+#include "draw/draw_vertex.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
+#include "nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_gldefs.h"
 
 #define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
 	struct nv50_context *ctx = nv50
-#include "pipe/nouveau/nouveau_push.h"
+#include "nouveau/nouveau_push.h"
 
 #include "nv50_state.h"
 
diff --git a/src/mesa/pipe/nv50/nv50_draw.c b/src/gallium/drivers/nv50/nv50_draw.c
index 85d347f5e00..c6ed6838c6a 100644
--- a/src/mesa/pipe/nv50/nv50_draw.c
+++ b/src/gallium/drivers/nv50/nv50_draw.c
@@ -1,4 +1,4 @@
-#include "pipe/draw/draw_private.h"
+#include "draw/draw_private.h"
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"
diff --git a/src/mesa/pipe/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 0c034ed4387..0c034ed4387 100644
--- a/src/mesa/pipe/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index d8c3491c2c5..d8c3491c2c5 100644
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
diff --git a/src/mesa/pipe/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 99dcab51b26..99dcab51b26 100644
--- a/src/mesa/pipe/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
diff --git a/src/mesa/pipe/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_state.h
index a3b781d4c61..a3b781d4c61 100644
--- a/src/mesa/pipe/nv50/nv50_state.h
+++ b/src/gallium/drivers/nv50/nv50_state.h
diff --git a/src/mesa/pipe/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index cfb370da77e..ca92ff02b89 100644
--- a/src/mesa/pipe/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -31,7 +31,7 @@
 #include "pipe/p_util.h"
 #include "pipe/p_winsys.h"
 #include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
+#include "util/p_tile.h"
 
 static struct pipe_surface *
 nv50_get_tex_surface(struct pipe_context *pipe,
@@ -43,9 +43,10 @@ nv50_get_tex_surface(struct pipe_context *pipe,
 }
 
 static void
-nv50_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+nv50_surface_copy(struct pipe_context *pipe, unsigned flip,
+		  struct pipe_surface *dest, unsigned destx, unsigned desty,
+		  struct pipe_surface *src, unsigned srcx, unsigned srcy,
+		  unsigned width, unsigned height)
 {
 	struct nv50_context *nv50 = (struct nv50_context *)pipe;
 	struct nouveau_winsys *nvws = nv50->nvws;
diff --git a/src/mesa/pipe/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 6c0dc23a439..6c0dc23a439 100644
--- a/src/mesa/pipe/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/gallium/winsys/dri/nouveau/Makefile
index 98ec5a79f5d..b463f218fd5 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/src/gallium/winsys/dri/nouveau/Makefile
@@ -7,10 +7,10 @@ LIBNAME = nouveau_dri.so
 MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
-	$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
-	$(TOP)/src/mesa/pipe/nv30/libnv30.a \
-	$(TOP)/src/mesa/pipe/nv40/libnv40.a \
-	$(TOP)/src/mesa/pipe/nv50/libnv50.a
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
+	$(TOP)/src/gallium/drivers/nv40/libnv40.a \
+	$(TOP)/src/gallium/drivers/nv50/libnv50.a
 
 DRIVER_SOURCES = \
 	nouveau_bo.c \
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c b/src/gallium/winsys/dri/nouveau/nouveau_bo.c
index 6887ffa6886..6887ffa6886 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_bo.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_channel.c b/src/gallium/winsys/dri/nouveau/nouveau_channel.c
index df80d04add5..df80d04add5 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_channel.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_channel.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.c b/src/gallium/winsys/dri/nouveau/nouveau_context.c
index 01fada5b89b..01fada5b89b 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.h b/src/gallium/winsys/dri/nouveau/nouveau_context.h
index 7a74f7deecd..5805f969ba8 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_context.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.h
@@ -4,7 +4,7 @@
 #include "dri_util.h"
 #include "xmlconfig.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 #include "nouveau_device.h"
 #include "nouveau_drmif.h"
 #include "nouveau_dma.h"
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.c b/src/gallium/winsys/dri/nouveau/nouveau_device.c
index 409e4415f76..409e4415f76 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_device.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.h b/src/gallium/winsys/dri/nouveau/nouveau_device.h
index 744a89f74bf..744a89f74bf 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_device.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_device.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c b/src/gallium/winsys/dri/nouveau/nouveau_dma.c
index f8a8ba04f6d..f8a8ba04f6d 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_dma.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.h b/src/gallium/winsys/dri/nouveau/nouveau_dma.h
index cfa6d26e828..cfa6d26e828 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_dma.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dri.h b/src/gallium/winsys/dri/nouveau/nouveau_dri.h
index 1207c2d609c..1207c2d609c 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dri.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_dri.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_drmif.h b/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
index 67e19f1cfe8..37e404fc6cb 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_drmif.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
@@ -28,12 +28,12 @@
 #include <nouveau_drm.h>
 
 #include "nouveau_device.h"
-#include "pipe/nouveau/nouveau_channel.h"
-#include "pipe/nouveau/nouveau_grobj.h"
-#include "pipe/nouveau/nouveau_notifier.h"
-#include "pipe/nouveau/nouveau_bo.h"
-#include "pipe/nouveau/nouveau_resource.h"
-#include "pipe/nouveau/nouveau_pushbuf.h"
+#include "nouveau/nouveau_channel.h"
+#include "nouveau/nouveau_grobj.h"
+#include "nouveau/nouveau_notifier.h"
+#include "nouveau/nouveau_bo.h"
+#include "nouveau/nouveau_resource.h"
+#include "nouveau/nouveau_pushbuf.h"
 
 struct nouveau_device_priv {
 	struct nouveau_device base;
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c b/src/gallium/winsys/dri/nouveau/nouveau_fence.c
index 7714e6f2485..7714e6f2485 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_fence.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_grobj.c b/src/gallium/winsys/dri/nouveau/nouveau_grobj.c
index 55dfeb99aa7..55dfeb99aa7 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_grobj.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_grobj.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_local.h b/src/gallium/winsys/dri/nouveau/nouveau_local.h
index 59febca2929..59febca2929 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_local.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_local.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_lock.c b/src/gallium/winsys/dri/nouveau/nouveau_lock.c
index 9adb9ac8547..9adb9ac8547 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_lock.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_lock.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_notifier.c b/src/gallium/winsys/dri/nouveau/nouveau_notifier.c
index 01e8f38440e..01e8f38440e 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_notifier.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_notifier.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_pushbuf.c b/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
index 7d5eddb92ff..7d5eddb92ff 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_pushbuf.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_resource.c b/src/gallium/winsys/dri/nouveau/nouveau_resource.c
index 5d9d578b4fe..5d9d578b4fe 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_resource.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_resource.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.c b/src/gallium/winsys/dri/nouveau/nouveau_screen.c
index f06e1784831..f06e1784831 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_screen.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.h b/src/gallium/winsys/dri/nouveau/nouveau_screen.h
index 019823bd44d..019823bd44d 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_screen.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_screen.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.c b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c
index 91bf243f424..91bf243f424 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.h b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h
index 825d3da6da5..825d3da6da5 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_swapbuffers.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 1494bd48dd4..2ca05d84c60 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -3,7 +3,7 @@
 #include "nouveau_context.h"
 #include "nouveau_winsys_pipe.h"
 
-#include "pipe/nouveau/nouveau_winsys.h"
+#include "nouveau/nouveau_winsys.h"
 
 static int
 nouveau_pipe_notifier_alloc(struct nouveau_winsys *nvws, int count,
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
index e1a9271395b..e1a9271395b 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.h b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h
index 6a03ac0d773..6a03ac0d773 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_pipe.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_softpipe.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
index 3908c175088..0e1b4273d1e 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys_softpipe.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
@@ -33,7 +33,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_format.h"
-#include "pipe/softpipe/sp_winsys.h"
+#include "softpipe/sp_winsys.h"
 
 #include "nouveau_context.h"
 #include "nouveau_winsys_pipe.h"
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv04_surface.c b/src/gallium/winsys/dri/nouveau/nv04_surface.c
index fe1ea4ed70f..fe1ea4ed70f 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nv04_surface.c
+++ b/src/gallium/winsys/dri/nouveau/nv04_surface.c
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv50_surface.c b/src/gallium/winsys/dri/nouveau/nv50_surface.c
index 15a10028613..15a10028613 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nv50_surface.c
+++ b/src/gallium/winsys/dri/nouveau/nv50_surface.c