diff --git a/man/meson.build b/man/meson.build
index d72b3cf96..635e47e46 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -10,8 +10,13 @@ if get_option('daemon')
     ['pulse-cli-syntax', '5'],
     ['pulse-daemon.conf', '5'],
     ['pulseaudio', '1'],
-    ['start-pulseaudio-x11', '1'],
   ]
+
+  if x11_dep.found()
+    manpages += [
+      ['start-pulseaudio-x11', '1'],
+    ]
+  endif
 endif
 
 if get_option('client')
diff --git a/meson.build b/meson.build
index 0ac420c94..b5b3e865d 100644
--- a/meson.build
+++ b/meson.build
@@ -621,6 +621,11 @@ if libsystemd_dep.found()
 endif
 
 x11_dep = dependency('x11-xcb', required : get_option('x11'))
+if x11_dep.found()
+  # Base X11 dependencies
+  xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
+  cdata.set('HAVE_X11', 1)
+endif
 
 # OSS support
 if cc.has_header('sys/soundcard.h', required: get_option('oss-output'))
@@ -751,11 +756,10 @@ if get_option('daemon')
   endif
 
   if x11_dep.found()
-    xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
+    # Additional X11 dependencies required by x11-modules
     ice_dep  = dependency('ice',  required : true)
     sm_dep   = dependency('sm',   required : true)
     xtst_dep = dependency('xtst', required : true)
-    cdata.set('HAVE_X11', 1)
     if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
       cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
     endif