diff --git a/cogl/meson.build b/cogl/meson.build
index d6996301f..868645c2f 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -40,9 +40,7 @@ if have_x11
   ]
   cogl_pkg_private_deps += [
     xext_dep,
-    xfixes_dep,
     xdamage_dep,
-    xcomposite_dep,
     xrandr_dep,
   ]
 endif
diff --git a/meson.build b/meson.build
index 4cb2ac722..339812646 100644
--- a/meson.build
+++ b/meson.build
@@ -123,7 +123,6 @@ gthread_dep = dependency('gobject-2.0', version: glib_req)
 gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req)
 gnome_settings_daemon_dep = dependency('gnome-settings-daemon', required: false)
 xkbcommon_dep = dependency('xkbcommon', version: xkbcommon_req)
-ice_dep = dependency('ice')
 atk_dep = dependency('atk', version: atk_req)
 dbus_dep = dependency('dbus-1')
 colord_dep = dependency('colord', version: colord_req)
@@ -155,16 +154,20 @@ if have_x11_client
   xext_dep = dependency('xext')
   xfixes_dep = dependency('xfixes', version: xfixes_req)
   xi_dep = dependency('xi', version: xi_req)
-  xtst_dep = dependency('xtst')
   xkbfile_dep = dependency('xkbfile')
   xkeyboard_config_dep = dependency('xkeyboard-config')
-  xkbcommon_x11_dep = dependency('xkbcommon-x11')
   x11_xcb_dep = dependency('x11-xcb')
   xrandr_dep = dependency('xrandr', version: xrandr_req)
-  xcb_randr_dep = dependency('xcb-randr')
   xcb_res_dep = dependency('xcb-res')
   xinerama_dep = dependency('xinerama')
   xau_dep = dependency('xau')
+
+  if have_x11
+    ice_dep = dependency('ice')
+    xcb_randr_dep = dependency('xcb-randr')
+    xkbcommon_x11_dep = dependency('xkbcommon-x11')
+    xtst_dep = dependency('xtst')
+  endif
 endif
 
 use_libdisplay_info = get_option('libdisplay_info')
diff --git a/src/frames/meson.build b/src/frames/meson.build
index 05c27d508..ea0838da2 100644
--- a/src/frames/meson.build
+++ b/src/frames/meson.build
@@ -12,7 +12,6 @@ x11_frames = executable('mutter-x11-frames',
     gsettings_desktop_schemas_dep,
     gtk4_dep,
     x11_dep,
-    xext_dep,
     xfixes_dep,
     xi_dep,
   ],
diff --git a/src/meson.build b/src/meson.build
index 851b96c23..2cd164f37 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -108,17 +108,21 @@ if have_x11_client
     xrandr_dep,
     xinerama_dep,
     xext_dep,
-    ice_dep,
     xcomposite_dep,
     xcursor_dep,
     xdamage_dep,
-    xkbfile_dep,
-    xkeyboard_config_dep,
-    xkbcommon_x11_dep,
     x11_xcb_dep,
-    xcb_randr_dep,
     xcb_res_dep,
     xau_dep,
+  ]
+endif
+
+if have_x11
+  mutter_pkg_private_deps += [
+    ice_dep,
+    xcb_randr_dep,
+    xkbfile_dep,
+    xkbcommon_x11_dep,
     xtst_dep,
   ]