From ca00c93962234735dab80d9953218ef0251c492c Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 14 May 2025 23:17:46 +0200
Subject: [PATCH] nss: Clean up includes

Split out of #37344.
---
 src/nss-myhostname/nss-myhostname.c | 3 ---
 src/nss-mymachines/nss-mymachines.c | 7 +------
 src/nss-resolve/nss-resolve.c       | 5 +----
 src/nss-systemd/nss-systemd.c       | 4 ++--
 src/nss-systemd/nss-systemd.h       | 4 +---
 src/nss-systemd/userdb-glue.c       | 5 ++++-
 src/nss-systemd/userdb-glue.h       | 2 +-
 7 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index a19a362896d..b1a4cfebb83 100644
--- 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 c64e79bdff8..2878ddc6b67 100644
--- 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 efcba2543d4..3a660ca8b2d 100644
--- 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 7b9908b89eb..3c92cc2d00b 100644
--- 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 2b46044e145..054bd403055 100644
--- 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 c522c264bc9..8e2d828be02 100644
--- 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 ed4c5ec546a..840329312d2 100644
--- 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);
-- 
2.47.3