diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 868bb327242..169d481734c 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -120,10 +120,6 @@ files_libgallium = files(
   'hud/hud_driver_query.c',
   'hud/hud_fps.c',
   'hud/hud_private.h',
-  'indices/u_indices.h',
-  'indices/u_indices_priv.h',
-  'indices/u_primconvert.c',
-  'indices/u_primconvert.h',
   'os/os_mman.h',
   'os/os_process.c',
   'os/os_process.h',
@@ -506,29 +502,13 @@ idep_u_tracepoints = declare_dependency(
   sources: files_u_tracepoints,
 )
 
-u_indices_gen_c = custom_target(
-  'u_indices_gen.c',
-  input : 'indices/u_indices_gen.py',
-  output : 'u_indices_gen.c',
-  command : [prog_python, '@INPUT@'],
-  capture : true,
-)
-
-u_unfilled_gen_c = custom_target(
-  'u_unfilled_gen.c',
-  input : 'indices/u_unfilled_gen.py',
-  output : 'u_unfilled_gen.c',
-  command : [prog_python, '@INPUT@'],
-  capture : true,
-)
-
 libgallium_extra_c_args = []
 if with_swrast_vk and with_gallium_zink
   libgallium_extra_c_args += '-DZINK_WITH_SWRAST_VK'
 endif
 libgallium = static_library(
   'gallium',
-  [files_libgallium, u_indices_gen_c, u_unfilled_gen_c],
+  [files_libgallium],
   include_directories : [
     inc_loader, inc_gallium, inc_src, inc_include, include_directories('util')
   ],
diff --git a/src/gallium/auxiliary/indices/u_indices.c b/src/util/indices/u_indices.c
similarity index 100%
rename from src/gallium/auxiliary/indices/u_indices.c
rename to src/util/indices/u_indices.c
diff --git a/src/gallium/auxiliary/indices/u_indices.h b/src/util/indices/u_indices.h
similarity index 100%
rename from src/gallium/auxiliary/indices/u_indices.h
rename to src/util/indices/u_indices.h
diff --git a/src/gallium/auxiliary/indices/u_indices_gen.py b/src/util/indices/u_indices_gen.py
similarity index 100%
rename from src/gallium/auxiliary/indices/u_indices_gen.py
rename to src/util/indices/u_indices_gen.py
diff --git a/src/gallium/auxiliary/indices/u_indices_priv.h b/src/util/indices/u_indices_priv.h
similarity index 100%
rename from src/gallium/auxiliary/indices/u_indices_priv.h
rename to src/util/indices/u_indices_priv.h
diff --git a/src/gallium/auxiliary/indices/u_primconvert.c b/src/util/indices/u_primconvert.c
similarity index 100%
rename from src/gallium/auxiliary/indices/u_primconvert.c
rename to src/util/indices/u_primconvert.c
diff --git a/src/gallium/auxiliary/indices/u_primconvert.h b/src/util/indices/u_primconvert.h
similarity index 100%
rename from src/gallium/auxiliary/indices/u_primconvert.h
rename to src/util/indices/u_primconvert.h
diff --git a/src/gallium/auxiliary/indices/u_unfilled_gen.py b/src/util/indices/u_unfilled_gen.py
similarity index 100%
rename from src/gallium/auxiliary/indices/u_unfilled_gen.py
rename to src/util/indices/u_unfilled_gen.py
diff --git a/src/gallium/auxiliary/indices/u_unfilled_indices.c b/src/util/indices/u_unfilled_indices.c
similarity index 100%
rename from src/gallium/auxiliary/indices/u_unfilled_indices.c
rename to src/util/indices/u_unfilled_indices.c
diff --git a/src/util/meson.build b/src/util/meson.build
index 92ed937622f..8a3cb548554 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -150,6 +150,10 @@ files_mesa_util = files(
   'vma.c',
   'vma.h',
   'xxhash.h',
+  'indices/u_indices.h',
+  'indices/u_indices_priv.h',
+  'indices/u_primconvert.c',
+  'indices/u_primconvert.h',
 )
 
 files_drirc = files('00-mesa-defaults.conf')
@@ -227,9 +231,25 @@ endif
 
 u_trace_py = files('perf/u_trace.py')
 
+u_indices_gen_c = custom_target(
+  'u_indices_gen.c',
+  input : 'indices/u_indices_gen.py',
+  output : 'u_indices_gen.c',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
+)
+
+u_unfilled_gen_c = custom_target(
+  'u_unfilled_gen.c',
+  input : 'indices/u_unfilled_gen.py',
+  output : 'u_unfilled_gen.c',
+  command : [prog_python, '@INPUT@'],
+  capture : true,
+)
+
 _libmesa_util = static_library(
   'mesa_util',
-  [files_mesa_util, files_debug_stack, format_srgb],
+  [files_mesa_util, files_debug_stack, format_srgb, u_indices_gen_c, u_unfilled_gen_c],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : deps_for_libmesa_util,
   link_with: libmesa_format,