2 files changed, 62 insertions, 62 deletions
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index c7c00bbbc3..91bbeac651 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -35,55 +35,55 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-message.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "cgroup-show.h"
-#include "cgroup-util.h"
-#include "copy.h"
+#include "basic/cgroup-util.h"
+#include "basic/copy.h"
 #include "dropin.h"
 #include "efivars.h"
-#include "env-util.h"
-#include "exit-status.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "fs-util.h"
-#include "glob-util.h"
-#include "hostname-util.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 "initreq.h"
 #include "install.h"
-#include "io-util.h"
-#include "list.h"
-#include "locale-util.h"
-#include "log.h"
+#include "basic/io-util.h"
+#include "basic/list.h"
+#include "basic/locale-util.h"
+#include "basic/log.h"
 #include "logs-show.h"
-#include "macro.h"
-#include "mkdir.h"
+#include "basic/macro.h"
+#include "basic/mkdir.h"
 #include "pager.h"
-#include "parse-util.h"
+#include "basic/parse-util.h"
 #include "path-lookup.h"
-#include "path-util.h"
-#include "process-util.h"
-#include "rlimit-util.h"
-#include "set.h"
-#include "signal-util.h"
-#include "socket-util.h"
+#include "basic/path-util.h"
+#include "basic/process-util.h"
+#include "basic/rlimit-util.h"
+#include "basic/set.h"
+#include "basic/signal-util.h"
+#include "basic/socket-util.h"
 #include "spawn-ask-password-agent.h"
 #include "spawn-polkit-agent.h"
-#include "special.h"
-#include "stat-util.h"
-#include "strv.h"
-#include "terminal-util.h"
-#include "unit-name.h"
-#include "user-util.h"
-#include "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 "utmp-wtmp.h"
-#include "verbs.h"
-#include "virt.h"
+#include "basic/verbs.h"
+#include "basic/virt.h"
 
 static char **arg_types = NULL;
 static char **arg_states = NULL;
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index 042cce49dd..4d161fac21 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -38,52 +38,52 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "architecture.h"
-#include "build.h"
+#include "basic/alloc-util.h"
+#include "basic/architecture.h"
+#include "basic/build.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "capability-util.h"
-#include "clock-util.h"
+#include "basic/capability-util.h"
+#include "basic/clock-util.h"
 #include "conf-parser.h"
-#include "cpu-set-util.h"
+#include "basic/cpu-set-util.h"
 #include "dbus-manager.h"
-#include "def.h"
-#include "env-util.h"
-#include "fd-util.h"
-#include "fdset.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "fs-util.h"
+#include "basic/def.h"
+#include "basic/env-util.h"
+#include "basic/fd-util.h"
+#include "basic/fdset.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/fs-util.h"
 #include "hostname-setup.h"
 #include "ima-setup.h"
 #include "killall.h"
 #include "kmod-setup.h"
 #include "load-fragment.h"
-#include "log.h"
+#include "basic/log.h"
 #include "loopback-setup.h"
 #include "machine-id-setup.h"
 #include "manager.h"
-#include "missing.h"
+#include "basic/missing.h"
 #include "mount-setup.h"
 #include "pager.h"
-#include "parse-util.h"
-#include "proc-cmdline.h"
-#include "process-util.h"
-#include "rlimit-util.h"
+#include "basic/parse-util.h"
+#include "basic/proc-cmdline.h"
+#include "basic/process-util.h"
+#include "basic/rlimit-util.h"
 #include "selinux-setup.h"
-#include "selinux-util.h"
-#include "signal-util.h"
+#include "basic/selinux-util.h"
+#include "basic/signal-util.h"
 #include "smack-setup.h"
-#include "special.h"
-#include "stat-util.h"
-#include "stdio-util.h"
-#include "strv.h"
+#include "basic/special.h"
+#include "basic/stat-util.h"
+#include "basic/stdio-util.h"
+#include "basic/strv.h"
 #include "switch-root.h"
-#include "terminal-util.h"
-#include "umask-util.h"
-#include "user-util.h"
-#include "virt.h"
+#include "basic/terminal-util.h"
+#include "basic/umask-util.h"
+#include "basic/user-util.h"
+#include "basic/virt.h"
 #include "watchdog.h"
 
 static enum {