nss: Clean up includes

Split out of #37344.

diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index a19a362896d1c24046dc10431e62367745e629e4..b1a4cfebb838ee5c19db1a9a9d35111f8e568c2c 100644 (file)
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -1,17 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <nss.h>
-#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "local-addresses.h"
-#include "macro.h"
 #include "nss-util.h"
 #include "resolve-util.h"
 #include "signal-util.h"

diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
index c64e79bdff8983d732d0e89c0d368203f3506094..2878ddc6b676b1474987c24e536eede8ba7d43d7 100644 (file)
--- a/src/nss-mymachines/nss-mymachines.c
+++ b/src/nss-mymachines/nss-mymachines.c
@@ -3,21 +3,16 @@
 #include <netdb.h>
 #include <nss.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 #include "sd-bus.h"
 #include "sd-login.h"
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
 #include "bus-locator.h"
-#include "env-util.h"
 #include "errno-util.h"
-#include "format-util.h"
-#include "hostname-util.h"
 #include "in-addr-util.h"
 #include "log.h"
-#include "macro.h"
-#include "memory-util.h"
 #include "nss-util.h"
 #include "signal-util.h"
 #include "string-util.h"

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index efcba2543d446f87a61588a3f395dae5e4afcb36..3a660ca8b2d9eb90cf043143692bae0454bd1c3a 100644 (file)
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -1,11 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <netdb.h>
 #include <nss.h>
 #include <pthread.h>
-#include <stdlib.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-varlink.h"
@@ -15,12 +12,12 @@
 #include "glyph-util.h"
 #include "in-addr-util.h"
 #include "json-util.h"
-#include "macro.h"
 #include "nss-util.h"
 #include "resolved-def.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 
 static sd_json_dispatch_flags_t json_dispatch_flags = SD_JSON_ALLOW_EXTENSIONS;
 

diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 7b9908b89eb8a1f2c4f3f22219e7617cd071ad8f..3c92cc2d00b0acbffcf610dba049ecce8614448b 100644 (file)
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <gshadow.h>
 #include <nss.h>
 #include <pthread.h>
 #include <string.h>
@@ -8,13 +9,12 @@
 #include "alloc-util.h"
 #include "env-util.h"
 #include "errno-util.h"
-#include "fd-util.h"
 #include "log.h"
-#include "macro.h"
 #include "nss-systemd.h"
 #include "nss-util.h"
 #include "pthread-util.h"
 #include "signal-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "user-record-nss.h"
 #include "user-util.h"

diff --git a/src/nss-systemd/nss-systemd.h b/src/nss-systemd/nss-systemd.h
index 2b46044e14591eaf9c56c156e1350674f347947e..054bd4030551503761798d92de86abfbc96cb96d 100644 (file)
--- a/src/nss-systemd/nss-systemd.h
+++ b/src/nss-systemd/nss-systemd.h
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "assert-util.h"
+#include "forward.h"
 
 int _nss_systemd_block(bool b);
 bool _nss_systemd_is_blocked(void);

diff --git a/src/nss-systemd/userdb-glue.c b/src/nss-systemd/userdb-glue.c
index c522c264bc91a2270ff0b0a64fe9ef009aeb5268..8e2d828be02bcf91c57a1b05810cf80d1c5af3f8 100644 (file)
--- a/src/nss-systemd/userdb-glue.c
+++ b/src/nss-systemd/userdb-glue.c
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <gshadow.h>
+#include <string.h>
+
 #include "env-util.h"
-#include "fd-util.h"
 #include "nss-systemd.h"
 #include "strv.h"
+#include "time-util.h"
 #include "user-record.h"
 #include "user-record-nss.h"
 #include "user-util.h"

diff --git a/src/nss-systemd/userdb-glue.h b/src/nss-systemd/userdb-glue.h
index ed4c5ec546ac7deba48b5340a66ddb00c5b3dd39..840329312d2e4b03ed0967655275f8d52922db85 100644 (file)
--- a/src/nss-systemd/userdb-glue.h
+++ b/src/nss-systemd/userdb-glue.h
@@ -4,8 +4,8 @@
 #include <grp.h>
 #include <nss.h>
 #include <pwd.h>
-#include <sys/types.h>
 
+#include "forward.h"
 #include "userdb.h"
 
 UserDBFlags nss_glue_userdb_flags(void);