fix

299 files changed, 455 insertions, 454 deletions

diff --git a/config.mk.in b/config.mk.in
index 4c0c8eb7fd..b1698d1db3 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -105,10 +105,10 @@ libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic/include -I$(t
 libbasic.DEPENDS                     =   $(topoutdir)/src/libbasic/src/libbasic.la
 libcore.CPPFLAGS                     = -I$(topsrcdir)/src/libcore $(libshared.CPPFLAGS)
 libcore.DEPENDS                      =   $(topoutdir)/src/libcore/libcore.la
-libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall
+libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall
 libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
-libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
-libshared.DEPENDS                    =   $(topoutdir)/src/libshared/libshared.la
+libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
+libshared.DEPENDS                    =   $(topoutdir)/src/libshared/src/libshared.la
 libsystemd-internal.CPPFLAGS         = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS)
 libsystemd-internal.DEPENDS          = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la
 libsystemd-network.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd-network -I$(topsrcdir)/src/libudev/src $(libsystemd.CPPFLAGS)
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index e17db1d10e..cd8254f5d7 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -26,13 +26,13 @@
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-signature.h"
 #include "sd-bus/bus-type.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "busctl-introspect.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/set.h"
diff --git a/src/grp-boot/bootctl/bootctl.c b/src/grp-boot/bootctl/bootctl.c
index c7b25f0455..487ad429e0 100644
--- a/src/grp-boot/bootctl/bootctl.c
+++ b/src/grp-boot/bootctl/bootctl.c
@@ -38,7 +38,7 @@
 #include "basic/alloc-util.h"
 #include "basic/blkid-util.h"
 #include "basic/dirent-util.h"
-#include "efivars.h"
+#include "shared/efivars.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/locale-util.h"
diff --git a/src/grp-coredump/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c
index 9ba4b30b3c..146a03032c 100644
--- a/src/grp-coredump/coredumpctl/coredumpctl.c
+++ b/src/grp-coredump/coredumpctl/coredumpctl.c
@@ -33,7 +33,7 @@
 #include "sd-journal/journal-internal.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c
index 4db1cef8b7..8f291e6bd8 100644
--- a/src/grp-coredump/systemd-coredump/coredump.c
+++ b/src/grp-coredump/systemd-coredump/coredump.c
@@ -32,12 +32,12 @@
 #include <systemd/sd-login.h>
 #include <systemd/sd-daemon.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/capability-util.h"
 #include "basic/cgroup-util.h"
 #include "sd-journal/compress.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/copy.h"
 #include "coredump-vacuum.h"
 #include "basic/dirent-util.h"
diff --git a/src/grp-helperunits/systemd-backlight/backlight.c b/src/grp-helperunits/systemd-backlight/backlight.c
index e64651ab1e..c7931ac584 100644
--- a/src/grp-helperunits/systemd-backlight/backlight.c
+++ b/src/grp-helperunits/systemd-backlight/backlight.c
@@ -27,7 +27,7 @@
 #include "basic/parse-util.h"
 #include "basic/proc-cmdline.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 static struct udev_device *find_pci_or_platform_parent(struct udev_device *device) {
diff --git a/src/grp-helperunits/systemd-rfkill/rfkill.c b/src/grp-helperunits/systemd-rfkill/rfkill.c
index 9a3539c256..d3dd2ef18d 100644
--- a/src/grp-helperunits/systemd-rfkill/rfkill.c
+++ b/src/grp-helperunits/systemd-rfkill/rfkill.c
@@ -33,7 +33,7 @@
 #include "basic/proc-cmdline.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 #define EXIT_USEC (5 * USEC_PER_SEC)
diff --git a/src/grp-helperunits/systemd-sleep/sleep.c b/src/grp-helperunits/systemd-sleep/sleep.c
index 500386ff09..100066d4c1 100644
--- a/src/grp-helperunits/systemd-sleep/sleep.c
+++ b/src/grp-helperunits/systemd-sleep/sleep.c
@@ -28,7 +28,7 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/log.h"
-#include "sleep-config.h"
+#include "shared/sleep-config.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
diff --git a/src/grp-hostname/hostnamectl.c b/src/grp-hostname/hostnamectl.c
index 04c220b4e3..30f0f06d89 100644
--- a/src/grp-hostname/hostnamectl.c
+++ b/src/grp-hostname/hostnamectl.c
@@ -29,9 +29,9 @@
 #include "basic/alloc-util.h"
 #include "basic/architecture.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/hostname-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/util.h"
 
 static bool arg_ask_password = true;
diff --git a/src/grp-hostname/hostnamed.c b/src/grp-hostname/hostnamed.c
index c90b85dc8c..61d660a9f6 100644
--- a/src/grp-hostname/hostnamed.c
+++ b/src/grp-hostname/hostnamed.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fileio-label.h"
diff --git a/src/grp-import/systemd-export/export.c b/src/grp-import/systemd-export/export.c
index 4419cedc57..a64b79bba0 100644
--- a/src/grp-import/systemd-export/export.c
+++ b/src/grp-import/systemd-export/export.c
@@ -27,8 +27,8 @@
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/verbs.h"
diff --git a/src/grp-import/systemd-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c
index 256d140bc8..0bbae2aa8a 100644
--- a/src/grp-import/systemd-import/import-raw.c
+++ b/src/grp-import/systemd-import/import-raw.c
@@ -34,7 +34,7 @@
 #include "import-compress.h"
 #include "import-raw.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "qcow2-util.h"
diff --git a/src/grp-import/systemd-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h
index 90b452e6e0..a3bc532d37 100644
--- a/src/grp-import/systemd-import/import-raw.h
+++ b/src/grp-import/systemd-import/import-raw.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct RawImport RawImport;
diff --git a/src/grp-import/systemd-import/import-tar.c b/src/grp-import/systemd-import/import-tar.c
index 3e76de481b..8848beb11b 100644
--- a/src/grp-import/systemd-import/import-tar.c
+++ b/src/grp-import/systemd-import/import-tar.c
@@ -33,7 +33,7 @@
 #include "import-compress.h"
 #include "import-tar.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
diff --git a/src/grp-import/systemd-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h
index 97a2a30e6d..90ab082f1a 100644
--- a/src/grp-import/systemd-import/import-tar.h
+++ b/src/grp-import/systemd-import/import-tar.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct TarImport TarImport;
diff --git a/src/grp-import/systemd-import/import.c b/src/grp-import/systemd-import/import.c
index 6a1f8d8e42..6c76c639c3 100644
--- a/src/grp-import/systemd-import/import.c
+++ b/src/grp-import/systemd-import/import.c
@@ -27,8 +27,8 @@
 #include "basic/hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/verbs.h"
diff --git a/src/grp-import/systemd-importd/importd.c b/src/grp-import/systemd-importd/importd.c
index c03df610b6..f9fe1038cd 100644
--- a/src/grp-import/systemd-importd/importd.c
+++ b/src/grp-import/systemd-importd/importd.c
@@ -23,12 +23,12 @@
 
 #include "basic/alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-pool.h"
+#include "shared/import-util.h"
+#include "shared/machine-pool.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-import/systemd-pull/pull-common.h b/src/grp-import/systemd-pull/pull-common.h
index 929a131c88..d9cfb6b3c1 100644
--- a/src/grp-import/systemd-pull/pull-common.h
+++ b/src/grp-import/systemd-pull/pull-common.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "pull-job.h"
 
 int pull_make_local_copy(const char *final, const char *root, const char *local, bool force_local);
diff --git a/src/grp-import/systemd-pull/pull-job.c b/src/grp-import/systemd-pull/pull-job.c
index 5b5828c4d5..fce08f65d9 100644
--- a/src/grp-import/systemd-pull/pull-job.c
+++ b/src/grp-import/systemd-pull/pull-job.c
@@ -23,7 +23,7 @@
 #include "basic/fd-util.h"
 #include "basic/hexdecoct.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/parse-util.h"
 #include "pull-job.h"
 #include "basic/string-util.h"
diff --git a/src/grp-import/systemd-pull/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c
index 9aa631bba7..a9777a5838 100644
--- a/src/grp-import/systemd-pull/pull-raw.c
+++ b/src/grp-import/systemd-pull/pull-raw.c
@@ -33,7 +33,7 @@
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
 #include "import-common.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
diff --git a/src/grp-import/systemd-pull/pull-raw.h b/src/grp-import/systemd-pull/pull-raw.h
index 16a6344817..84cd146647 100644
--- a/src/grp-import/systemd-pull/pull-raw.h
+++ b/src/grp-import/systemd-pull/pull-raw.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct RawPull RawPull;
diff --git a/src/grp-import/systemd-pull/pull-tar.c b/src/grp-import/systemd-pull/pull-tar.c
index 31f931da7c..576bda5a3d 100644
--- a/src/grp-import/systemd-pull/pull-tar.c
+++ b/src/grp-import/systemd-pull/pull-tar.c
@@ -31,7 +31,7 @@
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
 #include "import-common.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
diff --git a/src/grp-import/systemd-pull/pull-tar.h b/src/grp-import/systemd-pull/pull-tar.h
index c59b81ea2e..addd1f861c 100644
--- a/src/grp-import/systemd-pull/pull-tar.h
+++ b/src/grp-import/systemd-pull/pull-tar.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct TarPull TarPull;
diff --git a/src/grp-import/systemd-pull/pull.c b/src/grp-import/systemd-pull/pull.c
index ced1bf6dcb..fa2af2fc02 100644
--- a/src/grp-import/systemd-pull/pull.c
+++ b/src/grp-import/systemd-pull/pull.c
@@ -23,8 +23,8 @@
 
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/parse-util.h"
 #include "pull-raw.h"
 #include "pull-tar.h"
diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c
index 2ca4a47c24..2e21f9ecb7 100644
--- a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c
+++ b/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c
@@ -32,12 +32,12 @@
 #include <systemd/sd-journal.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hostname-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "microhttpd-util.h"
 #include "basic/parse-util.h"
 #include "basic/sigbus.h"
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote.c
index 5abc37e6ec..6ea7adabb0 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c
+++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote.c
@@ -34,7 +34,7 @@
 #include <systemd/sd-daemon.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c b/src/grp-journal-remote/systemd-journal-upload/journal-upload.c
index 6b80ee9b9b..643f44cd86 100644
--- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c
+++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload.c
@@ -26,7 +26,7 @@
 #include <systemd/sd-daemon.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c
index 043e437358..c673fbf78a 100644
--- a/src/grp-journal/journalctl/journalctl.c
+++ b/src/grp-journal/journalctl/journalctl.c
@@ -36,10 +36,10 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-journal.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "catalog.h"
 #include "basic/chattr-util.h"
 #include "basic/fd-util.h"
@@ -56,9 +56,9 @@
 #include "journal-verify.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "basic/mkdir.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/rlimit-util.h"
@@ -68,7 +68,7 @@
 #include "basic/syslog-util.h"
 #include "basic/terminal-util.h"
 #include "udev.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 
diff --git a/src/grp-journal/libjournal-core/journald-gperf.gperf b/src/grp-journal/libjournal-core/journald-gperf.gperf
index 7fecd7a964..f64cd871fe 100644
--- a/src/grp-journal/libjournal-core/journald-gperf.gperf
+++ b/src/grp-journal/libjournal-core/journald-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 #include <sys/socket.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "journald-server.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c
index ede7a5bf66..24b873abeb 100644
--- a/src/grp-journal/libjournal-core/journald-server.c
+++ b/src/grp-journal/libjournal-core/journald-server.c
@@ -31,11 +31,11 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-messages.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
 #include "basic/cgroup-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/dirent-util.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-journal/libjournal-core/journald-wall.c b/src/grp-journal/libjournal-core/journald-wall.c
index adbe275d66..fa3458fd4a 100644
--- a/src/grp-journal/libjournal-core/journald-wall.c
+++ b/src/grp-journal/libjournal-core/journald-wall.c
@@ -23,7 +23,7 @@
 #include "journald-wall.h"
 #include "basic/process-util.h"
 #include "basic/string-util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 void server_forward_wall(
                 Server *s,
diff --git a/src/grp-locale/localectl.c b/src/grp-locale/localectl.c
index 2f4a82a07c..a159f8ed2e 100644
--- a/src/grp-locale/localectl.c
+++ b/src/grp-locale/localectl.c
@@ -28,14 +28,14 @@
 #include <systemd/sd-bus.h>
 
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/locale-util.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/set.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 #include "basic/virt.h"
diff --git a/src/grp-locale/localed.c b/src/grp-locale/localed.c
index 540e6e7b2b..513413e2b5 100644
--- a/src/grp-locale/localed.c
+++ b/src/grp-locale/localed.c
@@ -32,7 +32,7 @@
 #include "basic/alloc-util.h"
 #include "bus-error.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c
