main: we want all setup functions to be in files called xxx-setup.[ch]

4 files changed, 11 insertions, 10 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 4c2be261f5..9db83aa2e5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -35,14 +35,6 @@
 
 #include "manager.h"
 #include "log.h"
-#include "mount-setup.h"
-#include "hostname-setup.h"
-#include "loopback-setup.h"
-#include "kmod-setup.h"
-#include "locale-setup.h"
-#include "selinux-setup.h"
-#include "ima-setup.h"
-#include "machine-id-util.h"
 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"
@@ -56,6 +48,15 @@
 #include "virt.h"
 #include "watchdog.h"
 
+#include "mount-setup.h"
+#include "loopback-setup.h"
+#include "kmod-setup.h"
+#include "hostname-setup.h"
+#include "machine-id-setup.h"
+#include "locale-setup.h"
+#include "selinux-setup.h"
+#include "ima-setup.h"
+
 static enum {
         ACTION_RUN,
         ACTION_HELP,
diff --git a/src/machine-id-setup.c b/src/machine-id-setup/machine-id-setup-main.c
index cb8101ea3c..ca8af596f7 100644
--- a/src/machine-id-setup.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "machine-id-util.h"
+#include "machine-id-setup.h"
 #include "log.h"
 
 int main(int argc, char *argv[]) {
diff --git a/src/shared/machine-id-util.c b/src/shared/machine-id-setup.c
index d65fd51131..9e84ac0cb9 100644
--- a/src/shared/machine-id-util.c
+++ b/src/shared/machine-id-setup.c
@@ -29,7 +29,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "machine-id-util.h"
+#include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
diff --git a/src/shared/machine-id-util.h b/src/shared/machine-id-setup.h
index 16f45d86d3..16f45d86d3 100644
--- a/src/shared/machine-id-util.h
+++ b/src/shared/machine-id-setup.h