From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 7 Dec 2017 17:59:58 +0000 (+0100)
Subject: Apply updates from upstream
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=326e11bd6182202b830c66742c1ddd6d419e8f5f;p=elogind.git

Apply updates from upstream
---

diff --git a/.gitignore b/.gitignore
index 4ecb0d66b..84c2ae5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@ mask_po_files.sh
 cccc
 *.v234
 *.v234.diff
+.project
+patches_port/
diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index cadaa17ca..81da0c50e 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -216,6 +216,9 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/basic/selinux-util.h" />
+		<Unit filename="../src/basic/set.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../src/basic/set.h" />
 		<Unit filename="../src/basic/signal-util.c">
 			<Option compilerVar="CC" />
@@ -603,6 +606,9 @@
 		<Unit filename="../src/test/test-copy.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../src/test/test-dlopen.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../src/test/test-ellipsize.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/meson.build b/meson.build
index 31494a3d3..ee24544bc 100644
--- a/meson.build
+++ b/meson.build
@@ -29,7 +29,8 @@ m4_defines = []
 
 #####################################################################
 #if 0 /// elogind does not need this
-# # Try to install the git pre-commit hook
+
+# Try to install the git pre-commit hook
 # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh'))
 # if git_hook.returncode() == 0
 #         message(git_hook.stdout().strip())
@@ -430,6 +431,7 @@ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h
 decl_headers = '''
 #include <uchar.h>
 #include <linux/ethtool.h>
+#include <linux/fib_rules.h>
 '''
 # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
 
@@ -701,11 +703,11 @@ substs.set('TTY_GID', tty_gid)
 # if get_option('adm-group')
 #         m4_defines += ['-DENABLE_ADM_GROUP']
 # endif
-#
+
 # if get_option('wheel-group')
 #         m4_defines += ['-DENABLE_WHEEL_GROUP']
 # endif
-#
+
 # substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
 #endif // 0
 
@@ -717,7 +719,7 @@ substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no')
 # dns_servers = get_option('dns-servers')
 # conf.set_quoted('DNS_SERVERS', dns_servers)
 # substs.set('DNS_SERVERS', dns_servers)
-#
+
 # ntp_servers = get_option('ntp-servers')
 # conf.set_quoted('NTP_SERVERS', ntp_servers)
 # substs.set('NTP_SERVERS', ntp_servers)
@@ -768,7 +770,7 @@ endif
 #if 0 /// UNNEEDED by elogind
 # libmount = dependency('mount',
 #                       version : '>= 2.30')
-#
+
 # want_seccomp = get_option('seccomp')
 # if want_seccomp != 'false'
 #         libseccomp = dependency('libseccomp',
@@ -866,7 +868,7 @@ conf.set10('HAVE_AUDIT', have)
 #         libblkid = []
 # endif
 # conf.set10('HAVE_BLKID', have)
-#
+
 # want_kmod = get_option('kmod')
 # if want_kmod != 'false'
 #         libkmod = dependency('libkmod',
@@ -909,7 +911,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_MICROHTTPD', have)
 # m4_defines += have ? ['-DHAVE_MICROHTTPD'] : []
-#
+
 # want_libcryptsetup = get_option('libcryptsetup')
 # if want_libcryptsetup != 'false'
 #         libcryptsetup = dependency('libcryptsetup',
@@ -921,7 +923,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libcryptsetup = []
 # endif
 # conf.set10('HAVE_LIBCRYPTSETUP', have)
-#
+
 # want_libcurl = get_option('libcurl')
 # if want_libcurl != 'false'
 #         libcurl = dependency('libcurl',
@@ -934,13 +936,13 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBCURL', have)
 # m4_defines += have ? ['-DHAVE_LIBCURL'] : []
-#
+
 # want_libidn = get_option('libidn')
 # want_libidn2 = get_option('libidn2')
 # if want_libidn == 'true' and want_libidn2 == 'true'
 #         error('libidn and libidn2 cannot be requested simultaneously')
 # endif
-#
+
 # if want_libidn != 'false' and want_libidn2 != 'true'
 #         libidn = dependency('libidn',
 #                             required : want_libidn == 'true')
@@ -961,7 +963,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIDN2', have)
 # m4_defines += have ? ['-DHAVE_LIBIDN2'] : []
-#
+
 # want_libiptc = get_option('libiptc')
 # if want_libiptc != 'false'
 #         libiptc = dependency('libiptc',
@@ -973,7 +975,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIPTC', have)
 # m4_defines += have ? ['-DHAVE_LIBIPTC'] : []
-#
+
 # want_qrencode = get_option('qrencode')
 # if want_qrencode != 'false'
 #         libqrencode = dependency('libqrencode',
@@ -984,7 +986,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libqrencode = []
 # endif
 # conf.set10('HAVE_QRENCODE', have)
-#
+
 # want_gcrypt = get_option('gcrypt')
 # if want_gcrypt != 'false'
 #         libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
@@ -999,7 +1001,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgpg_error = []
 # endif
 # conf.set10('HAVE_GCRYPT', have)
-#
+
 # want_gnutls = get_option('gnutls')
 # if want_gnutls != 'false'
 #         libgnutls = dependency('gnutls',
@@ -1011,7 +1013,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgnutls = []
 # endif
 # conf.set10('HAVE_GNUTLS', have)
-#
+
 # want_elfutils = get_option('elfutils')
 # if want_elfutils != 'false'
 #         libdw = dependency('libdw',
@@ -1022,7 +1024,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libdw = []
 # endif
 # conf.set10('HAVE_ELFUTILS', have)
-#
+
 # want_zlib = get_option('zlib')
 # if want_zlib != 'false'
 #         libz = dependency('zlib',
@@ -1033,7 +1035,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libz = []
 # endif
 # conf.set10('HAVE_ZLIB', have)
-#
+
 # want_bzip2 = get_option('bzip2')
 # if want_bzip2 != 'false'
 #         libbzip2 = cc.find_library('bz2',
@@ -1044,7 +1046,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libbzip2 = []
 # endif
 # conf.set10('HAVE_BZIP2', have)
-#
+
 # want_xz = get_option('xz')
 # if want_xz != 'false'
 #         libxz = dependency('liblzma',
@@ -1055,7 +1057,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libxz = []
 # endif
 # conf.set10('HAVE_XZ', have)
-#
+
 # want_lz4 = get_option('lz4')
 # if want_lz4 != 'false'
 #         liblz4 = dependency('liblz4',
@@ -1066,7 +1068,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         liblz4 = []
 # endif
 # conf.set10('HAVE_LZ4', have)
-#
+
 # want_xkbcommon = get_option('xkbcommon')
 # if want_xkbcommon != 'false'
 #         libxkbcommon = dependency('xkbcommon',
@@ -1136,7 +1138,7 @@ conf.set10('HAVE_DBUS', have)
 # conf.set('DEFAULT_DNSSEC_MODE',
 #          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
-#
+
 # want_importd = get_option('importd')
 # if want_importd != 'false'
 #         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1151,7 +1153,7 @@ conf.set10('HAVE_DBUS', have)
 #         have = false
 # endif
 # conf.set10('ENABLE_IMPORTD', have)
