fix

20 files changed, 132 insertions, 132 deletions

diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c
index 0cef88a82d..03a6c1059b 100644
--- a/src/grp-login/liblogind-core/logind-acl.c
+++ b/src/grp-login/liblogind-core/logind-acl.c
@@ -21,16 +21,16 @@
 #include <string.h>
 
 #include "acl-util.h"
-#include "alloc-util.h"
-#include "dirent-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "formats-util.h"
+#include "basic/alloc-util.h"
+#include "basic/dirent-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
 #include "logind-acl.h"
-#include "set.h"
-#include "string-util.h"
+#include "basic/set.h"
+#include "basic/string-util.h"
 #include "udev-util.h"
-#include "util.h"
+#include "basic/util.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/liblogind-core/logind-action.c
index 9a8089f97c..884957dcf4 100644
--- a/src/grp-login/liblogind-core/logind-action.c
+++ b/src/grp-login/liblogind-core/logind-action.c
@@ -19,18 +19,18 @@
 
 #include <unistd.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "conf-parser.h"
-#include "formats-util.h"
+#include "basic/formats-util.h"
 #include "logind-action.h"
-#include "process-util.h"
+#include "basic/process-util.h"
 #include "sleep-config.h"
-#include "special.h"
-#include "string-table.h"
-#include "terminal-util.h"
-#include "user-util.h"
+#include "basic/special.h"
+#include "basic/string-table.h"
+#include "basic/terminal-util.h"
+#include "basic/user-util.h"
 
 int manager_handle_action(
                 Manager *m,
diff --git a/src/grp-login/liblogind-core/logind-button.c b/src/grp-login/liblogind-core/logind-button.c
index acf7504a2e..d791578cd7 100644
--- a/src/grp-login/liblogind-core/logind-button.c
+++ b/src/grp-login/liblogind-core/logind-button.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
 #include "logind-button.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 Button* button_new(Manager *m, const char *name) {
         Button *b;
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index cbf8d757fe..901dfcbbaf 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
@@ -23,16 +23,16 @@
 #include <sys/types.h>
 #include <linux/vt.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "cgroup-util.h"
-#include "fd-util.h"
+#include "basic/cgroup-util.h"
+#include "basic/fd-util.h"
 #include "logind.h"
-#include "strv.h"
-#include "terminal-util.h"
+#include "basic/strv.h"
+#include "basic/terminal-util.h"
 #include "udev-util.h"
-#include "user-util.h"
+#include "basic/user-util.h"
 
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
         Device *d;
diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c
index 90dcd94710..cd03d80ffa 100644
--- a/src/grp-login/liblogind-core/logind-dbus.c
+++ b/src/grp-login/liblogind-core/logind-dbus.c
@@ -24,30 +24,30 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "audit-util.h"
+#include "basic/alloc-util.h"
+#include "basic/audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "dirent-util.h"
+#include "basic/dirent-util.h"
 #include "efivars.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio-label.h"
-#include "formats-util.h"
-#include "fs-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio-label.h"
+#include "basic/formats-util.h"
+#include "basic/fs-util.h"
 #include "logind.h"
-#include "mkdir.h"
-#include "path-util.h"
-#include "process-util.h"
-#include "selinux-util.h"
+#include "basic/mkdir.h"
+#include "basic/path-util.h"
+#include "basic/process-util.h"
+#include "basic/selinux-util.h"
 #include "sleep-config.h"
-#include "special.h"
-#include "strv.h"
-#include "terminal-util.h"
+#include "basic/special.h"
+#include "basic/strv.h"
+#include "basic/terminal-util.h"
 #include "udev-util.h"
-#include "unit-name.h"
-#include "user-util.h"
+#include "basic/unit-name.h"
+#include "basic/user-util.h"
 #include "utmp-wtmp.h"
 
 int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) {
diff --git a/src/grp-login/liblogind-core/logind-device.c b/src/grp-login/liblogind-core/logind-device.c
index eb5edd1cd5..db6a8d93d1 100644
--- a/src/grp-login/liblogind-core/logind-device.c
+++ b/src/grp-login/liblogind-core/logind-device.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "logind-device.h"
-#include "util.h"
+#include "basic/util.h"
 
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;
diff --git a/src/grp-login/liblogind-core/logind-device.h b/src/grp-login/liblogind-core/logind-device.h
index 927068e00a..96c012bdd9 100644
--- a/src/grp-login/liblogind-core/logind-device.h
+++ b/src/grp-login/liblogind-core/logind-device.h
@@ -21,7 +21,7 @@
 
 typedef struct Device Device;
 
-#include "list.h"
+#include "basic/list.h"
 #include "logind-seat.h"
 #include "logind-session-device.h"
 
diff --git a/src/grp-login/liblogind-core/logind-inhibit.c b/src/grp-login/liblogind-core/logind-inhibit.c
index 6c78e0dddc..f95582f9db 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.c
+++ b/src/grp-login/liblogind-core/logind-inhibit.c
@@ -22,18 +22,18 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
+#include "basic/alloc-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
 #include "logind-inhibit.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 Inhibitor* inhibitor_new(Manager *m, const char* id) {
         Inhibitor *i;
diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c
index f934a5326a..63286b6733 100644
--- a/src/grp-login/liblogind-core/logind-seat-dbus.c
+++ b/src/grp-login/liblogind-core/logind-seat-dbus.c
@@ -20,15 +20,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-util.h"
 #include "logind-seat.h"
 #include "logind.h"
-#include "strv.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 static int property_get_active_session(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-seat.c b/src/grp-login/liblogind-core/logind-seat.c
index aec67718a1..da68288dbd 100644
--- a/src/grp-login/liblogind-core/logind-seat.c
+++ b/src/grp-login/liblogind-core/logind-seat.c
@@ -24,18 +24,18 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
 #include "logind-acl.h"
 #include "logind-seat.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "terminal-util.h"
-#include "util.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/terminal-util.h"
+#include "basic/util.h"
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
diff --git a/src/grp-login/liblogind-core/logind-seat.h b/src/grp-login/liblogind-core/logind-seat.h
index 9a4fbc5bc5..9201e0ea1f 100644
--- a/src/grp-login/liblogind-core/logind-seat.h
+++ b/src/grp-login/liblogind-core/logind-seat.h
@@ -21,7 +21,7 @@
 
 typedef struct Seat Seat;
 
-#include "list.h"
+#include "basic/list.h"
 #include "logind-session.h"
 
 struct Seat {
diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c
index 22dea5db1f..c0a6b10d6c 100644
--- a/src/grp-login/liblogind-core/logind-session-dbus.c
+++ b/src/grp-login/liblogind-core/logind-session-dbus.c
@@ -20,17 +20,17 @@
 #include <errno.h>
 #include <string.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-util.h"
-#include "fd-util.h"
+#include "basic/fd-util.h"
 #include "logind-session-device.h"
 #include "logind-session.h"
 #include "logind.h"
-#include "signal-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/signal-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 static int property_get_user(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index 4055a23277..ae7ffc6e90 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
@@ -25,12 +25,12 @@
 
 #include "libudev.h"
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-util.h"
-#include "fd-util.h"
+#include "basic/fd-util.h"
 #include "logind-session-device.h"
-#include "missing.h"
-#include "util.h"
+#include "basic/missing.h"
+#include "basic/util.h"
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,
diff --git a/src/grp-login/liblogind-core/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h
index 7c8503583f..152bf75d7a 100644
--- a/src/grp-login/liblogind-core/logind-session-device.h
+++ b/src/grp-login/liblogind-core/logind-session-device.h
@@ -22,7 +22,7 @@
 typedef enum DeviceType DeviceType;
 typedef struct SessionDevice SessionDevice;
 
-#include "list.h"
+#include "basic/list.h"
 #include "logind.h"
 
 enum DeviceType {
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index 11a83106b1..176dd5d8ff 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
@@ -28,23 +28,23 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "audit-util.h"
+#include "basic/alloc-util.h"
+#include "basic/audit-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "io-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/io-util.h"
 #include "logind-session.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "string-table.h"
-#include "terminal-util.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/string-table.h"
+#include "basic/terminal-util.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
diff --git a/src/grp-login/liblogind-core/logind-session.h b/src/grp-login/liblogind-core/logind-session.h
index ffb7cd2d41..17da11e70c 100644
--- a/src/grp-login/liblogind-core/logind-session.h
+++ b/src/grp-login/liblogind-core/logind-session.h
@@ -22,8 +22,8 @@
 typedef struct Session Session;
 typedef enum KillWho KillWho;
 
-#include "list.h"
-#include "login-util.h"
+#include "basic/list.h"
+#include "basic/login-util.h"
 #include "logind-user.h"
 
 typedef enum SessionState {
diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c
index af6392e025..66f470472e 100644
--- a/src/grp-login/liblogind-core/logind-user-dbus.c
+++ b/src/grp-login/liblogind-core/logind-user-dbus.c
@@ -20,14 +20,14 @@
 #include <errno.h>
 #include <string.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-util.h"
-#include "formats-util.h"
+#include "basic/formats-util.h"
 #include "logind-user.h"
 #include "logind.h"
-#include "signal-util.h"
-#include "strv.h"
-#include "user-util.h"
+#include "basic/signal-util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
 
 static int property_get_display(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/liblogind-core/logind-user.c
index a826321bf0..6b88d9296e 100644
--- a/src/grp-login/liblogind-core/logind-user.c
+++ b/src/grp-login/liblogind-core/logind-user.c
@@ -22,32 +22,32 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "clean-ipc.h"
 #include "conf-parser.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "fs-util.h"
-#include "hashmap.h"
-#include "label.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/fs-util.h"
+#include "basic/hashmap.h"
+#include "basic/label.h"
 #include "logind-user.h"
-#include "mkdir.h"
-#include "mount-util.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "rm-rf.h"
-#include "smack-util.h"
-#include "special.h"
-#include "stdio-util.h"
-#include "string-table.h"
-#include "unit-name.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/mkdir.h"
+#include "basic/mount-util.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/rm-rf.h"
+#include "basic/smack-util.h"
+#include "basic/special.h"
+#include "basic/stdio-util.h"
+#include "basic/string-table.h"
+#include "basic/unit-name.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 int user_new(User **out, Manager *m, uid_t uid, gid_t gid, const char *name) {
         _cleanup_(user_freep) User *u = NULL;
diff --git a/src/grp-login/liblogind-core/logind-user.h b/src/grp-login/liblogind-core/logind-user.h
index 4f0966dc77..227976f036 100644
--- a/src/grp-login/liblogind-core/logind-user.h
+++ b/src/grp-login/liblogind-core/logind-user.h
@@ -21,7 +21,7 @@
 
 typedef struct User User;
 
-#include "list.h"
+#include "basic/list.h"
 #include "logind.h"
 
 typedef enum UserState {
diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c
index 47599fd466..526e606744 100644
--- a/src/grp-login/liblogind-core/logind-utmp.c
+++ b/src/grp-login/liblogind-core/logind-utmp.c
@@ -24,17 +24,17 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "audit-util.h"
+#include "basic/alloc-util.h"
+#include "basic/audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "formats-util.h"
+#include "basic/formats-util.h"
 #include "logind.h"
-#include "special.h"
-#include "strv.h"
-#include "unit-name.h"
-#include "user-util.h"
+#include "basic/special.h"
+#include "basic/strv.h"
+#include "basic/unit-name.h"
+#include "basic/user-util.h"
 #include "utmp-wtmp.h"
 
 _const_ static usec_t when_wall(usec_t n, usec_t elapse) {