diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 8f3842ee8d56..748c3ad84bd7 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -31,12 +31,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <unistd.h>
-#include <syslog.h>
 #include <sys/types.h>
-#include <paths.h>
 #include <fcntl.h>
 #include <libutil.h>
+#include <paths.h>
+#include <syslog.h>
+#include <unistd.h>
 
 static properties P;
 
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index a6778cb2fa45..ce9a2e47c316 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -34,23 +34,23 @@ __FBSDID("$FreeBSD$");
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libutil.h>
 #include <limits.h>
-#include <stdio.h>
-#include <ctype.h>
+#include <login_cap.h>
+#include <paths.h>
 #include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <login_cap.h>
-#include <stdarg.h>
-#include <paths.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <libutil.h>
 
 
 /*
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 7d501288b24b..b7193031dbd8 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -29,21 +29,20 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/param.h>
-#include <pwd.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <libutil.h>
-#include <syslog.h>
 #include <login_cap.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
 
 /*
  * allocstr()
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index d05b2e5f21b5..b8eb79ec6201 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -25,22 +25,22 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/mac.h>
+#include <sys/rtprio.h>
+#include <errno.h>
 #include <fcntl.h>
-#include <pwd.h>
-#include <syslog.h>
 #include <login_cap.h>
 #include <paths.h>
-#include <sys/rtprio.h>
-#include <sys/mac.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
 
 
 static struct login_res {
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index e66110c1e8c4..b23edbe07684 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -24,18 +24,17 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <ttyent.h>
-#include <fnmatch.h>
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/param.h>
+#include <errno.h>
+#include <fnmatch.h>
 #include <login_cap.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ttyent.h>
+#include <unistd.h>
 
 
 /* -- support functions -- */
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index add9135222ac..10e88dd5a5f3 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -24,13 +24,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
+#include <ctype.h>
+#include <login_cap.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <login_cap.h>
 
 static struct
 {
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 5981198e33b3..54d3fe8cdd4a 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -43,9 +43,9 @@ static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
 #include <sys/param.h>
 #include <sys/ioctl.h>
 
-#include <unistd.h>
-#include <stdlib.h>
 #include <libutil.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 int
 login_tty(fd)
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index f4a2eb625e09..b2753b93f24b 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -44,12 +44,12 @@ static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
 #include <sys/time.h>
 
 #include <fcntl.h>
-#include <utmp.h>
-#include <unistd.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <timeconv.h>
-#include <libutil.h>
+#include <unistd.h>
+#include <utmp.h>
 
 typedef struct utmp UTMP;
 
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index 34e6ee39b8d1..f2c3917e9296 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -32,14 +32,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
 #include <sys/types.h>
+#include <ctype.h>
+#include <err.h>
 #include <libutil.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 static properties
 property_alloc(char *name, char *value)
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 088ea8db0609..4a2ea782acff 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -47,11 +47,11 @@ static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <libutil.h>
 
 int
 openpty(amaster, aslave, name, termp, winp)
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index a5458786affc..114bf7265b1c 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -58,8 +58,8 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <err.h>
 #include <ctype.h>
+#include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <libgen.h>
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 6314db3e8fcb..80faf97d9423 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -28,8 +28,8 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-
 #include <sys/socket.h>
+
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 6b2e2c5a6a1a..1514a9b5bb71 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -42,12 +42,12 @@ static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 #include <sys/file.h>
 #include <dirent.h>
 #include <errno.h>
-#include <unistd.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <paths.h>
 #include <string.h>
+#include <unistd.h>
 #include "libutil.h"
 
 #define MAXTRIES 5