diff --git a/usr.sbin/nscd/agent.c b/usr.sbin/nscd/agent.c
index d53c7ba92d32..2102012abc5a 100644
--- a/usr.sbin/nscd/agent.c
+++ b/usr.sbin/nscd/agent.c
@@ -29,8 +29,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "agent.h"
 #include "debug.h"
 
diff --git a/usr.sbin/nscd/agents/group.c b/usr.sbin/nscd/agents/group.c
index 2ac061923504..4b607adb7dc4 100644
--- a/usr.sbin/nscd/agents/group.c
+++ b/usr.sbin/nscd/agents/group.c
@@ -29,12 +29,13 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
+
 #include <assert.h>
-#include <nsswitch.h>
 #include <grp.h>
-#include <string.h>
+#include <nsswitch.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "../debug.h"
 #include "passwd.h"
 
diff --git a/usr.sbin/nscd/agents/passwd.c b/usr.sbin/nscd/agents/passwd.c
index 9039febbb2f7..fbc3e46113d9 100644
--- a/usr.sbin/nscd/agents/passwd.c
+++ b/usr.sbin/nscd/agents/passwd.c
@@ -29,11 +29,13 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+
 #include <assert.h>
 #include <nsswitch.h>
 #include <pwd.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "../debug.h"
 #include "passwd.h"
 
diff --git a/usr.sbin/nscd/agents/services.c b/usr.sbin/nscd/agents/services.c
index f1f52d0a304a..d38675e9bed8 100644
--- a/usr.sbin/nscd/agents/services.c
+++ b/usr.sbin/nscd/agents/services.c
@@ -29,12 +29,13 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
+
 #include <assert.h>
-#include <nsswitch.h>
 #include <netdb.h>
-#include <string.h>
+#include <nsswitch.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "../debug.h"
 #include "services.h"
 
diff --git a/usr.sbin/nscd/cachelib.c b/usr.sbin/nscd/cachelib.c
index daa819348f4a..27c34e2096dd 100644
--- a/usr.sbin/nscd/cachelib.c
+++ b/usr.sbin/nscd/cachelib.c
@@ -29,9 +29,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/time.h>
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "cachelib.h"
 #include "debug.h"
 
diff --git a/usr.sbin/nscd/debug.c b/usr.sbin/nscd/debug.c
index 90d1c11f6d93..48130b4a00d0 100644
--- a/usr.sbin/nscd/debug.c
+++ b/usr.sbin/nscd/debug.c
@@ -29,6 +29,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
+
 #include "debug.h"
 
 static	int	trace_level = 0;
diff --git a/usr.sbin/nscd/log.c b/usr.sbin/nscd/log.c
index adfc5bf8c1c8..5f4c578f1130 100644
--- a/usr.sbin/nscd/log.c
+++ b/usr.sbin/nscd/log.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <syslog.h>
+
 #include "log.h"
 
 void
diff --git a/usr.sbin/nscd/mp_ws_query.c b/usr.sbin/nscd/mp_ws_query.c
index f5c889b31aa1..ca4433ae03e8 100644
--- a/usr.sbin/nscd/mp_ws_query.c
+++ b/usr.sbin/nscd/mp_ws_query.c
@@ -28,15 +28,16 @@
 #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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "cachelib.h"
 #include "config.h"
diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c
index 3b6996d7afb1..3ea4659d70ac 100644
--- a/usr.sbin/nscd/nscdcli.c
+++ b/usr.sbin/nscd/nscdcli.c
@@ -29,10 +29,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/socket.h>
+
 #include <sys/event.h>
+#include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/nscd/protocol.c b/usr.sbin/nscd/protocol.c
index 08cea9230995..3e40739600a6 100644
--- a/usr.sbin/nscd/protocol.c
+++ b/usr.sbin/nscd/protocol.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "debug.h"
 #include "log.h"
 #include "protocol.h"