diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 6922a12f990..10ccb815548 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -118,8 +118,6 @@ files_libgallium = files(
   'pipebuffer/pb_bufmgr_slab.c',
   'pipebuffer/pb_cache.c',
   'pipebuffer/pb_cache.h',
-  'pipebuffer/pb_slab.c',
-  'pipebuffer/pb_slab.h',
   'pipebuffer/pb_validate.c',
   'pipebuffer/pb_validate.h',
   'postprocess/filters.h',
diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h
index dba2caf2b2c..021c7081cf4 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.h
+++ b/src/gallium/drivers/iris/iris_bufmgr.h
@@ -38,7 +38,7 @@
 #include "util/list.h"
 #include "util/simple_mtx.h"
 #include "pipe/p_defines.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 #include "intel/dev/intel_device_info.h"
 
 struct intel_device_info;
diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h
index 66a3fc1200f..0c4cd093737 100644
--- a/src/gallium/drivers/zink/zink_types.h
+++ b/src/gallium/drivers/zink/zink_types.h
@@ -37,7 +37,7 @@
 #include "pipe/p_state.h"
 
 #include "pipebuffer/pb_cache.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 
 #include "util/blob.h"
 #include "util/disk_cache.h"
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
index 70085ae5ba7..3ce41e4148a 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
@@ -10,7 +10,7 @@
 #define AMDGPU_BO_H
 
 #include "amdgpu_winsys.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
index 439b3b95ffd..3e8bea950f9 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
@@ -9,7 +9,7 @@
 #define AMDGPU_WINSYS_H
 
 #include "pipebuffer/pb_cache.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 #include "winsys/radeon_winsys.h"
 #include "util/simple_mtx.h"
 #include "util/u_queue.h"
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
index 28619185e1a..7d257cad403 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
@@ -10,7 +10,7 @@
 
 #include "radeon_drm_winsys.h"
 #include "util/u_thread.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 
 struct radeon_bo {
    struct pb_buffer_lean base;
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
index 505f05ec47a..01f0bb5dd2b 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
@@ -9,7 +9,7 @@
 
 #include "winsys/radeon_winsys.h"
 #include "pipebuffer/pb_cache.h"
-#include "pipebuffer/pb_slab.h"
+#include "util/pb_slab.h"
 #include "util/u_queue.h"
 #include "util/list.h"
 #include "drm-uapi/radeon_drm.h"
diff --git a/src/util/meson.build b/src/util/meson.build
index 1fd00c38428..23b70c92d25 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -80,6 +80,8 @@ files_mesa_util = files(
   'os_misc.h',
   'os_socket.c',
   'os_socket.h',
+  'pb_slab.c',
+  'pb_slab.h',
   'ptralloc.h',
   'perf/u_trace.h',
   'perf/u_trace.c',
diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.c b/src/util/pb_slab.c
similarity index 100%
rename from src/gallium/auxiliary/pipebuffer/pb_slab.c
rename to src/util/pb_slab.c
diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.h b/src/util/pb_slab.h
similarity index 100%
rename from src/gallium/auxiliary/pipebuffer/pb_slab.h
rename to src/util/pb_slab.h