index 03a6c1059b..9f6199e6eb 100644
--- a/src/grp-login/liblogind-core/logind-acl.c
+++ b/src/grp-login/liblogind-core/logind-acl.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/dirent-util.h"
 #include "basic/escape.h"
@@ -29,7 +29,7 @@
 #include "logind-acl.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 static int flush_acl(acl_t acl) {
diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/liblogind-core/logind-action.c
index 884957dcf4..6976377c0a 100644
--- a/src/grp-login/liblogind-core/logind-action.c
+++ b/src/grp-login/liblogind-core/logind-action.c
@@ -21,12 +21,12 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
-#include "conf-parser.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
 #include "basic/formats-util.h"
 #include "logind-action.h"
 #include "basic/process-util.h"
-#include "sleep-config.h"
+#include "shared/sleep-config.h"
 #include "basic/special.h"
 #include "basic/string-table.h"
 #include "basic/terminal-util.h"
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index 901dfcbbaf..e47677ffda 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
@@ -25,13 +25,13 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
 #include "logind.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/user-util.h"
 
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c
index cd03d80ffa..bc705e1754 100644
--- a/src/grp-login/liblogind-core/logind-dbus.c
+++ b/src/grp-login/liblogind-core/logind-dbus.c
@@ -28,9 +28,9 @@
 #include "basic/audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/dirent-util.h"
-#include "efivars.h"
+#include "shared/efivars.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
@@ -41,14 +41,14 @@
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/selinux-util.h"
-#include "sleep-config.h"
+#include "shared/sleep-config.h"
 #include "basic/special.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.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/grp-login/liblogind-core/logind-gperf.gperf b/src/grp-login/liblogind-core/logind-gperf.gperf
index 6bd08adc05..6d5c484439 100644
--- a/src/grp-login/liblogind-core/logind-gperf.gperf
+++ b/src/grp-login/liblogind-core/logind-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "logind.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c
index 63286b6733..bd9c4d1c06 100644
--- a/src/grp-login/liblogind-core/logind-seat-dbus.c
+++ b/src/grp-login/liblogind-core/logind-seat-dbus.c
@@ -23,7 +23,7 @@
 #include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "logind-seat.h"
 #include "logind.h"
 #include "basic/strv.h"
diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c
index c0a6b10d6c..483bf0de52 100644
--- a/src/grp-login/liblogind-core/logind-session-dbus.c
+++ b/src/grp-login/liblogind-core/logind-session-dbus.c
@@ -23,7 +23,7 @@
 #include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "logind-session-device.h"
 #include "logind-session.h"
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index ae7ffc6e90..517a2fcb8e 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
@@ -26,7 +26,7 @@
 #include "libudev.h"
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "logind-session-device.h"
 #include "basic/missing.h"
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index 176dd5d8ff..b38e47e7e9 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
@@ -31,7 +31,7 @@
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c
index 66f470472e..b09ecf05b4 100644
--- a/src/grp-login/liblogind-core/logind-user-dbus.c
+++ b/src/grp-login/liblogind-core/logind-user-dbus.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/formats-util.h"
 #include "logind-user.h"
 #include "logind.h"
diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/liblogind-core/logind-user.c
index 6b88d9296e..4d7d8b1133 100644
--- a/src/grp-login/liblogind-core/logind-user.c
+++ b/src/grp-login/liblogind-core/logind-user.c
@@ -25,9 +25,9 @@
 #include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
-#include "clean-ipc.h"
-#include "conf-parser.h"
+#include "shared/bus-util.h"
+#include "shared/clean-ipc.h"
+#include "shared/conf-parser.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c
index 526e606744..04ade6684b 100644
--- a/src/grp-login/liblogind-core/logind-utmp.c
+++ b/src/grp-login/liblogind-core/logind-utmp.c
@@ -28,14 +28,14 @@
 #include "basic/audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/formats-util.h"
 #include "logind.h"
 #include "basic/special.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 _const_ static usec_t when_wall(usec_t n, usec_t elapse) {
 
diff --git a/src/grp-login/loginctl/loginctl.c b/src/grp-login/loginctl/loginctl.c
index 582a0fd011..af747d2344 100644
--- a/src/grp-login/loginctl/loginctl.c
+++ b/src/grp-login/loginctl/loginctl.c
@@ -27,18 +27,18 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
-#include "cgroup-show.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "basic/macro.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "sysfs-show.h"
 #include "basic/terminal-util.h"
diff --git a/src/grp-login/loginctl/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c
index 42b4c08046..c56c919168 100644
--- a/src/grp-login/loginctl/sysfs-show.c
+++ b/src/grp-login/loginctl/sysfs-show.c
@@ -28,7 +28,7 @@
 #include "basic/string-util.h"
 #include "sysfs-show.h"
 #include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 static int show_sysfs_one(
diff --git a/src/grp-login/pam_systemd/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c
index 4dfd12be42..b50fa50697 100644
--- a/src/grp-login/pam_systemd/pam_systemd.c
+++ b/src/grp-login/pam_systemd/pam_systemd.c
@@ -32,7 +32,7 @@
 #include "basic/audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-login/systemd-inhibit/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c
index ea11b2a0e7..89f116f1b5 100644
--- a/src/grp-login/systemd-inhibit/inhibit.c
+++ b/src/grp-login/systemd-inhibit/inhibit.c
@@ -27,7 +27,7 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/process-util.h"
diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c
index 6bc8cc907a..8031d04a8f 100644
--- a/src/grp-login/systemd-logind/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
@@ -27,8 +27,8 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
-#include "conf-parser.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
@@ -37,7 +37,7 @@
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
 #include "basic/strv.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 
 static void manager_free(Manager *m);
 
diff --git a/src/grp-login/test-inhibit.c b/src/grp-login/test-inhibit.c
index 07ece2f5bb..b186b36ce1 100644
--- a/src/grp-login/test-inhibit.c
+++ b/src/grp-login/test-inhibit.c
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/macro.h"
 #include "basic/util.h"
diff --git a/src/grp-login/test-login-tables.c b/src/grp-login/test-login-tables.c
index 4fbc893a9a..3f2f4f3054 100644
--- a/src/grp-login/test-login-tables.c
+++ b/src/grp-login/test-login-tables.c
@@ -19,7 +19,7 @@
 
 #include "logind-action.h"
 #include "logind-session.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(handle_action, HANDLE_ACTION);
diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c
index e55f419d46..13630fb881 100644
--- a/src/grp-machine/libmachine-core/image-dbus.c
+++ b/src/grp-machine/libmachine-core/image-dbus.c
@@ -19,11 +19,11 @@
 
 #include "basic/alloc-util.h"
 #include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "image-dbus.h"
 #include "basic/io-util.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
 #include "basic/process-util.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
diff --git a/src/grp-machine/libmachine-core/machine-dbus.c b/src/grp-machine/libmachine-core/machine-dbus.c
index dd6212249b..4e1b92f486 100644
--- a/src/grp-machine/libmachine-core/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/machine-dbus.c
@@ -32,7 +32,7 @@
 #include "bus-common-errors.h"
 #include "bus-internal.h"
 #include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/copy.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/libmachine-core/machine.c
index 3bcbe9782e..e238983397 100644
--- a/src/grp-machine/libmachine-core/machine.c
+++ b/src/grp-machine/libmachine-core/machine.c
@@ -25,7 +25,7 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/escape.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c
index 9346ad6a77..7b6d8f77ac 100644
--- a/src/grp-machine/libmachine-core/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/machined-dbus.c
@@ -26,7 +26,7 @@
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
@@ -34,8 +34,8 @@
 #include "image-dbus.h"
 #include "basic/io-util.h"
 #include "machine-dbus.h"
-#include "machine-image.h"
-#include "machine-pool.h"
+#include "shared/machine-image.h"
+#include "shared/machine-pool.h"
 #include "machined.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
diff --git a/src/grp-machine/libmachine-core/test-machine-tables.c b/src/grp-machine/libmachine-core/test-machine-tables.c
index f851a4d37d..4f87a7d06b 100644
--- a/src/grp-machine/libmachine-core/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/test-machine-tables.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "machine.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(machine_class, MACHINE_CLASS);
diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c
index f57cbc1e77..30a0668f75 100644
--- a/src/grp-machine/machinectl/machinectl.c
+++ b/src/grp-machine/machinectl/machinectl.c
@@ -33,26 +33,26 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
-#include "cgroup-show.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/copy.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
 #include "basic/signal-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/unit-name.h"
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index 1c79c2a71b..ae83e116bb 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -25,14 +25,14 @@
 
 #include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/hostname-util.h"
 #include "basic/label.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
 #include "machined.h"
 #include "basic/signal-util.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c
index ed4c887479..03b4a3f1b7 100644
--- a/src/grp-network/libnetworkd-core/networkd-address.c
+++ b/src/grp-network/libnetworkd-core/networkd-address.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "firewall-util.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c
index 1b3c4fa6e9..384dae624f 100644
--- a/src/grp-network/libnetworkd-core/networkd-conf.c
+++ b/src/grp-network/libnetworkd-core/networkd-conf.c
@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "dhcp-identifier.h"
 #include "basic/hexdecoct.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c
index 74e98b13dc..75fccea6b9 100644
--- a/src/grp-network/libnetworkd-core/networkd-fdb.c
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.c
@@ -21,7 +21,7 @@
 #include <net/if.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "netlink-util.h"
 #include "networkd-fdb.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
index 3fdfe74955..e1e2a687e6 100644
--- a/src/grp-network/libnetworkd-core/networkd-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "networkd-conf.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c
index e6e36d144b..86fff49be0 100644
--- a/src/grp-network/libnetworkd-core/networkd-link-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "networkd-link.h"
 #include "networkd.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index d17f6b12a2..cb59a8e07c 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dhcp-lease-internal.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -34,7 +34,7 @@
 #include "basic/socket-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-table.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 #include "basic/virt.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
index 42ca07627d..b6cbba5a85 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "networkd.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index a9493c38e2..6226c24b01 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -24,10 +24,10 @@
 #include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
-#include "conf-parser.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "libudev-private.h"
@@ -37,7 +37,7 @@
 #include "basic/ordered-set.h"
 #include "basic/path-util.h"
 #include "basic/set.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/virt.h"
 
 /* use 8 MB for receive socket kernel queue. */
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index f2668f5382..fc1d4eb12f 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -24,7 +24,7 @@
 #include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/extract-word.h"
 #include "basic/missing.h"
 #include "networkd-netdev-bond.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
index ba04bb0165..37f6884656 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "network-internal.h"
 #include "networkd-netdev-bond.h"
 #include "networkd-netdev-ipvlan.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
index 96a0bd600f..e388fa6567 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "networkd-netdev-ipvlan.h"
 #include "basic/string-table.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
index a651b9a8ab..030ec51b15 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "networkd-netdev-macvlan.h"
 #include "basic/string-table.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 9d07072ce4..16bb8a56e8 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/missing.h"
 #include "networkd-link.h"
 #include "networkd-netdev-tunnel.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
index e3d75ac034..1a36e8609f 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/alloc-util.h"
 #include "basic/extract-word.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c
index 7409542be0..33204753c8 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.c
@@ -21,7 +21,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/fd-util.h"
 #include "basic/list.h"
 #include "netlink-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
index 03e4e3b39f..9436e11b66 100644
--- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "networkd.h"
 #include "networkd-conf.h"
 #include "network-internal.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c
index 99a6859e40..e9132d4618 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.c
+++ b/src/grp-network/libnetworkd-core/networkd-network.c
@@ -22,8 +22,8 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "conf-parser.h"
-#include "dns-domain.h"
+#include "shared/conf-parser.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
 #include "network-internal.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h
index e5352e497a..33c97416f8 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.h
+++ b/src/grp-network/libnetworkd-core/networkd-network.h
@@ -22,10 +22,10 @@
 #include <systemd/sd-bus.h>
 #include "udev.h"
 
-#include "condition.h"
+#include "shared/condition.h"
 #include "dhcp-identifier.h"
 #include "basic/hashmap.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
 
 #include "networkd-address.h"
 #include "networkd-fdb.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c
index bf34f445fe..ee34a7df01 100644
--- a/src/grp-network/libnetworkd-core/networkd-route.c
+++ b/src/grp-network/libnetworkd-core/networkd-route.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/in-addr-util.h"
 #include "netlink-util.h"
 #include "networkd-route.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c
index f33cd3e916..7fb2fb26d2 100644
--- a/src/grp-network/libnetworkd-core/networkd-util.c
+++ b/src/grp-network/libnetworkd-core/networkd-util.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "networkd-util.h"
 #include "basic/parse-util.h"
 #include "basic/string-table.h"
diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c
index a2c51e4b9e..efbef4afed 100644
--- a/src/grp-network/networkctl/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
@@ -36,7 +36,7 @@
 #include "local-addresses.h"
 #include "basic/locale-util.h"
 #include "netlink-util.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/socket-util.h"
 #include "basic/sparse-endian.h"
diff --git a/src/grp-network/test-network-tables.c b/src/grp-network/test-network-tables.c
index adbe09a5e1..1b7eee8a03 100644
--- a/src/grp-network/test-network-tables.c
+++ b/src/grp-network/test-network-tables.c
@@ -5,7 +5,7 @@
 #include "networkd-netdev-bond.h"
 #include "networkd-netdev-macvlan.h"
 #include "networkd.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(bond_mode, NETDEV_BOND_MODE);
diff --git a/src/grp-resolve/systemd-resolved/gcrypt-util.c b/src/grp-resolve/systemd-resolved/gcrypt-util.c
index 79dc82a466..5b2fae92e2 120000
--- a/src/grp-resolve/systemd-resolved/gcrypt-util.c
+++ b/src/grp-resolve/systemd-resolved/gcrypt-util.c
@@ -1 +1 @@
-../../libshared/gcrypt-util.c
\ No newline at end of file
+../../libshared/src/gcrypt-util.c
\ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolved/gcrypt-util.h b/src/grp-resolve/systemd-resolved/gcrypt-util.h
index 6da58160eb..e1ad70b84f 120000
--- a/src/grp-resolve/systemd-resolved/gcrypt-util.h
+++ b/src/grp-resolve/systemd-resolved/gcrypt-util.h
@@ -1 +1 @@
-../../libshared/gcrypt-util.h
\ No newline at end of file
+../../libshared/include/shared/gcrypt-util.h
\ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c
index 7824a36d3d..f140820e0f 100644
--- a/src/grp-resolve/systemd-resolved/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolved/resolve-tool.c
@@ -25,10 +25,10 @@
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/escape.h"
 #include "basic/in-addr-util.h"
-#include "gcrypt-util.h"
+#include "shared/gcrypt-util.h"
 #include "basic/parse-util.h"
 #include "resolved-def.h"
 #include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c
index 49a7addc24..ff0bcdfef4 100644
--- a/src/grp-resolve/systemd-resolved/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
@@ -19,8 +19,8 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "bus-util.h"
-#include "dns-domain.h"
+#include "shared/bus-util.h"
+#include "shared/dns-domain.h"
 #include "resolved-bus.h"
 #include "resolved-def.h"
 #include "resolved-dns-synthesize.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index 3b33d45a6a..e22f107419 100644
--- a/src/grp-resolve/systemd-resolved/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
@@ -18,7 +18,7 @@
  ***/
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/extract-word.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
index bd3aef6e5e..f9f7e91c1a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-dnssec.h"
 #include "basic/string-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index 8b67a7b903..0527c57e1c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -21,7 +21,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
index 94524703b7..39afbada25 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
@@ -22,8 +22,8 @@
 #endif
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
-#include "gcrypt-util.h"
+#include "shared/dns-domain.h"
+#include "shared/gcrypt-util.h"
 #include "basic/hexdecoct.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
index 77bd4d71bf..c2ebff767f 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
@@ -22,7 +22,7 @@
 typedef enum DnssecResult DnssecResult;
 typedef enum DnssecVerdict DnssecVerdict;
 
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-rr.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
index 07fc9f5b73..b379b2bb97 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
@@ -18,7 +18,7 @@
  ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "resolved-dns-packet.h"
 #include "basic/string-table.h"
 #include "basic/strv.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index a1e471be92..0a62571af7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "dns-type.h"
 #include "basic/hostname-util.h"
 #include "sd-netlink/local-addresses.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
index 9e15ad45dd..cdbbecc488 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "dns-type.h"
 #include "resolved-dns-question.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
index c1a729ce94..e53b2c1831 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
@@ -20,7 +20,7 @@
 #include <math.h>
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "dns-type.h"
 #include "basic/escape.h"
 #include "basic/hexdecoct.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index a77162663d..98897ff41c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
@@ -21,7 +21,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
 #include "basic/missing.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
