13 files changed, 28 insertions, 22 deletions

diff --git a/usr.sbin/nscd/cachelib.h b/usr.sbin/nscd/cachelib.h
index b1c8af8553a4..a80bd48c4f2a 100644
--- a/usr.sbin/nscd/cachelib.h
+++ b/usr.sbin/nscd/cachelib.h
@@ -29,9 +29,6 @@
 #ifndef __NSCD_CACHELIB_H__
 #define __NSCD_CACHELIB_H__
 
-#include <sys/queue.h>
-#include <sys/time.h>
-#include <stdlib.h>
 #include "hashtable.h"
 #include "cacheplcs.h"
 
diff --git a/usr.sbin/nscd/cacheplcs.c b/usr.sbin/nscd/cacheplcs.c
index 7010ce8fc945..6f45b5ac382b 100644
--- a/usr.sbin/nscd/cacheplcs.c
+++ b/usr.sbin/nscd/cacheplcs.c
@@ -28,8 +28,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/time.h>
+
 #include <assert.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "cacheplcs.h"
 #include "debug.h"
 
diff --git a/usr.sbin/nscd/cacheplcs.h b/usr.sbin/nscd/cacheplcs.h
index 65b3230d7711..cc1ff5d98c55 100644
--- a/usr.sbin/nscd/cacheplcs.h
+++ b/usr.sbin/nscd/cacheplcs.h
@@ -30,8 +30,6 @@
 #define __NSCD_CACHEPLCS_H__
 
 #include <sys/queue.h>
-#include <sys/time.h>
-#include <stdlib.h>
 
 /* common policy definitions */
 #define CACHELIB_MAX_FREQUENCY 100
diff --git a/usr.sbin/nscd/config.c b/usr.sbin/nscd/config.c
index 5f20ad3c41a0..a3ec5062b587 100644
--- a/usr.sbin/nscd/config.c
+++ b/usr.sbin/nscd/config.c
@@ -28,11 +28,17 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/stat.h>
+#include <sys/time.h>
+
 #include <assert.h>
 #include <math.h>
+#include <nsswitch.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "config.h"
 #include "debug.h"
 #include "log.h"
diff --git a/usr.sbin/nscd/config.h b/usr.sbin/nscd/config.h
index a3205c968bbc..521db62e1ea8 100644
--- a/usr.sbin/nscd/config.h
+++ b/usr.sbin/nscd/config.h
@@ -29,11 +29,6 @@
 #ifndef __NSCD_CONFIG_H__
 #define __NSCD_CONFIG_H__
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pthread.h>
-#include <nsswitch.h>
-#include <unistd.h>
 #include "cachelib.h"
 
 #define DEFAULT_QUERY_TIMEOUT		8
diff --git a/usr.sbin/nscd/hashtable.h b/usr.sbin/nscd/hashtable.h
index 137820e99394..a763bf0895de 100644
--- a/usr.sbin/nscd/hashtable.h
+++ b/usr.sbin/nscd/hashtable.h
@@ -29,7 +29,6 @@
 #ifndef __CACHELIB_HASHTABLE_H__
 #define __CACHELIB_HASHTABLE_H__
 
-#include <search.h>
 #include <string.h>
 
 #define HASHTABLE_INITIAL_ENTRIES_CAPACITY 8
diff --git a/usr.sbin/nscd/mp_rs_query.c b/usr.sbin/nscd/mp_rs_query.c
index c1569e988210..9e99884f16e8 100644
--- a/usr.sbin/nscd/mp_rs_query.c
+++ b/usr.sbin/nscd/mp_rs_query.c
@@ -28,15 +28,17 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/event.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+
 #include <assert.h>
 #include <errno.h>
+#include <nsswitch.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "cachelib.h"
 #include "config.h"
diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
index 1739fac1e9f2..05d37a0d1ea7 100644
--- a/usr.sbin/nscd/nscd.c
+++ b/usr.sbin/nscd/nscd.c
@@ -28,12 +28,13 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/event.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/param.h>
 #include <sys/un.h>
+
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/nscd/parser.c b/usr.sbin/nscd/parser.c
index b877efa6cf44..a36821a75e7a 100644
--- a/usr.sbin/nscd/parser.c
+++ b/usr.sbin/nscd/parser.c
@@ -28,9 +28,13 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/time.h>
+
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "config.h"
 #include "debug.h"
 #include "log.h"
diff --git a/usr.sbin/nscd/protocol.h b/usr.sbin/nscd/protocol.h
index 6894d3c4b6de..2df9b815510e 100644
--- a/usr.sbin/nscd/protocol.h
+++ b/usr.sbin/nscd/protocol.h
@@ -29,8 +29,6 @@
 #ifndef __NSCD_PROTOCOL_H__
 #define __NSCD_PROTOCOL_H__
 
-#include <stdlib.h>
-
 /* maximum buffer size to receive - larger buffers are not allowed */
 #define MAX_BUFFER_SIZE (1 << 20)
 
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index 4b750931b418..9cc13347c7c7 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -29,15 +29,18 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <sys/event.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/event.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <nsswitch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include "config.h"
 #include "debug.h"
 #include "query.h"
diff --git a/usr.sbin/nscd/query.h b/usr.sbin/nscd/query.h
index 383d8065917e..32c6248dce44 100644
--- a/usr.sbin/nscd/query.h
+++ b/usr.sbin/nscd/query.h
@@ -29,9 +29,6 @@
 #ifndef __NSCD_QUERY_H__
 #define __NSCD_QUERY_H__
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include "cachelib.h"
 #include "config.h"
 #include "protocol.h"
diff --git a/usr.sbin/nscd/singletons.c b/usr.sbin/nscd/singletons.c
index 669d12be2abd..e557c20cfc1c 100644
--- a/usr.sbin/nscd/singletons.c
+++ b/usr.sbin/nscd/singletons.c
@@ -28,6 +28,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/time.h>
+
 #include "singletons.h"
 
 struct configuration *s_configuration = NULL;