3 files changed, 8 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index d69acf1f75a..1614744bdc5 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -59,11 +59,12 @@ if _dri_drivers != []
     [],
     link_whole : _dri_drivers,
     link_with : [
-      libmegadriver_stub, libdricommon, libglapi, libmesa_util,
+      libmegadriver_stub, libdricommon, libglapi,
       libmesa_classic,
     ],
     dependencies : [
-      dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl, idep_nir, idep_xmlconfig,
+      dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl,
+      idep_nir, idep_xmlconfig, idep_mesautil,
     ],
     link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],
     # Will be deleted during installation, see install_megadrivers.py
diff --git a/src/mesa/drivers/x11/meson.build b/src/mesa/drivers/x11/meson.build
index cb092d25d6c..e828566b4cf 100644
--- a/src/mesa/drivers/x11/meson.build
+++ b/src/mesa/drivers/x11/meson.build
@@ -32,8 +32,8 @@ libgl = shared_library(
   include_directories : [
     inc_include, inc_src, inc_mesa, inc_mapi, inc_gallium, inc_gallium_aux
   ],
-  link_with : [libmesa_classic, libglapi_static, libmesa_util, gl_link_with],
-  dependencies : [dep_x11, dep_xext, dep_xcb, dep_thread],
+  link_with : [libmesa_classic, libglapi_static, gl_link_with],
+  dependencies : [idep_mesautil, dep_x11, dep_xext, dep_xcb, dep_thread],
   version : '1.6.0',
   install : true,
 )
diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build
index 441de8d2796..d550f01c7fc 100644
--- a/src/mesa/state_tracker/tests/meson.build
+++ b/src/mesa/state_tracker/tests/meson.build
@@ -33,9 +33,8 @@ test(
     include_directories : inc_common,
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
-      libmesa_util,
     ],
-    dependencies : dep_thread,
+    dependencies : [dep_thread, idep_mesautil],
   ),
   suite : ['st_mesa'],
 )
@@ -48,9 +47,8 @@ test(
     include_directories : inc_common,
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
-      libmesa_util,
     ],
-    dependencies : [idep_gtest, dep_thread],
+    dependencies : [idep_mesautil, idep_gtest, dep_thread],
   ),
   suite : ['st_mesa'],
 )
@@ -63,9 +61,8 @@ test(
     include_directories : inc_common,
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
-      libmesa_util,
     ],
-    dependencies : [idep_gtest, dep_thread]
+    dependencies : [idep_mesautil, idep_gtest, dep_thread],
   ),
   suite : ['st_mesa'],
 )