integritysetup: Clean up includes

Split out of #37344.

diff --git a/src/integritysetup/integrity-util.c b/src/integritysetup/integrity-util.c
index 754f3bf332f2abd808be69eb6a8fce4969af194e..f421487805cf6856494df727f926e5bbc288de5c 100644 (file)
--- a/src/integritysetup/integrity-util.c
+++ b/src/integritysetup/integrity-util.c
@@ -1,10 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include "alloc-util.h"
+#include "cryptsetup-util.h"
 #include "extract-word.h"
-#include "fileio.h"
 #include "integrity-util.h"
 #include "log.h"
-#include "path-util.h"
 #include "percent-util.h"
+#include "string-util.h"
+#include "strv.h"
+#include "time-util.h"
 
 static int supported_integrity_algorithm(char *user_supplied) {
         if (!STR_IN_SET(user_supplied, "crc32", "crc32c", "xxhash64", "sha1", "sha256", "hmac-sha256"))

diff --git a/src/integritysetup/integrity-util.h b/src/integritysetup/integrity-util.h
index 359d2556a4892ae9044b4f9631ae7589d2121ae1..edc3ceac5ff0a065b27b8c245d3d8a6943e9e743 100644 (file)
--- a/src/integritysetup/integrity-util.h
+++ b/src/integritysetup/integrity-util.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdint.h>
-
-#include "cryptsetup-util.h"
-#include "time-util.h"
+#include "forward.h"
 
 int parse_integrity_options(
                 const char *options,

diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c
index 7b0863d95856417429dd0f7476679c09831d5ac6..60f26b5ddc910d6a6cbf68809a3cfbe6c8d9edb6 100644 (file)
--- a/src/integritysetup/integritysetup-generator.c
+++ b/src/integritysetup/integritysetup-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -11,14 +9,9 @@
 #include "fileio.h"
 #include "fstab-util.h"
 #include "generator.h"
-#include "hexdecoct.h"
-#include "id128-util.h"
 #include "integrity-util.h"
-#include "main-func.h"
-#include "mkdir.h"
-#include "parse-util.h"
+#include "log.h"
 #include "path-util.h"
-#include "proc-cmdline.h"
 #include "specifier.h"
 #include "string-util.h"
 #include "unit-name.h"

diff --git a/src/integritysetup/integritysetup.c b/src/integritysetup/integritysetup.c
index ece8c3c1a84d6d5d6422012cecd73260ad6d4464..b643a48e111300cd4ac9df06e9d03c2905308e11 100644 (file)
--- a/src/integritysetup/integritysetup.c
+++ b/src/integritysetup/integritysetup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
 
@@ -8,17 +7,13 @@
 #include "argv-util.h"
 #include "cryptsetup-util.h"
 #include "fileio.h"
-#include "hexdecoct.h"
 #include "integrity-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "memory-util.h"
-#include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
-#include "process-util.h"
 #include "string-util.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "verbs.h"
 
 static uint32_t arg_activate_flags;