diff --git a/man/meson.build b/man/meson.build
index 9b42c2a69..d72b3cf96 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -15,23 +15,23 @@ if get_option('daemon')
 endif
 
 if get_option('client')
-manpages += [
-  ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
-  ['pactl', '1'],
-  ['pulse-client.conf', '5'],
-]
-
-if cdata.has('HAVE_OSS_WRAPPER')
   manpages += [
-    ['padsp', '1'],
+    ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
+    ['pactl', '1'],
+    ['pulse-client.conf', '5'],
   ]
-endif
 
-if x11_dep.found()
-  manpages += [
-    ['pax11publish', '1'],
-  ]
-endif
+  if cdata.has('HAVE_OSS_WRAPPER')
+    manpages += [
+      ['padsp', '1'],
+    ]
+  endif
+
+  if x11_dep.found()
+    manpages += [
+      ['pax11publish', '1'],
+    ]
+  endif
 endif
 
 # FIXME: Add esdcompat if HAVE_ESOUND
diff --git a/meson.build b/meson.build
index 827dfe13f..5f51f3a30 100644
--- a/meson.build
+++ b/meson.build
@@ -848,69 +848,69 @@ configure_file(output : 'config.h', configuration : cdata)
 
 if get_option('client')
 
-# pkg-config files
+  # pkg-config files
 
-pc_cdata = configuration_data()
+  pc_cdata = configuration_data()
 
-pc_cdata.set('prefix', prefix)
-pc_cdata.set('exec_prefix', prefix)
-pc_cdata.set('libdir', libdir)
-pc_cdata.set('includedir', includedir)
-pc_cdata.set('modlibexecdir', modlibexecdir)
-pc_cdata.set('PACKAGE_VERSION', pa_version_str)
-pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
-# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
-# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
-# get_configtool_variable() work with it, so we have no way to get this flag right,
-# unless we do all the work ourselves. See current work in glib, also meson #553.
-pc_cdata.set('PTHREAD_LIBS', '-pthread')
+  pc_cdata.set('prefix', prefix)
+  pc_cdata.set('exec_prefix', prefix)
+  pc_cdata.set('libdir', libdir)
+  pc_cdata.set('includedir', includedir)
+  pc_cdata.set('modlibexecdir', modlibexecdir)
+  pc_cdata.set('PACKAGE_VERSION', pa_version_str)
+  pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
+  # FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
+  # and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
+  # get_configtool_variable() work with it, so we have no way to get this flag right,
+  # unless we do all the work ourselves. See current work in glib, also meson #553.
+  pc_cdata.set('PTHREAD_LIBS', '-pthread')
 
-pc_files = [
-  'libpulse.pc',
-  'libpulse-simple.pc',
-]
+  pc_files = [
+    'libpulse.pc',
+    'libpulse-simple.pc',
+  ]
 
-if glib_dep.found()
-  pc_files += 'libpulse-mainloop-glib.pc'
-endif
+  if glib_dep.found()
+    pc_files += 'libpulse-mainloop-glib.pc'
+  endif
+
+  foreach file : pc_files
+    configure_file(
+      input : file + '.in',
+      output : file,
+      configuration : pc_cdata,
+      install_dir : pkgconfigdir)
+  endforeach
+
+  # CMake files
+
+  m4 = find_program('m4', required: true)
+
+  cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
+
+  cmake_template_file = configure_file(
+    input : 'PulseAudioConfig.cmake.in',
+    output : 'PulseAudioConfig.cmake.tmp',
+    configuration: cdata,
+  )
+
+  custom_target('PulseAudioConfig.cmake',
+    input : cmake_template_file,
+    output : 'PulseAudioConfig.cmake',
+    capture : true,
+    command : [m4, '@INPUT@'],
+    build_by_default : true,
+    install : true,
+    install_dir : cmakedir,
+  )
 
