diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 1f16c598674..81ff5672f2c 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -238,14 +238,10 @@ files_libgallium = files(
   'util/u_cache.h',
   'util/u_compute.c',
   'util/u_compute.h',
-  'util/u_debug_describe.c',
-  'util/u_debug_describe.h',
   'util/u_debug_flush.c',
   'util/u_debug_flush.h',
   'util/u_debug_image.c',
   'util/u_debug_image.h',
-  'util/u_debug_refcnt.c',
-  'util/u_debug_refcnt.h',
   'util/u_dirty_flags.h',
   'util/u_dirty_surfaces.h',
   'util/u_dl.c',
@@ -266,8 +262,6 @@ files_libgallium = files(
   'util/u_gen_mipmap.h',
   'util/u_handle_table.c',
   'util/u_handle_table.h',
-  'util/u_hash_table.c',
-  'util/u_hash_table.h',
   'util/u_helpers.c',
   'util/u_helpers.h',
   'util/u_index_modify.c',
diff --git a/src/util/meson.build b/src/util/meson.build
index 1d4f85f889f..b8c2267071b 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -117,9 +117,15 @@ files_mesa_util = files(
   'timespec.h',
   'u_atomic.c',
   'u_atomic.h',
+  'u_debug_describe.c',
+  'u_debug_describe.h',
+  'u_debug_refcnt.c',
+  'u_debug_refcnt.h',
   'u_dynarray.h',
   'u_endian.h',
   'u_fifo.h',
+  'u_hash_table.c',
+  'u_hash_table.h',
   'u_queue.c',
   'u_queue.h',
   'u_string.h',
diff --git a/src/gallium/auxiliary/util/u_debug_describe.c b/src/util/u_debug_describe.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_debug_describe.c
rename to src/util/u_debug_describe.c
diff --git a/src/gallium/auxiliary/util/u_debug_describe.h b/src/util/u_debug_describe.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_debug_describe.h
rename to src/util/u_debug_describe.h
diff --git a/src/gallium/auxiliary/util/u_debug_refcnt.c b/src/util/u_debug_refcnt.c
similarity index 99%
rename from src/gallium/auxiliary/util/u_debug_refcnt.c
rename to src/util/u_debug_refcnt.c
index a25234b46cf..06498eb6772 100644
--- a/src/gallium/auxiliary/util/u_debug_refcnt.c
+++ b/src/util/u_debug_refcnt.c
@@ -43,8 +43,7 @@
 #include "util/u_debug_symbol.h"
 #include "util/u_string.h"
 #include "util/u_hash_table.h"
-#include "os/os_thread.h"
-#include "pipe/p_config.h"
+#include "util/u_thread.h"
 
 int debug_refcnt_state;
 
diff --git a/src/gallium/auxiliary/util/u_debug_refcnt.h b/src/util/u_debug_refcnt.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_debug_refcnt.h
rename to src/util/u_debug_refcnt.h
diff --git a/src/gallium/auxiliary/util/u_hash_table.c b/src/util/u_hash_table.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_hash_table.c
rename to src/util/u_hash_table.c
diff --git a/src/gallium/auxiliary/util/u_hash_table.h b/src/util/u_hash_table.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_hash_table.h
rename to src/util/u_hash_table.h