--- a/meson.build
+++ b/meson.build
@@ -278,14 +278,6 @@
 
 cdata.set('HAVE_PIDFD_OPEN',
           cc.get_define('SYS_pidfd_open', prefix: '#include <sys/syscall.h>') != '')
-
-systemd_dep = dependency('libsystemd', required: get_option('libsystemd'))
-summary({'libsystemd': systemd_dep.found()}, bool_yn: true)
-cdata.set('HAVE_SYSTEMD', systemd_dep.found())
-
-logind_dep = dependency(get_option('logind-provider'), required: get_option('logind'))
-summary({'logind': logind_dep.found()}, bool_yn: true)
-cdata.set('HAVE_LOGIND', logind_dep.found())
 
 selinux_dep = dependency('libselinux', required: get_option('selinux'))
 summary({'libselinux': selinux_dep.found()}, bool_yn: true)
@@ -520,22 +512,6 @@
 
 libffado_dep = dependency('libffado', required: get_option('libffado'))
 summary({'ffado': libffado_dep.found()}, bool_yn: true)
-glib2_snap_dep = dependency('glib-2.0', required : get_option('snap'))
-gio2_snap_dep = dependency('gio-2.0', required : get_option('snap'))
-apparmor_snap_dep = dependency('libapparmor', required : get_option('snap'))
-if dependency('snapd-glib-2', required: false).found()
-  snap_dep = dependency('snapd-glib-2', required : get_option('snap'))
-else
-  snap_dep = dependency('snapd-glib', required : get_option('snap'))
-endif
-if snap_dep.found() and glib2_snap_dep.found() and gio2_snap_dep.found() and apparmor_snap_dep.found()
-  cdata.set('HAVE_SNAP', true)
-  snap_deps = [glib2_snap_dep, gio2_snap_dep, snap_dep, apparmor_snap_dep]
-endif
-summary({'GLib-2.0 (Snap support)': glib2_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
-summary({'Gio-2.0 (Snap support)': gio2_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
-summary({'Apparmor (Snap support)': apparmor_snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
-summary({'Snapd-glib (Snap support)': snap_dep.found()}, bool_yn: true, section: 'Misc dependencies')
 
 check_functions = [
   ['gettid', '#include <unistd.h>', ['-D_GNU_SOURCE'], []],
@@ -591,15 +567,15 @@
   subdir('pipewire-alsa/tests')
 endif
 
-generate_docs = get_option('man').enabled() or get_option('docs').enabled()
-if get_option('man').allowed() or get_option('docs').allowed()
+generate_docs = get_option('man').enabled() or get_option('doc').enabled()
+if get_option('man').allowed() or get_option('doc').allowed()
   doxygen = find_program('doxygen', required : generate_docs, version : '>=1.9')
   pymod = import('python')
   python = pymod.find_installation('python3', required: generate_docs)
   generate_docs = doxygen.found() and python.found()
 endif
 
-install_docs = get_option('docs').require(generate_docs).allowed()
+install_docs = get_option('doc').require(generate_docs).allowed()
 install_man = get_option('man').require(generate_docs).allowed()
 
 summary({'Documentation ': install_docs}, bool_yn: true)


--- a/spa/meson.build
+++ b/spa/meson.build
@@ -74,14 +74,6 @@
     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-    lc3plus_dep = dependency('lc3plus', required : false)
-    if not lc3plus_dep.found()
-      lc3plus_lc3plus_h_dep = cc.find_library('LC3plus', has_headers: ['lc3plus.h'], required : get_option('bluez5-codec-lc3plus'))
-      if lc3plus_lc3plus_h_dep.found()
-        lc3plus_dep = declare_dependency(compile_args : '-DHAVE_LC3PLUS_H', dependencies : [ lc3plus_lc3plus_h_dep ])
-      endif
-    endif
-    summary({'LC3plus': lc3plus_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
     if get_option('bluez5-codec-opus').enabled() and not opus_dep.found()
         error('bluez5-codec-opus enabled, but opus dependency not found')
     endif

--- a/spa/plugins/bluez5/meson.build
+++ b/spa/plugins/bluez5/meson.build
@@ -134,15 +134,6 @@
     install_dir : spa_plugindir / 'bluez5')
 endif
 
-if get_option('bluez5-codec-lc3plus').allowed() and lc3plus_dep.found()
-  bluez_codec_lc3plus = shared_library('spa-codec-bluez5-lc3plus',
-    [ 'a2dp-codec-lc3plus.c', 'media-codecs.c' ],
-    include_directories : [ configinc ],
-    c_args : codec_args,
-    dependencies : [ spa_dep, lc3plus_dep, mathlib ],
-    install : true,
-    install_dir : spa_plugindir / 'bluez5')
-endif
 
 if get_option('bluez5-codec-opus').allowed() and opus_dep.found()
   opus_args = codec_args

--- a/spa/plugins/support/meson.build
+++ b/spa/plugins/support/meson.build
@@ -53,20 +53,3 @@
 else
   spa_dbus_dep = declare_dependency()
 endif
-
-
-if systemd_dep.found()
-  spa_journal_sources = [
-    'journal.c',
-  ]
-
-  spa_journal_lib = shared_library('spa-journal',
-    spa_journal_sources,
-    include_directories : [ configinc ],
-    dependencies : [ spa_dep, systemd_dep ],
-    install : true,
-    install_dir : spa_plugindir / 'support')
-  spa_journal_dep = declare_dependency(link_with: spa_journal_lib)
-else
-  spa_journal_dep = declare_dependency()
-endif

--- a/spa/plugins/v4l2/meson.build
+++ b/spa/plugins/v4l2/meson.build
@@ -6,9 +6,6 @@
 if libudev_dep.found()
   v4l2_sources += [ 'v4l2-udev.c' ]
   v4l2_dependencies += [ libudev_dep ]
-  if logind_dep.found()
-    v4l2_dependencies += [ logind_dep ]
-  endif
 endif
 
 v4l2lib = shared_library('spa-v4l2',

--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -161,4 +161,3 @@
 #endif
 
 subdir('filter-chain')
-subdir('systemd')


--- a/test/meson.build
+++ b/test/meson.build
@@ -105,7 +105,7 @@
                'test-support.c',
                'test-logger.c',
                include_directories: pwtest_inc,
-               dependencies: [spa_dep, systemd_dep, spa_support_dep, spa_journal_dep],
+               dependencies: [spa_dep, spa_support_dep],
                link_with: [pwtest_lib])
 )
 endif