125 files changed, 986 insertions, 1033 deletions

diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
index e27ae4f5c5..d98970b31c 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
@@ -19,15 +19,15 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "manager.h"
+#include "core/manager.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/pager.h"
 
 #include "analyze-verify.h"
 
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
index 7b89007fd0..33b809997a 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
@@ -21,6 +21,6 @@
 
 #include <stdbool.h>
 
-#include "shared/path-lookup.h"
+#include "systemd-shared/path-lookup.h"
 
 int verify_units(char **filenames, UnitFileScope scope, bool check_man);
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c
index e79a109651..7d7dd52648 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c
@@ -25,22 +25,22 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/glob-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/strxcpyx.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/pager.h"
 
 #include "analyze-verify.h"
 
diff --git a/src/grp-system/grp-utils/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c
index 5da779624d..0142803b46 100644
--- a/src/grp-system/grp-utils/systemd-delta/delta.c
+++ b/src/grp-system/grp-utils/systemd-delta/delta.c
@@ -24,23 +24,23 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 static const char prefixes[] =
         "/etc\0"
diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
index 70866cacda..f4b3a048e9 100644
--- a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
@@ -23,26 +23,25 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.h"
-
-#include "mount-setup.h"
+#include "core/mount-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/generator.h"
 
 static const char *arg_dest = "/tmp";
 static bool arg_fstab_enabled = true;
diff --git a/src/grp-system/grp-utils/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c
index 4aaf446177..a831d2e046 100644
--- a/src/grp-system/grp-utils/systemd-run/run.c
+++ b/src/grp-system/grp-utils/systemd-run/run.c
@@ -23,23 +23,23 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-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 "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/ptyfwd.h"
-#include "shared/spawn-polkit-agent.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/calendarspec.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/ptyfwd.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static bool arg_ask_password = true;
 static bool arg_scope = false;
diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
index de973034be..873cab1c5c 100644
--- a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
@@ -23,24 +23,24 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "shared/install.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/path-lookup.h"
 
 static const struct {
         const char *path;
diff --git a/src/grp-system/libcore/audit-fd.h b/src/grp-system/libcore/include/core/audit-fd.h
index 0eccb59210..0eccb59210 100644
--- a/src/grp-system/libcore/audit-fd.h
+++ b/src/grp-system/libcore/include/core/audit-fd.h
diff --git a/src/grp-system/libcore/automount.h b/src/grp-system/libcore/include/core/automount.h
index 76a201178e..76a201178e 100644
--- a/src/grp-system/libcore/automount.h
+++ b/src/grp-system/libcore/include/core/automount.h
diff --git a/src/grp-system/libcore/bus-policy.h b/src/grp-system/libcore/include/core/bus-policy.h
index 8cb6910c00..a338f29af6 100644
--- a/src/grp-system/libcore/bus-policy.h
+++ b/src/grp-system/libcore/include/core/bus-policy.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/macro.h"
 #include "sd-bus/kdbus.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
 
 typedef struct BusNamePolicy BusNamePolicy;
 
diff --git a/src/grp-system/libcore/busname.h b/src/grp-system/libcore/include/core/busname.h
index aa7f0ecb1b..aa7f0ecb1b 100644
--- a/src/grp-system/libcore/busname.h
+++ b/src/grp-system/libcore/include/core/busname.h
diff --git a/src/grp-system/libcore/cgroup.h b/src/grp-system/libcore/include/core/cgroup.h
index bf40c3cc74..0026609570 100644
--- a/src/grp-system/libcore/cgroup.h
+++ b/src/grp-system/libcore/include/core/cgroup.h
@@ -21,9 +21,9 @@
 
 #include <stdbool.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/list.h"
-#include "basic/time-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/time-util.h"
 
 typedef struct CGroupContext CGroupContext;
 typedef struct CGroupDeviceAllow CGroupDeviceAllow;
diff --git a/src/grp-system/libcore/dbus-automount.h b/src/grp-system/libcore/include/core/dbus-automount.h
index 7b51eb973a..7b51eb973a 100644
--- a/src/grp-system/libcore/dbus-automount.h
+++ b/src/grp-system/libcore/include/core/dbus-automount.h
diff --git a/src/grp-system/libcore/dbus-busname.h b/src/grp-system/libcore/include/core/dbus-busname.h
index 8643d1a404..8643d1a404 100644
--- a/src/grp-system/libcore/dbus-busname.h
+++ b/src/grp-system/libcore/include/core/dbus-busname.h
diff --git a/src/grp-system/libcore/dbus-cgroup.h b/src/grp-system/libcore/include/core/dbus-cgroup.h
index 84d0f1ba04..84d0f1ba04 100644
--- a/src/grp-system/libcore/dbus-cgroup.h
+++ b/src/grp-system/libcore/include/core/dbus-cgroup.h
diff --git a/src/grp-system/libcore/dbus-device.h b/src/grp-system/libcore/include/core/dbus-device.h
index eb1d8c3278..eb1d8c3278 100644
--- a/src/grp-system/libcore/dbus-device.h
+++ b/src/grp-system/libcore/include/core/dbus-device.h
diff --git a/src/grp-system/libcore/dbus-execute.h b/src/grp-system/libcore/include/core/dbus-execute.h
index bdfef41db4..bdfef41db4 100644
--- a/src/grp-system/libcore/dbus-execute.h
+++ b/src/grp-system/libcore/include/core/dbus-execute.h
diff --git a/src/grp-system/libcore/dbus-job.h b/src/grp-system/libcore/include/core/dbus-job.h
index 95664cb90c..95664cb90c 100644
--- a/src/grp-system/libcore/dbus-job.h
+++ b/src/grp-system/libcore/include/core/dbus-job.h
diff --git a/src/grp-system/libcore/dbus-kill.h b/src/grp-system/libcore/include/core/dbus-kill.h
index b32ce9d223..b32ce9d223 100644
--- a/src/grp-system/libcore/dbus-kill.h
+++ b/src/grp-system/libcore/include/core/dbus-kill.h
diff --git a/src/grp-system/libcore/dbus-manager.h b/src/grp-system/libcore/include/core/dbus-manager.h
index 36a2e9481b..36a2e9481b 100644
--- a/src/grp-system/libcore/dbus-manager.h
+++ b/src/grp-system/libcore/include/core/dbus-manager.h
diff --git a/src/grp-system/libcore/dbus-mount.h b/src/grp-system/libcore/include/core/dbus-mount.h
index f9844e449d..f9844e449d 100644
--- a/src/grp-system/libcore/dbus-mount.h
+++ b/src/grp-system/libcore/include/core/dbus-mount.h
diff --git a/src/grp-system/libcore/dbus-path.h b/src/grp-system/libcore/include/core/dbus-path.h
index d3c19e0c2b..d3c19e0c2b 100644
--- a/src/grp-system/libcore/dbus-path.h
+++ b/src/grp-system/libcore/include/core/dbus-path.h
diff --git a/src/grp-system/libcore/dbus-scope.h b/src/grp-system/libcore/include/core/dbus-scope.h
index f96ddef0cf..f96ddef0cf 100644
--- a/src/grp-system/libcore/dbus-scope.h
+++ b/src/grp-system/libcore/include/core/dbus-scope.h
diff --git a/src/grp-system/libcore/dbus-service.h b/src/grp-system/libcore/include/core/dbus-service.h
index 291959325c..291959325c 100644
--- a/src/grp-system/libcore/dbus-service.h
+++ b/src/grp-system/libcore/include/core/dbus-service.h
diff --git a/src/grp-system/libcore/dbus-slice.h b/src/grp-system/libcore/include/core/dbus-slice.h
index 8e4cabbf8a..8e4cabbf8a 100644
--- a/src/grp-system/libcore/dbus-slice.h
+++ b/src/grp-system/libcore/include/core/dbus-slice.h
diff --git a/src/grp-system/libcore/dbus-socket.h b/src/grp-system/libcore/include/core/dbus-socket.h
index a31906feea..a31906feea 100644
--- a/src/grp-system/libcore/dbus-socket.h
+++ b/src/grp-system/libcore/include/core/dbus-socket.h
diff --git a/src/grp-system/libcore/dbus-swap.h b/src/grp-system/libcore/include/core/dbus-swap.h
index 19151fb771..19151fb771 100644
--- a/src/grp-system/libcore/dbus-swap.h
+++ b/src/grp-system/libcore/include/core/dbus-swap.h
diff --git a/src/grp-system/libcore/dbus-target.h b/src/grp-system/libcore/include/core/dbus-target.h
index c97a9d626e..c97a9d626e 100644
--- a/src/grp-system/libcore/dbus-target.h
+++ b/src/grp-system/libcore/include/core/dbus-target.h
diff --git a/src/grp-system/libcore/dbus-timer.h b/src/grp-system/libcore/include/core/dbus-timer.h
index 505fb5df72..505fb5df72 100644
--- a/src/grp-system/libcore/dbus-timer.h
+++ b/src/grp-system/libcore/include/core/dbus-timer.h
diff --git a/src/grp-system/libcore/dbus-unit.h b/src/grp-system/libcore/include/core/dbus-unit.h
index 758045a47c..758045a47c 100644
--- a/src/grp-system/libcore/dbus-unit.h
+++ b/src/grp-system/libcore/include/core/dbus-unit.h
diff --git a/src/grp-system/libcore/dbus.h b/src/grp-system/libcore/include/core/dbus.h
index 6baaffbd75..6baaffbd75 100644
--- a/src/grp-system/libcore/dbus.h
+++ b/src/grp-system/libcore/include/core/dbus.h
diff --git a/src/grp-system/libcore/device.h b/src/grp-system/libcore/include/core/device.h
index 184a1a349b..184a1a349b 100644
--- a/src/grp-system/libcore/device.h
+++ b/src/grp-system/libcore/include/core/device.h
diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/include/core/execute.h
index cf5e7e4617..178adc00ae 100644
--- a/src/grp-system/libcore/execute.h
+++ b/src/grp-system/libcore/include/core/execute.h
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <sys/capability.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/list.h"
-#include "basic/missing.h"
-#include "shared/fdset.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/missing.h"
+#include "systemd-shared/fdset.h"
 
 typedef struct ExecCommand ExecCommand;
 typedef struct ExecContext ExecContext;
diff --git a/src/grp-system/libcore/failure-action.h b/src/grp-system/libcore/include/core/failure-action.h
index 87b091f46e..47c08f4006 100644
--- a/src/grp-system/libcore/failure-action.h
+++ b/src/grp-system/libcore/include/core/failure-action.h
@@ -32,7 +32,7 @@ typedef enum FailureAction {
         _FAILURE_ACTION_INVALID = -1
 } FailureAction;
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 #include "manager.h"
 
diff --git a/src/grp-system/libcore/hostname-setup.h b/src/grp-system/libcore/include/core/hostname-setup.h
index 73e8c75c71..73e8c75c71 100644
--- a/src/grp-system/libcore/hostname-setup.h
+++ b/src/grp-system/libcore/include/core/hostname-setup.h
diff --git a/src/grp-system/libcore/ima-setup.h b/src/grp-system/libcore/include/core/ima-setup.h
index 472b58cb00..472b58cb00 100644
--- a/src/grp-system/libcore/ima-setup.h
+++ b/src/grp-system/libcore/include/core/ima-setup.h
diff --git a/src/grp-system/libcore/job.h b/src/grp-system/libcore/include/core/job.h
index f88e5a0782..7338601bb7 100644
--- a/src/grp-system/libcore/job.h
+++ b/src/grp-system/libcore/include/core/job.h
@@ -23,8 +23,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/unit-name.h"
 
 typedef struct Job Job;
 typedef struct JobDependency JobDependency;
diff --git a/src/grp-system/libcore/kill.h b/src/grp-system/libcore/include/core/kill.h
index 481ffdf2ff..ad8583b9b0 100644
--- a/src/grp-system/libcore/kill.h
+++ b/src/grp-system/libcore/include/core/kill.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct KillContext KillContext;
 
diff --git a/src/grp-system/libcore/killall.h b/src/grp-system/libcore/include/core/killall.h
index acc2439f00..acc2439f00 100644
--- a/src/grp-system/libcore/killall.h
+++ b/src/grp-system/libcore/include/core/killall.h
diff --git a/src/grp-system/libcore/kmod-setup.h b/src/grp-system/libcore/include/core/kmod-setup.h
index 685f4df301..685f4df301 100644
--- a/src/grp-system/libcore/kmod-setup.h
+++ b/src/grp-system/libcore/include/core/kmod-setup.h
diff --git a/src/grp-system/libcore/load-dropin.h b/src/grp-system/libcore/include/core/load-dropin.h
index d91cf05197..d007aec604 100644
--- a/src/grp-system/libcore/load-dropin.h
+++ b/src/grp-system/libcore/include/core/load-dropin.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/dropin.h"
+#include "systemd-shared/dropin.h"
 
 #include "unit.h"
 
diff --git a/src/grp-system/libcore/load-fragment.h b/src/grp-system/libcore/include/core/load-fragment.h
index b36a2e3a02..b36a2e3a02 100644
--- a/src/grp-system/libcore/load-fragment.h
+++ b/src/grp-system/libcore/include/core/load-fragment.h
diff --git a/src/grp-system/libcore/locale-setup.h b/src/grp-system/libcore/include/core/locale-setup.h
index 3b97497afe..3b97497afe 100644
--- a/src/grp-system/libcore/locale-setup.h
+++ b/src/grp-system/libcore/include/core/locale-setup.h
diff --git a/src/grp-system/libcore/loopback-setup.h b/src/grp-system/libcore/include/core/loopback-setup.h
index e7547b8a26..e7547b8a26 100644
--- a/src/grp-system/libcore/loopback-setup.h
+++ b/src/grp-system/libcore/include/core/loopback-setup.h
diff --git a/src/grp-system/libcore/machine-id-setup.h b/src/grp-system/libcore/include/core/machine-id-setup.h
index 29f4620646..29f4620646 100644
--- a/src/grp-system/libcore/machine-id-setup.h
+++ b/src/grp-system/libcore/include/core/machine-id-setup.h
diff --git a/src/grp-system/libcore/manager.h b/src/grp-system/libcore/include/core/manager.h
index 252919c27f..ae56cf1a9a 100644
--- a/src/grp-system/libcore/manager.h
+++ b/src/grp-system/libcore/include/core/manager.h
@@ -26,11 +26,11 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/ratelimit.h"
-#include "shared/fdset.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-shared/fdset.h"
 
 /* Enforce upper limit how many names we allow */
 #define MANAGER_MAX_NAMES 131072 /* 128K */
@@ -68,8 +68,8 @@ typedef enum StatusType {
         STATUS_TYPE_EMERGENCY,
 } StatusType;
 
-#include "basic/unit-name.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/path-lookup.h"
 
 #include "execute.h"
 #include "job.h"
diff --git a/src/grp-system/libcore/mount-setup.h b/src/grp-system/libcore/include/core/mount-setup.h
index 647bd770ae..647bd770ae 100644
--- a/src/grp-system/libcore/mount-setup.h
+++ b/src/grp-system/libcore/include/core/mount-setup.h
diff --git a/src/grp-system/libcore/mount.h b/src/grp-system/libcore/include/core/mount.h
index da529c44f4..da529c44f4 100644
--- a/src/grp-system/libcore/mount.h
+++ b/src/grp-system/libcore/include/core/mount.h
diff --git a/src/grp-system/libcore/namespace.h b/src/grp-system/libcore/include/core/namespace.h
index 1ae206efd1..89c6225c39 100644
--- a/src/grp-system/libcore/namespace.h
+++ b/src/grp-system/libcore/include/core/namespace.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ProtectHome {
         PROTECT_HOME_NO,
diff --git a/src/grp-system/libcore/path.h b/src/grp-system/libcore/include/core/path.h
index 4230c8fb99..4230c8fb99 100644
--- a/src/grp-system/libcore/path.h
+++ b/src/grp-system/libcore/include/core/path.h
diff --git a/src/grp-system/libcore/scope.h b/src/grp-system/libcore/include/core/scope.h
index eaf8e8b447..eaf8e8b447 100644
--- a/src/grp-system/libcore/scope.h
+++ b/src/grp-system/libcore/include/core/scope.h
diff --git a/src/grp-system/libcore/selinux-access.h b/src/grp-system/libcore/include/core/selinux-access.h
index 8d91eea38f..fb4fc4f5a3 100644
--- a/src/grp-system/libcore/selinux-access.h
+++ b/src/grp-system/libcore/include/core/selinux-access.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "shared/bus-util.h"
+#include "systemd-shared/bus-util.h"
 
 #include "manager.h"
 
diff --git a/src/grp-system/libcore/selinux-setup.h b/src/grp-system/libcore/include/core/selinux-setup.h
index 7b613249b0..7b613249b0 100644
--- a/src/grp-system/libcore/selinux-setup.h
+++ b/src/grp-system/libcore/include/core/selinux-setup.h
diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/include/core/service.h
index 34a9fbe72e..528df23faf 100644
--- a/src/grp-system/libcore/service.h
+++ b/src/grp-system/libcore/include/core/service.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/exit-status.h"
-#include "basic/ratelimit.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/ratelimit.h"
 
 typedef struct Service Service;
 typedef struct ServiceFDStore ServiceFDStore;
diff --git a/src/grp-system/libcore/show-status.h b/src/grp-system/libcore/include/core/show-status.h
index 56c56eb358..08d6b7f6e1 100644
--- a/src/grp-system/libcore/show-status.h
+++ b/src/grp-system/libcore/include/core/show-status.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* Manager status */
 
diff --git a/src/grp-system/libcore/slice.h b/src/grp-system/libcore/include/core/slice.h
index c9f3f61067..c9f3f61067 100644
--- a/src/grp-system/libcore/slice.h
+++ b/src/grp-system/libcore/include/core/slice.h
diff --git a/src/grp-system/libcore/smack-setup.h b/src/grp-system/libcore/include/core/smack-setup.h
index 78164c85e6..78164c85e6 100644
--- a/src/grp-system/libcore/smack-setup.h
+++ b/src/grp-system/libcore/include/core/smack-setup.h
diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/include/core/socket.h
index 3b214946e0..c22500c69c 100644
--- a/src/grp-system/libcore/socket.h
+++ b/src/grp-system/libcore/include/core/socket.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/socket-util.h"
+#include "systemd-basic/socket-util.h"
 
 typedef struct Socket Socket;
 
diff --git a/src/grp-system/libcore/swap.h b/src/grp-system/libcore/include/core/swap.h
index c2cbfc5d2a..c2cbfc5d2a 100644
--- a/src/grp-system/libcore/swap.h
+++ b/src/grp-system/libcore/include/core/swap.h
diff --git a/src/grp-system/libcore/target.h b/src/grp-system/libcore/include/core/target.h
index 339aea154e..339aea154e 100644
--- a/src/grp-system/libcore/target.h
+++ b/src/grp-system/libcore/include/core/target.h
diff --git a/src/grp-system/libcore/timer.h b/src/grp-system/libcore/include/core/timer.h
index 99b47c3880..9cb30249e3 100644
--- a/src/grp-system/libcore/timer.h
+++ b/src/grp-system/libcore/include/core/timer.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/calendarspec.h"
+#include "systemd-basic/calendarspec.h"
 
 typedef struct Timer Timer;
 
diff --git a/src/grp-system/libcore/transaction.h b/src/grp-system/libcore/include/core/transaction.h
index 19d8d3d434..355b7bb6e6 100644
--- a/src/grp-system/libcore/transaction.h
+++ b/src/grp-system/libcore/include/core/transaction.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct Transaction Transaction;
 
diff --git a/src/grp-system/libcore/unit-printf.h b/src/grp-system/libcore/include/core/unit-printf.h
index 4fc8531228..4fc8531228 100644
--- a/src/grp-system/libcore/unit-printf.h
+++ b/src/grp-system/libcore/include/core/unit-printf.h
diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/include/core/unit.h
index 01123cab00..6c76e352d4 100644
--- a/src/grp-system/libcore/unit.h
+++ b/src/grp-system/libcore/include/core/unit.h
@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/list.h"
-#include "basic/unit-name.h"
-#include "shared/condition.h"
-#include "shared/install.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/install.h"
 
 typedef struct Unit Unit;
 typedef struct UnitRef UnitRef;
diff --git a/src/grp-system/libcore/audit-fd.c b/src/grp-system/libcore/src/audit-fd.c
index 8ea525eda3..3c2d06425f 100644
--- a/src/grp-system/libcore/audit-fd.c
+++ b/src/grp-system/libcore/src/audit-fd.c
@@ -20,16 +20,16 @@
 
 #include <errno.h>
 
-#include "audit-fd.h"
+#include "core/audit-fd.h"
 
 #ifdef HAVE_AUDIT
 
 #include <libaudit.h>
 #include <stdbool.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 static bool initialized = false;
 static int audit_fd;
diff --git a/src/grp-system/libcore/automount.c b/src/grp-system/libcore/src/automount.c
index 30c30469ca..c4568cec25 100644
--- a/src/grp-system/libcore/automount.c
+++ b/src/grp-system/libcore/src/automount.c
@@ -28,29 +28,28 @@
 #include <linux/auto_dev-ioctl.h>
 #include <linux/auto_fs4.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
+#include "core/automount.h"
+#include "core/dbus-automount.h"
+#include "core/mount.h"
+#include "core/unit.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
-#include "automount.h"
-#include "dbus-automount.h"
-#include "mount.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/bus-policy.c b/src/grp-system/libcore/src/bus-policy.c
index b6dc2f5438..d5bba61a93 100644
--- a/src/grp-system/libcore/bus-policy.c
+++ b/src/grp-system/libcore/src/bus-policy.c
@@ -19,14 +19,13 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-table.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "core/bus-policy.h"
 #include "sd-bus/bus-kernel.h"
 #include "sd-bus/kdbus.h"
-
-#include "bus-policy.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 int bus_kernel_translate_access(BusPolicyAccess access) {
         assert(access >= 0);
diff --git a/src/grp-system/libcore/busname.c b/src/grp-system/libcore/src/busname.c
index f21a2d23c1..e31cfd25de 100644
--- a/src/grp-system/libcore/busname.c
+++ b/src/grp-system/libcore/src/busname.c
@@ -19,24 +19,23 @@
 
 #include <sys/mman.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "core/bus-policy.h"
+#include "core/busname.h"
+#include "core/dbus-busname.h"
+#include "core/service.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-kernel.h"
 #include "sd-bus/kdbus.h"
-#include "shared/bus-util.h"
-
-#include "bus-policy.h"
-#include "busname.h"
-#include "dbus-busname.h"
-#include "service.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = {
         [BUSNAME_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/cgroup.c b/src/grp-system/libcore/src/cgroup.c
index 0c1365f329..fca369c4ff 100644
--- a/src/grp-system/libcore/cgroup.c
+++ b/src/grp-system/libcore/src/cgroup.c
@@ -20,20 +20,19 @@
 #include <fcntl.h>
 #include <fnmatch.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-
-#include "cgroup.h"
+#include "core/cgroup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
 
diff --git a/src/grp-system/libcore/dbus-automount.c b/src/grp-system/libcore/src/dbus-automount.c
index 2949c49a3f..bd07882d6b 100644
--- a/src/grp-system/libcore/dbus-automount.c
+++ b/src/grp-system/libcore/src/dbus-automount.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "automount.h"
-#include "dbus-automount.h"
+#include "core/automount.h"
+#include "core/dbus-automount.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult);
 
diff --git a/src/grp-system/libcore/dbus-busname.c b/src/grp-system/libcore/src/dbus-busname.c
index 65815bb826..b90582d6ee 100644
--- a/src/grp-system/libcore/dbus-busname.c
+++ b/src/grp-system/libcore/src/dbus-busname.c
@@ -17,12 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "busname.h"
-#include "dbus-busname.h"
-#include "unit.h"
+#include "core/busname.h"
+#include "core/dbus-busname.h"
+#include "core/unit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult);
 
diff --git a/src/grp-system/libcore/dbus-cgroup.c b/src/grp-system/libcore/src/dbus-cgroup.c
index da1c333043..0da198e1a8 100644
--- a/src/grp-system/libcore/dbus-cgroup.c
+++ b/src/grp-system/libcore/src/dbus-cgroup.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/path-util.h"
-#include "shared/bus-util.h"
-
-#include "cgroup.h"
-#include "dbus-cgroup.h"
+#include "core/cgroup.h"
+#include "core/dbus-cgroup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
 
diff --git a/src/grp-system/libcore/dbus-device.c b/src/grp-system/libcore/src/dbus-device.c
index e1a12224d3..6737f27a88 100644
--- a/src/grp-system/libcore/dbus-device.c
+++ b/src/grp-system/libcore/src/dbus-device.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dbus-device.h"
-#include "device.h"
-#include "unit.h"
+#include "core/dbus-device.h"
+#include "core/device.h"
+#include "core/unit.h"
 
 const sd_bus_vtable bus_device_vtable[] = {
         SD_BUS_VTABLE_START(0),
diff --git a/src/grp-system/libcore/dbus-execute.c b/src/grp-system/libcore/src/dbus-execute.c
index f7c217efc1..2c759f9a24 100644
--- a/src/grp-system/libcore/dbus-execute.c
+++ b/src/grp-system/libcore/src/dbus-execute.c
@@ -23,29 +23,28 @@
 #include <seccomp.h>
 #endif
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/ioprio.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-execute.h"
-#include "execute.h"
-#include "namespace.h"
+#include "core/dbus-execute.h"
+#include "core/execute.h"
+#include "core/namespace.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-shared/bus-util.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/utf8.h"
 
 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
 
diff --git a/src/grp-system/libcore/dbus-job.c b/src/grp-system/libcore/src/dbus-job.c
index ee1774da36..805d3c19bd 100644
--- a/src/grp-system/libcore/dbus-job.c
+++ b/src/grp-system/libcore/src/dbus-job.c
@@ -19,14 +19,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-
-#include "dbus-job.h"
-#include "dbus.h"
-#include "job.h"
-#include "selinux-access.h"
+#include "core/dbus-job.h"
+#include "core/dbus.h"
+#include "core/job.h"
+#include "core/selinux-access.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState);
diff --git a/src/grp-system/libcore/dbus-kill.c b/src/grp-system/libcore/src/dbus-kill.c
index 44bc2db7e2..a72b6170fd 100644
--- a/src/grp-system/libcore/dbus-kill.c
+++ b/src/grp-system/libcore/src/dbus-kill.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/signal-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-kill.h"
-#include "kill.h"
+#include "core/dbus-kill.h"
+#include "core/kill.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode);
 
diff --git a/src/grp-system/libcore/dbus-manager.c b/src/grp-system/libcore/src/dbus-manager.c
index c5684014d3..7810dadda6 100644
--- a/src/grp-system/libcore/dbus-manager.c
+++ b/src/grp-system/libcore/src/dbus-manager.c
@@ -21,31 +21,30 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/build.h"
-#include "basic/clock-util.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/virt.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-job.h"
+#include "core/dbus-manager.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/install.h"
-#include "shared/watchdog.h"
-
-#include "dbus-execute.h"
-#include "dbus-job.h"
-#include "dbus-manager.h"
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "selinux-access.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/watchdog.h"
 
 static int property_get_version(
                 sd_bus *bus,
diff --git a/src/grp-system/libcore/dbus-mount.c b/src/grp-system/libcore/src/dbus-mount.c
index 837a262f61..8ff5c53928 100644
--- a/src/grp-system/libcore/dbus-mount.c
+++ b/src/grp-system/libcore/src/dbus-mount.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-execute.h"
-#include "dbus-kill.h"
-#include "dbus-mount.h"
-#include "mount.h"
-#include "unit.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-kill.h"
+#include "core/dbus-mount.h"
+#include "core/mount.h"
+#include "core/unit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static int property_get_what(
                 sd_bus *bus,
diff --git a/src/grp-system/libcore/dbus-path.c b/src/grp-system/libcore/src/dbus-path.c
index d312652be4..b1021c1ab2 100644
--- a/src/grp-system/libcore/dbus-path.c
+++ b/src/grp-system/libcore/src/dbus-path.c
@@ -17,12 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-path.h"
-#include "path.h"
-#include "unit.h"
+#include "core/dbus-path.h"
+#include "core/path.h"
+#include "core/unit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult);
 
diff --git a/src/grp-system/libcore/dbus-scope.c b/src/grp-system/libcore/src/dbus-scope.c
index d319597c10..956f34f6da 100644
--- a/src/grp-system/libcore/dbus-scope.c
+++ b/src/grp-system/libcore/src/dbus-scope.c
@@ -17,19 +17,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-kill.h"
+#include "core/dbus-scope.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/scope.h"
+#include "core/selinux-access.h"
+#include "core/unit.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-kill.h"
-#include "dbus-scope.h"
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "scope.h"
-#include "selinux-access.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-shared/bus-util.h"
 
 static int bus_scope_abandon(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;
diff --git a/src/grp-system/libcore/dbus-service.c b/src/grp-system/libcore/src/dbus-service.c
index a3524815bd..f670dbc660 100644
--- a/src/grp-system/libcore/dbus-service.c
+++ b/src/grp-system/libcore/src/dbus-service.c
@@ -17,21 +17,20 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-execute.h"
-#include "dbus-kill.h"
-#include "dbus-service.h"
-#include "service.h"
-#include "unit.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-kill.h"
+#include "core/dbus-service.h"
+#include "core/service.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, ServiceResult);
diff --git a/src/grp-system/libcore/dbus-slice.c b/src/grp-system/libcore/src/dbus-slice.c
index e37f50b283..642fb19ec2 100644
--- a/src/grp-system/libcore/dbus-slice.c
+++ b/src/grp-system/libcore/src/dbus-slice.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dbus-cgroup.h"
-#include "dbus-slice.h"
-#include "slice.h"
-#include "unit.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-slice.h"
+#include "core/slice.h"
+#include "core/unit.h"
 
 const sd_bus_vtable bus_slice_vtable[] = {
         SD_BUS_VTABLE_START(0),
diff --git a/src/grp-system/libcore/dbus-socket.c b/src/grp-system/libcore/src/dbus-socket.c
index 4d99628725..31e4e0ca0b 100644
--- a/src/grp-system/libcore/dbus-socket.c
+++ b/src/grp-system/libcore/src/dbus-socket.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-execute.h"
-#include "dbus-socket.h"
-#include "socket.h"
-#include "unit.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-socket.h"
+#include "core/socket.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_bind_ipv6_only, socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);
diff --git a/src/grp-system/libcore/dbus-swap.c b/src/grp-system/libcore/src/dbus-swap.c
index fc911b038f..3a2cb70c68 100644
--- a/src/grp-system/libcore/dbus-swap.c
+++ b/src/grp-system/libcore/src/dbus-swap.c
@@ -18,14 +18,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-execute.h"
-#include "dbus-swap.h"
-#include "swap.h"
-#include "unit.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-swap.h"
+#include "core/swap.h"
+#include "core/unit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/bus-util.h"
 
 static int property_get_priority(
                 sd_bus *bus,
diff --git a/src/grp-system/libcore/dbus-target.c b/src/grp-system/libcore/src/dbus-target.c
index 6858b1ce72..06a114a1b1 100644
--- a/src/grp-system/libcore/dbus-target.c
+++ b/src/grp-system/libcore/src/dbus-target.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dbus-target.h"
-#include "unit.h"
+#include "core/dbus-target.h"
+#include "core/unit.h"
 
 const sd_bus_vtable bus_target_vtable[] = {
         SD_BUS_VTABLE_START(0),
diff --git a/src/grp-system/libcore/dbus-timer.c b/src/grp-system/libcore/src/dbus-timer.c
index ce454385f8..0c7ec4040f 100644
--- a/src/grp-system/libcore/dbus-timer.c
+++ b/src/grp-system/libcore/src/dbus-timer.c
@@ -17,13 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
-
-#include "dbus-timer.h"
-#include "timer.h"
-#include "unit.h"
+#include "core/dbus-timer.h"
+#include "core/timer.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/bus-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);
 
diff --git a/src/grp-system/libcore/dbus-unit.c b/src/grp-system/libcore/src/dbus-unit.c
index 7e2a63b434..e7dd70e40a 100644
--- a/src/grp-system/libcore/dbus-unit.c
+++ b/src/grp-system/libcore/src/dbus-unit.c
@@ -19,22 +19,21 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
-
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "selinux-access.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_job_mode, job_mode, JobMode);
diff --git a/src/grp-system/libcore/dbus.c b/src/grp-system/libcore/src/dbus.c
index e8e57e6a89..a1cc910e32 100644
--- a/src/grp-system/libcore/dbus.c
+++ b/src/grp-system/libcore/src/dbus.c
@@ -23,29 +23,28 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/strxcpyx.h"
-#include "basic/user-util.h"
+#include "core/dbus-cgroup.h"
+#include "core/dbus-execute.h"
+#include "core/dbus-job.h"
+#include "core/dbus-kill.h"
+#include "core/dbus-manager.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
-
-#include "dbus-cgroup.h"
-#include "dbus-execute.h"
-#include "dbus-job.h"
-#include "dbus-kill.h"
-#include "dbus-manager.h"
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "selinux-access.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-util.h"
 
 #define CONNECTIONS_MAX 4096
 
diff --git a/src/grp-system/libcore/device.c b/src/grp-system/libcore/src/device.c
index 11ee2ad047..9ccc825185 100644
--- a/src/grp-system/libcore/device.c
+++ b/src/grp-system/libcore/src/device.c
@@ -22,19 +22,18 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "shared/udev-util.h"
-
-#include "dbus-device.h"
-#include "device.h"
-#include "swap.h"
-#include "unit.h"
+#include "core/dbus-device.h"
+#include "core/device.h"
+#include "core/swap.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/udev-util.h"
 
 static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
         [DEVICE_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/execute.c b/src/grp-system/libcore/src/execute.c
index b73577817f..83b43c3535 100644
--- a/src/grp-system/libcore/execute.c
+++ b/src/grp-system/libcore/src/execute.c
@@ -52,55 +52,53 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
 #ifdef HAVE_APPARMOR
-#include "shared/apparmor-util.h"
+#include "systemd-shared/apparmor-util.h"
 #endif
-#include "basic/async.h"
-#include "basic/barrier.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/errno-list.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/io-util.h"
-#include "basic/ioprio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "basic/rm-rf.h"
-
-#include "execute.h"
-#include "namespace.h"
+#include "core/execute.h"
+#include "core/namespace.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/barrier.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/rm-rf.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/securebits.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/smack-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/utmp-wtmp.h"
-
-#include "unit.h"
+#include "core/unit.h"
+#include "systemd-basic/securebits.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
diff --git a/src/grp-system/libcore/failure-action.c b/src/grp-system/libcore/src/failure-action.c
index e22c71dac6..4fa53a095f 100644
--- a/src/grp-system/libcore/failure-action.c
+++ b/src/grp-system/libcore/src/failure-action.c
@@ -22,13 +22,12 @@
 
 #include <linux/reboot.h>
 
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
+#include "core/failure-action.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
-#include "failure-action.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-shared/bus-util.h"
 
 static void log_and_status(Manager *m, const char *message) {
         log_warning("%s", message);
diff --git a/src/grp-system/libcore/hostname-setup.c b/src/grp-system/libcore/src/hostname-setup.c
index 71e5649952..6170d5e030 100644
--- a/src/grp-system/libcore/hostname-setup.c
+++ b/src/grp-system/libcore/src/hostname-setup.c
@@ -21,15 +21,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-
-#include "hostname-setup.h"
+#include "core/hostname-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int hostname_setup(void) {
         int r;
diff --git a/src/grp-system/libcore/ima-setup.c b/src/grp-system/libcore/src/ima-setup.c
index 0b283d95f1..d1ec4852c9 100644
--- a/src/grp-system/libcore/ima-setup.c
+++ b/src/grp-system/libcore/src/ima-setup.c
@@ -22,12 +22,11 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/util.h"
-
-#include "ima-setup.h"
+#include "core/ima-setup.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #define IMA_SECFS_DIR "/sys/kernel/security/ima"
 #define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy"
diff --git a/src/grp-system/libcore/job.c b/src/grp-system/libcore/src/job.c
index 9dc44189e4..31845af5d9 100644
--- a/src/grp-system/libcore/job.c
+++ b/src/grp-system/libcore/src/job.c
@@ -22,25 +22,24 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/escape.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/virt.h"
-
-#include "dbus-job.h"
-#include "dbus.h"
-#include "job.h"
-#include "unit.h"
+#include "core/dbus-job.h"
+#include "core/dbus.h"
+#include "core/job.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/virt.h"
 
 Job* job_new_raw(Unit *unit) {
         Job *j;
diff --git a/src/grp-system/libcore/kill.c b/src/grp-system/libcore/src/kill.c
index 9f8b45971f..2f6d81f4eb 100644
--- a/src/grp-system/libcore/kill.c
+++ b/src/grp-system/libcore/src/kill.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/signal-util.h"
-#include "basic/string-table.h"
-#include "basic/util.h"
-
-#include "kill.h"
+#include "core/kill.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 
 void kill_context_init(KillContext *c) {
         assert(c);
diff --git a/src/grp-system/libcore/killall.c b/src/grp-system/libcore/src/killall.c
index 27946f1f84..3e4b5e5186 100644
--- a/src/grp-system/libcore/killall.c
+++ b/src/grp-system/libcore/src/killall.c
@@ -22,18 +22,17 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-
-#include "killall.h"
+#include "core/killall.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 static bool ignore_proc(pid_t pid, bool warn_rootfs) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/grp-system/libcore/kmod-setup.c b/src/grp-system/libcore/src/kmod-setup.c
index c91c280e7d..06080626b8 100644
--- a/src/grp-system/libcore/kmod-setup.c
+++ b/src/grp-system/libcore/src/kmod-setup.c
@@ -24,11 +24,10 @@
 #include <libkmod.h>
 #endif
 
-#include "basic/capability-util.h"
-#include "basic/macro.h"
-#include "shared/bus-util.h"
-
-#include "kmod-setup.h"
+#include "core/kmod-setup.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/bus-util.h"
 
 #ifdef HAVE_KMOD
 static void systemd_kmod_log(
diff --git a/src/grp-system/libcore/load-dropin.c b/src/grp-system/libcore/src/load-dropin.c
index 9a65b5038b..89dbf97283 100644
--- a/src/grp-system/libcore/load-dropin.c
+++ b/src/grp-system/libcore/src/load-dropin.c
@@ -18,14 +18,13 @@
 ***/
 
 
-#include "basic/log.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/conf-parser.h"
-
-#include "load-dropin.h"
-#include "load-fragment.h"
-#include "unit.h"
+#include "core/load-dropin.h"
+#include "core/load-fragment.h"
+#include "core/unit.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/conf-parser.h"
 
 static int add_dependency_consumer(
                 UnitDependency dependency,
diff --git a/src/grp-system/libcore/load-fragment.c b/src/grp-system/libcore/src/load-fragment.c
index 9a6ffc8bff..319bb512cd 100644
--- a/src/grp-system/libcore/load-fragment.c
+++ b/src/grp-system/libcore/src/load-fragment.c
@@ -31,44 +31,42 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/env-util.h"
-#include "basic/errno-list.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/ioprio.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
+#include "core/cgroup.h"
+#include "core/load-fragment.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-
-#include "cgroup.h"
-#include "load-fragment.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/conf-parser.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/securebits.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/utf8.h"
-#include "basic/web-util.h"
-
-#include "unit-printf.h"
-#include "unit.h"
+#include "core/unit-printf.h"
+#include "core/unit.h"
+#include "systemd-basic/securebits.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/web-util.h"
 
 int config_parse_warn_compat(
                 const char *unit,
diff --git a/src/grp-system/libcore/locale-setup.c b/src/grp-system/libcore/src/locale-setup.c
index ed50796c09..1b7a92e632 100644
--- a/src/grp-system/libcore/locale-setup.c
+++ b/src/grp-system/libcore/src/locale-setup.c
@@ -20,15 +20,14 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "basic/env-util.h"
-#include "basic/fileio.h"
-#include "basic/locale-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-
-#include "locale-setup.h"
+#include "core/locale-setup.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 int locale_setup(char ***environment) {
         char **add;
diff --git a/src/grp-system/libcore/loopback-setup.c b/src/grp-system/libcore/src/loopback-setup.c
index d5b65bca9c..a036581923 100644
--- a/src/grp-system/libcore/loopback-setup.c
+++ b/src/grp-system/libcore/src/loopback-setup.c
@@ -20,11 +20,10 @@
 #include <net/if.h>
 #include <stdlib.h>
 
-#include "basic/missing.h"
+#include "core/loopback-setup.h"
 #include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
-
-#include "loopback-setup.h"
+#include "systemd-basic/missing.h"
 
 static int start_loopback(sd_netlink *rtnl) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
diff --git a/src/grp-system/libcore/machine-id-setup.c b/src/grp-system/libcore/src/machine-id-setup.c
index 0b65583686..a8c6ae046c 100644
--- a/src/grp-system/libcore/machine-id-setup.c
+++ b/src/grp-system/libcore/src/machine-id-setup.c
@@ -24,23 +24,22 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/umask-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "core/machine-id-setup.h"
 #include "sd-id128/id128-util.h"
-
-#include "machine-id-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 static int generate_machine_id(const char *root, sd_id128_t *ret) {
         const char *dbus_machine_id;
diff --git a/src/grp-system/libcore/manager.c b/src/grp-system/libcore/src/manager.c
index 26395bc2b3..0d9673fec2 100644
--- a/src/grp-system/libcore/manager.c
+++ b/src/grp-system/libcore/src/manager.c
@@ -39,53 +39,52 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/env-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "core/audit-fd.h"
+#include "core/dbus-job.h"
+#include "core/dbus-manager.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/locale-setup.h"
+#include "core/manager.h"
+#include "core/transaction.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "shared/boot-timestamps.h"
-#include "shared/bus-util.h"
-#include "shared/path-lookup.h"
-#include "shared/watchdog.h"
-
-#include "audit-fd.h"
-#include "dbus-job.h"
-#include "dbus-manager.h"
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "locale-setup.h"
-#include "manager.h"
-#include "transaction.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/boot-timestamps.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/path-lookup.h"
+#include "systemd-shared/watchdog.h"
 
 #define NOTIFY_RCVBUF_SIZE (8*1024*1024)
 #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024)
@@ -1586,13 +1585,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
         return 0;
 }
 
-static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, size_t n, FDSet *fds) {
+static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, FDSet *fds) {
         _cleanup_strv_free_ char **tags = NULL;
 
         assert(m);
         assert(u);
         assert(buf);
-        assert(n > 0);
 
         tags = strv_split(buf, "\n\r");
         if (!tags) {
@@ -1645,10 +1643,14 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
 
         n = recvmsg(m->notify_fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
         if (n < 0) {
-                if (errno == EAGAIN || errno == EINTR)
-                        return 0;
+                if (!IN_SET(errno, EAGAIN, EINTR))
+                        log_error("Failed to receive notification message: %m");
 
-                return -errno;
+                /* It's not an option to return an error here since it
+                 * would disable the notification handler entirely. Services
+                 * wouldn't be able to send the WATCHDOG message for
+                 * example... */
+                return 0;
         }
 
         CMSG_FOREACH(cmsg, &msghdr) {
@@ -1671,7 +1673,8 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
                 r = fdset_new_array(&fds, fd_array, n_fds);
                 if (r < 0) {
                         close_many(fd_array, n_fds);
-                        return log_oom();
+                        log_oom();
+                        return 0;
                 }
         }
 
@@ -1685,25 +1688,27 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
                 return 0;
         }
 
+        /* The message should be a string. Here we make sure it's NUL-terminated,
+         * but only the part until first NUL will be used anyway. */
         buf[n] = 0;
 
         /* Notify every unit that might be interested, but try
          * to avoid notifying the same one multiple times. */
         u1 = manager_get_unit_by_pid_cgroup(m, ucred->pid);
         if (u1) {
-                manager_invoke_notify_message(m, u1, ucred->pid, buf, n, fds);
+                manager_invoke_notify_message(m, u1, ucred->pid, buf, fds);
                 found = true;
         }
 
         u2 = hashmap_get(m->watch_pids1, PID_TO_PTR(ucred->pid));
         if (u2 && u2 != u1) {
-                manager_invoke_notify_message(m, u2, ucred->pid, buf, n, fds);
+                manager_invoke_notify_message(m, u2, ucred->pid, buf, fds);
                 found = true;
         }
 
         u3 = hashmap_get(m->watch_pids2, PID_TO_PTR(ucred->pid));
         if (u3 && u3 != u2 && u3 != u1) {
-                manager_invoke_notify_message(m, u3, ucred->pid, buf, n, fds);
+                manager_invoke_notify_message(m, u3, ucred->pid, buf, fds);
                 found = true;
         }
 
diff --git a/src/grp-system/libcore/mount-setup.c b/src/grp-system/libcore/src/mount-setup.c
index 0de1c63b3e..28d799148a 100644
--- a/src/grp-system/libcore/mount-setup.c
+++ b/src/grp-system/libcore/src/mount-setup.c
@@ -23,27 +23,26 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/smack-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/bus-util.h"
-#include "shared/dev-setup.h"
-#include "shared/efivars.h"
-
-#include "mount-setup.h"
+#include "core/mount-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/dev-setup.h"
+#include "systemd-shared/efivars.h"
 
 typedef enum MountMode {
         MNT_NONE  =        0,
diff --git a/src/grp-system/libcore/mount.c b/src/grp-system/libcore/src/mount.c
index bc5f29692d..82608d4efd 100644
--- a/src/grp-system/libcore/mount.c
+++ b/src/grp-system/libcore/src/mount.c
@@ -24,28 +24,27 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/fstab-util.h"
-
-#include "dbus-mount.h"
-#include "manager.h"
-#include "mount-setup.h"
-#include "mount.h"
-#include "unit.h"
+#include "core/dbus-mount.h"
+#include "core/manager.h"
+#include "core/mount-setup.h"
+#include "core/mount.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/fstab-util.h"
 
 #define RETRY_UMOUNT_MAX 32
 
diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/src/namespace.c
index f76a0a7fbf..f67b0136bf 100644
--- a/src/grp-system/libcore/namespace.c
+++ b/src/grp-system/libcore/src/namespace.c
@@ -27,24 +27,23 @@
 
 #include <linux/fs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/dev-setup.h"
-
-#include "loopback-setup.h"
-#include "namespace.h"
+#include "core/loopback-setup.h"
+#include "core/namespace.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dev-setup.h"
 
 #define DEV_MOUNT_OPTIONS (MS_NOSUID|MS_STRICTATIME|MS_NOEXEC)
 
diff --git a/src/grp-system/libcore/path.c b/src/grp-system/libcore/src/path.c
index ee1b9a3480..4196a82df6 100644
--- a/src/grp-system/libcore/path.c
+++ b/src/grp-system/libcore/src/path.c
@@ -22,22 +22,21 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
+#include "core/dbus-path.h"
+#include "core/path.h"
+#include "core/unit.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
-#include "dbus-path.h"
-#include "path.h"
-#include "unit.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/scope.c b/src/grp-system/libcore/src/scope.c
index 8998f751f5..2b61a5fddc 100644
--- a/src/grp-system/libcore/scope.c
+++ b/src/grp-system/libcore/src/scope.c
@@ -20,18 +20,17 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-
-#include "dbus-scope.h"
-#include "load-dropin.h"
-#include "scope.h"
-#include "unit.h"
+#include "core/dbus-scope.h"
+#include "core/load-dropin.h"
+#include "core/scope.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = {
         [SCOPE_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/selinux-access.c b/src/grp-system/libcore/src/selinux-access.c
index f6dbfa64b7..a887dd8535 100644
--- a/src/grp-system/libcore/selinux-access.c
+++ b/src/grp-system/libcore/src/selinux-access.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "selinux-access.h"
+#include "core/selinux-access.h"
 
 #ifdef HAVE_SELINUX
 
@@ -31,16 +31,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
-
-#include "audit-fd.h"
+#include "core/audit-fd.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-util.h"
 
 static bool initialized = false;
 
diff --git a/src/grp-system/libcore/selinux-setup.c b/src/grp-system/libcore/src/selinux-setup.c
index 08c61af146..d81a8e7fa1 100644
--- a/src/grp-system/libcore/selinux-setup.c
+++ b/src/grp-system/libcore/src/selinux-setup.c
@@ -25,13 +25,12 @@
 #include <selinux/selinux.h>
 #endif
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-
-#include "selinux-setup.h"
+#include "core/selinux-setup.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_SELINUX
 _printf_(2,3)
diff --git a/src/grp-system/libcore/service.c b/src/grp-system/libcore/src/service.c
index 43d195bbba..2e4429d2f8 100644
--- a/src/grp-system/libcore/service.c
+++ b/src/grp-system/libcore/src/service.c
@@ -21,39 +21,38 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
+#include "core/dbus-service.h"
+#include "core/load-dropin.h"
+#include "core/load-fragment.h"
+#include "core/manager.h"
+#include "core/service.h"
+#include "core/unit-printf.h"
+#include "core/unit.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "shared/bus-util.h"
-
-#include "dbus-service.h"
-#include "load-dropin.h"
-#include "load-fragment.h"
-#include "manager.h"
-#include "service.h"
-#include "unit-printf.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/show-status.c b/src/grp-system/libcore/src/show-status.c
index bb6889630d..dec0eb00be 100644
--- a/src/grp-system/libcore/show-status.c
+++ b/src/grp-system/libcore/src/show-status.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-
-#include "show-status.h"
+#include "core/show-status.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 int parse_show_status(const char *v, ShowStatus *ret) {
         int r;
diff --git a/src/grp-system/libcore/slice.c b/src/grp-system/libcore/src/slice.c
index d646b838ac..cb663bead7 100644
--- a/src/grp-system/libcore/slice.c
+++ b/src/grp-system/libcore/src/slice.c
@@ -19,16 +19,15 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-
-#include "dbus-slice.h"
-#include "slice.h"
-#include "unit.h"
+#include "core/dbus-slice.h"
+#include "core/slice.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
         [SLICE_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/smack-setup.c b/src/grp-system/libcore/src/smack-setup.c
index ab316b69c9..5d94873419 100644
--- a/src/grp-system/libcore/smack-setup.c
+++ b/src/grp-system/libcore/src/smack-setup.c
@@ -26,16 +26,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-
-#include "smack-setup.h"
+#include "core/smack-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_SMACK
 
diff --git a/src/grp-system/libcore/socket.c b/src/grp-system/libcore/src/socket.c
index 3e0b3e2e49..f871f577a7 100644
--- a/src/grp-system/libcore/socket.c
+++ b/src/grp-system/libcore/src/socket.c
@@ -29,36 +29,35 @@
 
 #include <linux/sctp.h>
 
-#include "basic/alloc-util.h"
-#include "basic/copy.h"
-#include "basic/def.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/smack-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
+#include "core/dbus-socket.h"
+#include "core/socket.h"
+#include "core/unit-printf.h"
+#include "core/unit.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
-#include "dbus-socket.h"
-#include "socket.h"
-#include "unit-printf.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/swap.c b/src/grp-system/libcore/src/swap.c
index b787fc15a1..7d87d5768f 100644
--- a/src/grp-system/libcore/swap.c
+++ b/src/grp-system/libcore/src/swap.c
@@ -24,25 +24,24 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/udev-util.h"
-
-#include "dbus-swap.h"
-#include "swap.h"
-#include "unit.h"
+#include "core/dbus-swap.h"
+#include "core/swap.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/udev-util.h"
 
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/src/target.c
index e62a49be84..0b62019b4b 100644
--- a/src/grp-system/libcore/target.c
+++ b/src/grp-system/libcore/src/target.c
@@ -17,14 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-
-#include "dbus-target.h"
-#include "target.h"
-#include "unit.h"
+#include "core/dbus-target.h"
+#include "core/target.h"
+#include "core/unit.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/timer.c b/src/grp-system/libcore/src/timer.c
index 8b9fa71d27..2de644eaea 100644
--- a/src/grp-system/libcore/timer.c
+++ b/src/grp-system/libcore/src/timer.c
@@ -19,22 +19,21 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fs-util.h"
-#include "basic/parse-util.h"
-#include "basic/random-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
+#include "core/dbus-timer.h"
+#include "core/timer.h"
+#include "core/unit.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
-#include "dbus-timer.h"
-#include "timer.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-util.h"
 
 static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_DEAD] = UNIT_INACTIVE,
diff --git a/src/grp-system/libcore/transaction.c b/src/grp-system/libcore/src/transaction.c
index aa57eee556..fbf4fe6e8e 100644
--- a/src/grp-system/libcore/transaction.c
+++ b/src/grp-system/libcore/src/transaction.c
@@ -20,13 +20,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/terminal-util.h"
+#include "core/dbus-unit.h"
+#include "core/transaction.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-
-#include "dbus-unit.h"
-#include "transaction.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/terminal-util.h"
 
 static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies);
 
diff --git a/src/grp-system/libcore/unit-printf.c b/src/grp-system/libcore/src/unit-printf.c
index 14c36ab494..076ef9be11 100644
--- a/src/grp-system/libcore/unit-printf.c
+++ b/src/grp-system/libcore/src/unit-printf.c
@@ -17,18 +17,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "shared/specifier.h"
-
-#include "unit-printf.h"
-#include "unit.h"
+#include "core/unit-printf.h"
+#include "core/unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/specifier.h"
 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         Unit *u = userdata;
diff --git a/src/grp-system/libcore/unit.c b/src/grp-system/libcore/src/unit.c
index aff4dbd2ca..b7c4baea3c 100644
--- a/src/grp-system/libcore/unit.c
+++ b/src/grp-system/libcore/src/unit.c
@@ -26,39 +26,38 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/escape.h"
-#include "basic/fileio-label.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/umask-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
+#include "core/dbus-unit.h"
+#include "core/dbus.h"
+#include "core/execute.h"
+#include "core/load-dropin.h"
+#include "core/load-fragment.h"
+#include "core/unit.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/dropin.h"
-
-#include "dbus-unit.h"
-#include "dbus.h"
-#include "execute.h"
-#include "load-dropin.h"
-#include "load-fragment.h"
-#include "unit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/dropin.h"
 
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
         [UNIT_SERVICE] = &service_vtable,
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index 0f115db14c..1c25fb5b5f 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -36,56 +36,56 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/list.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "basic/set.h"
-#include "basic/sigbus.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-message.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/dropin.h"
-#include "shared/efivars.h"
-#include "shared/initreq.h"
-#include "shared/install.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/path-lookup.h"
-#include "shared/spawn-ask-password-agent.h"
-#include "shared/spawn-polkit-agent.h"
-#include "shared/utmp-wtmp.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/dropin.h"
+#include "systemd-shared/efivars.h"
+#include "systemd-shared/initreq.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/path-lookup.h"
+#include "systemd-shared/spawn-ask-password-agent.h"
+#include "systemd-shared/spawn-polkit-agent.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 /* The init script exit status codes
    0       program is running or service is OK
@@ -4686,12 +4686,14 @@ static int show_one(
                         return log_error_errno(r, "Failed to map properties: %s", bus_error_message(&error, r));
 
                 if (streq_ptr(info.load_state, "not-found") && streq_ptr(info.active_state, "inactive")) {
-                        log_error("Unit %s could not be found.", unit);
+                        log_full(streq(verb, "status") ? LOG_ERR : LOG_DEBUG,
+                                 "Unit %s could not be found.", unit);
 
                         if (streq(verb, "status"))
                                 return EXIT_PROGRAM_OR_SERVICES_STATUS_UNKNOWN;
 
-                        return -ENOENT;
+                        if (!streq(verb, "show"))
+                                return -ENOENT;
                 }
 
                 r = sd_bus_message_rewind(reply, true);
@@ -4756,10 +4758,11 @@ static int show_one(
         r = 0;
         if (show_properties) {
                 char **pp;
+                int not_found_level = streq(verb, "show") ? LOG_DEBUG : LOG_WARNING;
 
                 STRV_FOREACH(pp, arg_properties)
                         if (!set_contains(found_properties, *pp)) {
-                                log_warning("Property %s does not exist.", *pp);
+                                log_full(not_found_level, "Property %s does not exist.", *pp);
                                 r = -ENXIO;
                         }
 
diff --git a/src/grp-system/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c
index 093b6eea87..11e2143089 100644
--- a/src/grp-system/systemd-shutdown/shutdown.c
+++ b/src/grp-system/systemd-shutdown/shutdown.c
@@ -30,22 +30,22 @@
 
 #include <linux/reboot.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/def.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/switch-root.h"
-#include "shared/watchdog.h"
-
-#include "killall.h"
+#include "core/killall.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/switch-root.h"
+#include "systemd-shared/watchdog.h"
+
 #include "umount.h"
 
 #define FINALIZE_ATTEMPTS 50
diff --git a/src/grp-system/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c
index 0079f8ec78..8d280c8c8c 100644
--- a/src/grp-system/systemd-shutdown/umount.c
+++ b/src/grp-system/systemd-shutdown/umount.c
@@ -28,18 +28,18 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/list.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/udev-util.h"
-
-#include "mount-setup.h"
+#include "core/mount-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/udev-util.h"
+
 #include "umount.h"
 
 typedef struct MountPoint {
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index c558a4b21c..4877aeeb30 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -38,54 +38,54 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/build.h"
-#include "basic/capability-util.h"
-#include "basic/clock-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/raw-clone.h"
-#include "basic/rlimit-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
-#include "dbus-manager.h"
-#include "hostname-setup.h"
-#include "ima-setup.h"
-#include "killall.h"
-#include "kmod-setup.h"
-#include "load-fragment.h"
-#include "loopback-setup.h"
-#include "machine-id-setup.h"
-#include "manager.h"
-#include "mount-setup.h"
+#include "core/dbus-manager.h"
+#include "core/hostname-setup.h"
+#include "core/ima-setup.h"
+#include "core/killall.h"
+#include "core/kmod-setup.h"
+#include "core/load-fragment.h"
+#include "core/loopback-setup.h"
+#include "core/machine-id-setup.h"
+#include "core/manager.h"
+#include "core/mount-setup.h"
+#include "core/selinux-setup.h"
+#include "core/smack-setup.h"
 #include "sd-bus/bus-error.h"
-#include "selinux-setup.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/fdset.h"
-#include "shared/pager.h"
-#include "shared/switch-root.h"
-#include "shared/watchdog.h"
-#include "smack-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/raw-clone.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/fdset.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/switch-root.h"
+#include "systemd-shared/watchdog.h"
 
 static enum {
         ACTION_RUN,
@@ -2016,9 +2016,6 @@ finish:
                                 log_error_errno(r, "Failed to switch root, trying to continue: %m");
                 }
 
-                /* Reopen the console */
-                (void) make_console_stdio();
-
                 args_size = MAX(6, argc+1);
                 args = newa(const char*, args_size);
 
@@ -2066,6 +2063,9 @@ finish:
                 arg_serialization = safe_fclose(arg_serialization);
                 fds = fdset_free(fds);
 
+                /* Reopen the console */
+                (void) make_console_stdio();
+
                 for (j = 1, i = 1; j < (unsigned) argc; j++)
                         args[i++] = argv[j];
                 args[i++] = NULL;