wip

24 files changed, 171 insertions, 170 deletions

diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
index ed2db4e038..0dbbc9733b 100644
--- a/src/grp-login/systemd-logind/Makefile
+++ b/src/grp-login/systemd-logind/Makefile
@@ -32,7 +32,8 @@ nodist_systemd_logind_SOURCES = \
 	src/login/logind-gperf.c
 
 systemd_logind_LDADD = \
-	libshared.la
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 _liblogind_core_la_SOURCES = \
 	src/login/logind-core.c \
diff --git a/src/grp-login/systemd-logind/logind-acl.c b/src/grp-login/systemd-logind/logind-acl.c
index 44e49c1dad..9261e59122 100644
--- a/src/grp-login/systemd-logind/logind-acl.c
+++ b/src/grp-login/systemd-logind/logind-acl.c
@@ -20,16 +20,16 @@
 #include <errno.h>
 #include <string.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 "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/acl-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind-acl.h"
 
diff --git a/src/grp-login/systemd-logind/logind-action.c b/src/grp-login/systemd-logind/logind-action.c
index a7c88e7e65..594a7e0039 100644
--- a/src/grp-login/systemd-logind/logind-action.c
+++ b/src/grp-login/systemd-logind/logind-action.c
@@ -19,17 +19,17 @@
 
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/sleep-config.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/sleep-config.h"
 
 #include "logind-action.h"
 
diff --git a/src/grp-login/systemd-logind/logind-button.c b/src/grp-login/systemd-logind/logind-button.c
index 81c82117fc..912140cc13 100644
--- a/src/grp-login/systemd-logind/logind-button.c
+++ b/src/grp-login/systemd-logind/logind-button.c
@@ -27,10 +27,10 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-button.h"
 
diff --git a/src/grp-login/systemd-logind/logind-core.c b/src/grp-login/systemd-logind/logind-core.c
index b2ae7c2e1a..b4bb502aac 100644
--- a/src/grp-login/systemd-logind/logind-core.c
+++ b/src/grp-login/systemd-logind/logind-core.c
@@ -24,15 +24,15 @@
 
 #include <linux/vt.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/udev-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind-dbus.c b/src/grp-login/systemd-logind/logind-dbus.c
index 282ba64a3d..c4b962ec92 100644
--- a/src/grp-login/systemd-logind/logind-dbus.c
+++ b/src/grp-login/systemd-logind/logind-dbus.c
@@ -24,30 +24,30 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/dirent-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 "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/efivars.h"
-#include "shared/sleep-config.h"
-#include "shared/udev-util.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/special.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/efivars.h"
+#include "systemd-shared/sleep-config.h"
+#include "systemd-shared/udev-util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind-device.c b/src/grp-login/systemd-logind/logind-device.c
index 6165a9ea6e..ac119701a0 100644
--- a/src/grp-login/systemd-logind/logind-device.c
+++ b/src/grp-login/systemd-logind/logind-device.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-device.h"
 
diff --git a/src/grp-login/systemd-logind/logind-device.h b/src/grp-login/systemd-logind/logind-device.h
index 9e2678d801..11b9bfbecd 100644
--- a/src/grp-login/systemd-logind/logind-device.h
+++ b/src/grp-login/systemd-logind/logind-device.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Device Device;
 
diff --git a/src/grp-login/systemd-logind/logind-gperf.gperf b/src/grp-login/systemd-logind/logind-gperf.gperf
index 1a39c3bf96..3dcde4cb8f 100644
--- a/src/grp-login/systemd-logind/logind-gperf.gperf
+++ b/src/grp-login/systemd-logind/logind-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "logind.h"
 %}
diff --git a/src/grp-login/systemd-logind/logind-inhibit.c b/src/grp-login/systemd-logind/logind-inhibit.c
index 8a35db0dc8..cea4850a47 100644
--- a/src/grp-login/systemd-logind/logind-inhibit.c
+++ b/src/grp-login/systemd-logind/logind-inhibit.c
@@ -22,17 +22,17 @@
 #include <string.h>
 #include <unistd.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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-inhibit.h"
 
diff --git a/src/grp-login/systemd-logind/logind-seat-dbus.c b/src/grp-login/systemd-logind/logind-seat-dbus.c
index e4febe1ab5..000a96cddc 100644
--- a/src/grp-login/systemd-logind/logind-seat-dbus.c
+++ b/src/grp-login/systemd-logind/logind-seat-dbus.c
@@ -20,13 +20,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-seat.h"
 #include "logind.h"
