92 files changed, 158 insertions, 123 deletions
diff --git a/Makefile.am b/Makefile.am
index eca7e59435..bb232871d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1041,6 +1041,8 @@ libbasic_la_LIBADD = \
 	-lm
 
 #@src/libshared/Makefile -------------------------------------------------------
+at.subdirs += src
+#@src/libshared/src/Makefile
 noinst_LTLIBRARIES += \
 	libshared.la
 
diff --git a/move.sh b/move.sh
index 0808720e44..9a420b344c 100755
--- a/move.sh
+++ b/move.sh
@@ -26,6 +26,18 @@ move_files() (
 	mkdir src/libbasic/include/basic
 	mv src/libbasic/.gitignore src/libbasic/*.h src/libbasic/include/basic/
 
+	mv -T src/lib{shared,core}/linux
+
+	mkdir src/libfirewall
+	mv -T src/lib{shared,firewall}/firewall-util.c
+	mv -T src/lib{shared,firewall}/firewall-util.h
+
+	mkdir src/libshared/src
+	mv src/libshared/*.c src/libshared/src/
+	mkdir src/libshared/include
+	mkdir src/libshared/include/shared
+	mv src/libshared/*.h src/libshared/include/shared/
+
 	pfix=(
 		dbus1-generator
 		debug-generator
@@ -95,8 +107,6 @@ move_files() (
 	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
 	mv -T {man,src/kernel-install}/kernel-install.xml
 
-	mv -T src/lib{shared,core}/linux
-
 	mkdir src/libsystemd/include
 	mv -T src/{,libsystemd/include}/systemd
 
@@ -115,10 +125,6 @@ move_files() (
 	mkdir src/grp-system
 	mv -T src/{,grp-system}/systemctl
 
-	mkdir src/libfirewall
-	mv -T src/lib{shared,firewall}/firewall-util.c
-	mv -T src/lib{shared,firewall}/firewall-util.h
-
 	mkdir src/grp-system/systemd
 	mv -T src/{libcore,grp-system/systemd}/main.c
 	mv -T src/{libcore,grp-system/systemd}/macros.systemd.in
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 1d5dbd394d..7ed2706100 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -23,121 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libshared.la
-
-libshared_la_SOURCES = \
-	src/shared/output-mode.h \
-	src/shared/output-mode.c \
-	src/shared/gpt.h \
-	src/shared/udev-util.h \
-	src/shared/linux/auto_dev-ioctl.h \
-	src/shared/initreq.h \
-	src/shared/dns-domain.c \
-	src/shared/dns-domain.h \
-	src/shared/efivars.c \
-	src/shared/efivars.h \
-	src/shared/fstab-util.c \
-	src/shared/fstab-util.h \
-	src/shared/sleep-config.c \
-	src/shared/sleep-config.h \
-	src/shared/conf-parser.c \
-	src/shared/conf-parser.h \
-	src/shared/pager.c \
-	src/shared/pager.h \
-	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h \
-	src/shared/apparmor-util.c \
-	src/shared/apparmor-util.h \
-	src/shared/ima-util.c \
-	src/shared/ima-util.h \
-	src/shared/ptyfwd.c \
-	src/shared/ptyfwd.h \
-	src/shared/base-filesystem.c \
-	src/shared/base-filesystem.h \
-	src/shared/uid-range.c \
-	src/shared/uid-range.h \
-	src/shared/install.c \
-	src/shared/install.h \
-	src/shared/install-printf.c \
-	src/shared/install-printf.h \
-	src/shared/path-lookup.c \
-	src/shared/path-lookup.h \
-	src/shared/specifier.c \
-	src/shared/specifier.h \
-	src/shared/dev-setup.c \
-	src/shared/dev-setup.h \
-	src/shared/dropin.c \
-	src/shared/dropin.h \
-	src/shared/condition.c \
-	src/shared/condition.h \
-	src/shared/clean-ipc.c \
-	src/shared/clean-ipc.h \
-	src/shared/generator.h \
-	src/shared/generator.c \
-	src/shared/acpi-fpdt.h \
-	src/shared/acpi-fpdt.c \
-	src/shared/boot-timestamps.h \
-	src/shared/boot-timestamps.c \
-	src/shared/cgroup-show.c \
-	src/shared/cgroup-show.h \
-	src/shared/utmp-wtmp.h \
-	src/shared/watchdog.c \
-	src/shared/watchdog.h \
-	src/shared/spawn-ask-password-agent.c \
-	src/shared/spawn-ask-password-agent.h \
-	src/shared/ask-password-api.c \
-	src/shared/ask-password-api.h \
-	src/shared/switch-root.h \
-	src/shared/switch-root.c \
-	src/shared/import-util.c \
-	src/shared/import-util.h \
-	src/shared/sysctl-util.c \
-	src/shared/sysctl-util.h \
-	src/shared/bus-util.c \
-	src/shared/bus-util.h \
-	src/shared/logs-show.c \
-	src/shared/logs-show.h \
-	src/shared/machine-image.c \
-	src/shared/machine-image.h \
-	src/shared/machine-pool.c \
-	src/shared/machine-pool.h \
-	src/shared/resolve-util.c \
-	src/shared/resolve-util.h \
-	src/shared/bus-unit-util.c \
-	src/shared/bus-unit-util.h \
-	src/shared/tests.h \
-	src/shared/tests.c
-
-ifneq ($(HAVE_UTMP),)
-libshared_la_SOURCES += \
-	src/shared/utmp-wtmp.c
-endif # HAVE_UTMP
-
-ifneq ($(HAVE_SECCOMP),)
-libshared_la_SOURCES += \
-	src/shared/seccomp-util.h \
-	src/shared/seccomp-util.c
-endif # HAVE_SECCOMP
-
-ifneq ($(HAVE_ACL),)
-libshared_la_SOURCES += \
-	src/shared/acl-util.c \
-	src/shared/acl-util.h
-endif # HAVE_ACL
-
-libshared_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-libshared_la_LIBADD = \
-	libsystemd-internal.la \
-	libsystemd-journal-internal.la \
-	libudev-internal.la \
-	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
-	$(SECCOMP_LIBS)
-
+at.subdirs += src
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/acl-util.h b/src/libshared/include/shared/acl-util.h
index 396e9e067e..396e9e067e 100644
--- a/src/libshared/acl-util.h
+++ b/src/libshared/include/shared/acl-util.h
diff --git a/src/libshared/acpi-fpdt.h b/src/libshared/include/shared/acpi-fpdt.h
index fc28175d0a..fc28175d0a 100644
--- a/src/libshared/acpi-fpdt.h
+++ b/src/libshared/include/shared/acpi-fpdt.h
diff --git a/src/libshared/apparmor-util.h b/src/libshared/include/shared/apparmor-util.h
index 524f740152..524f740152 100644
--- a/src/libshared/apparmor-util.h
+++ b/src/libshared/include/shared/apparmor-util.h
diff --git a/src/libshared/ask-password-api.h b/src/libshared/include/shared/ask-password-api.h
index 9d7f65130c..9d7f65130c 100644
--- a/src/libshared/ask-password-api.h
+++ b/src/libshared/include/shared/ask-password-api.h
diff --git a/src/libshared/base-filesystem.h b/src/libshared/include/shared/base-filesystem.h
index 49599f0a60..49599f0a60 100644
--- a/src/libshared/base-filesystem.h
+++ b/src/libshared/include/shared/base-filesystem.h
diff --git a/src/libshared/boot-timestamps.h b/src/libshared/include/shared/boot-timestamps.h
index 6f691026be..6f691026be 100644
--- a/src/libshared/boot-timestamps.h
+++ b/src/libshared/include/shared/boot-timestamps.h
diff --git a/src/libshared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h
index 8327189a63..8327189a63 100644
--- a/src/libshared/bus-unit-util.h
+++ b/src/libshared/include/shared/bus-unit-util.h
diff --git a/src/libshared/bus-util.h b/src/libshared/include/shared/bus-util.h
index f2b46530ba..f2b46530ba 100644
--- a/src/libshared/bus-util.h
+++ b/src/libshared/include/shared/bus-util.h
diff --git a/src/libshared/cgroup-show.h b/src/libshared/include/shared/cgroup-show.h
index 5c1d6e6d98..5c1d6e6d98 100644
--- a/src/libshared/cgroup-show.h
+++ b/src/libshared/include/shared/cgroup-show.h
diff --git a/src/libshared/clean-ipc.h b/src/libshared/include/shared/clean-ipc.h
index 44a83afcf7..44a83afcf7 100644
--- a/src/libshared/clean-ipc.h
+++ b/src/libshared/include/shared/clean-ipc.h
diff --git a/src/libshared/condition.h b/src/libshared/include/shared/condition.h
index bdda04b770..bdda04b770 100644
--- a/src/libshared/condition.h
+++ b/src/libshared/include/shared/condition.h
diff --git a/src/libshared/conf-parser.h b/src/libshared/include/shared/conf-parser.h
index f6964e3fd4..f6964e3fd4 100644
--- a/src/libshared/conf-parser.h
+++ b/src/libshared/include/shared/conf-parser.h
diff --git a/src/libshared/dev-setup.h b/src/libshared/include/shared/dev-setup.h
index 5766a62060..5766a62060 100644
--- a/src/libshared/dev-setup.h
+++ b/src/libshared/include/shared/dev-setup.h
diff --git a/src/libshared/dns-domain.h b/src/libshared/include/shared/dns-domain.h
index af780f0b8b..af780f0b8b 100644
--- a/src/libshared/dns-domain.h
+++ b/src/libshared/include/shared/dns-domain.h
diff --git a/src/libshared/dropin.h b/src/libshared/include/shared/dropin.h
index c1936f397b..c1936f397b 100644
--- a/src/libshared/dropin.h
+++ b/src/libshared/include/shared/dropin.h
diff --git a/src/libshared/efivars.h b/src/libshared/include/shared/efivars.h
index 243151f922..243151f922 100644
--- a/src/libshared/efivars.h
+++ b/src/libshared/include/shared/efivars.h
diff --git a/src/libshared/fstab-util.h b/src/libshared/include/shared/fstab-util.h
index 679f6902f7..679f6902f7 100644
--- a/src/libshared/fstab-util.h
+++ b/src/libshared/include/shared/fstab-util.h
diff --git a/src/libshared/gcrypt-util.h b/src/libshared/include/shared/gcrypt-util.h
index cf33b3c59c..cf33b3c59c 100644
--- a/src/libshared/gcrypt-util.h
+++ b/src/libshared/include/shared/gcrypt-util.h
diff --git a/src/libshared/generator.h b/src/libshared/include/shared/generator.h
index a6017c1b76..a6017c1b76 100644
--- a/src/libshared/generator.h
+++ b/src/libshared/include/shared/generator.h
diff --git a/src/libshared/gpt.h b/src/libshared/include/shared/gpt.h
index 07153b51f4..07153b51f4 100644
--- a/src/libshared/gpt.h
+++ b/src/libshared/include/shared/gpt.h
diff --git a/src/libshared/ima-util.h b/src/libshared/include/shared/ima-util.h
index 5be94761fd..5be94761fd 100644
--- a/src/libshared/ima-util.h
+++ b/src/libshared/include/shared/ima-util.h
diff --git a/src/libshared/import-util.h b/src/libshared/include/shared/import-util.h
index 77b17d91f3..77b17d91f3 100644
--- a/src/libshared/import-util.h
+++ b/src/libshared/include/shared/import-util.h
diff --git a/src/libshared/initreq.h b/src/libshared/include/shared/initreq.h
index 710037d84b..710037d84b 100644
--- a/src/libshared/initreq.h
+++ b/src/libshared/include/shared/initreq.h
diff --git a/src/libshared/install-printf.h b/src/libshared/include/shared/install-printf.h
index 8a570fc265..8a570fc265 100644
--- a/src/libshared/install-printf.h
+++ b/src/libshared/include/shared/install-printf.h
diff --git a/src/libshared/install.h b/src/libshared/include/shared/install.h
index c6aa4f6ef1..c6aa4f6ef1 100644
--- a/src/libshared/install.h
+++ b/src/libshared/include/shared/install.h
diff --git a/src/libshared/logs-show.h b/src/libshared/include/shared/logs-show.h
index 15fe5b6e5c..15fe5b6e5c 100644
--- a/src/libshared/logs-show.h
+++ b/src/libshared/include/shared/logs-show.h
diff --git a/src/libshared/machine-image.h b/src/libshared/include/shared/machine-image.h
index 7410168c4f..7410168c4f 100644
--- a/src/libshared/machine-image.h
+++ b/src/libshared/include/shared/machine-image.h
diff --git a/src/libshared/machine-pool.h b/src/libshared/include/shared/machine-pool.h
index fe99b7e0ae..fe99b7e0ae 100644
--- a/src/libshared/machine-pool.h
+++ b/src/libshared/include/shared/machine-pool.h
diff --git a/src/libshared/output-mode.h b/src/libshared/include/shared/output-mode.h
index f37189e57f..f37189e57f 100644
--- a/src/libshared/output-mode.h
+++ b/src/libshared/include/shared/output-mode.h
diff --git a/src/libshared/pager.h b/src/libshared/include/shared/pager.h
index 893e1d2bb6..893e1d2bb6 100644
--- a/src/libshared/pager.h
+++ b/src/libshared/include/shared/pager.h
diff --git a/src/libshared/path-lookup.h b/src/libshared/include/shared/path-lookup.h
index f9bb2fe237..f9bb2fe237 100644
--- a/src/libshared/path-lookup.h
+++ b/src/libshared/include/shared/path-lookup.h
diff --git a/src/libshared/ptyfwd.h b/src/libshared/include/shared/ptyfwd.h
index 83c1f60970..83c1f60970 100644
--- a/src/libshared/ptyfwd.h
+++ b/src/libshared/include/shared/ptyfwd.h
diff --git a/src/libshared/resolve-util.h b/src/libshared/include/shared/resolve-util.h
index 8636a6c134..8636a6c134 100644
--- a/src/libshared/resolve-util.h
+++ b/src/libshared/include/shared/resolve-util.h
diff --git a/src/libshared/seccomp-util.h b/src/libshared/include/shared/seccomp-util.h
index 4ed2afc1b2..4ed2afc1b2 100644
--- a/src/libshared/seccomp-util.h
+++ b/src/libshared/include/shared/seccomp-util.h
diff --git a/src/libshared/sleep-config.h b/src/libshared/include/shared/sleep-config.h
index ad10039ff4..ad10039ff4 100644
--- a/src/libshared/sleep-config.h
+++ b/src/libshared/include/shared/sleep-config.h
diff --git a/src/libshared/spawn-ask-password-agent.h b/src/libshared/include/shared/spawn-ask-password-agent.h
index fb0749b13f..fb0749b13f 100644
--- a/src/libshared/spawn-ask-password-agent.h
+++ b/src/libshared/include/shared/spawn-ask-password-agent.h
diff --git a/src/libshared/spawn-polkit-agent.h b/src/libshared/include/shared/spawn-polkit-agent.h
index 42b2989ded..42b2989ded 100644
--- a/src/libshared/spawn-polkit-agent.h
+++ b/src/libshared/include/shared/spawn-polkit-agent.h
diff --git a/src/libshared/specifier.h b/src/libshared/include/shared/specifier.h
index 6b1623ee61..6b1623ee61 100644
--- a/src/libshared/specifier.h
+++ b/src/libshared/include/shared/specifier.h
diff --git a/src/libshared/switch-root.h b/src/libshared/include/shared/switch-root.h
index a7a080b3e8..a7a080b3e8 100644
--- a/src/libshared/switch-root.h
+++ b/src/libshared/include/shared/switch-root.h
diff --git a/src/libshared/sysctl-util.h b/src/libshared/include/shared/sysctl-util.h
index 2decb39f58..2decb39f58 100644
--- a/src/libshared/sysctl-util.h
+++ b/src/libshared/include/shared/sysctl-util.h
diff --git a/src/libshared/test-tables.h b/src/libshared/include/shared/test-tables.h
index 228e510104..228e510104 100644
--- a/src/libshared/test-tables.h
+++ b/src/libshared/include/shared/test-tables.h
diff --git a/src/libshared/tests.h b/src/libshared/include/shared/tests.h
index 93f09013a1..93f09013a1 100644
--- a/src/libshared/tests.h
+++ b/src/libshared/include/shared/tests.h
diff --git a/src/libshared/udev-util.h b/src/libshared/include/shared/udev-util.h
index ca0889f8a6..ca0889f8a6 100644
--- a/src/libshared/udev-util.h
+++ b/src/libshared/include/shared/udev-util.h
diff --git a/src/libshared/uid-range.h b/src/libshared/include/shared/uid-range.h
index 4044eb4c9c..4044eb4c9c 100644
--- a/src/libshared/uid-range.h
+++ b/src/libshared/include/shared/uid-range.h
diff --git a/src/libshared/utmp-wtmp.h b/src/libshared/include/shared/utmp-wtmp.h
index 438e270a26..438e270a26 100644
--- a/src/libshared/utmp-wtmp.h
+++ b/src/libshared/include/shared/utmp-wtmp.h
diff --git a/src/libshared/watchdog.h b/src/libshared/include/shared/watchdog.h
index f6ec178ea1..f6ec178ea1 100644
--- a/src/libshared/watchdog.h
+++ b/src/libshared/include/shared/watchdog.h
diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile
new file mode 100644
index 0000000000..d808b55361
--- /dev/null
+++ b/src/libshared/src/Makefile
@@ -0,0 +1,143 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libshared.la
+
+libshared_la_SOURCES = \
+	src/shared/output-mode.h \
+	src/shared/output-mode.c \
+	src/shared/gpt.h \
+	src/shared/udev-util.h \
+	src/shared/linux/auto_dev-ioctl.h \
+	src/shared/initreq.h \
+	src/shared/dns-domain.c \
+	src/shared/dns-domain.h \
+	src/shared/efivars.c \
+	src/shared/efivars.h \
+	src/shared/fstab-util.c \
+	src/shared/fstab-util.h \
+	src/shared/sleep-config.c \
+	src/shared/sleep-config.h \
+	src/shared/conf-parser.c \
+	src/shared/conf-parser.h \
+	src/shared/pager.c \
+	src/shared/pager.h \
+	src/shared/spawn-polkit-agent.c \
+	src/shared/spawn-polkit-agent.h \
+	src/shared/apparmor-util.c \
+	src/shared/apparmor-util.h \
+	src/shared/ima-util.c \
+	src/shared/ima-util.h \
+	src/shared/ptyfwd.c \
+	src/shared/ptyfwd.h \
+	src/shared/base-filesystem.c \
+	src/shared/base-filesystem.h \
+	src/shared/uid-range.c \
+	src/shared/uid-range.h \
+	src/shared/install.c \
+	src/shared/install.h \
+	src/shared/install-printf.c \
+	src/shared/install-printf.h \
+	src/shared/path-lookup.c \
+	src/shared/path-lookup.h \
+	src/shared/specifier.c \
+	src/shared/specifier.h \
+	src/shared/dev-setup.c \
+	src/shared/dev-setup.h \
+	src/shared/dropin.c \
+	src/shared/dropin.h \
+	src/shared/condition.c \
+	src/shared/condition.h \
+	src/shared/clean-ipc.c \
+	src/shared/clean-ipc.h \
+	src/shared/generator.h \
+	src/shared/generator.c \
+	src/shared/acpi-fpdt.h \
+	src/shared/acpi-fpdt.c \
+	src/shared/boot-timestamps.h \
+	src/shared/boot-timestamps.c \
+	src/shared/cgroup-show.c \
+	src/shared/cgroup-show.h \
+	src/shared/utmp-wtmp.h \
+	src/shared/watchdog.c \
+	src/shared/watchdog.h \
+	src/shared/spawn-ask-password-agent.c \
+	src/shared/spawn-ask-password-agent.h \
+	src/shared/ask-password-api.c \
+	src/shared/ask-password-api.h \
+	src/shared/switch-root.h \
+	src/shared/switch-root.c \
+	src/shared/import-util.c \
+	src/shared/import-util.h \
+	src/shared/sysctl-util.c \
+	src/shared/sysctl-util.h \
+	src/shared/bus-util.c \
+	src/shared/bus-util.h \
+	src/shared/logs-show.c \
+	src/shared/logs-show.h \
+	src/shared/machine-image.c \
+	src/shared/machine-image.h \
+	src/shared/machine-pool.c \
+	src/shared/machine-pool.h \
+	src/shared/resolve-util.c \
+	src/shared/resolve-util.h \
+	src/shared/bus-unit-util.c \
+	src/shared/bus-unit-util.h \
+	src/shared/tests.h \
+	src/shared/tests.c
+
+ifneq ($(HAVE_UTMP),)
+libshared_la_SOURCES += \
+	src/shared/utmp-wtmp.c
+endif # HAVE_UTMP
+
+ifneq ($(HAVE_SECCOMP),)
+libshared_la_SOURCES += \
+	src/shared/seccomp-util.h \
+	src/shared/seccomp-util.c
+endif # HAVE_SECCOMP
+
+ifneq ($(HAVE_ACL),)
+libshared_la_SOURCES += \
+	src/shared/acl-util.c \
+	src/shared/acl-util.h
+endif # HAVE_ACL
+
+libshared_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ACL_CFLAGS) \
+	$(LIBIDN_CFLAGS) \
+	$(SECCOMP_CFLAGS)
+
+libshared_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-journal-internal.la \
+	libudev-internal.la \
+	$(ACL_LIBS) \
+	$(LIBIDN_LIBS) \
+	$(SECCOMP_LIBS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/acl-util.c b/src/libshared/src/acl-util.c
index 2aa951fce9..2aa951fce9 100644
--- a/src/libshared/acl-util.c
+++ b/src/libshared/src/acl-util.c
diff --git a/src/libshared/acpi-fpdt.c b/src/libshared/src/acpi-fpdt.c
index 6779691c28..6779691c28 100644
--- a/src/libshared/acpi-fpdt.c
+++ b/src/libshared/src/acpi-fpdt.c
diff --git a/src/libshared/apparmor-util.c b/src/libshared/src/apparmor-util.c
index edd695fd23..edd695fd23 100644
--- a/src/libshared/apparmor-util.c
+++ b/src/libshared/src/apparmor-util.c
diff --git a/src/libshared/ask-password-api.c b/src/libshared/src/ask-password-api.c
index 4a4bd8d3b8..4a4bd8d3b8 100644
--- a/src/libshared/ask-password-api.c
+++ b/src/libshared/src/ask-password-api.c
diff --git a/src/libshared/base-filesystem.c b/src/libshared/src/base-filesystem.c
index 59a34a9d11..59a34a9d11 100644
--- a/src/libshared/base-filesystem.c
+++ b/src/libshared/src/base-filesystem.c
diff --git a/src/libshared/boot-timestamps.c b/src/libshared/src/boot-timestamps.c
index 7e0152761c..7e0152761c 100644
--- a/src/libshared/boot-timestamps.c
+++ b/src/libshared/src/boot-timestamps.c
diff --git a/src/libshared/bus-unit-util.c b/src/libshared/src/bus-unit-util.c
index f68c4a41ac..f68c4a41ac 100644
--- a/src/libshared/bus-unit-util.c
+++ b/src/libshared/src/bus-unit-util.c
diff --git a/src/libshared/bus-util.c b/src/libshared/src/bus-util.c
index 62b5585e84..62b5585e84 100644
--- a/src/libshared/bus-util.c
+++ b/src/libshared/src/bus-util.c
diff --git a/src/libshared/cgroup-show.c b/src/libshared/src/cgroup-show.c
index 3e451db715..3e451db715 100644
--- a/src/libshared/cgroup-show.c
+++ b/src/libshared/src/cgroup-show.c
diff --git a/src/libshared/clean-ipc.c b/src/libshared/src/clean-ipc.c
index a3ac7aeb82..a3ac7aeb82 100644
--- a/src/libshared/clean-ipc.c
+++ b/src/libshared/src/clean-ipc.c
diff --git a/src/libshared/condition.c b/src/libshared/src/condition.c
index 33ca6e029e..33ca6e029e 100644
--- a/src/libshared/condition.c
+++ b/src/libshared/src/condition.c
diff --git a/src/libshared/conf-parser.c b/src/libshared/src/conf-parser.c
index 83be79a4f5..83be79a4f5 100644
--- a/src/libshared/conf-parser.c
+++ b/src/libshared/src/conf-parser.c
diff --git a/src/libshared/dev-setup.c b/src/libshared/src/dev-setup.c
index b2d464c117..b2d464c117 100644
--- a/src/libshared/dev-setup.c
+++ b/src/libshared/src/dev-setup.c
diff --git a/src/libshared/dns-domain.c b/src/libshared/src/dns-domain.c
index 835557c6b2..835557c6b2 100644
--- a/src/libshared/dns-domain.c
+++ b/src/libshared/src/dns-domain.c
diff --git a/src/libshared/dropin.c b/src/libshared/src/dropin.c
index b9cd952ac8..b9cd952ac8 100644
--- a/src/libshared/dropin.c
+++ b/src/libshared/src/dropin.c
diff --git a/src/libshared/efivars.c b/src/libshared/src/efivars.c
index 5073c61740..5073c61740 100644
--- a/src/libshared/efivars.c
+++ b/src/libshared/src/efivars.c
diff --git a/src/libshared/fstab-util.c b/src/libshared/src/fstab-util.c
index a4e0cd3267..a4e0cd3267 100644
--- a/src/libshared/fstab-util.c
+++ b/src/libshared/src/fstab-util.c
diff --git a/src/libshared/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index 39b544b6f0..39b544b6f0 100644
--- a/src/libshared/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
diff --git a/src/libshared/generator.c b/src/libshared/src/generator.c
index 70afc6a285..70afc6a285 100644
--- a/src/libshared/generator.c
+++ b/src/libshared/src/generator.c
diff --git a/src/libshared/ima-util.c b/src/libshared/src/ima-util.c
index 789064d653..789064d653 100644
--- a/src/libshared/ima-util.c
+++ b/src/libshared/src/ima-util.c
diff --git a/src/libshared/import-util.c b/src/libshared/src/import-util.c
index ab701ad8b2..ab701ad8b2 100644
--- a/src/libshared/import-util.c
+++ b/src/libshared/src/import-util.c
diff --git a/src/libshared/install-printf.c b/src/libshared/src/install-printf.c
index 88143361da..88143361da 100644
--- a/src/libshared/install-printf.c
+++ b/src/libshared/src/install-printf.c
diff --git a/src/libshared/install.c b/src/libshared/src/install.c
index 64d66a45d3..64d66a45d3 100644
--- a/src/libshared/install.c
+++ b/src/libshared/src/install.c
diff --git a/src/libshared/logs-show.c b/src/libshared/src/logs-show.c
index 294fa3bede..294fa3bede 100644
--- a/src/libshared/logs-show.c
+++ b/src/libshared/src/logs-show.c
diff --git a/src/libshared/machine-image.c b/src/libshared/src/machine-image.c
index 529d89ee2a..529d89ee2a 100644
--- a/src/libshared/machine-image.c
+++ b/src/libshared/src/machine-image.c
diff --git a/src/libshared/machine-pool.c b/src/libshared/src/machine-pool.c
index c36efa0102..c36efa0102 100644
--- a/src/libshared/machine-pool.c
+++ b/src/libshared/src/machine-pool.c
diff --git a/src/libshared/output-mode.c b/src/libshared/src/output-mode.c
index bec53ee0ae..bec53ee0ae 100644
--- a/src/libshared/output-mode.c
+++ b/src/libshared/src/output-mode.c
diff --git a/src/libshared/pager.c b/src/libshared/src/pager.c
index c16bc027be..c16bc027be 100644
--- a/src/libshared/pager.c
+++ b/src/libshared/src/pager.c
diff --git a/src/libshared/path-lookup.c b/src/libshared/src/path-lookup.c
index ca593b6963..ca593b6963 100644
--- a/src/libshared/path-lookup.c
+++ b/src/libshared/src/path-lookup.c
diff --git a/src/libshared/ptyfwd.c b/src/libshared/src/ptyfwd.c
index 9629b50ed9..9629b50ed9 100644
--- a/src/libshared/ptyfwd.c
+++ b/src/libshared/src/ptyfwd.c
diff --git a/src/libshared/resolve-util.c b/src/libshared/src/resolve-util.c
index e2da81bab7..e2da81bab7 100644
--- a/src/libshared/resolve-util.c
+++ b/src/libshared/src/resolve-util.c
diff --git a/src/libshared/seccomp-util.c b/src/libshared/src/seccomp-util.c
index cebe0fce2a..cebe0fce2a 100644
--- a/src/libshared/seccomp-util.c
+++ b/src/libshared/src/seccomp-util.c
diff --git a/src/libshared/sleep-config.c b/src/libshared/src/sleep-config.c
index f00624d0f2..f00624d0f2 100644
--- a/src/libshared/sleep-config.c
+++ b/src/libshared/src/sleep-config.c
diff --git a/src/libshared/spawn-ask-password-agent.c b/src/libshared/src/spawn-ask-password-agent.c
index a46b7525f0..a46b7525f0 100644
--- a/src/libshared/spawn-ask-password-agent.c
+++ b/src/libshared/src/spawn-ask-password-agent.c
diff --git a/src/libshared/spawn-polkit-agent.c b/src/libshared/src/spawn-polkit-agent.c
index 7dae4d14fe..7dae4d14fe 100644
--- a/src/libshared/spawn-polkit-agent.c
+++ b/src/libshared/src/spawn-polkit-agent.c
diff --git a/src/libshared/specifier.c b/src/libshared/src/specifier.c
index 303ddf0401..303ddf0401 100644
--- a/src/libshared/specifier.c
+++ b/src/libshared/src/specifier.c
diff --git a/src/libshared/switch-root.c b/src/libshared/src/switch-root.c
index 47d3a5a1fa..47d3a5a1fa 100644
--- a/src/libshared/switch-root.c
+++ b/src/libshared/src/switch-root.c
diff --git a/src/libshared/sysctl-util.c b/src/libshared/src/sysctl-util.c
index e1ccb3294c..e1ccb3294c 100644
--- a/src/libshared/sysctl-util.c
+++ b/src/libshared/src/sysctl-util.c
diff --git a/src/libshared/tests.c b/src/libshared/src/tests.c
index 409116290d..409116290d 100644
--- a/src/libshared/tests.c
+++ b/src/libshared/src/tests.c
diff --git a/src/libshared/uid-range.c b/src/libshared/src/uid-range.c
index b6ec474390..b6ec474390 100644
--- a/src/libshared/uid-range.c
+++ b/src/libshared/src/uid-range.c
diff --git a/src/libshared/utmp-wtmp.c b/src/libshared/src/utmp-wtmp.c
index 9750dcd817..9750dcd817 100644
--- a/src/libshared/utmp-wtmp.c
+++ b/src/libshared/src/utmp-wtmp.c
diff --git a/src/libshared/watchdog.c b/src/libshared/src/watchdog.c
index 4f3e0125f3..4f3e0125f3 100644
--- a/src/libshared/watchdog.c
+++ b/src/libshared/src/watchdog.c