27 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/winsys/dri/nouveau/Makefile b/src/gallium/winsys/drm/nouveau/Makefile
index be630ff6d1..be630ff6d1 100644
--- a/src/gallium/winsys/dri/nouveau/Makefile
+++ b/src/gallium/winsys/drm/nouveau/Makefile
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_bo.c b/src/gallium/winsys/drm/nouveau/nouveau_bo.c
index b5942994d9..b5942994d9 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_bo.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_bo.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_channel.c b/src/gallium/winsys/drm/nouveau/nouveau_channel.c
index 3b4dcd1ecf..3b4dcd1ecf 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_channel.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_channel.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.c b/src/gallium/winsys/drm/nouveau/nouveau_context.c
index 74413c408f..74413c408f 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_context.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.h b/src/gallium/winsys/drm/nouveau/nouveau_context.h
index 77e2147a2c..77e2147a2c 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_context.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_device.c b/src/gallium/winsys/drm/nouveau/nouveau_device.c
index 0b452fcd02..0b452fcd02 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_device.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_device.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dma.c b/src/gallium/winsys/drm/nouveau/nouveau_dma.c
index f8a8ba04f6..f8a8ba04f6 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dma.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dma.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dma.h b/src/gallium/winsys/drm/nouveau/nouveau_dma.h
index cfa6d26e82..cfa6d26e82 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dma.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dma.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_dri.h b/src/gallium/winsys/drm/nouveau/nouveau_dri.h
index 1207c2d609..1207c2d609 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_dri.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_dri.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h b/src/gallium/winsys/drm/nouveau/nouveau_drmif.h
index dcd6a5eb0a..dcd6a5eb0a 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_drmif.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_fence.c b/src/gallium/winsys/drm/nouveau/nouveau_fence.c
index e7b0b4ff07..e7b0b4ff07 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_fence.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_fence.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_grobj.c b/src/gallium/winsys/drm/nouveau/nouveau_grobj.c
index 51523897d5..51523897d5 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_grobj.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_grobj.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_local.h b/src/gallium/winsys/drm/nouveau/nouveau_local.h
index e878a40803..e878a40803 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_local.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_local.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_lock.c b/src/gallium/winsys/drm/nouveau/nouveau_lock.c
index 9adb9ac854..9adb9ac854 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_lock.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_lock.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_notifier.c b/src/gallium/winsys/drm/nouveau/nouveau_notifier.c
index 01e8f38440..01e8f38440 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_notifier.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_notifier.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c b/src/gallium/winsys/drm/nouveau/nouveau_pushbuf.c
index 815046ba85..815046ba85 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_pushbuf.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_resource.c b/src/gallium/winsys/drm/nouveau/nouveau_resource.c
index 3bbcb5c45e..3bbcb5c45e 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_resource.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_resource.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.c b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
index df1fe7e69b..df1fe7e69b 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.h b/src/gallium/winsys/drm/nouveau/nouveau_screen.h
index 388d6be9bb..388d6be9bb 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_screen.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.c
index 70e0104e83..70e0104e83 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.c
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.h
index 825d3da6da..825d3da6da 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_swapbuffers.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_swapbuffers.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
index 5eabbc8893..0878840dcc 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
@@ -1,4 +1,4 @@
-#include "pipe/p_util.h"
+#include "util/u_memory.h"
 
 #include "nouveau_context.h"
 #include "nouveau_screen.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
index 8a2870a2ff..5276806de6 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.c
@@ -1,8 +1,9 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
 
+#include "util/u_memory.h"
+
 #include "nouveau_context.h"
 #include "nouveau_local.h"
 #include "nouveau_screen.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.h
index 6a03ac0d77..6a03ac0d77 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.h
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_pipe.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys_softpipe.c
index 704f6c7750..704f6c7750 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_softpipe.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys_softpipe.c
diff --git a/src/gallium/winsys/dri/nouveau/nv04_surface.c b/src/gallium/winsys/drm/nouveau/nv04_surface.c
index 8fa3d106c8..8fa3d106c8 100644
--- a/src/gallium/winsys/dri/nouveau/nv04_surface.c
+++ b/src/gallium/winsys/drm/nouveau/nv04_surface.c
diff --git a/src/gallium/winsys/dri/nouveau/nv50_surface.c b/src/gallium/winsys/drm/nouveau/nv50_surface.c
index c8ab7f690f..c8ab7f690f 100644
--- a/src/gallium/winsys/dri/nouveau/nv50_surface.c
+++ b/src/gallium/winsys/drm/nouveau/nv50_surface.c