wip

5 files changed, 27 insertions, 29 deletions

diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c
index c17fc952d3..bce4cdf3d4 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.c
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.c
@@ -27,15 +27,15 @@
 
 #include <systemd/sd-daemon.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/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-raw.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h
index 00f6931d7b..89aef76eed 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.h
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct RawExport RawExport;
-
 typedef void (*RawExportFinished)(RawExport *export, int error, void *userdata);
 
 int raw_export_new(RawExport **export, sd_event *event, RawExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c
index e2b3c5f2e9..701dfaf61d 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.c
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.c
@@ -19,15 +19,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-tar.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h
index 9efde8931d..2c50c1e5bf 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.h
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct TarExport TarExport;
-
 typedef void (*TarExportFinished)(TarExport *export, int error, void *userdata);
 
 int tar_export_new(TarExport **export, sd_event *event, TarExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c
index 5db164c7d1..a07273da7c 100644
--- a/src/grp-machine/grp-import/systemd-export/export.c
+++ b/src/grp-machine/grp-import/systemd-export/export.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "export-raw.h"
 #include "export-tar.h"