locale: Clean up includes

Split out of #37344.

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)

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"

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"
 

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;

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"

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"
 

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>