8 files changed, 47 insertions, 47 deletions
diff --git a/src/grp-import/systemd-import/import-common.c b/src/grp-import/systemd-import/import-common.c
index 287a3382a1..c2baef83f8 100644
--- a/src/grp-import/systemd-import/import-common.c
+++ b/src/grp-import/systemd-import/import-common.c
@@ -22,12 +22,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "btrfs-util.h"
-#include "capability-util.h"
-#include "fd-util.h"
+#include "basic/btrfs-util.h"
+#include "basic/capability-util.h"
+#include "basic/fd-util.h"
 #include "import-common.h"
-#include "signal-util.h"
-#include "util.h"
+#include "basic/signal-util.h"
+#include "basic/util.h"
 
 int import_make_read_only_fd(int fd) {
         int r;
diff --git a/src/grp-import/systemd-import/import-compress.c b/src/grp-import/systemd-import/import-compress.c
index f1766bbe3b..05643cfbaf 100644
--- a/src/grp-import/systemd-import/import-compress.c
+++ b/src/grp-import/systemd-import/import-compress.c
@@ -18,8 +18,8 @@
 ***/
 
 #include "import-compress.h"
-#include "string-table.h"
-#include "util.h"
+#include "basic/string-table.h"
+#include "basic/util.h"
 
 void import_compress_free(ImportCompress *c) {
         assert(c);
diff --git a/src/grp-import/systemd-import/import-compress.h b/src/grp-import/systemd-import/import-compress.h
index 6b59d0724b..130afb4cd0 100644
--- a/src/grp-import/systemd-import/import-compress.h
+++ b/src/grp-import/systemd-import/import-compress.h
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <zlib.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef enum ImportCompressType {
         IMPORT_COMPRESS_UNKNOWN,
diff --git a/src/grp-import/systemd-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c
index ce37392707..256d140bc8 100644
--- a/src/grp-import/systemd-import/import-raw.c
+++ b/src/grp-import/systemd-import/import-raw.c
@@ -22,26 +22,26 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "alloc-util.h"
-#include "btrfs-util.h"
-#include "chattr-util.h"
-#include "copy.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "hostname-util.h"
+#include "basic/alloc-util.h"
+#include "basic/btrfs-util.h"
+#include "basic/chattr-util.h"
+#include "basic/copy.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "basic/hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "import-raw.h"
-#include "io-util.h"
+#include "basic/io-util.h"
 #include "machine-pool.h"
-#include "mkdir.h"
-#include "path-util.h"
+#include "basic/mkdir.h"
+#include "basic/path-util.h"
 #include "qcow2-util.h"
-#include "ratelimit.h"
-#include "rm-rf.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/ratelimit.h"
+#include "basic/rm-rf.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 struct RawImport {
         sd_event *event;
diff --git a/src/grp-import/systemd-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h
index f0a315c088..90b452e6e0 100644
--- a/src/grp-import/systemd-import/import-raw.h
+++ b/src/grp-import/systemd-import/import-raw.h
@@ -22,7 +22,7 @@
 #include <systemd/sd-event.h>
 
 #include "import-util.h"
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct RawImport RawImport;
 
diff --git a/src/grp-import/systemd-import/import-tar.c b/src/grp-import/systemd-import/import-tar.c
index 016d05e77d..3e76de481b 100644
--- a/src/grp-import/systemd-import/import-tar.c
+++ b/src/grp-import/systemd-import/import-tar.c
@@ -22,26 +22,26 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "alloc-util.h"
-#include "btrfs-util.h"
-#include "copy.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "hostname-util.h"
+#include "basic/alloc-util.h"
+#include "basic/btrfs-util.h"
+#include "basic/copy.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "basic/hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "import-tar.h"
-#include "io-util.h"
+#include "basic/io-util.h"
 #include "machine-pool.h"
-#include "mkdir.h"
-#include "path-util.h"
-#include "process-util.h"
+#include "basic/mkdir.h"
+#include "basic/path-util.h"
+#include "basic/process-util.h"
 #include "qcow2-util.h"
-#include "ratelimit.h"
-#include "rm-rf.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/ratelimit.h"
+#include "basic/rm-rf.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 struct TarImport {
         sd_event *event;
diff --git a/src/grp-import/systemd-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h
index b66b00ddfd..97a2a30e6d 100644
--- a/src/grp-import/systemd-import/import-tar.h
+++ b/src/grp-import/systemd-import/import-tar.h
@@ -22,7 +22,7 @@
 #include <systemd/sd-event.h>
 
 #include "import-util.h"
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct TarImport TarImport;
 
diff --git a/src/grp-import/systemd-import/import.c b/src/grp-import/systemd-import/import.c
index 338847dbc2..6a1f8d8e42 100644
--- a/src/grp-import/systemd-import/import.c
+++ b/src/grp-import/systemd-import/import.c
@@ -21,17 +21,17 @@
 
 #include <systemd/sd-event.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "hostname-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "basic/hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
 #include "import-util.h"
 #include "machine-image.h"
-#include "signal-util.h"
-#include "string-util.h"
-#include "verbs.h"
+#include "basic/signal-util.h"
+#include "basic/string-util.h"
+#include "basic/verbs.h"
 
 static bool arg_force = false;
 static bool arg_read_only = false;