5 files changed, 25 insertions, 25 deletions
diff --git a/src/grp-import/systemd-export/export-raw.c b/src/grp-import/systemd-export/export-raw.c
index 658f835132..1e3f6e034e 100644
--- a/src/grp-import/systemd-export/export-raw.c
+++ b/src/grp-import/systemd-export/export-raw.c
@@ -27,16 +27,16 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "btrfs-util.h"
-#include "copy.h"
+#include "basic/alloc-util.h"
+#include "basic/btrfs-util.h"
+#include "basic/copy.h"
 #include "export-raw.h"
-#include "fd-util.h"
-#include "fileio.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
 #include "import-common.h"
-#include "ratelimit.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/ratelimit.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
diff --git a/src/grp-import/systemd-export/export-raw.h b/src/grp-import/systemd-export/export-raw.h
index c7ac134603..13d7809b9d 100644
--- a/src/grp-import/systemd-export/export-raw.h
+++ b/src/grp-import/systemd-export/export-raw.h
@@ -22,7 +22,7 @@
 #include <systemd/sd-event.h>
 
 #include "import-compress.h"
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct RawExport RawExport;
 
diff --git a/src/grp-import/systemd-export/export-tar.c b/src/grp-import/systemd-export/export-tar.c
index 9c511984c1..9a8d48dc2e 100644
--- a/src/grp-import/systemd-export/export-tar.c
+++ b/src/grp-import/systemd-export/export-tar.c
@@ -19,16 +19,16 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "btrfs-util.h"
+#include "basic/alloc-util.h"
+#include "basic/btrfs-util.h"
 #include "export-tar.h"
-#include "fd-util.h"
-#include "fileio.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
 #include "import-common.h"
-#include "process-util.h"
-#include "ratelimit.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/process-util.h"
+#include "basic/ratelimit.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
diff --git a/src/grp-import/systemd-export/export-tar.h b/src/grp-import/systemd-export/export-tar.h
index 50206cabb3..0a59033d5b 100644
--- a/src/grp-import/systemd-export/export-tar.h
+++ b/src/grp-import/systemd-export/export-tar.h
@@ -22,7 +22,7 @@
 #include <systemd/sd-event.h>
 
 #include "import-compress.h"
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct TarExport TarExport;
 
diff --git a/src/grp-import/systemd-export/export.c b/src/grp-import/systemd-export/export.c
index 0a5efe5476..4419cedc57 100644
--- a/src/grp-import/systemd-export/export.c
+++ b/src/grp-import/systemd-export/export.c
@@ -21,17 +21,17 @@
 
 #include <systemd/sd-event.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "export-raw.h"
 #include "export-tar.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "hostname-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "basic/hostname-util.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 ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN;