fix

48 files changed, 68 insertions, 67 deletions

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;