-#
+
 # want_remote = get_option('remote')
 # if want_remote != 'false'
 #         have_deps = [conf.get('HAVE_MICROHTTPD') == 1,
@@ -1223,7 +1225,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', get_option('slow-tests'))
 #if 0 /// UNNEEDED by elogind
 # if get_option('efi')
 #         efi_arch = host_machine.cpu_family()
-#
+
 #         if efi_arch == 'x86'
 #                 EFI_MACHINE_TYPE_NAME = 'ia32'
 #                 gnu_efi_arch = 'ia32'
@@ -1240,10 +1242,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', get_option('slow-tests'))
 #                 EFI_MACHINE_TYPE_NAME = ''
 #                 gnu_efi_arch = ''
 #         endif
-#
+
 #         have = true
 #         conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-#
+
 #         conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
 # else
 #         have = false
@@ -1320,7 +1322,7 @@ subdir('src/login')
 #         journald_gperf_c,
 #         include_directories : includes,
 #         install : false)
-#
+
 # libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
 # libsystemd = shared_library(
 #         'systemd',
@@ -1372,7 +1374,7 @@ subdir('src/shared')
 # subdir('src/core')
 # subdir('src/udev')
 # subdir('src/network')
-#
+
 # subdir('src/analyze')
 # subdir('src/journal-remote')
 # subdir('src/coredump')