diff --git a/src/grp-login/systemd-logind/logind-seat.c b/src/grp-login/systemd-logind/logind-seat.c
index 6525ad5d7b..5bb9ed6226 100644
--- a/src/grp-login/systemd-logind/logind-seat.c
+++ b/src/grp-login/systemd-logind/logind-seat.c
@@ -24,16 +24,16 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-acl.h"
 #include "logind-seat.h"
diff --git a/src/grp-login/systemd-logind/logind-seat.h b/src/grp-login/systemd-logind/logind-seat.h
index 7fbeb5a727..fba08ef5c3 100644
--- a/src/grp-login/systemd-logind/logind-seat.h
+++ b/src/grp-login/systemd-logind/logind-seat.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Seat Seat;
 
diff --git a/src/grp-login/systemd-logind/logind-session-dbus.c b/src/grp-login/systemd-logind/logind-session-dbus.c
index f79f9b5003..ffcc1c8324 100644
--- a/src/grp-login/systemd-logind/logind-session-dbus.c
+++ b/src/grp-login/systemd-logind/logind-session-dbus.c
@@ -20,14 +20,14 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session-device.h"
 #include "logind-session.h"
diff --git a/src/grp-login/systemd-logind/logind-session-device.c b/src/grp-login/systemd-logind/logind-session-device.c
index 99528488c0..131e000439 100644
--- a/src/grp-login/systemd-logind/logind-session-device.c
+++ b/src/grp-login/systemd-logind/logind-session-device.c
@@ -26,11 +26,11 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session-device.h"
 
diff --git a/src/grp-login/systemd-logind/logind-session-device.h b/src/grp-login/systemd-logind/logind-session-device.h
index 4a22decb1d..4bd0f28695 100644
--- a/src/grp-login/systemd-logind/logind-session-device.h
+++ b/src/grp-login/systemd-logind/logind-session-device.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef enum DeviceType DeviceType;
 typedef struct SessionDevice SessionDevice;
diff --git a/src/grp-login/systemd-logind/logind-session.c b/src/grp-login/systemd-logind/logind-session.c
index b08db54068..58ac2aeeb7 100644
--- a/src/grp-login/systemd-logind/logind-session.c
+++ b/src/grp-login/systemd-logind/logind-session.c
@@ -29,22 +29,22 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-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 "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"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session.h"
 
diff --git a/src/grp-login/systemd-logind/logind-session.h b/src/grp-login/systemd-logind/logind-session.h
index 976046d847..9b836aacd2 100644
--- a/src/grp-login/systemd-logind/logind-session.h
+++ b/src/grp-login/systemd-logind/logind-session.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/login-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/login-util.h"
 
 typedef enum KillWho KillWho;
 typedef struct Session Session;
diff --git a/src/grp-login/systemd-logind/logind-user-dbus.c b/src/grp-login/systemd-logind/logind-user-dbus.c
index 57d1c857e6..73e44f8e61 100644
--- a/src/grp-login/systemd-logind/logind-user-dbus.c
+++ b/src/grp-login/systemd-logind/logind-user-dbus.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 #include "logind-user.h"
 #include "logind.h"
diff --git a/src/grp-login/systemd-logind/logind-user.c b/src/grp-login/systemd-logind/logind-user.c
index 5a2750b72b..3c5f5df290 100644
--- a/src/grp-login/systemd-logind/logind-user.c
+++ b/src/grp-login/systemd-logind/logind-user.c
@@ -22,31 +22,31 @@
 #include <sys/mount.h>
 #include <unistd.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 "basic/fs-util.h"
-#include "basic/hashmap.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/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"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/clean-ipc.h"
-#include "shared/conf-parser.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.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/hashmap.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/rm-rf.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/clean-ipc.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "logind-user.h"
 
diff --git a/src/grp-login/systemd-logind/logind-user.h b/src/grp-login/systemd-logind/logind-user.h
index b23c59fa1d..d93223f6ad 100644
--- a/src/grp-login/systemd-logind/logind-user.h
+++ b/src/grp-login/systemd-logind/logind-user.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct User User;
 
diff --git a/src/grp-login/systemd-logind/logind-utmp.c b/src/grp-login/systemd-logind/logind-utmp.c
index 1e97083f78..319718ca57 100644
--- a/src/grp-login/systemd-logind/logind-utmp.c
+++ b/src/grp-login/systemd-logind/logind-utmp.c
@@ -24,17 +24,17 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/formats-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c
index 84e23beef0..ccb88d4ead 100644
--- a/src/grp-login/systemd-logind/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
@@ -25,18 +25,18 @@
 #include <libudev.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/udev-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind.h b/src/grp-login/systemd-logind/logind.h
index c637cdfcac..4f1290f9c2 100644
--- a/src/grp-login/systemd-logind/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
@@ -25,9 +25,9 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/set.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/set.h"
 
 typedef struct Manager Manager;