diff --git a/hw/kdrive/meson.build b/hw/kdrive/meson.build
index 16341e2281..d6e35d48e7 100644
--- a/hw/kdrive/meson.build
+++ b/hw/kdrive/meson.build
@@ -1,2 +1,10 @@
-subdir('src')
-subdir('ephyr')
+build_xephyr = get_option('xephyr')
+build_kdrive = build_xephyr
+
+if build_kdrive
+    subdir('src')
+endif
+
+if build_xephyr
+    subdir('ephyr')
+endif
diff --git a/hw/meson.build b/hw/meson.build
index fb9e5d431c..73ec936399 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,4 @@
-if build_xephyr
-    subdir('kdrive')
-endif
+subdir('kdrive')
 
 if build_xvfb
     subdir('vfb')
diff --git a/meson.build b/meson.build
index f284b824de..d543f69ed3 100644
--- a/meson.build
+++ b/meson.build
@@ -240,7 +240,6 @@ if build_xquartz
     build_rootless = true
 endif
 
-build_xephyr = get_option('xephyr')
 build_xvfb = get_option('xvfb')
 
 summary({