@@ -1411,14 +1413,14 @@ test_dlopen = executable(
 #                  ['systemd',    'ENABLE_NSS_SYSTEMD'],
 #                  ['mymachines', 'ENABLE_MACHINED'],
 #                  ['resolve',    'ENABLE_RESOLVED']]
-#
+
 #         condition = tuple[1] == '' or conf.get(tuple[1]) == 1
 #         if condition
 #                 module = tuple[0]
-#
+
 #                 sym = 'src/nss-@0@/nss-@0@.sym'.format(module)
 #                 version_script_arg = join_paths(meson.current_source_dir(), sym)
-#
+
 #                 nss = shared_library(
 #                         'nss_' + module,
 #                         'src/nss-@0@/nss-@0@.c'.format(module),
@@ -1434,13 +1436,13 @@ test_dlopen = executable(
 #                         link_depends : sym,
 #                         install : true,
 #                         install_dir : rootlibdir)
-#
+
 #                 # We cannot use shared_module because it does not support version suffix.
 #                 # Unfortunately shared_library insists on creating the symlink…
 #                 meson.add_install_script('sh', '-c',
 #                                          'rm $DESTDIR@0@/libnss_@1@.so'
 #                                          .format(rootlibdir, module))
-#
+
 #                 test('dlopen-nss_' + module,
 #                      test_dlopen,
 #                      args : [nss.full_path()]) # path to dlopen must include a slash
@@ -1465,7 +1467,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-analyze',
 #                  systemd_analyze_sources,
 #                  include_directories : includes,
@@ -1480,7 +1482,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # executable('systemd-journald',
 #            systemd_journald_sources,
 #            include_directories : includes,
@@ -1493,7 +1495,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-cat',
 #                  systemd_cat_sources,
 #                  include_directories : includes,
@@ -1503,7 +1505,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('journalctl',
 #                  journalctl_sources,
 #                  include_directories : includes,
@@ -1516,7 +1518,7 @@ test_dlopen = executable(
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # executable('systemd-getty-generator',
 #            'src/getty-generator/getty-generator.c',
 #            include_directories : includes,
@@ -1524,7 +1526,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+
 # executable('systemd-debug-generator',
 #            'src/debug-generator/debug-generator.c',
 #            include_directories : includes,
@@ -1532,7 +1534,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+
 # executable('systemd-fstab-generator',
 #            'src/fstab-generator/fstab-generator.c',
 #            'src/core/mount-setup.c',
@@ -1541,7 +1543,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+
 # if conf.get('ENABLE_ENVIRONMENT_D') == 1
 #         executable('30-systemd-environment-d-generator',
 #                    'src/environment-d-generator/environment-d-generator.c',
@@ -1550,12 +1552,12 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : userenvgeneratordir)
-#
+
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(sysconfdir, 'environment'),
 #                                  join_paths(environmentdir, '99-environment.conf'))
 # endif
-#
+
 # if conf.get('ENABLE_HIBERNATE') == 1
 #         executable('systemd-hibernate-resume-generator',
 #                    'src/hibernate-resume/hibernate-resume-generator.c',
@@ -1564,7 +1566,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+
 #         executable('systemd-hibernate-resume',
 #                    'src/hibernate-resume/hibernate-resume.c',
 #                    include_directories : includes,
@@ -1573,7 +1575,7 @@ test_dlopen = executable(
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('HAVE_BLKID') == 1
 #         executable('systemd-gpt-auto-generator',
 #                    'src/gpt-auto-generator/gpt-auto-generator.c',
@@ -1584,7 +1586,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+
 #         exe = executable('systemd-dissect',
 #                          'src/dissect/dissect.c',
 #                          include_directories : includes,
@@ -1594,7 +1596,7 @@ test_dlopen = executable(
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_RESOLVED') == 1
 #         executable('systemd-resolved',
 #                    systemd_resolved_sources,
@@ -1609,7 +1611,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('systemd-resolve',
 #                          systemd_resolve_sources,
 #                          gcrypt_util_sources,
@@ -1624,7 +1626,7 @@ test_dlopen = executable(
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_LOGIND') == 1
 #         executable('systemd-logind',
 #                    systemd_logind_sources,
@@ -1636,7 +1638,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('loginctl',
 #                          loginctl_sources,
 #                          include_directories : includes,
@@ -1648,7 +1650,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-#
+
 #         exe = executable('systemd-inhibit',
 #                          'src/login/inhibit.c',
 #                          include_directories : includes,
@@ -1657,7 +1659,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-#
+
 #         if conf.get('HAVE_PAM') == 1
 #                 version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
 #                 pam_systemd = shared_library(
@@ -1675,7 +1677,7 @@ test_dlopen = executable(
 #                         link_depends : pam_systemd_sym,
 #                         install : true,
 #                         install_dir : pamlibdir)
-#
+
 #                 test('dlopen-pam_systemd',
 #                      test_dlopen,
 #                      args : [pam_systemd.full_path()]) # path to dlopen must include a slash
@@ -1738,6 +1740,8 @@ if conf.get('HAVE_PAM') == 1
              test_dlopen,
              args : [pam_elogind.full_path()]) # path to dlopen must include a slash
 endif
+#endif // 0
+
 #if 0 /// UNNEEDED by elogind
 # if conf.get('HAVE_PAM') == 1
 #         executable('systemd-user-sessions',
@@ -1748,7 +1752,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
 #         exe = executable('bootctl',
 #                          'src/boot/bootctl.c',
@@ -1759,7 +1763,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # exe = executable('systemd-socket-activate', 'src/activate/activate.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1767,7 +1771,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemctl', 'src/systemctl/systemctl.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1780,7 +1784,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # if conf.get('ENABLE_BACKLIGHT') == 1
 #         executable('systemd-backlight',
 #                    'src/backlight/backlight.c',
@@ -1790,7 +1794,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('ENABLE_RFKILL') == 1
 #         executable('systemd-rfkill',
 #                    'src/rfkill/rfkill.c',
@@ -1800,7 +1804,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # executable('systemd-system-update-generator',
 #            'src/system-update-generator/system-update-generator.c',
 #            include_directories : includes,
@@ -1808,7 +1812,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+
 # if conf.get('HAVE_LIBCRYPTSETUP') == 1
 #         executable('systemd-cryptsetup',
 #                    'src/cryptsetup/cryptsetup.c',
@@ -1818,7 +1822,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         executable('systemd-cryptsetup-generator',
 #                    'src/cryptsetup/cryptsetup-generator.c',
 #                    include_directories : includes,
@@ -1827,7 +1831,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+
 #         executable('systemd-veritysetup',
 #                    'src/veritysetup/veritysetup.c',
 #                    include_directories : includes,
@@ -1836,7 +1840,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         executable('systemd-veritysetup-generator',
 #                    'src/veritysetup/veritysetup-generator.c',
 #                    include_directories : includes,
@@ -1846,7 +1850,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-#
+
 # if conf.get('HAVE_SYSV_COMPAT') == 1
 #         executable('systemd-sysv-generator',
 #                    'src/sysv-generator/sysv-generator.c',
@@ -1855,7 +1859,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+
 #         executable('systemd-rc-local-generator',
 #                    'src/rc-local-generator/rc-local-generator.c',
 #                    include_directories : includes,
@@ -1864,7 +1868,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-#
+
 # if conf.get('ENABLE_HOSTNAMED') == 1
 #         executable('systemd-hostnamed',
 #                    'src/hostname/hostnamed.c',
@@ -1873,7 +1877,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('hostnamectl',
 #                          'src/hostname/hostnamectl.c',
 #                          include_directories : includes,
@@ -1882,7 +1886,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_LOCALED') == 1
 #         if conf.get('HAVE_XKBCOMMON') == 1
 #                 # logind will load libxkbcommon.so dynamically on its own
@@ -1890,7 +1894,7 @@ endif
 #         else
 #                 deps = []
 #         endif
-#
+
 #         executable('systemd-localed',
 #                    systemd_localed_sources,
 #                    include_directories : includes,
@@ -1899,7 +1903,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('localectl',
 #                          localectl_sources,
 #                          include_directories : includes,
@@ -1908,7 +1912,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_TIMEDATED') == 1
 #         executable('systemd-timedated',
 #                    'src/timedate/timedated.c',
@@ -1917,7 +1921,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('timedatectl',
 #                          'src/timedate/timedatectl.c',
 #                          include_directories : includes,
@@ -1926,7 +1930,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_TIMESYNCD') == 1
 #         executable('systemd-timesyncd',
 #                    systemd_timesyncd_sources,
@@ -1938,7 +1942,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('ENABLE_MACHINED') == 1
 #         executable('systemd-machined',
 #                    systemd_machined_sources,
@@ -1948,7 +1952,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('machinectl',
 #                          'src/machine/machinectl.c',
 #                          include_directories : includes,
@@ -1961,7 +1965,7 @@ endif
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_IMPORTD') == 1
 #         executable('systemd-importd',
 #                    systemd_importd_sources,
@@ -1971,7 +1975,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         systemd_pull = executable('systemd-pull',
 #                                   systemd_pull_sources,
 #                                   include_directories : includes,
@@ -1984,7 +1988,7 @@ endif
 #                                   install_rpath : rootlibexecdir,
 #                                   install : true,
 #                                   install_dir : rootlibexecdir)
-#
+
 #         systemd_import = executable('systemd-import',
 #                                     systemd_import_sources,
 #                                     include_directories : includes,
@@ -1996,7 +2000,7 @@ endif
 #                                     install_rpath : rootlibexecdir,
 #                                     install : true,
 #                                     install_dir : rootlibexecdir)
-#
+
 #         systemd_export = executable('systemd-export',
 #                                     systemd_export_sources,
 #                                     include_directories : includes,
@@ -2010,7 +2014,7 @@ endif
 #                                     install_dir : rootlibexecdir)
 #         public_programs += [systemd_pull, systemd_import, systemd_export]
 # endif
-#
+
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
 #         exe = executable('systemd-journal-upload',
 #                          systemd_journal_upload_sources,
@@ -2026,7 +2030,7 @@ endif
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
 #         s_j_remote = executable('systemd-journal-remote',
 #                                 systemd_journal_remote_sources,
@@ -2040,7 +2044,7 @@ endif
 #                                 install_rpath : rootlibexecdir,
 #                                 install : true,
 #                                 install_dir : rootlibexecdir)
-#
+
 #         s_j_gatewayd = executable('systemd-journal-gatewayd',
 #                                   systemd_journal_gatewayd_sources,
 #                                   include_directories : includes,
@@ -2055,7 +2059,7 @@ endif
 #                                   install_dir : rootlibexecdir)
 #         public_programs += [s_j_remote, s_j_gatewayd]
 # endif
-#
+
 # if conf.get('ENABLE_COREDUMP') == 1
 #         executable('systemd-coredump',
 #                    systemd_coredump_sources,
@@ -2069,7 +2073,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('coredumpctl',
 #                          coredumpctl_sources,
 #                          include_directories : includes,
@@ -2081,7 +2085,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_BINFMT') == 1
 #         exe = executable('systemd-binfmt',
 #                          'src/binfmt/binfmt.c',
@@ -2091,13 +2095,13 @@ endif
 #                          install : true,
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
-#
+
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(binfmtdir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
 # endif
-#
+
 # if conf.get('ENABLE_VCONSOLE') == 1
 #         executable('systemd-vconsole-setup',
 #                    'src/vconsole/vconsole-setup.c',
@@ -2107,7 +2111,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('ENABLE_RANDOMSEED') == 1
 #         executable('systemd-random-seed',
 #                    'src/random-seed/random-seed.c',
@@ -2117,7 +2121,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # if conf.get('ENABLE_FIRSTBOOT') == 1
 #         executable('systemd-firstboot',
 #                    'src/firstboot/firstboot.c',
@@ -2128,7 +2132,7 @@ endif
 #                    install : true,
 #                    install_dir : rootbindir)
 # endif
-#
+
 # executable('systemd-remount-fs',
 #            'src/remount-fs/remount-fs.c',
 #            'src/core/mount-setup.c',
@@ -2138,7 +2142,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # executable('systemd-machine-id-setup',
 #            'src/machine-id-setup/machine-id-setup-main.c',
 #            'src/core/machine-id-setup.c',
@@ -2148,7 +2152,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootbindir)
-#
+
 # executable('systemd-fsck',
 #            'src/fsck/fsck.c',
 #            include_directories : includes,
@@ -2156,7 +2160,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # executable('systemd-sleep',
 #            'src/sleep/sleep.c',
 #            include_directories : includes,
@@ -2164,7 +2168,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-sysctl',
 #                  'src/sysctl/sysctl.c',
 #                  include_directories : includes,
@@ -2173,7 +2177,7 @@ endif
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+
 # executable('systemd-ac-power',
 #            'src/ac-power/ac-power.c',
 #            include_directories : includes,
@@ -2181,7 +2185,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-detect-virt',
 #                  'src/detect-virt/detect-virt.c',
 #                  include_directories : includes,
@@ -2189,7 +2193,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-delta',
 #                  'src/delta/delta.c',
 #                  include_directories : includes,
@@ -2197,7 +2201,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-escape',
 #                  'src/escape/escape.c',
 #                  include_directories : includes,
@@ -2206,7 +2210,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-notify',
 #                  'src/notify/notify.c',
 #                  include_directories : includes,
@@ -2215,7 +2219,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # executable('systemd-volatile-root',
 #            'src/volatile-root/volatile-root.c',
 #            include_directories : includes,
@@ -2223,7 +2227,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # executable('systemd-cgroups-agent',
 #            'src/cgroups-agent/cgroups-agent.c',
 #            include_directories : includes,
@@ -2249,7 +2253,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-ask-password',
 #                  'src/ask-password/ask-password.c',
 #                  include_directories : includes,
@@ -2258,7 +2262,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # executable('systemd-reply-password',
 #            'src/reply-password/reply-password.c',
 #            include_directories : includes,
@@ -2266,7 +2270,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-tty-ask-password-agent',
 #                  'src/tty-ask-password-agent/tty-ask-password-agent.c',
 #                  include_directories : includes,
@@ -2275,7 +2279,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-cgls',
 #                  'src/cgls/cgls.c',
 #                  include_directories : includes,
@@ -2283,7 +2287,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-cgtop',
 #                  'src/cgtop/cgtop.c',
 #                  include_directories : includes,
@@ -2291,7 +2295,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # executable('systemd-initctl',
 #            'src/initctl/initctl.c',
 #            include_directories : includes,
@@ -2299,7 +2303,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # exe = executable('systemd-mount',
 #                  'src/mount/mount-tool.c',
 #                  include_directories : includes,
@@ -2307,10 +2311,10 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # meson.add_install_script(meson_make_symlink,
 #                          'systemd-mount', join_paths(bindir, 'systemd-umount'))
-#
+
 # exe = executable('systemd-run',
 #                  'src/run/run.c',
 #                  include_directories : includes,
@@ -2318,7 +2322,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-stdio-bridge',
 #                  'src/stdio-bridge/stdio-bridge.c',
 #                  include_directories : includes,
@@ -2326,7 +2330,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # exe = executable('busctl',
 #                  'src/busctl/busctl.c',
 #                  'src/busctl/busctl-introspect.c',
@@ -2336,7 +2340,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # if conf.get('ENABLE_SYSUSERS') == 1
 #         exe = executable('systemd-sysusers',
 #                          'src/sysusers/sysusers.c',
@@ -2347,7 +2351,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_TMPFILES') == 1
 #         exe = executable('systemd-tmpfiles',
 #                          'src/tmpfiles/tmpfiles.c',
@@ -2359,7 +2363,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_HWDB') == 1
 #         exe = executable('systemd-hwdb',
 #                          'src/hwdb/hwdb.c',
@@ -2371,7 +2375,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+
 # if conf.get('ENABLE_QUOTACHECK') == 1
 #         executable('systemd-quotacheck',
 #                    'src/quotacheck/quotacheck.c',
@@ -2381,7 +2385,7 @@ executable('elogind-cgroups-agent',
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+
 # exe = executable('systemd-socket-proxyd',
 #                  'src/socket-proxy/socket-proxyd.c',
 #                  include_directories : includes,
@@ -2391,7 +2395,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+
 # exe = executable('systemd-udevd',
 #                  systemd_udevd_sources,
 #                  include_directories : includes,
@@ -2408,7 +2412,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+
 # exe = executable('udevadm',
 #                  udevadm_sources,
 #                  include_directories : includes,
@@ -2424,7 +2428,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+
 # executable('systemd-shutdown',
 #            systemd_shutdown_sources,
 #            include_directories : includes,
@@ -2432,7 +2436,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # executable('systemd-update-done',
 #            'src/update-done/update-done.c',
 #            include_directories : includes,
@@ -2440,7 +2444,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # executable('systemd-update-utmp',
 #            'src/update-utmp/update-utmp.c',
 #            include_directories : includes,
@@ -2449,7 +2453,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+
 # if conf.get('HAVE_KMOD') == 1
 #         executable('systemd-modules-load',
 #                    'src/modules-load/modules-load.c',
@@ -2459,13 +2463,13 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(modulesloaddir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
 # endif
-#
+
 # exe = executable('systemd-nspawn',
 #                  systemd_nspawn_sources,
 #                  'src/core/mount-setup.c', # FIXME: use a variable?
@@ -2481,7 +2485,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+
 # if conf.get('ENABLE_NETWORKD') == 1
 #         executable('systemd-networkd',
 #                    systemd_networkd_sources,
@@ -2494,7 +2498,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         executable('systemd-networkd-wait-online',
 #                    systemd_networkd_wait_online_sources,
 #                    include_directories : includes,
@@ -2503,7 +2507,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+
 #         exe = executable('networkctl',
 #                    networkctl_sources,
 #                    include_directories : includes,
@@ -2569,7 +2573,7 @@ endforeach
 #         install_dir : testsdir)
 # test('test-libsystemd-sym',
 #      test_libsystemd_sym)
-#
+
 # test_libudev_sym = executable(
 #         'test-libudev-sym',
 #         test_libudev_sym_c,
@@ -2599,7 +2603,7 @@ make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 #if 0 /// UNNEEDED by elogind
 # hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-#
+
 # subdir('units')
 # subdir('sysctl.d')
 # subdir('sysusers.d')
@@ -2747,7 +2751,7 @@ status = [
 #         'nobody group name:                 @0@'.format(get_option('nobody-group')),
 #         'fallback hostname:                 @0@'.format(get_option('fallback-hostname')),
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
-#
+
 #         'default DNSSEC mode:               @0@'.format(default_dnssec),
 #         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
 #endif // 0
@@ -2759,7 +2763,7 @@ status = [
 # status += [
 #         'default DNS servers:               @0@'.format(alt_dns_servers),
 #         'default NTP servers:               @0@'.format(alt_ntp_servers)]
-#
+
 # alt_time_epoch = run_command('date', '-Is', '-u', '-d',
 #                              '@@0@'.format(time_epoch)).stdout().strip()
 # status += [
@@ -2775,7 +2779,7 @@ status = [
 # if conf.get('ENABLE_EFI') == 1
 #         status += [
 #                 'efi arch:                          @0@'.format(efi_arch)]
-#
+
 #         if have_gnu_efi
 #                 status += [
 #                         'EFI machine type:                  @0@'.format(EFI_MACHINE_TYPE_NAME),
diff --git a/meson_options.txt b/meson_options.txt
index 441d22749..d4f6d25b8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,7 @@ option('rootprefix', type : 'string',
 #if 0 /// UNNEEDED by elogind
 # option('link-udev-shared', type : 'boolean',
 #        description : 'link systemd-udev and its helpers to libsystemd-shared.so')
-# 
+
 # option('sysvinit-path', type : 'string', value : '/etc/init.d',
 #        description : 'the directory where the SysV init scripts are located')
 # option('sysvrcnd-path', type : 'string', value : '/etc/rc.d',
@@ -19,7 +19,7 @@ option('rootprefix', type : 'string',
 #        value : '/etc/rc.local')
 # option('halt-local', type : 'string',
 #        value : '/usr/sbin/halt.local')
-#
+
 # option('quotaon-path', type : 'string', description : 'path to quotaon')
 # option('quotacheck-path', type : 'string', description : 'path to quotacheck')
 # option('kill-path', type : 'string', description : 'path to kill')
@@ -48,7 +48,7 @@ option('kexec-path', type : 'string', description : 'path to kexec')
 # option('umount-path', type : 'string', description : 'path to umount')
 # option('loadkeys-path', type : 'string', description : 'path to loadkeys')
 # option('setfont-path', type : 'string', description : 'path to setfont')
-#
+
 # option('debug-shell', type : 'string', value : '/bin/sh',
 #        description : 'path to debug shell binary')
 # option('debug-tty', type : 'string', value : '/dev/tty9',
@@ -206,7 +206,7 @@ option('gshadow', type : 'boolean',
 # option('www-target', type : 'string',
 #        description : 'the address and dir to upload docs too',
 #        value : 'www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd')
-#
+
 # option('seccomp', type : 'combo', choices : ['auto', 'true', 'false'],
 #        description : 'SECCOMP support')
 #endif // 0
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index de467101a..3742318b1 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -16,7 +16,7 @@ if bashcompletiondir != 'no'
 #                 input : 'systemctl.in',
 #                 output : 'systemctl',
 #                 configuration : substs)
-#
+
 #         items = [['busctl',              ''],
 #                  ['journalctl',          ''],
 #                  ['systemd-analyze',     ''],
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index be30ebf0e..3894ca227 100644
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -11,7 +11,7 @@ if zshcompletiondir != 'no'
 #                 input : '_systemctl.in',
 #                 output : '_systemctl',
 #                 configuration : substs)
-#
+
 #         items = [['_busctl',                   ''],
 #                  ['_journalctl',               ''],
 #                  ['_systemd-analyze',          ''],
diff --git a/src/basic/build.h b/src/basic/build.h
index 334383bdf..379459f3d 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -19,37 +19,37 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_PAM
+#if HAVE_PAM
 #define _PAM_FEATURE_ "+PAM"
 #else
 #define _PAM_FEATURE_ "-PAM"
 #endif
 
-#ifdef HAVE_AUDIT
+#if HAVE_AUDIT
 #define _AUDIT_FEATURE_ "+AUDIT"
 #else
 #define _AUDIT_FEATURE_ "-AUDIT"
 #endif
 
-#ifdef HAVE_SELINUX
+#if HAVE_SELINUX
 #define _SELINUX_FEATURE_ "+SELINUX"
 #else
 #define _SELINUX_FEATURE_ "-SELINUX"
 #endif
 
-#ifdef HAVE_SMACK
+#if HAVE_SMACK
 #define _SMACK_FEATURE_ "+SMACK"
 #else
 #define _SMACK_FEATURE_ "-SMACK"
 #endif
 
-#ifdef HAVE_UTMP
+#if HAVE_UTMP
 #define _UTMP_FEATURE_ "+UTMP"
 #else
 #define _UTMP_FEATURE_ "-UTMP"
 #endif
 
-#ifdef HAVE_ACL
+#if HAVE_ACL
 #define _ACL_FEATURE_ "+ACL"
 #else
 #define _ACL_FEATURE_ "-ACL"
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index 294dcc8d4..66324021a 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "macro.h"
 #include "parse-util.h"
+#include "user-util.h"
 #include "util.h"
 
 #if 0 /// UNNEEDED by elogind
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 630ae23a0..8136e62b4 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -153,7 +153,7 @@ bool cg_ns_supported(void) {
 
         return enabled;
 }
-#endif //0
+#endif // 0
 
 int cg_enumerate_subgroups(const char *controller, const char *path, DIR **_d) {
         _cleanup_free_ char *fs = NULL;
@@ -1037,7 +1037,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;
         char line[LINE_MAX];
-        const char *fs, *controller_str = NULL;
+        const char *fs, *controller_str;
         size_t cs = 0;
         int unified;
 
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 2fa377414..1f1a33873 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -23,6 +23,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 
 #include "def.h"
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 37212be22..6827290e2 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -40,10 +40,12 @@
 //#include "fs-util.h"
 #include "io-util.h"
 //#include "macro.h"
+#include "missing.h"
 //#include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 //#include "umask-util.h"
+#include "user-util.h"
 //#include "xattr-util.h"
 
 #define COPY_BUFFER_SIZE (16*1024u)
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index d12b5036b..565902c7b 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -26,11 +26,14 @@
 
 #include "dirent-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "process-util.h"
 #include "socket-util.h"
+#include "stdio-util.h"
 #include "util.h"
 
 int close_nointr(int fd) {
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index a9ec7611d..f30b69550 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -58,8 +58,7 @@ int fd_warn_permissions(const char *path, int fd);
 #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
 #else
 #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0)
-#endif
-
+#endif // __GLIBC__
 
 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
 int touch(const char *path);
diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
index 0678bb5a3..4019d7092 100755
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -1,5 +1,11 @@
 #!/bin/sh -eu
 
+#if 0 /// elogind needs musl_missing.sh, which is in shared.
+# $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \
+#         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
+#         grep -v CAP_LAST_CAP
+#else
 $1 -dM -include linux/capability.h -I../src/shared -include "$2" -include "$3" - </dev/null | \
         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
         grep -v CAP_LAST_CAP
+#endif // 0
diff --git a/src/basic/log.h b/src/basic/log.h
index 5633a2b42..c4d089b19 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -30,6 +30,7 @@
 #include "sd-id128.h"
 
 #include "macro.h"
+#include "process-util.h"
 
 typedef enum LogRealm {
         LOG_REALM_SYSTEMD,
diff --git a/src/basic/meson.build b/src/basic/meson.build
index c1712f2db..fd7bbd781 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -351,7 +351,7 @@ generate_gperfs = find_program('generate-gperfs.py')
 #         output : 'af-list.txt',
 #         command : [generate_af_list, cpp],
 #         capture : true)
-#
+
 # generate_arphrd_list = find_program('generate-arphrd-list.sh')
 # arphrd_list_txt = custom_target(
 #         'arphrd-list.txt',
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 98ef9f99f..e65cd67dc 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -37,6 +37,7 @@
 #include "set.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "strv.h"
 
 static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id) {
         char path[strlen("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)];
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 280beae22..9ee0547fc 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,9 +34,11 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fs-util.h"
+#include "glob-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/basic/set.h b/src/basic/set.h
index e21e4220b..08b7c4a72 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "extract-word.h"
 #include "hashmap.h"
 #include "macro.h"
 
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 3d622bb1c..ef3c59172 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -23,6 +23,7 @@
 #include <net/if.h>
 #include <netdb.h>
 #include <netinet/ip.h>
+#include <poll.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 064f0b477..0c8c301b6 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -28,6 +28,7 @@
 
 #include "dirent-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "stat-util.h"
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index fc94c945e..07fc5a444 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/timerfd.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index 3dfe1ff65..8358d3c08 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <alloca.h>
-//#include <dirent.h>
 //#include <errno.h>
 //#include <fcntl.h>
 #include <sched.h>
@@ -35,13 +34,14 @@
 //#include <unistd.h>
 
 #include "alloc-util.h"
+//#include "btrfs-util.h"
 #include "build.h"
 #include "cgroup-util.h"
 //#include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-//#include "formats-util.h"
+//#include "format-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
 //#include "log.h"
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 36bfd2429..8df839243 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -25,6 +25,7 @@
 
 #include "alloc-util.h"
 #include "dirent-util.h"
+#include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index c0f07ca9a..6e200ccb6 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -21,6 +21,7 @@
 #include <fnmatch.h>
 
 #include "alloc-util.h"
+#include "bpf-firewall.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "fd-util.h"
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index af906db21..dc4b4cadf 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -24,6 +24,7 @@
 //#include "list.h"
 //#include "time-util.h"
 #include "cgroup-util.h"
+#include "ip-address-access.h"
 
 #if 0 /// UNNEEDED by elogind
 typedef struct CGroupContext CGroupContext;
diff --git a/src/core/meson.build b/src/core/meson.build
index 482d1f09b..e58312d81 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -133,13 +133,13 @@ libcore_la_sources = files('''
 #         output: 'load-fragment-gperf.gperf',
 #         command : [m4, '-P'] + m4_defines + ['@INPUT@'],
 #         capture : true)
-# 
+
 # load_fragment_gperf_c = custom_target(
 #         'load-fragment-gperf.c',
 #         input : load_fragment_gperf_gperf,
 #         output : 'load-fragment-gperf.c',
 #         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
-# 
+
 # awkscript = 'load-fragment-gperf-nulstr.awk'
 # load_fragment_gperf_nulstr_c = custom_target(
 #         'load-fragment-gperf-nulstr.c',
@@ -147,7 +147,7 @@ libcore_la_sources = files('''
 #         output : 'load-fragment-gperf-nulstr.c',
 #         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
 #         capture : true)
-#
+
 # libcore = static_library(
 #         'core',
 #         libcore_la_sources,
@@ -162,9 +162,9 @@ libcore_la_sources = files('''
 #                         libkmod,
 #                         libapparmor,
 #                         libmount])
-#
+
 # systemd_sources = files('main.c')
-# 
+
 # systemd_shutdown_sources = files('''
 #         shutdown.c
 #         umount.c
@@ -174,15 +174,15 @@ libcore_la_sources = files('''
 #         killall.c
 #         killall.h
 # '''.split())
-# 
+
 # in_files = [['macros.systemd',   rpmmacrosdir],
 #             ['triggers.systemd', ''],
 #             ['systemd.pc',       pkgconfigdatadir]]
-# 
+
 # foreach item : in_files
 #         file = item[0]
 #         dir = item[1]
-# 
+
 #         # If 'no', disable generation completely.
 #         # If '', generate, but do not install.
 #         if dir != 'no'
@@ -196,17 +196,17 @@ libcore_la_sources = files('''
 #                 endif
 #         endif
 # endforeach
-# 
+
 # install_data('org.freedesktop.systemd1.conf',
 #              install_dir : dbuspolicydir)
 # install_data('org.freedesktop.systemd1.service',
 #              install_dir : dbussystemservicedir)
-# 
+
 # policy_in = configure_file(
 #         input : 'org.freedesktop.systemd1.policy.in.in',
 #         output : 'org.freedesktop.systemd1.policy.in',
 #         configuration : substs)
-# 
+
 # custom_target(
 #         'org.freedesktop.systemd1.policy',
 #         input : policy_in,
@@ -231,12 +231,12 @@ libcore_la_sources = files('''
 # install_data('system.conf',
 #              'user.conf',
 #              install_dir : pkgsysconfdir)
-# 
+
 # meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
 # meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
 # meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
 # meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
-# 
+
 # meson.add_install_script('sh', '-c',
 #                          mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants')))
 # meson.add_install_script('sh', '-c',
diff --git a/src/libelogind/sd-bus/bus-common-errors.h b/src/libelogind/sd-bus/bus-common-errors.h
index aad97ff5c..4266ca61d 100644
--- a/src/libelogind/sd-bus/bus-common-errors.h
+++ b/src/libelogind/sd-bus/bus-common-errors.h
@@ -24,6 +24,7 @@
 #if 0 /// only system command elogind knows are needed
 #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"
 #define BUS_ERROR_NO_UNIT_FOR_PID "org.freedesktop.systemd1.NoUnitForPID"
+#define BUS_ERROR_NO_UNIT_FOR_INVOCATION_ID "org.freedesktop.elogind1.NoUnitForInvocationID"
 #define BUS_ERROR_UNIT_EXISTS "org.freedesktop.systemd1.UnitExists"
 #define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed"
 #define BUS_ERROR_JOB_FAILED "org.freedesktop.systemd1.JobFailed"
@@ -42,6 +43,9 @@
 #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"
 #define BUS_ERROR_SCOPE_NOT_RUNNING "org.freedesktop.systemd1.ScopeNotRunning"
 #endif // 0
+#define BUS_ERROR_NO_SUCH_DYNAMIC_USER "org.freedesktop.elogind1.NoSuchDynamicUser"
+#define BUS_ERROR_NOT_REFERENCED "org.freedesktop.elogind1.NotReferenced"
+#define BUS_ERROR_DISK_FULL "org.freedesktop.elogind1.DiskFull"
 
 #if 0 /// no machined in elogind
 #define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine"
diff --git a/src/libelogind/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c
index 7dc67cf83..d44d75ece 100644
--- a/src/libelogind/sd-id128/sd-id128.c
+++ b/src/libelogind/sd-id128/sd-id128.c
@@ -30,6 +30,7 @@
 #include "io-util.h"
 #include "khash.h"
 #include "macro.h"
+#include "missing.h"
 #include "random-util.h"
 #include "user-util.h"
 #include "util.h"
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 62d68b907..dc39f8cdf 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -27,6 +27,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
+#include "bus-unit-util.h"
 #include "bus-util.h"
 //#include "cgroup-show.h"
 #include "cgroup-util.h"
@@ -1433,9 +1434,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -i --ignore-inhibitors   When shutting down or sleeping, ignore inhibitors\n\n"
 #endif // 0
                "Session Commands:\n"
-#if 1 /// elogind has "list" as a shorthand for "list-sessions"
+#if 0 /// elogind has "list" as a shorthand for "list-sessions"
+               "  list-sessions            List sessions\n"
+#else
                "  list[-sessions]          List sessions (default command)\n"
-#endif // 1
+#endif // 0
                "  session-status [ID...]   Show session status\n"
                "  show-session [ID...]     Show properties of sessions or the manager\n"
                "  activate [ID]            Activate a session\n"
@@ -1459,15 +1462,17 @@ static int help(int argc, char *argv[], void *userdata) {
                "  show-seat [NAME...]      Show properties of seats or the manager\n"
                "  attach NAME DEVICE...    Attach one or more devices to a seat\n"
                "  flush-devices            Flush all device associations\n"
+#if 0 /// elogind adds some system commands to loginctl
+               "  terminate-seat NAME...   Terminate all sessions on one or more seats\n"
+#else
                "  terminate-seat NAME...   Terminate all sessions on one or more seats\n\n"
-#if 1 /// elogind adds some system commands to loginctl
                "System Commands:\n"
                "  poweroff [TIME] [WALL...] Turn off the machine\n"
                "  reboot   [TIME] [WALL...] Reboot the machine\n"
                "  suspend                   Suspend the machine to memory\n"
                "  hibernate                 Suspend the machine to disk\n"
                "  hybrid-sleep              Suspend the machine to memory and disk\n"
-#endif // 1
+#endif // 0
                , program_invocation_short_name);
 
         return 0;
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 6eb1e4c93..714503228 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -29,6 +29,7 @@
 #include "cgroup-util.h"
 #include "fd-util.h"
 #include "logind.h"
+#include "parse-util.h"
 #include "strv.h"
 #include "terminal-util.h"
 #include "udev-util.h"
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 63cd1a4d4..8247ec494 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -52,7 +52,6 @@
 
 /// Additional includes needed by elogind
 #include "elogind-dbus.h"
-//#include "update-utmp.h"
 
 int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) {
         _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index b46644894..b347ef52a 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -34,6 +34,7 @@
 #include "fd-util.h"
 #include "logind-session-device.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "sd-daemon.h"
 #include "util.h"
 
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 8712dae62..ff1552b8a 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -41,7 +41,6 @@
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
-#include "process-util.h"
 #include "string-table.h"
 #include "terminal-util.h"
 #include "user-util.h"
@@ -49,6 +48,7 @@
 
 /// Additional includes needed by elogind
 #include "extract-word.h"
+#include "process-util.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
diff --git a/src/login/logind.c b/src/login/logind.c
index 1fc636a7a..b552ad664 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -48,6 +48,7 @@
 #include "label.h"
 #include "musl_missing.h"
 #include "process-util.h"
+#include "cgroup-util.h"
 
 static void manager_free(Manager *m);
 
@@ -1276,7 +1277,7 @@ int main(int argc, char *argv[]) {
         r = elogind_startup(argc, argv);
         if (r)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-#endif // 0
+#endif // 1
 
         elogind_set_program_name(argv[0]);
         log_set_target(LOG_TARGET_AUTO);
@@ -1356,7 +1357,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_run(m);
 
-        log_debug("elogind stopped as pid "PID_FMT, getpid());
+        log_debug("elogind stopped as pid "PID_FMT, getpid_cached());
 
 finish:
         sd_notify(false,
diff --git a/src/login/meson.build b/src/login/meson.build
index aff6e3f2a..f8fbfbc67 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -96,15 +96,15 @@ loginctl_sources += files('''
 #                 configuration : substs)
 #         install_data(logind_conf,
 #                      install_dir : pkgsysconfdir)
-#
+
 #         pam_systemd_sym = 'src/login/pam_systemd.sym'
 #         pam_systemd_c = files('pam_systemd.c')
-#
+
 #         install_data('org.freedesktop.login1.conf',
 #                      install_dir : dbuspolicydir)
 #         install_data('org.freedesktop.login1.service',
 #                      install_dir : dbussystemservicedir)
-#
+
 #         custom_target(
 #                 'org.freedesktop.login1.policy',
 #                 input : 'org.freedesktop.login1.policy.in',
@@ -112,11 +112,11 @@ loginctl_sources += files('''
 #                 command : intltool_command,
 #                 install : install_polkit,
 #                 install_dir : polkitpolicydir)
-#
+
 #         install_data('70-power-switch.rules',
 #                      '70-uaccess.rules',
 #                      install_dir : udevrulesdir)
-#
+
 #         foreach file : ['71-seat.rules',
 #                         '73-seat-late.rules']
 #                 gen = configure_file(
@@ -126,7 +126,7 @@ loginctl_sources += files('''
 #                 install_data(gen,
 #                              install_dir : udevrulesdir)
 #         endforeach
-#
+
 #         custom_target(
 #                 'systemd-user',
 #                 input : 'systemd-user.m4',
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 8dff2886c..0735901e3 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -28,8 +28,10 @@
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "def.h"
 #include "extract-word.h"
 #include "fd-util.h"
+#include "fileio.h"
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
@@ -37,6 +39,7 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
+#include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "syslog-util.h"
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 172f55ba7..27311b8b8 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -139,7 +139,7 @@ endif
 # if conf.get('HAVE_SECCOMP') == 1
 #         shared_sources += ['seccomp-util.c']
 # endif
-#
+
 # if conf.get('HAVE_LIBIPTC') == 1
 #         shared_sources += ['firewall-util.c']
 # endif
@@ -161,7 +161,7 @@ libshared_name = 'elogind-shared-@0@'.format(meson.project_version())
 #                   libxz,
 #                   liblz4,
 #                   libblkid]
-# #else
+#else
 libshared_deps = [threads,
                   libacl,
                   libcap,
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 3a947fcde..0d8eadc37 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -112,7 +112,7 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
 
 #if 1 /// Only available in this file for elogind
 static
-#endif // 0
+#endif // 1
 int can_sleep_state(char **types) {
         char **type;
         int r;
@@ -144,7 +144,7 @@ int can_sleep_state(char **types) {
 
 #if 1 /// Only available in this file for elogind
 static
-#endif // 0
+#endif // 1
 int can_sleep_disk(char **types) {
         char **type;
         int r;
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 83a8fe82f..959e2804c 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -22,6 +22,7 @@
 
 #include <inttypes.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 
 #include "_sd-common.h"
 
diff --git a/src/test/meson.build b/src/test/meson.build
index a923d6144..d374629fa 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -46,7 +46,7 @@ tests += [
 #         [['src/test/test-device-nodes.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-engine.c',
 #           'src/test/test-helper.c'],
 #          [libcore,
@@ -58,7 +58,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-job-type.c'],
 #          [libcore,
 #           libshared],
@@ -68,7 +68,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-ns.c'],
 #          [libcore,
 #           libshared],
@@ -79,7 +79,7 @@ tests += [
 #           libmount,
 #           libblkid],
 #          '', 'manual'],
-#
+
 #         [['src/test/test-loopback.c'],
 #          [libcore,
 #           libshared],
@@ -89,7 +89,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-hostname.c'],
 #          [libcore,
 #           libshared],
@@ -100,17 +100,17 @@ tests += [
 #           libmount,
 #           libblkid],
 #          '', 'unsafe'],
-#
+
 #         [['src/test/test-dns-domain.c'],
 #          [libcore,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/test/test-boot-timestamps.c'],
 #          [],
 #          [],
 #          'ENABLE_EFI'],
-#
+
 #         [['src/test/test-unit-name.c',
 #           'src/test/test-helper.c'],
 #          [libcore,
@@ -121,7 +121,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-unit-file.c',
 #           'src/test/test-helper.c'],
 #          [libcore,
@@ -282,36 +282,36 @@ tests += [
 #         [['src/test/test-terminal-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-path-lookup.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-uid-range.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-cap-list.c',
 #           generated_gperf_headers],
 #          [],
 #          [libcap]],
-#
+
 #         [['src/test/test-socket-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-in-addr-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-barrier.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-tmpfiles.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-namespace.c'],
 #          [libcore,
 #           libshared],
@@ -327,26 +327,26 @@ tests += [
 #         [['src/test/test-install-root.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-acl-util.c'],
 #          [],
 #          [],
 #          'HAVE_ACL'],
-#
+
 #         [['src/test/test-seccomp.c'],
 #          [],
 #          [libseccomp],
 #          'HAVE_SECCOMP'],
-#
+
 #         [['src/test/test-rlimit-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-ask-password-api.c'],
 #          [],
 #          [],
 #          '', 'manual'],
-#
+
 #         [['src/test/test-dissect-image.c'],
 #          [],
 #          [libblkid],
@@ -393,7 +393,7 @@ tests += [
 #         [['src/test/test-bitmap.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-xml.c'],
 #          [],
 #          []],
@@ -435,15 +435,15 @@ tests += [
 #         [['src/test/test-fileio.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-time.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-clock.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-architecture.c'],
 #          [],
 #          []],
@@ -463,13 +463,13 @@ tests += [
 #          [],
 #          [],
 #          '', 'manual'],
-#
-#
+
+
 #         [['src/test/test-firewall-util.c'],
 #          [libshared],
 #          [],
 #          'HAVE_LIBIPTC'],
-#
+
 #         [['src/test/test-netlink-manual.c'],
 #          [],
 #          [libkmod],
@@ -484,15 +484,15 @@ tests += [
 #         [['src/test/test-date.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-sleep.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-replace-var.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-calendarspec.c'],
 #          [],
 #          []],
@@ -525,19 +525,19 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-cgroup-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-env-util.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-strbuf.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-strv.c'],
 #          [],
 #          []],
@@ -558,7 +558,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-#
+
 #         [['src/test/test-execute.c',
 #           'src/test/test-helper.c'],
 #          [libcore,
@@ -579,17 +579,17 @@ tests += [
 #         [['src/test/test-strxcpyx.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-install.c'],
 #          [libcore,
 #           libshared],
 #          [],
 #          '', 'manual'],
-#
+
 #         [['src/test/test-watchdog.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-sched-prio.c',
 #           'src/test/test-helper.c'],
 #          [libcore,
@@ -615,20 +615,20 @@ tests += [
 #           generated_gperf_headers],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-arphrd-list.c',
 #           generated_gperf_headers],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-journal-importer.c'],
 #          [],
 #          []],
-#
+
 #         [['src/test/test-libudev.c'],
 #          [libshared],
 #          []],
-#
+
 #         [['src/test/test-udev.c'],
 #          [libudev_core,
 #           libudev_internal,
@@ -670,14 +670,14 @@ tests += [
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-send.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-syslog.c'],
 #          [libjournal_core,
 #           libshared],
@@ -685,63 +685,63 @@ tests += [
 #           libxz,
 #           liblz4,
 #           libselinux]],
-#
+
 #         [['src/journal/test-journal-match.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-enum.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-stream.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-flush.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-init.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-verify.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-journal-interleaving.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-mmap-cache.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-#
+
 #         [['src/journal/test-catalog.c'],
 #          [libjournal_core,
 #           libshared],
@@ -749,20 +749,20 @@ tests += [
 #           libxz,
 #           liblz4],
 #          '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)],
-#
+
 #         [['src/journal/test-compress.c'],
 #          [libjournal_core,
 #           libshared],
 #          [liblz4,
 #           libxz]],
-#
+
 #         [['src/journal/test-compress-benchmark.c'],
 #          [libjournal_core,
 #           libshared],
 #          [liblz4,
 #           libxz],
 #          '', 'timeout=90'],
-#
+
 #         [['src/journal/test-audit-type.c'],
 #          [libjournal_core,
 #           libshared],
@@ -792,7 +792,7 @@ tests += [
 #         [['src/libelogind/sd-bus/test-bus-chat.c'],
 #          [],
 #          [threads]],
-#
+
 #         [['src/libelogind/sd-bus/test-bus-cleanup.c'],
 #          [],
 #          [threads,
@@ -830,7 +830,7 @@ tests += [
 #          [libglib,
 #           libgobject,
 #           libgio]],
-#
+
 #         [['src/libelogind/sd-bus/test-bus-creds.c'],
 #          [],
 #          []],
@@ -841,21 +841,10 @@ tests += [
          []],
 
 #if 0 /// UNNEEDED in elogind
-#         [['src/libelogind/sd-bus/test-bus-kernel.c'],
-#          [],
-#          []],
-#
-#         [['src/libelogind/sd-bus/test-bus-kernel-bloom.c'],
-#          [],
-#          []],
-#
 #         [['src/libelogind/sd-bus/test-bus-benchmark.c'],
 #          [],
-#          [threads]],
-#
-#         [['src/libelogind/sd-bus/test-bus-zero-copy.c'],
-#          [],
-#          []],
+#          [threads],
+#          '', 'manual'],
 #endif // 0
 
         [['src/libelogind/sd-bus/test-bus-introspect.c'],
@@ -870,11 +859,11 @@ tests += [
 #         [['src/libelogind/sd-netlink/test-netlink.c'],
 #          [],
 #          []],
-#
+
 #         [['src/libelogind/sd-netlink/test-local-addresses.c'],
 #          [],
 #          []],
-#
+
 #         [['src/libelogind/sd-resolve/test-resolve.c'],
 #          [],
 #          [threads]],
@@ -905,13 +894,13 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-sd-dhcp-lease.c',
 #           'src/libelogind-network/dhcp-lease-internal.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-dhcp-client.c',
 #           'src/libelogind-network/dhcp-protocol.h',
 #           'src/libelogind-network/dhcp-internal.h',
@@ -919,33 +908,33 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-dhcp-server.c'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-ipv4ll.c',
 #           'src/libelogind-network/arp-util.h',
 #           'src/systemd/sd-ipv4ll.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-ipv4ll-manual.c',
 #           'src/systemd/sd-ipv4ll.h'],
 #          [libshared,
 #           libelogind_network],
 #          [],
 #          '', 'manual'],
-#
+
 #         [['src/libelogind-network/test-acd.c',
 #           'src/systemd/sd-ipv4acd.h'],
 #          [libshared,
 #           libelogind_network],
 #          [],
 #          '', 'manual'],
-#
+
 #         [['src/libelogind-network/test-ndisc-rs.c',
 #           'src/libelogind-network/dhcp-identifier.h',
 #           'src/libelogind-network/dhcp-identifier.c',
@@ -955,14 +944,14 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-ndisc-ra.c',
 #           'src/libelogind-network/icmp6-util.h',
 #           'src/systemd/sd-ndisc.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-dhcp6-client.c',
 #           'src/libelogind-network/dhcp-identifier.h',
 #           'src/libelogind-network/dhcp-identifier.c',
@@ -971,7 +960,7 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-#
+
 #         [['src/libelogind-network/test-lldp.c'],
 #          [libshared,
 #           libelogind_network],
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 17d12ec76..d2567f67d 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -18,6 +18,8 @@
 ***/
 
 #include "conf-parser.h"
+#include "fd-util.h"
+#include "fileio.h"
 #include "log.h"
 #include "macro.h"
 #include "string-util.h"