10 files changed, 77 insertions, 77 deletions
diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c
index 6ab627a710..e34b2578f6 100644
--- a/src/grp-machine/systemd-machined/image-dbus.c
+++ b/src/grp-machine/systemd-machined/image-dbus.c
@@ -17,15 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/process-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "image-dbus.h"
 
diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c
index 91b5dfa993..769101ab42 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.c
+++ b/src/grp-machine/systemd-machined/machine-dbus.c
@@ -28,26 +28,26 @@
 #include <libgen.h>
 #undef basename
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/copy.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/in-addr-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-netlink/local-addresses.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/copy.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/in-addr-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-util.h"
 
 #include "machine-dbus.h"
 #include "machine.h"
diff --git a/src/grp-machine/systemd-machined/machine.c b/src/grp-machine/systemd-machined/machine.c
index 701fec0e67..75d1c98023 100644
--- a/src/grp-machine/systemd-machined/machine.c
+++ b/src/grp-machine/systemd-machined/machine.c
@@ -23,23 +23,23 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-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/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-util.h"
 
 #include "machine-dbus.h"
 #include "machine.h"
diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/systemd-machined/machine.h
index e93f0cf222..361451b1c8 100644
--- a/src/grp-machine/systemd-machined/machine.h
+++ b/src/grp-machine/systemd-machined/machine.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 KillWho KillWho;
 typedef struct Machine Machine;
diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c
index 349ffcf298..0a836fb5fd 100644
--- a/src/grp-machine/systemd-machined/machined-dbus.c
+++ b/src/grp-machine/systemd-machined/machined-dbus.c
@@ -23,24 +23,24 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-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"
+#include "systemd-shared/machine-image.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "image-dbus.h"
 #include "machine-dbus.h"
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index a01d1820a1..f947bbd144 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -23,17 +23,17 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/label.h"
-#include "basic/signal-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-shared/bus-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "machined.h"
 
diff --git a/src/grp-machine/systemd-machined/machined.h b/src/grp-machine/systemd-machined/machined.h
index b16ea3ef15..8994097db0 100644
--- a/src/grp-machine/systemd-machined/machined.h
+++ b/src/grp-machine/systemd-machined/machined.h
@@ -24,8 +24,8 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-machine/systemd-machined/operation.c b/src/grp-machine/systemd-machined/operation.c
index f16c38c47a..9732be95fb 100644
--- a/src/grp-machine/systemd-machined/operation.c
+++ b/src/grp-machine/systemd-machined/operation.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/process-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/process-util.h"
 
 #include "operation.h"
 
diff --git a/src/grp-machine/systemd-machined/operation.h b/src/grp-machine/systemd-machined/operation.h
index 713ffe88c4..5eed62bd6f 100644
--- a/src/grp-machine/systemd-machined/operation.h
+++ b/src/grp-machine/systemd-machined/operation.h
@@ -24,7 +24,7 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Operation Operation;
 
diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c
index 7d44c55a4b..8f9ce8d385 100644
--- a/src/grp-machine/systemd-machined/test-machine-tables.c
+++ b/src/grp-machine/systemd-machined/test-machine-tables.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/test-tables.h"
+#include "systemd-shared/test-tables.h"
 
 #include "machine.h"