diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 79bd5af87cb..8094a9623f7 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -201,7 +201,6 @@ files_libgallium = files(
   'translate/translate_cache.h',
   'translate/translate_generic.c',
   'translate/translate_sse.c',
-  'util/dbghelp.h',
   'util/u_async_debug.h',
   'util/u_async_debug.c',
   'util/u_bitcast.h',
@@ -245,7 +244,6 @@ files_libgallium = files(
   'util/u_live_shader_cache.h',
   'util/u_log.c',
   'util/u_log.h',
-  'util/u_pack_color.h',
   'util/u_prim.h',
   'util/u_prim.c',
   'util/u_prim_restart.c',
diff --git a/src/panfrost/lib/pan_clear.c b/src/panfrost/lib/pan_clear.c
index b1a8533a8ee..eed14e3c2a3 100644
--- a/src/panfrost/lib/pan_clear.c
+++ b/src/panfrost/lib/pan_clear.c
@@ -26,9 +26,9 @@
 #include "genxml/gen_macros.h"
 
 #include <string.h>
-#include "gallium/auxiliary/util/u_pack_color.h"
 #include "util/format_srgb.h"
 #include "util/rounding.h"
+#include "util/u_pack_color.h"
 #include "pan_format.h"
 #include "pan_util.h"
 
diff --git a/src/gallium/auxiliary/util/dbghelp.h b/src/util/dbghelp.h
similarity index 100%
rename from src/gallium/auxiliary/util/dbghelp.h
rename to src/util/dbghelp.h
diff --git a/src/util/meson.build b/src/util/meson.build
index 47416f983ae..f4946d7843b 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -154,6 +154,7 @@ files_mesa_util = files(
   'u_memset.h',
   'u_mm.c',
   'u_mm.h',
+  'u_pack_color.h',
   'u_debug.c',
   'u_debug.h',
   'u_debug_memory.c',
@@ -232,8 +233,9 @@ deps_for_libmesa_util = [
 if with_platform_android
   deps_for_libmesa_util += dep_android
   files_debug_stack = files('u_debug_stack_android.cpp')
- else
+else
   files_debug_stack = files(
+    'dbghelp.h',
     'u_debug_stack.c',
     'u_debug_symbol.c',
     'u_debug_symbol.h',
diff --git a/src/gallium/auxiliary/util/u_pack_color.h b/src/util/u_pack_color.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_pack_color.h
rename to src/util/u_pack_color.h