index 71824d8c4a..d3b8bf3b4d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "resolved-dns-search-domain.h"
 
 int dns_search_domain_new(
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index f5c52a5185..abaa11d803 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -21,7 +21,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/errno-list.h"
 #include "basic/fd-util.h"
 #include "basic/random-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index f1998f99f7..f810c82848 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -22,7 +22,7 @@
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
 #include "basic/def.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hexdecoct.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index f78e6da33c..97048c45d1 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/list.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dns-zone.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
index 82f26215df..5d1c209c35 100644
--- a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
+++ b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "resolved-conf.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/grp-resolve/systemd-resolved/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index 2a51c3a1b0..3c0c032fac 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
@@ -18,9 +18,9 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/parse-util.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
 #include "resolved-bus.h"
 #include "resolved-link-bus.h"
 #include "basic/strv.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index 051716db96..cc4f4f59d7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
@@ -23,7 +23,7 @@
 
 #include "basic/in-addr-util.h"
 #include "basic/ratelimit.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
 
 typedef struct Link Link;
 typedef struct LinkAddress LinkAddress;
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c
index 0294345294..b2b3daaf5c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
@@ -23,7 +23,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
 #include "basic/hostname-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 49fac4c346..1860994463 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
@@ -26,7 +26,7 @@
 #include "basic/hashmap.h"
 #include "basic/list.h"
 #include "basic/ordered-set.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
index 5e1f293de0..70f9173c22 100644
--- a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
@@ -20,7 +20,7 @@
 #include <resolv.h>
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
 #include "basic/fileio.h"
diff --git a/src/grp-resolve/systemd-resolved/test-resolve-tables.c b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
index 2d615130e1..0307c6485f 100644
--- a/src/grp-resolve/systemd-resolved/test-resolve-tables.c
+++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "dns-type.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
 
 int main(int argc, char **argv) {
         uint16_t i;
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index 91bbeac651..b9b1c8400b 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -39,13 +39,13 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-message.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
-#include "cgroup-show.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/copy.h"
-#include "dropin.h"
-#include "efivars.h"
+#include "shared/dropin.h"
+#include "shared/efivars.h"
 #include "basic/env-util.h"
 #include "basic/exit-status.h"
 #include "basic/fd-util.h"
@@ -54,26 +54,26 @@
 #include "basic/fs-util.h"
 #include "basic/glob-util.h"
 #include "basic/hostname-util.h"
-#include "initreq.h"
-#include "install.h"
+#include "shared/initreq.h"
+#include "shared/install.h"
 #include "basic/io-util.h"
 #include "basic/list.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #include "basic/set.h"
 #include "basic/signal-util.h"
 #include "basic/socket-util.h"
-#include "spawn-ask-password-agent.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-ask-password-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/special.h"
 #include "basic/stat-util.h"
 #include "basic/strv.h"
@@ -81,7 +81,7 @@
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 #include "basic/verbs.h"
 #include "basic/virt.h"
 
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index 4d161fac21..31206f21dc 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -42,10 +42,10 @@
 #include "basic/architecture.h"
 #include "basic/build.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/clock-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/cpu-set-util.h"
 #include "dbus-manager.h"
 #include "basic/def.h"
@@ -66,7 +66,7 @@
 #include "manager.h"
 #include "basic/missing.h"
 #include "mount-setup.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/proc-cmdline.h"
 #include "basic/process-util.h"
@@ -79,12 +79,12 @@
 #include "basic/stat-util.h"
 #include "basic/stdio-util.h"
 #include "basic/strv.h"
-#include "switch-root.h"
+#include "shared/switch-root.h"
 #include "basic/terminal-util.h"
 #include "basic/umask-util.h"
 #include "basic/user-util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 static enum {
         ACTION_RUN,
diff --git a/src/grp-timedate/systemd-timedated/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c
index 722f3dd2f8..2d3f1d4fd2 100644
--- a/src/grp-timedate/systemd-timedated/timedated.c
+++ b/src/grp-timedate/systemd-timedated/timedated.c
@@ -28,7 +28,7 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/clock-util.h"
 #include "basic/def.h"
 #include "basic/fileio-label.h"
diff --git a/src/grp-timedate/timedatectl/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c
index 993fe7d385..323d2d7d53 100644
--- a/src/grp-timedate/timedatectl/timedatectl.c
+++ b/src/grp-timedate/timedatectl/timedatectl.c
@@ -26,10 +26,10 @@
 #include <systemd/sd-bus.h>
 
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
-#include "pager.h"
+#include "shared/bus-util.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/util.h"
diff --git a/src/grp-udev/ata_id/ata_id.c b/src/grp-udev/ata_id/ata_id.c
index 28e11118dc..962332c0ad 100644
--- a/src/grp-udev/ata_id/ata_id.c
+++ b/src/grp-udev/ata_id/ata_id.c
@@ -42,7 +42,7 @@
 #include "basic/fd-util.h"
 #include "libudev-private.h"
 #include "basic/log.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 
 #define COMMAND_TIMEOUT_MSEC (30 * 1000)
 
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c
index 2b5ba10ae2..09a3517444 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/grp-udev/libudev-core/net/ethtool-util.c
@@ -22,7 +22,7 @@
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "ethtool-util.h"
 #include "basic/log.h"
 #include "basic/string-table.h"
diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
index b25e4b3344..46fa4ed03d 100644
--- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf
+++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "network-internal.h"
 #include "link-config.h"
 #include "ethtool-util.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c
index 7f37adc75d..872b9ba209 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/grp-udev/libudev-core/net/link-config.c
@@ -23,7 +23,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "ethtool-util.h"
 #include "basic/fd-util.h"
 #include "libudev-private.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h
index 54be667536..b520e1ee9e 100644
--- a/src/grp-udev/libudev-core/net/link-config.h
+++ b/src/grp-udev/libudev-core/net/link-config.h
@@ -21,7 +21,7 @@
 
 #include "libudev.h"
 
-#include "condition.h"
+#include "shared/condition.h"
 #include "ethtool-util.h"
 #include "basic/list.h"
 
diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c
index e3dc26eb3e..b226626e8d 100644
--- a/src/grp-udev/libudev-core/udev-builtin-blkid.c
+++ b/src/grp-udev/libudev-core/udev-builtin-blkid.c
@@ -30,9 +30,9 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "efivars.h"
+#include "shared/efivars.h"
 #include "basic/fd-util.h"
-#include "gpt.h"
+#include "shared/gpt.h"
 #include "basic/string-util.h"
 #include "udev.h"
 
diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
index 2bf65e1ec6..24f4ba0744 100644
--- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c
+++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
@@ -27,7 +27,7 @@
 #include "basic/alloc-util.h"
 #include "sd-hwdb/hwdb-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 
 static sd_hwdb *hwdb;
diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c
index 71eaf8ae5f..73fb7677da 100644
--- a/src/grp-udev/libudev-core/udev-rules.c
+++ b/src/grp-udev/libudev-core/udev-rules.c
@@ -41,7 +41,7 @@
 #include "basic/strbuf.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
-#include "sysctl-util.h"
+#include "shared/sysctl-util.h"
 #include "udev.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
diff --git a/src/grp-udev/scsi_id/scsi_id.c b/src/grp-udev/scsi_id/scsi_id.c
index 1ba35d79a1..48c6cb4074 100644
--- a/src/grp-udev/scsi_id/scsi_id.c
+++ b/src/grp-udev/scsi_id/scsi_id.c
@@ -35,7 +35,7 @@
 #include "libudev-private.h"
 #include "scsi_id.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 
 static const struct option options[] = {
         { "device",             required_argument, NULL, 'd' },
diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c
index 8262cf5a0b..8033ab4eab 100644
--- a/src/grp-udev/systemd-udevd/udevd.c
+++ b/src/grp-udev/systemd-udevd/udevd.c
@@ -46,7 +46,7 @@
 #include "basic/alloc-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/cpu-set-util.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
@@ -61,7 +61,7 @@
 #include "basic/socket-util.h"
 #include "basic/string-util.h"
 #include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 #include "basic/user-util.h"
 
diff --git a/src/grp-udev/udevadm/udevadm-control.c b/src/grp-udev/udevadm/udevadm-control.c
index 989decbe95..8aaef5fa14 100644
--- a/src/grp-udev/udevadm/udevadm-control.c
+++ b/src/grp-udev/udevadm/udevadm-control.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 
 static void print_help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c
index 45d2de99d7..9694a991ec 100644
--- a/src/grp-udev/udevadm/udevadm-info.c
+++ b/src/grp-udev/udevadm/udevadm-info.c
@@ -28,7 +28,7 @@
 
 #include "basic/fd-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 
diff --git a/src/grp-udev/udevadm/udevadm-monitor.c b/src/grp-udev/udevadm/udevadm-monitor.c
index 202cea6385..01f322f721 100644
--- a/src/grp-udev/udevadm/udevadm-monitor.c
+++ b/src/grp-udev/udevadm/udevadm-monitor.c
@@ -27,7 +27,7 @@
 
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 
 static bool udev_exit;
diff --git a/src/grp-udev/udevadm/udevadm-test.c b/src/grp-udev/udevadm/udevadm-test.c
index 396e08fb5d..ed919ec244 100644
--- a/src/grp-udev/udevadm/udevadm-test.c
+++ b/src/grp-udev/udevadm/udevadm-test.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 
 static void help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c
index 97f28f6163..89ca90d01b 100644
--- a/src/grp-udev/udevadm/udevadm-trigger.c
+++ b/src/grp-udev/udevadm/udevadm-trigger.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
 #include "basic/util.h"
diff --git a/src/libcore/automount.c b/src/libcore/automount.c
index 88c3c0cda0..145ed5ab5d 100644
--- a/src/libcore/automount.c
+++ b/src/libcore/automount.c
@@ -31,7 +31,7 @@
 #include "basic/async.h"
 #include "automount.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-automount.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
diff --git a/src/libcore/busname.c b/src/libcore/busname.c
index 7098e0cbd8..765fd7a442 100644
--- a/src/libcore/busname.c
+++ b/src/libcore/busname.c
@@ -23,7 +23,7 @@
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-kernel.h"
 #include "bus-policy.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "busname.h"
 #include "dbus-busname.h"
 #include "basic/fd-util.h"
diff --git a/src/libcore/dbus-automount.c b/src/libcore/dbus-automount.c
index 333ccb6303..bc44dc1c0a 100644
--- a/src/libcore/dbus-automount.c
+++ b/src/libcore/dbus-automount.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "automount.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-automount.h"
 #include "basic/string-util.h"
 
diff --git a/src/libcore/dbus-busname.c b/src/libcore/dbus-busname.c
index f5180d645c..80e7484f46 100644
--- a/src/libcore/dbus-busname.c
+++ b/src/libcore/dbus-busname.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "busname.h"
 #include "dbus-busname.h"
 #include "basic/string-util.h"
diff --git a/src/libcore/dbus-cgroup.c b/src/libcore/dbus-cgroup.c
index ca865f9b90..86f7c626c4 100644
--- a/src/libcore/dbus-cgroup.c
+++ b/src/libcore/dbus-cgroup.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "cgroup.h"
 #include "dbus-cgroup.h"
diff --git a/src/libcore/dbus-execute.c b/src/libcore/dbus-execute.c
index 6cb69ff9b9..b5530d945e 100644
--- a/src/libcore/dbus-execute.c
+++ b/src/libcore/dbus-execute.c
@@ -25,7 +25,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "dbus-execute.h"
 #include "basic/env-util.h"
@@ -40,7 +40,7 @@
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
diff --git a/src/libcore/dbus-kill.c b/src/libcore/dbus-kill.c
index 3a8fdab808..cd76682298 100644
--- a/src/libcore/dbus-kill.c
+++ b/src/libcore/dbus-kill.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-kill.h"
 #include "kill.h"
 #include "basic/signal-util.h"
diff --git a/src/libcore/dbus-manager.c b/src/libcore/dbus-manager.c
index 7fe22646b5..59f8a7908a 100644
--- a/src/libcore/dbus-manager.c
+++ b/src/libcore/dbus-manager.c
@@ -35,7 +35,7 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "selinux-access.h"
@@ -44,7 +44,7 @@
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 static int property_get_version(
                 sd_bus *bus,
diff --git a/src/libcore/dbus-mount.c b/src/libcore/dbus-mount.c
index 3adf12d377..e6e824b6b9 100644
--- a/src/libcore/dbus-mount.c
+++ b/src/libcore/dbus-mount.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/libcore/dbus-path.c b/src/libcore/dbus-path.c
index 83eb38fe9a..2f2a65d4c1 100644
--- a/src/libcore/dbus-path.c
+++ b/src/libcore/dbus-path.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-path.h"
 #include "path.h"
 #include "basic/string-util.h"
diff --git a/src/libcore/dbus-scope.c b/src/libcore/dbus-scope.c
index 5059416d65..3a9c3b98ec 100644
--- a/src/libcore/dbus-scope.c
+++ b/src/libcore/dbus-scope.c
@@ -20,7 +20,7 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
 #include "dbus-scope.h"
diff --git a/src/libcore/dbus-service.c b/src/libcore/dbus-service.c
index ecffd45b20..463d9da4e1 100644
--- a/src/libcore/dbus-service.c
+++ b/src/libcore/dbus-service.c
@@ -19,7 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/async.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/libcore/dbus-socket.c b/src/libcore/dbus-socket.c
index 6007c3e1f0..53c9911991 100644
--- a/src/libcore/dbus-socket.c
+++ b/src/libcore/dbus-socket.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-socket.h"
diff --git a/src/libcore/dbus-swap.c b/src/libcore/dbus-swap.c
index baae9b83b4..2cfc8bd496 100644
--- a/src/libcore/dbus-swap.c
+++ b/src/libcore/dbus-swap.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-swap.h"
diff --git a/src/libcore/dbus-timer.c b/src/libcore/dbus-timer.c
index b03809341a..be84522036 100644
--- a/src/libcore/dbus-timer.c
+++ b/src/libcore/dbus-timer.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-timer.h"
 #include "basic/strv.h"
 #include "timer.h"
diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c
index c864c4e2f8..d1d6248041 100644
--- a/src/libcore/dbus.c
+++ b/src/libcore/dbus.c
@@ -27,7 +27,7 @@
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/libcore/device.c b/src/libcore/device.c
index 162a6cdb85..10e9e9ae76 100644
--- a/src/libcore/device.c
+++ b/src/libcore/device.c
@@ -31,7 +31,7 @@
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
 #include "swap.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "unit.h"
 
diff --git a/src/libcore/execute.c b/src/libcore/execute.c
index 32382ad6b8..e7628bceb3 100644
--- a/src/libcore/execute.c
+++ b/src/libcore/execute.c
@@ -54,7 +54,7 @@
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
 #ifdef HAVE_APPARMOR
-#include "apparmor-util.h"
+#include "shared/apparmor-util.h"
 #endif
 #include "basic/async.h"
 #include "basic/barrier.h"
@@ -83,7 +83,7 @@
 #include "basic/rlimit-util.h"
 #include "basic/rm-rf.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/securebits.h"
 #include "basic/selinux-util.h"
@@ -97,7 +97,7 @@
 #include "unit.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
diff --git a/src/libcore/failure-action.c b/src/libcore/failure-action.c
index d8d2100287..be76c15a37 100644
--- a/src/libcore/failure-action.c
+++ b/src/libcore/failure-action.c
@@ -22,7 +22,7 @@
 #include <linux/reboot.h>
 
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "failure-action.h"
 #include "basic/special.h"
 #include "basic/string-table.h"
diff --git a/src/libcore/kmod-setup.c b/src/libcore/kmod-setup.c
index 0f7ba5c235..6ddf1137ec 100644
--- a/src/libcore/kmod-setup.c
+++ b/src/libcore/kmod-setup.c
@@ -24,7 +24,7 @@
 #include <libkmod.h>
 #endif
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "kmod-setup.h"
 #include "basic/macro.h"
diff --git a/src/libcore/load-dropin.c b/src/libcore/load-dropin.c
index d142dc9618..bb6cf0f989 100644
--- a/src/libcore/load-dropin.c
+++ b/src/libcore/load-dropin.c
@@ -18,7 +18,7 @@
 ***/
 
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "load-dropin.h"
 #include "load-fragment.h"
 #include "basic/log.h"
diff --git a/src/libcore/load-dropin.h b/src/libcore/load-dropin.h
index 942d26724e..067661b1ff 100644
--- a/src/libcore/load-dropin.h
+++ b/src/libcore/load-dropin.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "unit.h"
 
 /* Read service data supplementary drop-in directories */
diff --git a/src/libcore/load-fragment-gperf.gperf.m4 b/src/libcore/load-fragment-gperf.gperf.m4
index bee0431538..c9f6e6acf7 100644
--- a/src/libcore/load-fragment-gperf.gperf.m4
+++ b/src/libcore/load-fragment-gperf.gperf.m4
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "load-fragment.h"
 #include "basic/missing.h"
 %}
diff --git a/src/libcore/load-fragment.c b/src/libcore/load-fragment.c
index cf99d5c9d4..6d9100b189 100644
--- a/src/libcore/load-fragment.c
+++ b/src/libcore/load-fragment.c
@@ -34,11 +34,11 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cap-list.h"
 #include "basic/capability-util.h"
 #include "cgroup.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/cpu-set-util.h"
 #include "basic/env-util.h"
 #include "basic/errno-list.h"
@@ -54,7 +54,7 @@
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/securebits.h"
 #include "basic/signal-util.h"
diff --git a/src/libcore/manager.c b/src/libcore/manager.c
index 75ee77599a..9019967300 100644
--- a/src/libcore/manager.c
+++ b/src/libcore/manager.c
@@ -40,11 +40,11 @@
 
 #include "basic/alloc-util.h"
 #include "audit-fd.h"
-#include "boot-timestamps.h"
+#include "shared/boot-timestamps.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
@@ -66,7 +66,7 @@
 #include "basic/mkdir.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/ratelimit.h"
@@ -84,7 +84,7 @@
 #include "basic/unit-name.h"
 #include "basic/util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 #define NOTIFY_RCVBUF_SIZE (8*1024*1024)
 #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024)
diff --git a/src/libcore/manager.h b/src/libcore/manager.h
index f1c21940a9..87186b6e40 100644
--- a/src/libcore/manager.h
+++ b/src/libcore/manager.h
@@ -70,7 +70,7 @@ typedef enum StatusType {
 
 #include "execute.h"
 #include "job.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "show-status.h"
 #include "basic/unit-name.h"
 
diff --git a/src/libcore/mount-setup.c b/src/libcore/mount-setup.c
index 443c24dfe9..09df45c567 100644
--- a/src/libcore/mount-setup.c
+++ b/src/libcore/mount-setup.c
@@ -24,10 +24,10 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
-#include "dev-setup.h"
-#include "efivars.h"
+#include "shared/dev-setup.h"
+#include "shared/efivars.h"
 #include "basic/label.h"
 #include "basic/log.h"
 #include "basic/macro.h"
diff --git a/src/libcore/mount.c b/src/libcore/mount.c
index 4e2476dc2a..ab6efd4a9c 100644
--- a/src/libcore/mount.c
+++ b/src/libcore/mount.c
@@ -29,7 +29,7 @@
 #include "basic/escape.h"
 #include "basic/exit-status.h"
 #include "basic/formats-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/log.h"
 #include "manager.h"
 #include "basic/mkdir.h"
diff --git a/src/libcore/namespace.c b/src/libcore/namespace.c
index 868c0a9d5d..f7c5364437 100644
--- a/src/libcore/namespace.c
+++ b/src/libcore/namespace.c
@@ -27,7 +27,7 @@
 #include <linux/fs.h>
 
 #include "basic/alloc-util.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
 #include "basic/fd-util.h"
 #include "loopback-setup.h"
 #include "basic/missing.h"
diff --git a/src/libcore/path.c b/src/libcore/path.c
index c659b4eb38..782e085174 100644
--- a/src/libcore/path.c
+++ b/src/libcore/path.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-path.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
diff --git a/src/libcore/selinux-access.c b/src/libcore/selinux-access.c
index 6fbc4893c0..a259e128c1 100644
--- a/src/libcore/selinux-access.c
+++ b/src/libcore/selinux-access.c
@@ -33,7 +33,7 @@
 
 #include "basic/alloc-util.h"
 #include "audit-fd.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "basic/selinux-util.h"
diff --git a/src/libcore/selinux-access.h b/src/libcore/selinux-access.h
index cbf33ef6c4..1b1a8418ec 100644
--- a/src/libcore/selinux-access.h
+++ b/src/libcore/selinux-access.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "manager.h"
 
 int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error);
diff --git a/src/libcore/service.c b/src/libcore/service.c
index 4b37b99013..2845a841c3 100644
--- a/src/libcore/service.c
+++ b/src/libcore/service.c
@@ -25,7 +25,7 @@
 #include "basic/async.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-service.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
diff --git a/src/libcore/socket.c b/src/libcore/socket.c
index 7800c7f9d0..7ee5edfef8 100644
--- a/src/libcore/socket.c
+++ b/src/libcore/socket.c
@@ -30,7 +30,7 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/copy.h"
 #include "dbus-socket.h"
 #include "basic/def.h"
diff --git a/src/libcore/swap.c b/src/libcore/swap.c
index 4311caec12..c08057a9fe 100644
--- a/src/libcore/swap.c
+++ b/src/libcore/swap.c
@@ -30,7 +30,7 @@
 #include "basic/exit-status.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
@@ -38,7 +38,7 @@
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "swap.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "unit.h"
 #include "basic/virt.h"
diff --git a/src/libcore/timer.c b/src/libcore/timer.c
index fced3df4cc..45eec02dee 100644
--- a/src/libcore/timer.c
+++ b/src/libcore/timer.c
@@ -21,7 +21,7 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-timer.h"
 #include "basic/fs-util.h"
 #include "basic/parse-util.h"
diff --git a/src/libcore/unit-printf.c b/src/libcore/unit-printf.c
index b04582a6de..c64d45e251 100644
--- a/src/libcore/unit-printf.c
+++ b/src/libcore/unit-printf.c
@@ -21,7 +21,7 @@
 #include "basic/cgroup-util.h"
 #include "basic/formats-util.h"
 #include "basic/macro.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
diff --git a/src/libcore/unit.c b/src/libcore/unit.c
index c310c5e9d7..3caa8baa26 100644
--- a/src/libcore/unit.c
+++ b/src/libcore/unit.c
@@ -28,11 +28,11 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "dbus-unit.h"
 #include "dbus.h"
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "execute.h"
 #include "basic/fileio-label.h"
diff --git a/src/libcore/unit.h b/src/libcore/unit.h
index bc5227b3c3..df1174b837 100644
--- a/src/libcore/unit.h
+++ b/src/libcore/unit.h
@@ -28,9 +28,9 @@ typedef struct UnitVTable UnitVTable;
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 
-#include "condition.h"
+#include "shared/condition.h"
 #include "failure-action.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/list.h"
 #include "basic/unit-name.h"
 
diff --git a/src/libshared/include/shared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h
index 8327189a63..e657b42ecb 100644
--- a/src/libshared/include/shared/bus-unit-util.h
+++ b/src/libshared/include/shared/bus-unit-util.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "output-mode.h"
-#include "install.h"
+#include "shared/output-mode.h"
+#include "shared/install.h"
 
 typedef struct UnitInfo {
         const char *machine;
diff --git a/src/libshared/include/shared/cgroup-show.h b/src/libshared/include/shared/cgroup-show.h
index 5c1d6e6d98..7deb42fff7 100644
--- a/src/libshared/include/shared/cgroup-show.h
+++ b/src/libshared/include/shared/cgroup-show.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "logs-show.h"
-#include "output-mode.h"
+#include "shared/logs-show.h"
+#include "shared/output-mode.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, OutputFlags flags);
 int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, OutputFlags flags);
diff --git a/src/libshared/include/shared/install-printf.h b/src/libshared/include/shared/install-printf.h
index 8a570fc265..56099f464d 100644
--- a/src/libshared/include/shared/install-printf.h
+++ b/src/libshared/include/shared/install-printf.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "install.h"
+#include "shared/install.h"
 
 int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret);
diff --git a/src/libshared/include/shared/install.h b/src/libshared/include/shared/install.h
index b16c752a9b..2f9b15a1c8 100644
--- a/src/libshared/include/shared/install.h
+++ b/src/libshared/include/shared/install.h
@@ -32,7 +32,7 @@ typedef struct UnitFileInstallInfo UnitFileInstallInfo;
 
 #include "basic/hashmap.h"
 #include "basic/macro.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
 
diff --git a/src/libshared/include/shared/logs-show.h b/src/libshared/include/shared/logs-show.h
index 11a64a092e..8f3cadd0e3 100644
--- a/src/libshared/include/shared/logs-show.h
+++ b/src/libshared/include/shared/logs-show.h
@@ -27,7 +27,7 @@
 #include <systemd/sd-journal.h>
 
 #include "basic/macro.h"
-#include "output-mode.h"
+#include "shared/output-mode.h"
 #include "basic/time-util.h"
 #include "basic/util.h"
 
diff --git a/src/libshared/include/shared/path-lookup.h b/src/libshared/include/shared/path-lookup.h
index b5df3d9fef..c3e0a10552 100644
--- a/src/libshared/include/shared/path-lookup.h
+++ b/src/libshared/include/shared/path-lookup.h
@@ -23,7 +23,7 @@
 
 typedef struct LookupPaths LookupPaths;
 
-#include "install.h"
+#include "shared/install.h"
 #include "basic/macro.h"
 
 typedef enum LookupPathsFlags {
diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile
index 077d7aa9f5..08de6a2ef5 100644
--- a/src/libshared/src/Makefile
+++ b/src/libshared/src/Makefile
@@ -139,6 +139,7 @@ libshared_la_LIBADD = \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
+systemd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared))
 systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
 systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
diff --git a/src/libshared/src/acl-util.c b/src/libshared/src/acl-util.c
index a29790a115..fb19394e02 100644
--- a/src/libshared/src/acl-util.c
+++ b/src/libshared/src/acl-util.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
diff --git a/src/libshared/src/acpi-fpdt.c b/src/libshared/src/acpi-fpdt.c
index 844db82645..a43bf3847a 100644
--- a/src/libshared/src/acpi-fpdt.c
+++ b/src/libshared/src/acpi-fpdt.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "acpi-fpdt.h"
+#include "shared/acpi-fpdt.h"
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/libshared/src/apparmor-util.c b/src/libshared/src/apparmor-util.c
index 6d1861d2ee..7d638d0a28 100644
--- a/src/libshared/src/apparmor-util.c
+++ b/src/libshared/src/apparmor-util.c
@@ -20,7 +20,7 @@
 #include <stddef.h>
 
 #include "basic/alloc-util.h"
-#include "apparmor-util.h"
+#include "shared/apparmor-util.h"
 #include "basic/fileio.h"
 #include "basic/parse-util.h"
 
diff --git a/src/libshared/src/ask-password-api.c b/src/libshared/src/ask-password-api.c
index deff185c0b..864c62ee9b 100644
--- a/src/libshared/src/ask-password-api.c
+++ b/src/libshared/src/ask-password-api.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "ask-password-api.h"
+#include "shared/ask-password-api.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
diff --git a/src/libshared/src/base-filesystem.c b/src/libshared/src/base-filesystem.c
index 85276bbc8c..ac3a1bf6b9 100644
--- a/src/libshared/src/base-filesystem.c
+++ b/src/libshared/src/base-filesystem.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "base-filesystem.h"
+#include "shared/base-filesystem.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
diff --git a/src/libshared/src/boot-timestamps.c b/src/libshared/src/boot-timestamps.c
index 5d2d39aaed..4d2bad0492 100644
--- a/src/libshared/src/boot-timestamps.c
+++ b/src/libshared/src/boot-timestamps.c
@@ -18,9 +18,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "acpi-fpdt.h"
-#include "boot-timestamps.h"
-#include "efivars.h"
+#include "shared/acpi-fpdt.h"
+#include "shared/boot-timestamps.h"
+#include "shared/efivars.h"
 #include "basic/macro.h"
 #include "basic/time-util.h"
 
diff --git a/src/libshared/src/bus-unit-util.c b/src/libshared/src/bus-unit-util.c
index c78f428875..9ae172c181 100644
--- a/src/libshared/src/bus-unit-util.c
+++ b/src/libshared/src/bus-unit-util.c
@@ -19,8 +19,8 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/env-util.h"
 #include "basic/escape.h"
diff --git a/src/libshared/src/bus-util.c b/src/libshared/src/bus-util.c
index 5a03339b79..6163b40679 100644
--- a/src/libshared/src/bus-util.c
+++ b/src/libshared/src/bus-util.c
@@ -38,7 +38,7 @@
 #include "sd-bus/bus-internal.h"
 #include "basic/bus-label.h"
 #include "sd-bus/bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
diff --git a/src/libshared/src/cgroup-show.c b/src/libshared/src/cgroup-show.c
index 84cd322997..6b1b8dba99 100644
--- a/src/libshared/src/cgroup-show.c
+++ b/src/libshared/src/cgroup-show.c
@@ -25,13 +25,13 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "cgroup-show.h"
+#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/locale-util.h"
 #include "basic/macro.h"
-#include "output-mode.h"
+#include "shared/output-mode.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/string-util.h"
diff --git a/src/libshared/src/clean-ipc.c b/src/libshared/src/clean-ipc.c
index b92cd28f67..326fa32a3a 100644
--- a/src/libshared/src/clean-ipc.c
+++ b/src/libshared/src/clean-ipc.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "clean-ipc.h"
+#include "shared/clean-ipc.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/libshared/src/condition.c b/src/libshared/src/condition.c
index e089a9cb66..bb0346f416 100644
--- a/src/libshared/src/condition.c
+++ b/src/libshared/src/condition.c
@@ -30,16 +30,16 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "apparmor-util.h"
+#include "shared/apparmor-util.h"
 #include "basic/architecture.h"
 #include "basic/audit-util.h"
 #include "basic/cap-list.h"
-#include "condition.h"
+#include "shared/condition.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/glob-util.h"
 #include "basic/hostname-util.h"
-#include "ima-util.h"
+#include "shared/ima-util.h"
 #include "basic/list.h"
 #include "basic/macro.h"
 #include "basic/mount-util.h"
diff --git a/src/libshared/src/conf-parser.c b/src/libshared/src/conf-parser.c
index 5a8c698fba..ee1cb0f5d7 100644
--- a/src/libshared/src/conf-parser.c
+++ b/src/libshared/src/conf-parser.c
@@ -27,7 +27,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
diff --git a/src/libshared/src/dev-setup.c b/src/libshared/src/dev-setup.c
index df80e3c63d..57489ef6d9 100644
--- a/src/libshared/src/dev-setup.c
+++ b/src/libshared/src/dev-setup.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
 #include "basic/label.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
diff --git a/src/libshared/src/dns-domain.c b/src/libshared/src/dns-domain.c
index 9d01c074ef..63793edcfa 100644
--- a/src/libshared/src/dns-domain.c
+++ b/src/libshared/src/dns-domain.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/hashmap.h"
 #include "basic/hexdecoct.h"
 #include "basic/in-addr-util.h"
diff --git a/src/libshared/src/dropin.c b/src/libshared/src/dropin.c
index f045ebaf5a..8a2cccb38f 100644
--- a/src/libshared/src/dropin.c
+++ b/src/libshared/src/dropin.c
@@ -25,7 +25,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
diff --git a/src/libshared/src/efivars.c b/src/libshared/src/efivars.c
index 0a16f8473f..28bf61c11a 100644
--- a/src/libshared/src/efivars.c
+++ b/src/libshared/src/efivars.c
@@ -31,7 +31,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/dirent-util.h"
-#include "efivars.h"
+#include "shared/efivars.h"
 #include "basic/fd-util.h"
 #include "basic/io-util.h"
 #include "basic/macro.h"
diff --git a/src/libshared/src/fstab-util.c b/src/libshared/src/fstab-util.c
index e13941d9cd..82a175bfd6 100644
--- a/src/libshared/src/fstab-util.c
+++ b/src/libshared/src/fstab-util.c
@@ -25,7 +25,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/device-nodes.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/macro.h"
 #include "basic/mount-util.h"
 #include "basic/parse-util.h"
diff --git a/src/libshared/src/generator.c b/src/libshared/src/generator.c
index b4ab498a21..f7ced68f36 100644
--- a/src/libshared/src/generator.c
+++ b/src/libshared/src/generator.c
@@ -21,12 +21,12 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "fstab-util.h"
-#include "generator.h"
+#include "shared/fstab-util.h"
+#include "shared/generator.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
diff --git a/src/libshared/src/ima-util.c b/src/libshared/src/ima-util.c
index 789064d653..74fa5e280d 100644
--- a/src/libshared/src/ima-util.c
+++ b/src/libshared/src/ima-util.c
@@ -19,7 +19,7 @@
 
 #include <unistd.h>
 
-#include "ima-util.h"
+#include "shared/ima-util.h"
 
 static int use_ima_cached = -1;
 
diff --git a/src/libshared/src/import-util.c b/src/libshared/src/import-util.c
index 10e47f3061..d587b596b2 100644
--- a/src/libshared/src/import-util.c
+++ b/src/libshared/src/import-util.c
@@ -22,7 +22,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/path-util.h"
diff --git a/src/libshared/src/install-printf.c b/src/libshared/src/install-printf.c
index e1635b462c..d22057d5aa 100644
--- a/src/libshared/src/install-printf.c
+++ b/src/libshared/src/install-printf.c
@@ -23,10 +23,10 @@
 #include <unistd.h>
 
 #include "basic/formats-util.h"
-#include "install-printf.h"
-#include "install.h"
+#include "shared/install-printf.h"
+#include "shared/install.h"
 #include "basic/macro.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 
diff --git a/src/libshared/src/install.c b/src/libshared/src/install.c
index c453ba65b0..d07ff0a652 100644
--- a/src/libshared/src/install.c
+++ b/src/libshared/src/install.c
@@ -31,20 +31,20 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/dirent-util.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
 #include "basic/hashmap.h"
-#include "install-printf.h"
-#include "install.h"
+#include "shared/install-printf.h"
+#include "shared/install.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
 #include "basic/set.h"
diff --git a/src/libshared/src/logs-show.c b/src/libshared/src/logs-show.c
index c1bcdf690b..8956728414 100644
--- a/src/libshared/src/logs-show.c
+++ b/src/libshared/src/logs-show.c
@@ -39,9 +39,9 @@
 #include "basic/io-util.h"
 #include "sd-journal/journal-internal.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "basic/macro.h"
-#include "output-mode.h"
+#include "shared/output-mode.h"
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/sparse-endian.h"
diff --git a/src/libshared/src/machine-image.c b/src/libshared/src/machine-image.c
index a4e4ba6856..8f533d82ec 100644
--- a/src/libshared/src/machine-image.c
+++ b/src/libshared/src/machine-image.c
@@ -38,7 +38,7 @@
 #include "basic/lockfile-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
diff --git a/src/libshared/src/machine-pool.c b/src/libshared/src/machine-pool.c
index 861c30ac1a..7ca3980ece 100644
--- a/src/libshared/src/machine-pool.c
+++ b/src/libshared/src/machine-pool.c
@@ -43,7 +43,7 @@
 #include "basic/fs-util.h"
 #include "basic/lockfile-util.h"
 #include "basic/log.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/macro.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
diff --git a/src/libshared/src/output-mode.c b/src/libshared/src/output-mode.c
index 1ed9b3845d..b112ceb20f 100644
--- a/src/libshared/src/output-mode.c
+++ b/src/libshared/src/output-mode.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "output-mode.h"
+#include "shared/output-mode.h"
 #include "basic/string-table.h"
 
 static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
diff --git a/src/libshared/src/pager.c b/src/libshared/src/pager.c
index a25ad795a7..611337bed3 100644
--- a/src/libshared/src/pager.c
+++ b/src/libshared/src/pager.c
@@ -32,7 +32,7 @@
 #include "basic/locale-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
diff --git a/src/libshared/src/path-lookup.c b/src/libshared/src/path-lookup.c
index 36e621232f..3e9a478075 100644
--- a/src/libshared/src/path-lookup.c
+++ b/src/libshared/src/path-lookup.c
@@ -23,11 +23,11 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
 #include "basic/stat-util.h"
diff --git a/src/libshared/src/ptyfwd.c b/src/libshared/src/ptyfwd.c
index ca3ed5e16e..d8d8af6b4a 100644
--- a/src/libshared/src/ptyfwd.c
+++ b/src/libshared/src/ptyfwd.c
@@ -36,7 +36,7 @@
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
 #include "basic/time-util.h"
 
 struct PTYForward {
diff --git a/src/libshared/src/resolve-util.c b/src/libshared/src/resolve-util.c
index d80a2fba7c..17d6188ba3 100644
--- a/src/libshared/src/resolve-util.c
+++ b/src/libshared/src/resolve-util.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "conf-parser.h"
-#include "resolve-util.h"
+#include "shared/conf-parser.h"
+#include "shared/resolve-util.h"
 #include "basic/string-table.h"
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_resolve_support, resolve_support, ResolveSupport, "Failed to parse resolve support setting");
diff --git a/src/libshared/src/seccomp-util.c b/src/libshared/src/seccomp-util.c
index 49884d99b7..2278a0e904 100644
--- a/src/libshared/src/seccomp-util.c
+++ b/src/libshared/src/seccomp-util.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 
 #include "basic/macro.h"
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #include "basic/string-util.h"
 
 const char* seccomp_arch_to_string(uint32_t c) {
diff --git a/src/libshared/src/sleep-config.c b/src/libshared/src/sleep-config.c
index 212a7f32c9..9525246fb3 100644
--- a/src/libshared/src/sleep-config.c
+++ b/src/libshared/src/sleep-config.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
@@ -34,7 +34,7 @@
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/parse-util.h"
-#include "sleep-config.h"
+#include "shared/sleep-config.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 
diff --git a/src/libshared/src/spawn-ask-password-agent.c b/src/libshared/src/spawn-ask-password-agent.c
index 4a7411a1df..bfd47d88dc 100644
--- a/src/libshared/src/spawn-ask-password-agent.c
+++ b/src/libshared/src/spawn-ask-password-agent.c
@@ -23,7 +23,7 @@
 
 #include "basic/log.h"
 #include "basic/process-util.h"
-#include "spawn-ask-password-agent.h"
+#include "shared/spawn-ask-password-agent.h"
 #include "basic/util.h"
 
 static pid_t agent_pid = 0;
diff --git a/src/libshared/src/spawn-polkit-agent.c b/src/libshared/src/spawn-polkit-agent.c
index 7b62e576ee..d5d129ccad 100644
--- a/src/libshared/src/spawn-polkit-agent.c
+++ b/src/libshared/src/spawn-polkit-agent.c
@@ -28,7 +28,7 @@
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/process-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/stdio-util.h"
 #include "basic/time-util.h"
 #include "basic/util.h"
diff --git a/src/libshared/src/specifier.c b/src/libshared/src/specifier.c
index dded146aa4..195854f212 100644
--- a/src/libshared/src/specifier.c
+++ b/src/libshared/src/specifier.c
@@ -29,7 +29,7 @@
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
 #include "basic/macro.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 
 /*
diff --git a/src/libshared/src/switch-root.c b/src/libshared/src/switch-root.c
index 750e631a6f..42079ea70b 100644
--- a/src/libshared/src/switch-root.c
+++ b/src/libshared/src/switch-root.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "base-filesystem.h"
+#include "shared/base-filesystem.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/missing.h"
@@ -35,7 +35,7 @@
 #include "basic/rm-rf.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
-#include "switch-root.h"
+#include "shared/switch-root.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
diff --git a/src/libshared/src/sysctl-util.c b/src/libshared/src/sysctl-util.c
index b84502376d..5dfe32a16b 100644
--- a/src/libshared/src/sysctl-util.c
+++ b/src/libshared/src/sysctl-util.c
@@ -24,7 +24,7 @@
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/string-util.h"
-#include "sysctl-util.h"
+#include "shared/sysctl-util.h"
 
 char *sysctl_normalize(char *s) {
         char *n;
diff --git a/src/libshared/src/tests.c b/src/libshared/src/tests.c
index b53deeb66f..37f57ca18c 100644
--- a/src/libshared/src/tests.c
+++ b/src/libshared/src/tests.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include "basic/util.h"
-#include "tests.h"
+#include "shared/tests.h"
 
 char* setup_fake_runtime_dir(void) {
         char t[] = "/tmp/fake-xdg-runtime-XXXXXX", *p;
diff --git a/src/libshared/src/uid-range.c b/src/libshared/src/uid-range.c
index 4d97503c0a..3764198610 100644
--- a/src/libshared/src/uid-range.c
+++ b/src/libshared/src/uid-range.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "basic/macro.h"
-#include "uid-range.h"
+#include "shared/uid-range.h"
 #include "basic/user-util.h"
 
 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
diff --git a/src/libshared/src/utmp-wtmp.c b/src/libshared/src/utmp-wtmp.c
index 1a19898c6b..f10d7e9008 100644
--- a/src/libshared/src/utmp-wtmp.c
+++ b/src/libshared/src/utmp-wtmp.c
@@ -39,7 +39,7 @@
 #include "basic/time-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 int utmp_get_runlevel(int *runlevel, int *previous) {
         struct utmpx *found, lookup = { .ut_type = RUN_LVL };
diff --git a/src/libshared/src/watchdog.c b/src/libshared/src/watchdog.c
index 4eaf022e21..bc5c5f0503 100644
--- a/src/libshared/src/watchdog.c
+++ b/src/libshared/src/watchdog.c
@@ -27,7 +27,7 @@
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/time-util.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 static int watchdog_fd = -1;
 static usec_t watchdog_timeout = USEC_INFINITY;
diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 5917ddb506..f263635040 100644
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -25,7 +25,7 @@
 #include "network-internal.h"
 #include "basic/siphash24.h"
 #include "basic/sparse-endian.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/virt.h"
 
 #define SYSTEMD_PEN 43793
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index 2de3d61c50..a90587295c 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -26,7 +26,7 @@
 #include "basic/alloc-util.h"
 #include "dhcp6-internal.h"
 #include "dhcp6-protocol.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/sparse-endian.h"
 #include "basic/strv.h"
 #include "basic/unaligned.h"
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 6a0fb5fb2e..e64f87a608 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -24,8 +24,8 @@
 #include <systemd/sd-ndisc.h>
 
 #include "basic/alloc-util.h"
-#include "condition.h"
-#include "conf-parser.h"
+#include "shared/condition.h"
+#include "shared/conf-parser.h"
 #include "dhcp-lease-internal.h"
 #include "basic/ether-addr-util.h"
 #include "basic/hexdecoct.h"
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 1cafb0747f..aa2d6c191c 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-dhcp-lease.h>
 
-#include "condition.h"
+#include "shared/condition.h"
 #include "udev.h"
 
 bool net_match_config(const struct ether_addr *match_mac,
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 636be90ec3..bebf21689c 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -34,7 +34,7 @@
 #include "dhcp-internal.h"
 #include "dhcp-lease-internal.h"
 #include "dhcp-protocol.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/hostname-util.h"
 #include "basic/random-util.h"
 #include "basic/string-util.h"
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index c214264ec1..b8107faf6f 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -29,7 +29,7 @@
 #include "basic/alloc-util.h"
 #include "dhcp-lease-internal.h"
 #include "dhcp-protocol.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hexdecoct.h"
diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c
index 33b5dbcda0..5582a17aae 100644
--- a/src/libsystemd/src/sd-bus/bus-control.c
+++ b/src/libsystemd/src/sd-bus/bus-control.c
@@ -31,7 +31,7 @@
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/src/sd-bus/bus-convenience.c
index 78ef116fa1..12fcc89d92 100644
--- a/src/libsystemd/src/sd-bus/bus-convenience.c
+++ b/src/libsystemd/src/sd-bus/bus-convenience.c
@@ -21,7 +21,7 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/string-util.h"
 
 _public_ int sd_bus_emit_signal(
diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c
index 72723f6cc2..30b80d88e0 100644
--- a/src/libsystemd/src/sd-bus/bus-creds.c
+++ b/src/libsystemd/src/sd-bus/bus-creds.c
@@ -25,7 +25,7 @@
 #include "bus-creds.h"
 #include "basic/bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c
index 6fcbd2b68e..ef9fb87ee5 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/bus-kernel.c
@@ -38,7 +38,7 @@
 #include "bus-kernel.h"
 #include "basic/bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/src/sd-bus/bus-match.c
index 45790e1ef6..be5a0975e3 100644
--- a/src/libsystemd/src/sd-bus/bus-match.c
+++ b/src/libsystemd/src/sd-bus/bus-match.c
@@ -21,7 +21,7 @@
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hexdecoct.h"
diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/src/sd-bus/bus-message.c
index 9a50808e07..96f4213416 100644
--- a/src/libsystemd/src/sd-bus/bus-message.c
+++ b/src/libsystemd/src/sd-bus/bus-message.c
@@ -29,7 +29,7 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/io-util.h"
 #include "basic/memfd-util.h"
diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c
index 04d0fc9bc3..f0e80017c5 100644
--- a/src/libsystemd/src/sd-bus/bus-objects.c
+++ b/src/libsystemd/src/sd-bus/bus-objects.c
@@ -25,7 +25,7 @@
 #include "bus-signature.h"
 #include "bus-slot.h"
 #include "bus-type.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c
index f6c800439c..997afd9dc9 100644
--- a/src/libsystemd/src/sd-bus/bus-track.c
+++ b/src/libsystemd/src/sd-bus/bus-track.c
@@ -22,7 +22,7 @@
 #include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 
 struct sd_bus_track {
         unsigned n_ref;
diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c
index b60ae05394..748b46413d 100644
--- a/src/libsystemd/src/sd-bus/sd-bus.c
+++ b/src/libsystemd/src/sd-bus/sd-bus.c
@@ -40,7 +40,7 @@
 #include "bus-socket.h"
 #include "bus-track.h"
 #include "bus-type.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/src/sd-bus/test-bus-benchmark.c
index c2484ab4d3..08186870cb 100644
--- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c
@@ -24,7 +24,7 @@
 #include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/time-util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/src/sd-bus/test-bus-chat.c
index fc40b365bb..353edc9c7c 100644
--- a/src/libsystemd/src/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/src/sd-bus/test-bus-chat.c
@@ -28,7 +28,7 @@
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-match.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/log.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/src/sd-bus/test-bus-cleanup.c
index 02c186e1d6..3a308453ed 100644
--- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c
@@ -23,7 +23,7 @@
 
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/refcnt.h"
 
 static void test_bus_new(void) {
diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/src/sd-bus/test-bus-creds.c
index 0c0bda49ec..22fe1fa759 100644
--- a/src/libsystemd/src/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/src/sd-bus/test-bus-creds.c
@@ -20,7 +20,7 @@
 #include <systemd/sd-bus.h>
 
 #include "bus-dump.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 
 int main(int argc, char *argv[]) {
diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/src/sd-bus/test-bus-error.c
index 45c039a885..348629c718 100644
--- a/src/libsystemd/src/sd-bus/test-bus-error.c
+++ b/src/libsystemd/src/sd-bus/test-bus-error.c
@@ -21,7 +21,7 @@
 
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/errno-list.h"
 
 static void test_error(void) {
diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
index dd7218ce79..bffc7247c2 100644
--- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
@@ -28,7 +28,7 @@
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/macro.h"
 #include "basic/util.h"
 
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
index d5c8e7eba7..75874a6892 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
@@ -21,7 +21,7 @@
 
 #include "basic/alloc-util.h"
 #include "bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/src/sd-bus/test-bus-kernel.c
index c24c66b996..79ac9064d6 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c
@@ -24,7 +24,7 @@
 #include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c
index f8ced127e6..59a11718d9 100644
--- a/src/libsystemd/src/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c
@@ -34,7 +34,7 @@
 #include "bus-dump.h"
 #include "basic/bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/hexdecoct.h"
 #include "basic/log.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/src/sd-bus/test-bus-match.c
index 4581d986fb..c73643ec37 100644
--- a/src/libsystemd/src/sd-bus/test-bus-match.c
+++ b/src/libsystemd/src/sd-bus/test-bus-match.c
@@ -20,7 +20,7 @@
 #include "bus-match.h"
 #include "bus-message.h"
 #include "bus-slot.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 
diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c
index 23f131e405..990dd196e2 100644
--- a/src/libsystemd/src/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/src/sd-bus/test-bus-objects.c
@@ -26,7 +26,7 @@
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/strv.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c
index 3a53c909f0..596529b7e4 100644
--- a/src/libsystemd/src/sd-bus/test-bus-server.c
+++ b/src/libsystemd/src/sd-bus/test-bus-server.c
@@ -23,7 +23,7 @@
 #include <systemd/sd-bus.h>
 
 #include "bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/util.h"
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c
index 2bd8bde8da..56bb2382a6 120000
--- a/src/libsystemd/src/sd-journal/gcrypt-util.c
+++ b/src/libsystemd/src/sd-journal/gcrypt-util.c
@@ -1 +1 @@
-../../../libshared/gcrypt-util.c
\ No newline at end of file
+../../../libshared/src/gcrypt-util.c
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h
index 6de2527ac8..c1168ad265 120000
--- a/src/libsystemd/src/sd-journal/gcrypt-util.h
+++ b/src/libsystemd/src/sd-journal/gcrypt-util.h
@@ -1 +1 @@
-../../../libshared/gcrypt-util.h
\ No newline at end of file
+../../../libshared/include/shared/gcrypt-util.h
\ No newline at end of file
diff --git a/src/systemd-analyze/analyze-verify.c b/src/systemd-analyze/analyze-verify.c
index 613bf8a2b4..7553574f53 100644
--- a/src/systemd-analyze/analyze-verify.c
+++ b/src/systemd-analyze/analyze-verify.c
@@ -22,10 +22,10 @@
 #include "basic/alloc-util.h"
 #include "analyze-verify.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "manager.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/path-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
diff --git a/src/systemd-analyze/analyze-verify.h b/src/systemd-analyze/analyze-verify.h
index d8204dc69c..7b89007fd0 100644
--- a/src/systemd-analyze/analyze-verify.h
+++ b/src/systemd-analyze/analyze-verify.h
@@ -21,6 +21,6 @@
 
 #include <stdbool.h>
 
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 
 int verify_units(char **filenames, UnitFileScope scope, bool check_man);
diff --git a/src/systemd-analyze/analyze.c b/src/systemd-analyze/analyze.c
index 3054e957b1..1ce700ccba 100644
--- a/src/systemd-analyze/analyze.c
+++ b/src/systemd-analyze/analyze.c
@@ -28,13 +28,13 @@
 #include "basic/alloc-util.h"
 #include "analyze-verify.h"
 #include "sd-bus/bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
 #include "basic/glob-util.h"
 #include "basic/hashmap.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/special.h"
 #include "basic/strv.h"
diff --git a/src/systemd-ask-password/ask-password.c b/src/systemd-ask-password/ask-password.c
index 2872fe274d..95951601c1 100644
--- a/src/systemd-ask-password/ask-password.c
+++ b/src/systemd-ask-password/ask-password.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "ask-password-api.h"
+#include "shared/ask-password-api.h"
 #include "basic/def.h"
 #include "basic/log.h"
 #include "basic/macro.h"
diff --git a/src/systemd-cgls/cgls.c b/src/systemd-cgls/cgls.c
index 5d2f56ec33..8f1757924f 100644
--- a/src/systemd-cgls/cgls.c
+++ b/src/systemd-cgls/cgls.c
@@ -27,13 +27,13 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
-#include "cgroup-show.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/fileio.h"
 #include "basic/log.h"
-#include "output-mode.h"
-#include "pager.h"
+#include "shared/output-mode.h"
+#include "shared/pager.h"
 #include "basic/path-util.h"
 #include "basic/unit-name.h"
 #include "basic/util.h"
diff --git a/src/systemd-cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c
index 8a6984c776..78e9950a5b 100644
--- a/src/systemd-cgtop/cgtop.c
+++ b/src/systemd-cgtop/cgtop.c
@@ -30,7 +30,7 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/systemd-cryptsetup/cryptsetup-generator.c b/src/systemd-cryptsetup/cryptsetup-generator.c
index e0ca72b291..69787fc719 100644
--- a/src/systemd-cryptsetup/cryptsetup-generator.c
+++ b/src/systemd-cryptsetup/cryptsetup-generator.c
@@ -20,11 +20,11 @@
 #include <errno.h>
 
 #include "basic/alloc-util.h"
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "fstab-util.h"
-#include "generator.h"
+#include "shared/fstab-util.h"
+#include "shared/generator.h"
 #include "basic/hashmap.h"
 #include "basic/log.h"
 #include "basic/mkdir.h"
diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c
index 2b1d6d31e1..fc0d7e0e9a 100644
--- a/src/systemd-cryptsetup/cryptsetup.c
+++ b/src/systemd-cryptsetup/cryptsetup.c
@@ -26,7 +26,7 @@
 #include <systemd/sd-device.h>
 
 #include "basic/alloc-util.h"
-#include "ask-password-api.h"
+#include "shared/ask-password-api.h"
 #include "sd-device/device-util.h"
 #include "basic/escape.h"
 #include "basic/fileio.h"
diff --git a/src/systemd-dbus1-generator/dbus1-generator.c b/src/systemd-dbus1-generator/dbus1-generator.c
index 6d71dc0c7c..55bee9fd0d 100644
--- a/src/systemd-dbus1-generator/dbus1-generator.c
+++ b/src/systemd-dbus1-generator/dbus1-generator.c
@@ -19,9 +19,9 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/systemd-delta/delta.c b/src/systemd-delta/delta.c
index dbc26518b7..dd571e7195 100644
--- a/src/systemd-delta/delta.c
+++ b/src/systemd-delta/delta.c
@@ -31,7 +31,7 @@
 #include "basic/hashmap.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "pager.h"
+#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
diff --git a/src/systemd-firstboot/firstboot.c b/src/systemd-firstboot/firstboot.c
index 7f4db73b1a..46e82a2a7b 100644
--- a/src/systemd-firstboot/firstboot.c
+++ b/src/systemd-firstboot/firstboot.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "ask-password-api.h"
+#include "shared/ask-password-api.h"
 #include "basic/copy.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/systemd-fsck/fsck.c b/src/systemd-fsck/fsck.c
index 4341302cf3..f6e5309cd5 100644
--- a/src/systemd-fsck/fsck.c
+++ b/src/systemd-fsck/fsck.c
@@ -33,7 +33,7 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "sd-device/device-util.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
diff --git a/src/systemd-fstab-generator/fstab-generator.c b/src/systemd-fstab-generator/fstab-generator.c
index 89dc9677cf..bedf469f93 100644
--- a/src/systemd-fstab-generator/fstab-generator.c
+++ b/src/systemd-fstab-generator/fstab-generator.c
@@ -26,8 +26,8 @@
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "fstab-util.h"
-#include "generator.h"
+#include "shared/fstab-util.h"
+#include "shared/generator.h"
 #include "basic/log.h"
 #include "basic/mkdir.h"
 #include "mount-setup.h"
diff --git a/src/systemd-gpt-auto-generator/gpt-auto-generator.c b/src/systemd-gpt-auto-generator/gpt-auto-generator.c
index 2709d80322..b878d438b0 100644
--- a/src/systemd-gpt-auto-generator/gpt-auto-generator.c
+++ b/src/systemd-gpt-auto-generator/gpt-auto-generator.c
@@ -29,12 +29,12 @@
 #include "basic/blkid-util.h"
 #include "basic/btrfs-util.h"
 #include "basic/dirent-util.h"
-#include "efivars.h"
+#include "shared/efivars.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "fstab-util.h"
-#include "generator.h"
-#include "gpt.h"
+#include "shared/fstab-util.h"
+#include "shared/generator.h"
+#include "shared/gpt.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
 #include "basic/mount-util.h"
@@ -44,7 +44,7 @@
 #include "basic/special.h"
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "basic/util.h"
 #include "basic/virt.h"
diff --git a/src/systemd-hibernate-resume/hibernate-resume-generator.c b/src/systemd-hibernate-resume/hibernate-resume-generator.c
index 66d39f2c68..08de7e1983 100644
--- a/src/systemd-hibernate-resume/hibernate-resume-generator.c
+++ b/src/systemd-hibernate-resume/hibernate-resume-generator.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 
 #include "basic/alloc-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/log.h"
 #include "basic/mkdir.h"
 #include "basic/proc-cmdline.h"
diff --git a/src/systemd-initctl/initctl.c b/src/systemd-initctl/initctl.c
index cb4ba8310b..986c463389 100644
--- a/src/systemd-initctl/initctl.c
+++ b/src/systemd-initctl/initctl.c
@@ -28,11 +28,11 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "initreq.h"
+#include "shared/initreq.h"
 #include "basic/list.h"
 #include "basic/log.h"
 #include "basic/special.h"
diff --git a/src/systemd-nspawn/nspawn-gperf.gperf b/src/systemd-nspawn/nspawn-gperf.gperf
index 2b5d452662..f814ed8863 100644
--- a/src/systemd-nspawn/nspawn-gperf.gperf
+++ b/src/systemd-nspawn/nspawn-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "nspawn-settings.h"
 #include "nspawn-expose-ports.h"
 %}
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index dd8208633e..98bb3e386f 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -32,7 +32,7 @@
 #include "basic/socket-util.h"
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
diff --git a/src/systemd-nspawn/nspawn-patch-uid.c b/src/systemd-nspawn/nspawn-patch-uid.c
index 91b3c8e7ac..737ffd246e 100644
--- a/src/systemd-nspawn/nspawn-patch-uid.c
+++ b/src/systemd-nspawn/nspawn-patch-uid.c
@@ -26,7 +26,7 @@
 #include <sys/vfs.h>
 #include <unistd.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/missing.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 4eb0031a39..29e60ca48a 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -20,8 +20,8 @@
 #include <systemd/sd-bus.h>
 
 #include "sd-bus/bus-error.h" /* for bus_error_message */
-#include "bus-unit-util.h"
-#include "bus-util.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
 #include "nspawn-register.h"
 #include "basic/stat-util.h"
 #include "basic/strv.h"
diff --git a/src/systemd-nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c
index 2ab881a63f..e5cc385e07 100644
--- a/src/systemd-nspawn/nspawn-settings.c
+++ b/src/systemd-nspawn/nspawn-settings.c
@@ -19,7 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/cap-list.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "nspawn-network.h"
 #include "nspawn-settings.h"
 #include "basic/parse-util.h"
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index 16558a07e1..fc913a2363 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -48,26 +48,26 @@
 
 #include "basic/alloc-util.h"
 #include "basic/barrier.h"
-#include "base-filesystem.h"
+#include "shared/base-filesystem.h"
 #include "basic/blkid-util.h"
 #include "basic/btrfs-util.h"
 #include "basic/cap-list.h"
 #include "basic/capability-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/copy.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
 #include "basic/fdset.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
 #include "basic/fs-util.h"
-#include "gpt.h"
+#include "shared/gpt.h"
 #include "basic/hostname-util.h"
 #include "basic/log.h"
 #include "loopback-setup.h"
 #include "machine-id-setup.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
 #include "basic/macro.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
@@ -84,11 +84,11 @@
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
 #include "basic/random-util.h"
 #include "basic/rm-rf.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
@@ -98,7 +98,7 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/umask-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
diff --git a/src/systemd-run/run.c b/src/systemd-run/run.c
index 91f134235b..9ff2ba8003 100644
--- a/src/systemd-run/run.c
+++ b/src/systemd-run/run.c
@@ -25,17 +25,17 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
 #include "basic/calendarspec.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
 #include "basic/signal-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/unit-name.h"
diff --git a/src/systemd-shutdown/shutdown.c b/src/systemd-shutdown/shutdown.c
index eb47677eb3..6281d99c1d 100644
--- a/src/systemd-shutdown/shutdown.c
+++ b/src/systemd-shutdown/shutdown.c
@@ -39,12 +39,12 @@
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/string-util.h"
-#include "switch-root.h"
+#include "shared/switch-root.h"
 #include "basic/terminal-util.h"
 #include "umount.h"
 #include "basic/util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 #define FINALIZE_ATTEMPTS 50
 
diff --git a/src/systemd-shutdown/umount.c b/src/systemd-shutdown/umount.c
index 13f0df3c84..2e032fb9d6 100644
--- a/src/systemd-shutdown/umount.c
+++ b/src/systemd-shutdown/umount.c
@@ -30,12 +30,12 @@
 #include "basic/alloc-util.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/list.h"
 #include "mount-setup.h"
 #include "basic/path-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "umount.h"
 #include "basic/util.h"
 #include "basic/virt.h"
diff --git a/src/systemd-stdio-bridge/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c
index 2b58615035..284af3dea9 100644
--- a/src/systemd-stdio-bridge/stdio-bridge.c
+++ b/src/systemd-stdio-bridge/stdio-bridge.c
@@ -28,7 +28,7 @@
 #include <systemd/sd-daemon.h>
 
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/build.h"
 #include "basic/log.h"
 #include "basic/util.h"
diff --git a/src/systemd-sysctl/sysctl.c b/src/systemd-sysctl/sysctl.c
index 11b4e36777..132420d95d 100644
--- a/src/systemd-sysctl/sysctl.c
+++ b/src/systemd-sysctl/sysctl.c
@@ -34,7 +34,7 @@
 #include "basic/path-util.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
-#include "sysctl-util.h"
+#include "shared/sysctl-util.h"
 #include "basic/util.h"
 
 static char **arg_prefixes = NULL;
diff --git a/src/systemd-sysusers/sysusers.c b/src/systemd-sysusers/sysusers.c
index 90c7c30929..83e526c5ff 100644
--- a/src/systemd-sysusers/sysusers.c
+++ b/src/systemd-sysusers/sysusers.c
@@ -35,10 +35,10 @@
 #include "basic/path-util.h"
 #include "basic/selinux-util.h"
 #include "basic/smack-util.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
-#include "uid-range.h"
+#include "shared/uid-range.h"
 #include "basic/user-util.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
diff --git a/src/systemd-sysv-generator/sysv-generator.c b/src/systemd-sysv-generator/sysv-generator.c
index d69677340c..183f93e9e7 100644
--- a/src/systemd-sysv-generator/sysv-generator.c
+++ b/src/systemd-sysv-generator/sysv-generator.c
@@ -29,10 +29,10 @@
 #include "basic/fileio.h"
 #include "basic/hashmap.h"
 #include "basic/hexdecoct.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/log.h"
 #include "basic/mkdir.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/set.h"
 #include "basic/special.h"
diff --git a/src/systemd-timesyncd/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h
index cba0724b1b..1c96bd066d 100644
--- a/src/systemd-timesyncd/timesyncd-conf.h
+++ b/src/systemd-timesyncd/timesyncd-conf.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "timesyncd-manager.h"
 
 const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
diff --git a/src/systemd-timesyncd/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf
index 29a2cfeef6..b8af831105 100644
--- a/src/systemd-timesyncd/timesyncd-gperf.gperf
+++ b/src/systemd-timesyncd/timesyncd-gperf.gperf
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "timesyncd-conf.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/systemd-tmpfiles/tmpfiles.c b/src/systemd-tmpfiles/tmpfiles.c
index c3d955e3e1..58dd7c0f8c 100644
--- a/src/systemd-tmpfiles/tmpfiles.c
+++ b/src/systemd-tmpfiles/tmpfiles.c
@@ -36,7 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
 #include "basic/capability-util.h"
@@ -62,7 +62,7 @@
 #include "basic/rm-rf.h"
 #include "basic/selinux-util.h"
 #include "basic/set.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/stat-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-table.h"
diff --git a/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
index b8d7a10e17..b77c884c28 100644
--- a/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
@@ -31,8 +31,8 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "ask-password-api.h"
-#include "conf-parser.h"
+#include "shared/ask-password-api.h"
+#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
@@ -46,7 +46,7 @@
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 static enum {
         ACTION_LIST,
diff --git a/src/systemd-update-utmp/update-utmp.c b/src/systemd-update-utmp/update-utmp.c
index 661215ea8e..69264c3a26 100644
--- a/src/systemd-update-utmp/update-utmp.c
+++ b/src/systemd-update-utmp/update-utmp.c
@@ -29,14 +29,14 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/formats-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/special.h"
 #include "basic/unit-name.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 typedef struct Context {
         sd_bus *bus;
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index de6bb2ce99..8672f008b8 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "acl-util.h"
+#include "shared/acl-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/string-util.h"
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index d94b88ddca..b12f3c2e47 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "ask-password-api.h"
+#include "shared/ask-password-api.h"
 #include "basic/log.h"
 
 static void ask_password(void) {
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 3ff8cdd6d5..5ac6cd16e3 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -18,9 +18,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "acpi-fpdt.h"
-#include "boot-timestamps.h"
-#include "efivars.h"
+#include "shared/acpi-fpdt.h"
+#include "shared/boot-timestamps.h"
+#include "shared/efivars.h"
 #include "basic/log.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index c33a49eea0..30c3ec9ae6 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -23,7 +23,7 @@
 #include "manager.h"
 #include "basic/rm-rf.h"
 #include "test-helper.h"
-#include "tests.h"
+#include "shared/tests.h"
 #include "unit.h"
 
 static int test_cgroup_mask(void) {
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index 5b16b942b0..868e1dcf8d 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -20,12 +20,12 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "apparmor-util.h"
+#include "shared/apparmor-util.h"
 #include "basic/architecture.h"
 #include "basic/audit-util.h"
-#include "condition.h"
+#include "shared/condition.h"
 #include "basic/hostname-util.h"
-#include "ima-util.h"
+#include "shared/ima-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/selinux-util.h"
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 9fc0f1e554..5b63e60b32 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/string-util.h"
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index fcb3443320..6165948314 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -18,7 +18,7 @@
  ***/
 
 #include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
 #include "basic/macro.h"
 #include "basic/string-util.h"
 
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 94272b8818..86f8b0d335 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -21,11 +21,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "manager.h"
 #include "basic/rm-rf.h"
 #include "test-helper.h"
-#include "tests.h"
+#include "shared/tests.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index 69d59f6def..42c7368801 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/log.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 57b449567d..69eb85593b 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -19,7 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/fileio.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/mkdir.h"
 #include "basic/rm-rf.h"
 #include "basic/string-util.h"
diff --git a/src/test/test-install.c b/src/test/test-install.c
index 0ac85f040a..784bcfdd5f 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "install.h"
+#include "shared/install.h"
 
 static void dump_changes(UnitFileChange *c, unsigned n) {
         unsigned i;
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index f9071f8200..8ca3952bf5 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "clean-ipc.h"
+#include "shared/clean-ipc.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 29db6a0446..40205ecb8c 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -28,7 +28,7 @@
 #include "basic/log.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/util.h"
 
 static void print_device(struct udev_device *device) {
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 24db2da200..41eb48d787 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 
 #include "basic/log.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/rm-rf.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 2e2e4d8e70..ed87cfdb8f 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -30,7 +30,7 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "test-helper.h"
-#include "tests.h"
+#include "shared/tests.h"
 #include "unit.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 4452cf8bb5..33249fe12c 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -23,7 +23,7 @@
 #include "manager.h"
 #include "basic/rm-rf.h"
 #include "test-helper.h"
-#include "tests.h"
+#include "shared/tests.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 573e3ef9eb..9260428d04 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "basic/log.h"
-#include "sleep-config.h"
+#include "shared/sleep-config.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index d46ed342b4..90fcb20cdd 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 9c7a1d79b8..2643a05648 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -22,17 +22,17 @@
 #include "busname.h"
 #include "cgroup.h"
 #include "compress.h"
-#include "condition.h"
+#include "shared/condition.h"
 #include "device.h"
 #include "execute.h"
-#include "install.h"
+#include "shared/install.h"
 #include "job.h"
 #include "journald-server.h"
 #include "kill.h"
 #include "link-config.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
 #include "mount.h"
 #include "path.h"
 #include "basic/rlimit-util.h"
@@ -43,7 +43,7 @@
 #include "socket.h"
 #include "swap.h"
 #include "target.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
 #include "timer.h"
 #include "basic/unit-name.h"
 #include "unit.h"
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 6da4470c72..1f6dc878c8 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -32,7 +32,7 @@
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 
 static int fake_filesystems(void) {
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index dc53491e99..50da66bde1 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -20,7 +20,7 @@
 #include <stddef.h>
 
 #include "basic/alloc-util.h"
-#include "uid-range.h"
+#include "shared/uid-range.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 562398c40a..09481364b9 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -31,16 +31,16 @@
 #include "basic/fileio.h"
 #include "basic/hashmap.h"
 #include "basic/hostname-util.h"
-#include "install-printf.h"
-#include "install.h"
+#include "shared/install-printf.h"
+#include "shared/install.h"
 #include "load-fragment.h"
 #include "basic/macro.h"
 #include "basic/rm-rf.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "test-helper.h"
-#include "tests.h"
+#include "shared/tests.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index cf003dc0de..b4c91cfa6c 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -30,7 +30,7 @@
 #include "basic/macro.h"
 #include "manager.h"
 #include "basic/path-util.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "test-helper.h"
 #include "basic/unit-name.h"
diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index 011c957b14..64814fc174 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include "basic/log.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 int main(int argc, char *argv[]) {
         usec_t t = 10 * USEC_PER_SEC;