tidy libmachine-core header locations

12 files changed, 11 insertions, 11 deletions

diff --git a/src/grp-machine/libmachine-core/include/image-dbus.h b/src/grp-machine/libmachine-core/include/machine-core/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/grp-machine/libmachine-core/include/image-dbus.h
+++ b/src/grp-machine/libmachine-core/include/machine-core/image-dbus.h
diff --git a/src/grp-machine/libmachine-core/include/machine-dbus.h b/src/grp-machine/libmachine-core/include/machine-core/machine-dbus.h
index d3faf5cb07..d3faf5cb07 100644
--- a/src/grp-machine/libmachine-core/include/machine-dbus.h
+++ b/src/grp-machine/libmachine-core/include/machine-core/machine-dbus.h
diff --git a/src/grp-machine/libmachine-core/include/machine.h b/src/grp-machine/libmachine-core/include/machine-core/machine.h
index 361451b1c8..361451b1c8 100644
--- a/src/grp-machine/libmachine-core/include/machine.h
+++ b/src/grp-machine/libmachine-core/include/machine-core/machine.h
diff --git a/src/grp-machine/libmachine-core/include/machined.h b/src/grp-machine/libmachine-core/include/machine-core/machined.h
index 8994097db0..8994097db0 100644
--- a/src/grp-machine/libmachine-core/include/machined.h
+++ b/src/grp-machine/libmachine-core/include/machine-core/machined.h
diff --git a/src/grp-machine/libmachine-core/include/operation.h b/src/grp-machine/libmachine-core/include/machine-core/operation.h
index 5eed62bd6f..5eed62bd6f 100644
--- a/src/grp-machine/libmachine-core/include/operation.h
+++ b/src/grp-machine/libmachine-core/include/machine-core/operation.h
diff --git a/src/grp-machine/libmachine-core/src/image-dbus.c b/src/grp-machine/libmachine-core/src/image-dbus.c
index b8c647eab1..f3467bf193 100644
--- a/src/grp-machine/libmachine-core/src/image-dbus.c
+++ b/src/grp-machine/libmachine-core/src/image-dbus.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "image-dbus.h"
+#include "machine-core/image-dbus.h"
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/bus-label.h"
diff --git a/src/grp-machine/libmachine-core/src/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c
index 5a402e2e95..f9c709fd30 100644
--- a/src/grp-machine/libmachine-core/src/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machine-dbus.c
@@ -28,8 +28,8 @@
 #include <libgen.h>
 #undef basename
 
-#include "machine-dbus.h"
-#include "machine.h"
+#include "machine-core/machine-dbus.h"
+#include "machine-core/machine.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-util.h"
diff --git a/src/grp-machine/libmachine-core/src/machine.c b/src/grp-machine/libmachine-core/src/machine.c
index 49eeea2d6b..12965d88c9 100644
--- a/src/grp-machine/libmachine-core/src/machine.c
+++ b/src/grp-machine/libmachine-core/src/machine.c
@@ -23,8 +23,8 @@
 
 #include <systemd/sd-messages.h>
 
-#include "machine-dbus.h"
-#include "machine.h"
+#include "machine-core/machine-dbus.h"
+#include "machine-core/machine.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/alloc-util.h"
diff --git a/src/grp-machine/libmachine-core/src/machined-dbus.c b/src/grp-machine/libmachine-core/src/machined-dbus.c
index e0245971a1..ea94a40452 100644
--- a/src/grp-machine/libmachine-core/src/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machined-dbus.c
@@ -23,9 +23,9 @@
 
 #include <systemd/sd-id128.h>
 
-#include "image-dbus.h"
-#include "machine-dbus.h"
-#include "machined.h"
+#include "machine-core/image-dbus.h"
+#include "machine-core/machine-dbus.h"
+#include "machine-core/machined.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/alloc-util.h"
diff --git a/src/grp-machine/libmachine-core/src/operation.c b/src/grp-machine/libmachine-core/src/operation.c
index 0d852aba24..715e867e4f 100644
--- a/src/grp-machine/libmachine-core/src/operation.c
+++ b/src/grp-machine/libmachine-core/src/operation.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "operation.h"
+#include "machine-core/operation.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/process-util.h"
diff --git a/src/grp-machine/libmachine-core/src/test-machine-tables.c b/src/grp-machine/libmachine-core/src/test-machine-tables.c
index 99c3274c20..5f50c3856b 100644
--- a/src/grp-machine/libmachine-core/src/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/src/test-machine-tables.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "machine.h"
+#include "machine-core/machine.h"
 #include "systemd-shared/test-tables.h"
 
 int main(int argc, char **argv) {
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index 361d85cb3f..d6ce7e0c26 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "machined.h"
+#include "machine-core/machined.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/alloc-util.h"