-foreach file : pc_files
   configure_file(
-    input : file + '.in',
-    output : file,
-    configuration : pc_cdata,
-    install_dir : pkgconfigdir)
-endforeach
-
-# CMake files
-
-m4 = find_program('m4', required: true)
-
-cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
-
-cmake_template_file = configure_file(
-  input : 'PulseAudioConfig.cmake.in',
-  output : 'PulseAudioConfig.cmake.tmp',
-  configuration: cdata,
-)
-
-custom_target('PulseAudioConfig.cmake',
-  input : cmake_template_file,
-  output : 'PulseAudioConfig.cmake',
-  capture : true,
-  command : [m4, '@INPUT@'],
-  build_by_default : true,
-  install : true,
-  install_dir : cmakedir,
-)
-
-configure_file(
-  input : 'PulseAudioConfigVersion.cmake.in',
-  output : 'PulseAudioConfigVersion.cmake',
-  configuration: cdata,
-  install : true,
-  install_dir : cmakedir,
-)
+    input : 'PulseAudioConfigVersion.cmake.in',
+    output : 'PulseAudioConfigVersion.cmake',
+    configuration: cdata,
+    install : true,
+    install_dir : cmakedir,
+  )
 
 endif # client
 
diff --git a/src/meson.build b/src/meson.build
index d5cd7e4fa..96dcec354 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -193,26 +193,25 @@ if not get_option('client')
   libpulse_dep = dependency('libpulse', required : true)
   libpulse_simple_dep = dependency('libpulse-simple', required : true)
 else
+  libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
+    libpulsecommon_sources,
+    libpulsecommon_headers,
+    include_directories : [configinc, topinc],
+    c_args : [pa_c_args],
+    link_args : [nodelete_link_args],
+    install : true,
+    install_dir : privlibdir,
+    dependencies : [
+      libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
+      x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
+      gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
+      platform_dep, platform_socket_dep, execinfo_dep,
+    ],
+    implicit_include_directories : false)
 
-libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
-  libpulsecommon_sources,
-  libpulsecommon_headers,
-  include_directories : [configinc, topinc],
-  c_args : [pa_c_args],
-  link_args : [nodelete_link_args],
-  install : true,
-  install_dir : privlibdir,
-  dependencies : [
-    libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
-    x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
-    gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
-    platform_dep, platform_socket_dep, execinfo_dep,
-  ],
-  implicit_include_directories : false)
+  libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
 
-libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
-
-subdir('pulse')
+  subdir('pulse')
 endif
 
 if get_option('daemon')
diff --git a/src/utils/meson.build b/src/utils/meson.build
index f67cff4a9..28e1fc10a 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -1,47 +1,47 @@
 if get_option('client')
-pacat_sources = [
-  'pacat.c',
-]
+  pacat_sources = [
+    'pacat.c',
+  ]
 
-pacat_aliases = [
-  'pamon',
-  'paplay',
-  'parec',
-  'parecord',
-]
+  pacat_aliases = [
+    'pamon',
+    'paplay',
+    'parec',
+    'parecord',
+  ]
 
-executable('pacat',
-  pacat_sources,
-  install: true,
-  install_rpath : privlibdir,
-  include_directories : [configinc, topinc],
-  link_with : [libpulsecommon, libpulse],
-  dependencies : [sndfile_dep, libintl_dep],
-  c_args : pa_c_args,
-)
+  executable('pacat',
+    pacat_sources,
+    install: true,
+    install_rpath : privlibdir,
+    include_directories : [configinc, topinc],
+    link_with : [libpulsecommon, libpulse],
+    dependencies : [sndfile_dep, libintl_dep],
+    c_args : pa_c_args,
+  )
 
-# Windows doesn't support symbolic links.
-if host_machine.system() != 'windows'
-  foreach alias : pacat_aliases
-    dst = join_paths(bindir, alias)
-    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pacat', dst)
-    meson.add_install_script('sh', '-c', cmd)
-  endforeach
-endif
+  # Windows doesn't support symbolic links.
+  if host_machine.system() != 'windows'
+    foreach alias : pacat_aliases
+      dst = join_paths(bindir, alias)
+      cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pacat', dst)
+      meson.add_install_script('sh', '-c', cmd)
+    endforeach
+  endif
 
-pactl_sources = [
-  'pactl.c',
-]
+  pactl_sources = [
+    'pactl.c',
+  ]
 
-executable('pactl',
-  pactl_sources,
-  install: true,
-  install_rpath : privlibdir,
-  include_directories : [configinc, topinc],
-  link_with : [libpulsecommon, libpulse],
-  dependencies : [sndfile_dep, libintl_dep],
-  c_args : pa_c_args,
-)
+  executable('pactl',
+    pactl_sources,
+    install: true,
+    install_rpath : privlibdir,
+    include_directories : [configinc, topinc],
+    link_with : [libpulsecommon, libpulse],
+    dependencies : [sndfile_dep, libintl_dep],
+    c_args : pa_c_args,
+  )
 endif
 
 if get_option('daemon')
@@ -75,51 +75,51 @@ if get_option('daemon')
 endif
 
 if get_option('client')
-if x11_dep.found()
-  pax11publish_sources = [
-    'pax11publish.c',
-  ]
+  if x11_dep.found()
+    pax11publish_sources = [
+      'pax11publish.c',
+    ]
 
-  executable('pax11publish',
-    pax11publish_sources,
-    install: true,
-    install_rpath : privlibdir,
-    include_directories : [configinc, topinc],
-    link_with : [libpulsecommon, libpulse],
-    dependencies : [x11_dep, libintl_dep],
-    c_args : pa_c_args,
-  )
-endif
-
-if cdata.has('HAVE_OSS_WRAPPER')
-  libpulsecommon_sources = [
-    'padsp.c',
-  ]
-
-  libpulsedsp = shared_library('pulsedsp',
-    libpulsecommon_sources,
-    install: true,
-    install_dir : padsplibdir,
-    install_rpath : privlibdir,
-    include_directories : [configinc, topinc],
-    link_with : [libpulsecommon, libpulse],
-    link_args : [nodelete_link_args],
-    dependencies: [thread_dep, dl_dep],
-    c_args : [pa_c_args, '-Wno-nonnull-compare']
-  )
-
-  configure_file(
-    input : 'padsp.in',
-    output : 'padsp',
-    configuration : cdata,
-    install : true,
-    install_dir : bindir,
-  )
-endif
-
-if dbus_dep.found() and fftw_dep.found()
-  install_data('qpaeq', install_dir : bindir)
-endif
-
-install_data('pa-info', install_dir : bindir)
+    executable('pax11publish',
+      pax11publish_sources,
+      install: true,
+      install_rpath : privlibdir,
+      include_directories : [configinc, topinc],
+      link_with : [libpulsecommon, libpulse],
+      dependencies : [x11_dep, libintl_dep],
+      c_args : pa_c_args,
+    )
+  endif
+
+  if cdata.has('HAVE_OSS_WRAPPER')
+    libpulsecommon_sources = [
+      'padsp.c',
+    ]
+
+    libpulsedsp = shared_library('pulsedsp',
+      libpulsecommon_sources,
+      install: true,
+      install_dir : padsplibdir,
+      install_rpath : privlibdir,
+      include_directories : [configinc, topinc],
+      link_with : [libpulsecommon, libpulse],
+      link_args : [nodelete_link_args],
+      dependencies: [thread_dep, dl_dep],
+      c_args : [pa_c_args, '-Wno-nonnull-compare']
+    )
+
+    configure_file(
+      input : 'padsp.in',
+      output : 'padsp',
+      configuration : cdata,
+      install : true,
+      install_dir : bindir,
+    )
+  endif
+
+  if dbus_dep.found() and fftw_dep.found()
+    install_data('qpaeq', install_dir : bindir)
+  endif
+
+  install_data('pa-info', install_dir : bindir)
 endif