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

userdb: Clean up includes

Split out of #37344.
---

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index db1743ee05a..2d405197dc2 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "bitfield.h"
@@ -9,22 +11,23 @@
 #include "creds-util.h"
 #include "dirent-util.h"
 #include "errno-list.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
 #include "format-util.h"
+#include "fs-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "mkdir-label.h"
+#include "mkdir.h"
 #include "pager.h"
 #include "parse-argument.h"
-#include "parse-util.h"
 #include "pretty-print.h"
 #include "recurse-dir.h"
 #include "socket-util.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "uid-classification.h"
 #include "uid-range.h"
 #include "umask-util.h"
diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c
index e30ec8ed757..48bd37ef500 100644
--- a/src/userdb/userdbd-manager.c
+++ b/src/userdb/userdbd-manager.c
@@ -1,14 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
 #include <sys/wait.h>
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "build-path.h"
 #include "common-signal.h"
 #include "env-util.h"
 #include "event-util.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "mkdir.h"
@@ -16,8 +19,9 @@
 #include "set.h"
 #include "signal-util.h"
 #include "socket-util.h"
-#include "stdio-util.h"
+#include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "userdbd-manager.h"
 
diff --git a/src/userdb/userdbd-manager.h b/src/userdb/userdbd-manager.h
index c39f79d25ca..40ff0ed1213 100644
--- a/src/userdb/userdbd-manager.h
+++ b/src/userdb/userdbd-manager.h
@@ -1,18 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-#include "sd-event.h"
-
-typedef struct Manager Manager;
-
-#include "hashmap.h"
+#include "forward.h"
 #include "ratelimit.h"
 
 #define USERDB_WORKERS_MIN 3
 #define USERDB_WORKERS_MAX 4096
 
-struct Manager {
+typedef struct Manager {
         sd_event *event;
 
         Set *workers_fixed;    /* Workers 0…USERDB_WORKERS_MIN */
@@ -23,7 +18,7 @@ struct Manager {
         RateLimit worker_ratelimit;
 
         sd_event_source *deferred_start_worker_event_source;
-};
+} Manager;
 
 int manager_new(Manager **ret);
 Manager* manager_free(Manager *m);
diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c
index 64babef1c40..f3f4d516b66 100644
--- a/src/userdb/userdbd.c
+++ b/src/userdb/userdbd.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+
+#include "sd-event.h"
 
 #include "daemon-util.h"
 #include "log.h"
diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c
index 6ce5d57ef3c..d1e296081c1 100644
--- a/src/userdb/userwork.c
+++ b/src/userdb/userwork.c
@@ -6,6 +6,7 @@
 #include "sd-daemon.h"
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "argv-util.h"
 #include "env-util.h"
 #include "errno-util.h"
@@ -14,11 +15,10 @@
 #include "io-util.h"
 #include "json-util.h"
 #include "main-func.h"
-#include "process-util.h"
-#include "strv.h"
+#include "pidref.h"
+#include "string-util.h"
 #include "time-util.h"
 #include "user-record.h"
-#include "user-record-nss.h"
 #include "user-util.h"
 #include "userdb.h"
 #include "varlink-io.systemd.UserDatabase.h"