From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 14 May 2025 21:26:58 +0000 (+0200)
Subject: locale: Clean up includes
X-Git-Tag: v258-rc1~589^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7dad604d7377896d343f9e96e631ab52a5690ab;p=thirdparty%2Fsystemd.git

locale: Clean up includes

Split out of #37344.
---

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 54e2ee597cd..451bd19e085 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <stdbool.h>
 
 #include "sd-bus.h"
 
@@ -20,12 +19,11 @@
 #include "pager.h"
 #include "polkit-agent.h"
 #include "pretty-print.h"
-#include "proc-cmdline.h"
-#include "set.h"
+#include "runtime-scope.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "verbs.h"
-#include "virt.h"
 
 /* Enough time for locale-gen to finish server-side (in case it is in use) */
 #define LOCALE_SLOW_BUS_CALL_TIMEOUT_USEC (2*USEC_PER_MINUTE)
diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index 067d0940209..9e990443e4d 100644
--- a/src/locale/localed-util.c
+++ b/src/locale/localed-util.c
@@ -1,19 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "copy.h"
 #include "env-file.h"
 #include "env-file-label.h"
-#include "env-util.h"
 #include "errno-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "fs-util.h"
+#include "hashmap.h"
 #include "kbd-util.h"
 #include "localed-util.h"
 #include "log.h"
diff --git a/src/locale/localed-util.h b/src/locale/localed-util.h
index a5bd78a4f78..888313b0012 100644
--- a/src/locale/localed-util.h
+++ b/src/locale/localed-util.h
@@ -4,9 +4,7 @@
 #include <sys/stat.h>
 #include <syslog.h>
 
-#include "sd-bus.h"
-
-#include "hashmap.h"
+#include "forward.h"
 #include "locale-setup.h"
 #include "vconsole-util.h"
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 24ec6263e5f..4a62e063b1c 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1,34 +1,29 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
+#include "sd-event.h"
 
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-log-control-api.h"
-#include "bus-message.h"
 #include "bus-polkit.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "constants.h"
 #include "daemon-util.h"
-#include "kbd-util.h"
+#include "hashmap.h"
+#include "label-util.h"
 #include "localed-util.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
-#include "path-util.h"
-#include "selinux-util.h"
 #include "service-util.h"
-#include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "user-util.h"
+#include "time-util.h"
 
 static int vconsole_reload(sd_bus *bus) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/locale/test-localed-util.c b/src/locale/test-localed-util.c
index d6221edbafe..92fe7b0421e 100644
--- a/src/locale/test-localed-util.c
+++ b/src/locale/test-localed-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "alloc-util.h"
 #include "localed-util.h"
 #include "log.h"
diff --git a/src/locale/xkbcommon-util.c b/src/locale/xkbcommon-util.c
index 8d0de9b4318..edced7492df 100644
--- a/src/locale/xkbcommon-util.c
+++ b/src/locale/xkbcommon-util.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
 #include "dlfcn-util.h"
 #include "log.h"
-#include "macro.h"
 #include "string-util.h"
 #include "xkbcommon-util.h"
 
diff --git a/src/locale/xkbcommon-util.h b/src/locale/xkbcommon-util.h
index 6149ce392d2..7d4071fd79d 100644
--- a/src/locale/xkbcommon-util.h
+++ b/src/locale/xkbcommon-util.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "dlfcn-util.h"
+#include "forward.h"
 
 #if HAVE_XKBCOMMON
 #include <xkbcommon/xkbcommon.h>