From bcbdb01e569876034a66c001132994482b048c31 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 2 Aug 2015 13:22:46 +0000
Subject: [PATCH] Cleanup a bit includes

---
 usr.sbin/pw/cpdir.c    |  7 +------
 usr.sbin/pw/grupd.c    |  4 +---
 usr.sbin/pw/psdate.c   |  5 ++---
 usr.sbin/pw/pw.c       |  7 ++++---
 usr.sbin/pw/pw.h       | 16 +++-------------
 usr.sbin/pw/pw_conf.c  |  8 ++++----
 usr.sbin/pw/pw_group.c |  4 ++--
 usr.sbin/pw/pw_log.c   |  2 ++
 usr.sbin/pw/pw_nis.c   |  1 +
 usr.sbin/pw/pw_user.c  | 25 +++++++++++++++----------
 usr.sbin/pw/pw_utils.c |  2 ++
 usr.sbin/pw/pwupd.c    | 14 ++++++--------
 12 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index e84d0f34a6bc..334f789bb75e 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -29,17 +29,12 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <dirent.h>
 
 #include "pw.h"
 #include "pwupd.h"
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index d52a345b48fb..9cbe0cb0b345 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -29,13 +29,11 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <err.h>
 #include <grp.h>
 #include <libutil.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
 
 #include "pwupd.h"
 
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 8e3a951ef85b..bd2aa152b437 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -29,12 +29,11 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <stdio.h>
+#include <ctype.h>
+#include <err.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <xlocale.h>
-#include <err.h>
 
 #include "psdate.h"
 
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index b13db70a57d1..1f42101a9add 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -32,9 +32,10 @@ static const char rcsid[] =
 #include <err.h>
 #include <fcntl.h>
 #include <locale.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <sys/wait.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
 #include "pw.h"
 
 const char     *Modes[] = {
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index e1a394995c19..b389f1248dd1 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -26,23 +26,13 @@
  * $FreeBSD$
  */
 
+#include <sys/stat.h>
+
 #define _WITH_GETLINE
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/queue.h>
-#include <sysexits.h>
 
-#include "psdate.h"
 #include "pwupd.h"
 
 enum _mode
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 41ab79b2f177..087f48e3fdf7 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -31,11 +31,11 @@ static const char rcsid[] =
 
 #include <sys/types.h>
 #include <sys/sbuf.h>
-#include <inttypes.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
+
 #include <err.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "pw.h"
 
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 22e80b0cc2d3..3f19e77aa7c3 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -32,10 +32,10 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
-#include <inttypes.h>
 #include <libutil.h>
 #include <paths.h>
-#include <stdbool.h>
+#include <string.h>
+#include <sysexits.h>
 #include <termios.h>
 #include <unistd.h>
 
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index b7744234c336..29038d903747 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -30,6 +30,8 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
 
 #include "pw.h"
 
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 669783546505..6cc361b7a25c 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -30,6 +30,7 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/types.h>
+
 #include <err.h>
 #include <pwd.h>
 #include <libutil.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 172e5efec144..b54cccb07da8 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -30,23 +30,28 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
 #include <ctype.h>
+#include <dirent.h>
 #include <err.h>
 #include <fcntl.h>
-#include <inttypes.h>
-#include <sys/param.h>
-#include <dirent.h>
-#include <paths.h>
-#include <termios.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <login_cap.h>
-#include <pwd.h>
 #include <grp.h>
+#include <pwd.h>
 #include <libutil.h>
+#include <login_cap.h>
+#include <paths.h>
+#include <string.h>
+#include <sysexits.h>
+#include <termios.h>
+#include <unistd.h>
+
 #include "pw.h"
 #include "bitmap.h"
+#include "psdate.h"
 
 #define LOGNAMESIZE (MAXLOGNAME-1)
 
diff --git a/usr.sbin/pw/pw_utils.c b/usr.sbin/pw/pw_utils.c
index 31b79c078e4a..1a4f8127de14 100644
--- a/usr.sbin/pw/pw_utils.c
+++ b/usr.sbin/pw/pw_utils.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 #include <sysexits.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "pw.h"
 
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index f9e1959f44a7..ee23952e090f 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -29,18 +29,16 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <pwd.h>
+#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <pwd.h>
-#include <libutil.h>
-#include <errno.h>
-#include <err.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/wait.h>
 
 #include "pwupd.h"