14 files changed, 19 insertions, 19 deletions
diff --git a/src/grp-import/systemd-export/export.c b/src/grp-import/systemd-export/export.c
index 4419cedc57..a64b79bba0 100644
--- a/src/grp-import/systemd-export/export.c
+++ b/src/grp-import/systemd-export/export.c
@@ -27,8 +27,8 @@
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/verbs.h"
diff --git a/src/grp-import/systemd-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c
index 256d140bc8..0bbae2aa8a 100644
--- a/src/grp-import/systemd-import/import-raw.c
+++ b/src/grp-import/systemd-import/import-raw.c
@@ -34,7 +34,7 @@
 #include "import-compress.h"
 #include "import-raw.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "qcow2-util.h"
diff --git a/src/grp-import/systemd-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h
index 90b452e6e0..a3bc532d37 100644
--- a/src/grp-import/systemd-import/import-raw.h
+++ b/src/grp-import/systemd-import/import-raw.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.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 3e76de481b..8848beb11b 100644
--- a/src/grp-import/systemd-import/import-tar.c
+++ b/src/grp-import/systemd-import/import-tar.c
@@ -33,7 +33,7 @@
 #include "import-compress.h"
 #include "import-tar.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
diff --git a/src/grp-import/systemd-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h
index 97a2a30e6d..90ab082f1a 100644
--- a/src/grp-import/systemd-import/import-tar.h
+++ b/src/grp-import/systemd-import/import-tar.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.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 6a1f8d8e42..6c76c639c3 100644
--- a/src/grp-import/systemd-import/import.c
+++ b/src/grp-import/systemd-import/import.c
@@ -27,8 +27,8 @@
 #include "basic/hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/verbs.h"
diff --git a/src/grp-import/systemd-importd/importd.c b/src/grp-import/systemd-importd/importd.c
index c03df610b6..f9fe1038cd 100644
--- a/src/grp-import/systemd-importd/importd.c
+++ b/src/grp-import/systemd-importd/importd.c
@@ -23,12 +23,12 @@
 
 #include "basic/alloc-util.h"
 #include "bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-pool.h"
+#include "shared/import-util.h"
+#include "shared/machine-pool.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-import/systemd-pull/pull-common.h b/src/grp-import/systemd-pull/pull-common.h
index 929a131c88..d9cfb6b3c1 100644
--- a/src/grp-import/systemd-pull/pull-common.h
+++ b/src/grp-import/systemd-pull/pull-common.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "pull-job.h"
 
 int pull_make_local_copy(const char *final, const char *root, const char *local, bool force_local);
diff --git a/src/grp-import/systemd-pull/pull-job.c b/src/grp-import/systemd-pull/pull-job.c
index 5b5828c4d5..fce08f65d9 100644
--- a/src/grp-import/systemd-pull/pull-job.c
+++ b/src/grp-import/systemd-pull/pull-job.c
@@ -23,7 +23,7 @@
 #include "basic/fd-util.h"
 #include "basic/hexdecoct.h"
 #include "basic/io-util.h"
-#include "machine-pool.h"
+#include "shared/machine-pool.h"
 #include "basic/parse-util.h"
 #include "pull-job.h"
 #include "basic/string-util.h"
diff --git a/src/grp-import/systemd-pull/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c
index 9aa631bba7..a9777a5838 100644
--- a/src/grp-import/systemd-pull/pull-raw.c
+++ b/src/grp-import/systemd-pull/pull-raw.c
@@ -33,7 +33,7 @@
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
 #include "import-common.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
diff --git a/src/grp-import/systemd-pull/pull-raw.h b/src/grp-import/systemd-pull/pull-raw.h
index 16a6344817..84cd146647 100644
--- a/src/grp-import/systemd-pull/pull-raw.h
+++ b/src/grp-import/systemd-pull/pull-raw.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct RawPull RawPull;
diff --git a/src/grp-import/systemd-pull/pull-tar.c b/src/grp-import/systemd-pull/pull-tar.c
index 31f931da7c..576bda5a3d 100644
--- a/src/grp-import/systemd-pull/pull-tar.c
+++ b/src/grp-import/systemd-pull/pull-tar.c
@@ -31,7 +31,7 @@
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
 #include "import-common.h"
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
diff --git a/src/grp-import/systemd-pull/pull-tar.h b/src/grp-import/systemd-pull/pull-tar.h
index c59b81ea2e..addd1f861c 100644
--- a/src/grp-import/systemd-pull/pull-tar.h
+++ b/src/grp-import/systemd-pull/pull-tar.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "import-util.h"
+#include "shared/import-util.h"
 #include "basic/macro.h"
 
 typedef struct TarPull TarPull;
diff --git a/src/grp-import/systemd-pull/pull.c b/src/grp-import/systemd-pull/pull.c
index ced1bf6dcb..fa2af2fc02 100644
--- a/src/grp-import/systemd-pull/pull.c
+++ b/src/grp-import/systemd-pull/pull.c
@@ -23,8 +23,8 @@
 
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
-#include "import-util.h"
-#include "machine-image.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
 #include "basic/parse-util.h"
 #include "pull-raw.h"
 #include "pull-tar.h"