util-lib: move main() definition macros to its own header file

This way, we can extend the macro a bit with stuff pulled in from other
headers without this affecting everything which pulls in macro.h, which
is one of our most basic headers.

This is just refactoring, no change in behaviour, in prepartion for
later changes.

4 files changed, 4 insertions, 0 deletions

diff --git a/src/import/export.c b/src/import/export.c
index 317ac1bba7..e07aa5d6d5 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -13,6 +13,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "verbs.h"
diff --git a/src/import/import.c b/src/import/import.c
index 69fe8a8a37..9dca2f3d41 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -13,6 +13,7 @@
 #include "import-tar.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "verbs.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index b5265a7ed3..f17cdf10d4 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -13,6 +13,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-pool.h"
+#include "main-func.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 821c9772e4..810cab53ba 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -9,6 +9,7 @@
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "pull-raw.h"
 #include "pull-tar.h"