9 files changed, 69 insertions, 69 deletions
diff --git a/src/grp-helperunits/systemd-backlight/backlight.c b/src/grp-helperunits/systemd-backlight/backlight.c
index 45be135a23..e64651ab1e 100644
--- a/src/grp-helperunits/systemd-backlight/backlight.c
+++ b/src/grp-helperunits/systemd-backlight/backlight.c
@@ -19,16 +19,16 @@
 
 #include "libudev.h"
 
-#include "alloc-util.h"
-#include "def.h"
-#include "escape.h"
-#include "fileio.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "proc-cmdline.h"
-#include "string-util.h"
+#include "basic/alloc-util.h"
+#include "basic/def.h"
+#include "basic/escape.h"
+#include "basic/fileio.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/proc-cmdline.h"
+#include "basic/string-util.h"
 #include "udev-util.h"
-#include "util.h"
+#include "basic/util.h"
 
 static struct udev_device *find_pci_or_platform_parent(struct udev_device *device) {
         struct udev_device *parent;
diff --git a/src/grp-helperunits/systemd-binfmt/binfmt.c b/src/grp-helperunits/systemd-binfmt/binfmt.c
index eeef04fb1c..39bbdb5335 100644
--- a/src/grp-helperunits/systemd-binfmt/binfmt.c
+++ b/src/grp-helperunits/systemd-binfmt/binfmt.c
@@ -25,15 +25,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "alloc-util.h"
-#include "conf-files.h"
-#include "def.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "log.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/conf-files.h"
+#include "basic/def.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/log.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 static const char conf_file_dirs[] = CONF_PATHS_NULSTR("binfmt.d");
 
diff --git a/src/grp-helperunits/systemd-detect-virt/detect-virt.c b/src/grp-helperunits/systemd-detect-virt/detect-virt.c
index 5d51589a31..06cdab5297 100644
--- a/src/grp-helperunits/systemd-detect-virt/detect-virt.c
+++ b/src/grp-helperunits/systemd-detect-virt/detect-virt.c
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "util.h"
-#include "virt.h"
+#include "basic/util.h"
+#include "basic/virt.h"
 
 static bool arg_quiet = false;
 static enum {
diff --git a/src/grp-helperunits/systemd-quotacheck/quotacheck.c b/src/grp-helperunits/systemd-quotacheck/quotacheck.c
index 6d8c05f046..3c2292b0c4 100644
--- a/src/grp-helperunits/systemd-quotacheck/quotacheck.c
+++ b/src/grp-helperunits/systemd-quotacheck/quotacheck.c
@@ -23,11 +23,11 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "proc-cmdline.h"
-#include "process-util.h"
-#include "signal-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/proc-cmdline.h"
+#include "basic/process-util.h"
+#include "basic/signal-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
diff --git a/src/grp-helperunits/systemd-random-seed/random-seed.c b/src/grp-helperunits/systemd-random-seed/random-seed.c
index 6748bb9dd3..7fea6069f3 100644
--- a/src/grp-helperunits/systemd-random-seed/random-seed.c
+++ b/src/grp-helperunits/systemd-random-seed/random-seed.c
@@ -23,13 +23,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "io-util.h"
-#include "log.h"
-#include "mkdir.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/io-util.h"
+#include "basic/log.h"
+#include "basic/mkdir.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define POOL_SIZE_MIN 512
 
diff --git a/src/grp-helperunits/systemd-rfkill/rfkill.c b/src/grp-helperunits/systemd-rfkill/rfkill.c
index f0b0ad9275..9a3539c256 100644
--- a/src/grp-helperunits/systemd-rfkill/rfkill.c
+++ b/src/grp-helperunits/systemd-rfkill/rfkill.c
@@ -23,18 +23,18 @@
 #include "libudev.h"
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "io-util.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "proc-cmdline.h"
-#include "string-table.h"
-#include "string-util.h"
+#include "basic/alloc-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/io-util.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/proc-cmdline.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
 #include "udev-util.h"
-#include "util.h"
+#include "basic/util.h"
 
 #define EXIT_USEC (5 * USEC_PER_SEC)
 
diff --git a/src/grp-helperunits/systemd-sleep/sleep.c b/src/grp-helperunits/systemd-sleep/sleep.c
index 7f8a95728d..500386ff09 100644
--- a/src/grp-helperunits/systemd-sleep/sleep.c
+++ b/src/grp-helperunits/systemd-sleep/sleep.c
@@ -24,14 +24,14 @@
 
 #include <systemd/sd-messages.h>
 
-#include "def.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "log.h"
+#include "basic/def.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/log.h"
 #include "sleep-config.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 static char* arg_verb = NULL;
 
diff --git a/src/grp-helperunits/systemd-user-sessions/user-sessions.c b/src/grp-helperunits/systemd-user-sessions/user-sessions.c
index 9b29b5ba1d..4cec29c39e 100644
--- a/src/grp-helperunits/systemd-user-sessions/user-sessions.c
+++ b/src/grp-helperunits/systemd-user-sessions/user-sessions.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "fileio.h"
-#include "fileio-label.h"
-#include "log.h"
-#include "selinux-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/fileio.h"
+#include "basic/fileio-label.h"
+#include "basic/log.h"
+#include "basic/selinux-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 int main(int argc, char*argv[]) {
 
diff --git a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
index 1118118450..dd05231982 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
+++ b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
@@ -29,19 +29,19 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "io-util.h"
-#include "locale-util.h"
-#include "log.h"
-#include "process-util.h"
-#include "signal-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "terminal-util.h"
-#include "util.h"
-#include "virt.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/io-util.h"
+#include "basic/locale-util.h"
+#include "basic/log.h"
+#include "basic/process-util.h"
+#include "basic/signal-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/terminal-util.h"
+#include "basic/util.h"
+#include "basic/virt.h"
 
 static bool is_vconsole(int fd) {
         unsigned char data[1];