From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 20:42:37 +0000 (+0000)
Subject: bu*: Tidy header includes
X-Git-Tag: openafs-devel-1_7_1~711
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=ccfb125e8b944e516e5414935f800f9e65cef585

bu*: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Change-Id: If20a2ef67d4cbc70156c1707264a5b7360cfa11a
Reviewed-on: http://gerrit.openafs.org/4323
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/bu_utils/fms.c b/src/bu_utils/fms.c
index 6d4878b..b1e1a21 100644
--- a/src/bu_utils/fms.c
+++ b/src/bu_utils/fms.c
@@ -10,15 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <afs/procmgmt.h>
+#include <roken.h>
 
-#undef	IN
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>		/* for mtio.h */
 #include <afs/cmd.h>
-#include <afs/procmgmt.h>
 #include <afs/usd.h>
 
 /* structure for writing data to tape */
diff --git a/src/bucoord/bc_status.c b/src/bucoord/bc_status.c
index 265562c..818cc58 100644
--- a/src/bucoord/bc_status.c
+++ b/src/bucoord/bc_status.c
@@ -12,19 +12,12 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
 #include <afs/com_err.h>
 #include <afs/bubasics.h>
 #include <lock.h>
 #include <afs/tcdata.h>
 #include <afs/cmd.h>
+
 #include "bc.h"
 #include "error_macros.h"
 #include "bucoord_internal.h"
diff --git a/src/bucoord/btest.c b/src/bucoord/btest.c
index 8a1aae5..d0dfae2 100644
--- a/src/bucoord/btest.c
+++ b/src/bucoord/btest.c
@@ -7,10 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+
 #include <lwp.h>
 #include <rx/rx.h>
 #include <afs/bubasics.h>
@@ -18,9 +19,8 @@
 
 #include "AFS_component_version_number.c"
 
-main(argc, argv)
-     int argc;
-     char **argv;
+int
+main(int argc, char **argv)
 {
     struct rx_securityClass *rxsc;
     struct rx_connection *tconn;
diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c
index 5e4ba53..99bf933 100644
--- a/src/bucoord/commands.c
+++ b/src/bucoord/commands.c
@@ -9,23 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#if defined(AFS_LINUX24_ENV)
-#define _REGEX_RE_COMP
+#ifdef HAVE_POSIX_REGEX		/* use POSIX regexp library */
+#include <regex.h>
 #endif
-#include <sys/types.h>
+
 #include <afs/cmd.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <errno.h>
 #include <afs/com_err.h>
 #include <afs/afsutil.h>
 #include <afs/budb.h>
@@ -37,15 +29,11 @@
 #include <afs/vldbint.h>	/* PA */
 #include <afs/ktime.h>		/* PA */
 #include <ubik.h>
-#include <time.h>
 #include <lock.h>
-#include <afs/butc.h>
 #include <afs/tcdata.h>
 #include <afs/butx.h>
 #include <afs/vsutils_prototypes.h>
-#ifdef HAVE_POSIX_REGEX		/* use POSIX regexp library */
-#include <regex.h>
-#endif
+
 #include "bc.h"
 #include "error_macros.h"
 #include "bucoord_internal.h"
diff --git a/src/bucoord/config.c b/src/bucoord/config.c
index 86624fd..f88ea29 100644
--- a/src/bucoord/config.c
+++ b/src/bucoord/config.c
@@ -12,16 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <errno.h>
-
 #include "bc.h"
 
 struct bc_config *bc_globalConfig;
diff --git a/src/bucoord/dlq.c b/src/bucoord/dlq.c
index a8b3158..642d26d 100644
--- a/src/bucoord/dlq.c
+++ b/src/bucoord/dlq.c
@@ -12,10 +12,6 @@
 
 #include <roken.h>
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include "bc.h"
 #include <afs/bubasics.h>
 #include "bucoord_prototypes.h"
diff --git a/src/bucoord/dsstub.c b/src/bucoord/dsstub.c
index 0d356de..717ee3e 100644
--- a/src/bucoord/dsstub.c
+++ b/src/bucoord/dsstub.c
@@ -16,22 +16,12 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #include <afs/cmd.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
 #include <afs/afsutil.h>
 #include <afs/budb.h>
 #include <afs/bubasics.h>
 #include <afs/volser.h>
+
 #include "bc.h"
 
 /* protos */
diff --git a/src/bucoord/dsvs.c b/src/bucoord/dsvs.c
index c48a585..0ec3714 100644
--- a/src/bucoord/dsvs.c
+++ b/src/bucoord/dsvs.c
@@ -20,19 +20,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #include <afs/cmd.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/param.h>
-#endif
 #include <afs/com_err.h>
-
 #include <afs/bubasics.h>
+
 #include "bc.h"
 #include "bucoord_internal.h"
 
diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c
index 6f5d175..3c67a7f 100644
--- a/src/bucoord/dump.c
+++ b/src/bucoord/dump.c
@@ -16,20 +16,7 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
 #include <afs/cmd.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#endif
 #include <lwp.h>
 #include <rx/rx.h>
 #include <afs/bubasics.h>
diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c
index 95146f3..62f9342 100644
--- a/src/bucoord/dump_sched.c
+++ b/src/bucoord/dump_sched.c
@@ -11,27 +11,17 @@
  * ALL RIGHTS RESERVED
  */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <errno.h>
 #include <afs/ktime.h>
 #include <afs/budb_client.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <afs/bubasics.h>
+
 #include "bc.h"
 #include "error_macros.h"
 #include "bucoord_internal.h"
diff --git a/src/bucoord/expire.c b/src/bucoord/expire.c
index 4ec586b..6ceccc9 100644
--- a/src/bucoord/expire.c
+++ b/src/bucoord/expire.c
@@ -9,17 +9,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <afs/ktime.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <afs/cmd.h>
-#include <ctype.h>
-#include "bc.h"
 
+#include "bc.h"
 
 #define	MAX_YEAR_VALUE	0
 #define	MAX_MONTH_VALUE 11
diff --git a/src/bucoord/main.c b/src/bucoord/main.c
index ce3d7a2..ad0801c 100644
--- a/src/bucoord/main.c
+++ b/src/bucoord/main.c
@@ -9,31 +9,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
 
-#include <errno.h>
 #include <afs/cmd.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <lwp.h>
 #include <afs/bubasics.h>
-#include <fcntl.h>
 #include <afs/afsutil.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
diff --git a/src/bucoord/restore.c b/src/bucoord/restore.c
index 8c61bc9..ee11a8d 100644
--- a/src/bucoord/restore.c
+++ b/src/bucoord/restore.c
@@ -13,20 +13,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <afs/cmd.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#endif
 #include <lwp.h>
 #include <afs/bubasics.h>
 #include "bc.h"
@@ -34,6 +25,7 @@
 #include <afs/butc.h>
 #include <afs/budb.h>
 #include <afs/vlserver.h>
+
 #include "error_macros.h"
 #include "bucoord_internal.h"
 #include "bucoord_prototypes.h"
diff --git a/src/bucoord/server.c b/src/bucoord/server.c
index 02dda6d..aa2ebfd 100644
--- a/src/bucoord/server.c
+++ b/src/bucoord/server.c
@@ -7,17 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
 #include <rx/rx.h>
 
 /* services available on incoming message port */
diff --git a/src/bucoord/status.c b/src/bucoord/status.c
index ed5a5d6..3ca7cc0 100644
--- a/src/bucoord/status.c
+++ b/src/bucoord/status.c
@@ -9,21 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#endif
 #include <afs/com_err.h>
 #include <afs/bubasics.h>
+
 #include "bc.h"
 #include "error_macros.h"
 #include "bucoord_internal.h"
diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c
index 47bc05e..1da0bfb 100644
--- a/src/bucoord/tape_hosts.c
+++ b/src/bucoord/tape_hosts.c
@@ -9,25 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
 #include <afs/budb_client.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <afs/bubasics.h>
+
 #include "bc.h"
 #include "error_macros.h"
-#include <errno.h>
 #include "bucoord_internal.h"
 #include "bucoord_prototypes.h"
 
diff --git a/src/bucoord/ttest.c b/src/bucoord/ttest.c
index 338ea70..121002c 100644
--- a/src/bucoord/ttest.c
+++ b/src/bucoord/ttest.c
@@ -7,13 +7,13 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+
 #include <lwp.h>
 #include <rx/rx.h>
-#include <rpc/types.h>
 #include <afs/bubasics.h>
 #include <afs/butc.h>
 #include <afs/budb.h>
diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c
index 1c0a917..22b0e6a 100644
--- a/src/bucoord/ubik_db_if.c
+++ b/src/bucoord/ubik_db_if.c
@@ -18,15 +18,6 @@
 # pragma GCC diagnostic warning "-Wstrict-prototypes"
 #endif
 
-#include <sys/types.h>
-#include <fcntl.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#elif defined(AFS_SUN5_ENV)
-#include <netdb.h>
-#else
-#include <sys/param.h>		/* for hostnames etc */
-#endif
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>
@@ -37,7 +28,6 @@
 #include <afs/budb_client.h>
 #include <afs/budb.h>
 #include <afs/com_err.h>
-#include <errno.h>
 
 #include "bc.h"
 #include "error_macros.h"
diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c
index 581cada..fafdcf7 100644
--- a/src/bucoord/vol_sets.c
+++ b/src/bucoord/vol_sets.c
@@ -9,23 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <errno.h>
 #include <afs/budb_client.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <afs/bubasics.h>
+
 #include "bc.h"
 #include "error_macros.h"
 #include "bucoord_internal.h"
diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c
index b2e3020..e149f44 100644
--- a/src/bucoord/volstub.c
+++ b/src/bucoord/volstub.c
@@ -12,18 +12,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
 #include <rx/xdr.h>
 #include <afs/vlserver.h>	/*Misc server-side Volume Location stuff */
 #include <ubik.h>
 #include <afs/volser.h>
+
 #include "bc.h"
 #include <afs/volint.h>
 #include <afs/volser.h>
diff --git a/src/budb/database.c b/src/budb/database.c
index 94045e2..a57d830 100644
--- a/src/budb/database.c
+++ b/src/budb/database.c
@@ -9,24 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <sys/types.h>
-#include <afs/stds.h>
 #include <ubik.h>
 #include <afs/bubasics.h>
+#include <afs/audit.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "error_macros.h"
 #include "budb_internal.h"
-#include "afs/audit.h"
-#include <string.h>
 
 int pollCount;
 struct memoryDB db;		/* really allocate it here */
diff --git a/src/budb/db_alloc.c b/src/budb/db_alloc.c
index 54e1f00..48468c5 100644
--- a/src/budb/db_alloc.c
+++ b/src/budb/db_alloc.c
@@ -9,19 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <sys/types.h>
-#include <afs/stds.h>
 #include <ubik.h>
 #include <afs/bubasics.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "budb_internal.h"
diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c
index beb9009..a1510ac 100644
--- a/src/budb/db_dump.c
+++ b/src/budb/db_dump.c
@@ -14,20 +14,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <sys/param.h>
-#endif
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <ubik.h>
 #include <lock.h>
-#include <string.h>
+#include <afs/audit.h>
 
 #include "database.h"
 #include "budb.h"
@@ -35,7 +28,6 @@
 #include "error_macros.h"
 #include "budb_errs.h"
 #include "budb_internal.h"
-#include "afs/audit.h"
 
 
 /* dump ubik database - routines to scan the database and dump all
diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c
index bfe12ed..af7c643 100644
--- a/src/budb/db_hash.c
+++ b/src/budb/db_hash.c
@@ -9,19 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <sys/types.h>
-#include <afs/stds.h>
 #include <ubik.h>
 #include <afs/bubasics.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "budb_internal.h"
diff --git a/src/budb/db_lock.c b/src/budb/db_lock.c
index 5f499a3..244175a 100644
--- a/src/budb/db_lock.c
+++ b/src/budb/db_lock.c
@@ -12,21 +12,15 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <sys/time.h>
-#endif
-#include <afs/afsutil.h>
 #include <ubik.h>
+#include <afs/afsutil.h>
+#include <afs/audit.h>
 #include <afs/bubasics.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "budb_internal.h"
 #include "error_macros.h"
-#include "afs/audit.h"
 
 #define	DBH_POS(ptr)		( (char *) (ptr) - (char *) &db.h )
 
diff --git a/src/budb/db_text.c b/src/budb/db_text.c
index c5ceed6..ee76d97 100644
--- a/src/budb/db_text.c
+++ b/src/budb/db_text.c
@@ -12,25 +12,15 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <netinet/in.h>
-#include <sys/file.h>
-#include <sys/param.h>
-#endif
-#include <string.h>
-#include <sys/types.h>
 #include <ubik.h>
 #include <afs/bubasics.h>
+#include <afs/audit.h>
+#include <afs/afsutil.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "error_macros.h"
 #include "budb_internal.h"
-#include "afs/audit.h"
-#include <afs/afsutil.h>
 
 /* --------------------------------
  * interface & support code to manage text blocks within the
diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c
index 17db2bd..f1dc0b3 100644
--- a/src/budb/dbs_dump.c
+++ b/src/budb/dbs_dump.c
@@ -9,42 +9,25 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/file.h>
-#endif
-#include <time.h>
-#include <sys/types.h>
-#include <afs/stds.h>
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #include <lock.h>
 #include <ubik.h>
 #include <lwp.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
-#include <string.h>
 #include <afs/cellconfig.h>
-#include <errno.h>
+#include <afs/audit.h>
+
 #include "budb.h"
 #include "budb_errs.h"
 #include "database.h"
 #include "budb_internal.h"
 #include "error_macros.h"
 #include "globals.h"
-#include "afs/audit.h"
 
 afs_int32 DumpDB(struct rx_call *, int, afs_int32, charListT *, afs_int32 *);
 afs_int32 RestoreDbHeader(struct rx_call *, struct DbHeader *);
diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c
index e52a421..f6cdd35 100644
--- a/src/budb/ol_verify.c
+++ b/src/budb/ol_verify.c
@@ -11,27 +11,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <string.h>
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <lock.h>
 #include <ubik.h>
+#include <afs/cellconfig.h>
+#include <afs/audit.h>
+
 #include "database.h"
 #include "error_macros.h"
 #include "budb_errs.h"
 #include "budb_internal.h"
-#include <afs/cellconfig.h>
-#include "afs/audit.h"
 
 #undef min
 #undef max
diff --git a/src/budb/procs.c b/src/budb/procs.c
index 75b14a8..f53368f 100644
--- a/src/budb/procs.c
+++ b/src/budb/procs.c
@@ -18,21 +18,8 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <sys/file.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-
-#include <string.h>
-#include <sys/types.h>
 #include <afs/stds.h>
 #include <afs/bubasics.h>
-#include <stdio.h>
 #include <lock.h>
 #include <ubik.h>
 #include <lwp.h>
@@ -41,15 +28,15 @@
 #include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
-#include <errno.h>
+#include <afs/audit.h>
+#include <afs/afsutil.h>
+
 #include "budb.h"
 #include "budb_errs.h"
 #include "database.h"
 #include "budb_internal.h"
 #include "error_macros.h"
 #include "globals.h"
-#include "afs/audit.h"
-#include <afs/afsutil.h>
 
 #undef min
 #undef max
diff --git a/src/budb/server.c b/src/budb/server.c
index 5a7528a..4c202ee 100644
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -9,25 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
 #include <fcntl.h>
-#include <sys/stat.h>
+
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <netinet/in.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <netdb.h>
 #endif
-#include <string.h>
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <time.h>
-#include <stdio.h>
 #include <afs/cmd.h>
 #include <lwp.h>
 #include <ubik.h>
@@ -39,16 +29,13 @@
 #include <afs/bubasics.h>
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
-#include <errno.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <afs/audit.h>
+
 #include "budb_errs.h"
 #include "database.h"
 #include "error_macros.h"
 #include "budb_internal.h"
 #include "globals.h"
-#include "afs/audit.h"
 
 struct ubik_dbase *BU_dbase;
 struct afsconf_dir *BU_conf;	/* for getting cell info */
diff --git a/src/budb/struct_ops.c b/src/budb/struct_ops.c
index 1d67f786..367a017 100644
--- a/src/budb/struct_ops.c
+++ b/src/budb/struct_ops.c
@@ -9,24 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <sys/file.h>
-#endif
-#include <sys/types.h>
-
-#include <afs/stds.h>
 #include <afs/bubasics.h>
 #include <afs/afsutil.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <string.h>
+
 #include "budb.h"
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/butc/afsxbsa.c b/src/butc/afsxbsa.c
index cb8a7a1..c951661 100644
--- a/src/butc/afsxbsa.c
+++ b/src/butc/afsxbsa.c
@@ -11,17 +11,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <sys/types.h>
 #include <afs/stds.h>
-#include <stdio.h>
 
+#include <roken.h>
 
 #if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
 #include <dlfcn.h>
 #endif
 
-#include <errno.h>
 #include "butc_xbsa.h"
 #include <afs/butx.h>
 
diff --git a/src/butc/butc_xbsa.c b/src/butc/butc_xbsa.c
index f009cba..fcafeb6 100644
--- a/src/butc/butc_xbsa.c
+++ b/src/butc/butc_xbsa.c
@@ -11,15 +11,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <afs/stds.h>
-#include <stdio.h>
 #if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV)
 #include <dlfcn.h>
 #endif
-#include <errno.h>
+
 #include "butc_xbsa.h"
 #include <afs/butx.h>
 #include <afs/bubasics.h>
diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c
index 728c68d..be9b343 100644
--- a/src/butc/dbentries.c
+++ b/src/butc/dbentries.c
@@ -12,18 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netdb.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>
@@ -32,7 +20,6 @@
 #include <afs/bubasics.h>
 #include <afs/budb_client.h>
 #include <afs/vldbint.h>
-
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
@@ -40,7 +27,6 @@
 #include <afs/bucoord_prototypes.h>
 
 #include "butc_internal.h"
-
 #include "error_macros.h"
 
 dlqlinkT savedEntries;
diff --git a/src/butc/dump.c b/src/butc/dump.c
index e1da036..532324f 100644
--- a/src/butc/dump.c
+++ b/src/butc/dump.c
@@ -12,26 +12,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>
 #include <lock.h>
-#include <errno.h>
 #include <afs/tcdata.h>
 #include <afs/bubasics.h>
 #include <afs/budb_client.h>
diff --git a/src/butc/list.c b/src/butc/list.c
index 9c09f52..5521ba5 100644
--- a/src/butc/list.c
+++ b/src/butc/list.c
@@ -12,14 +12,10 @@
 
 #include <roken.h>
 
-#ifndef AFS_NT40_ENV
-#include <sys/time.h>
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>
 #include <lwp.h>
-#include <errno.h>
 #include <afs/tcdata.h>
 
 #include "error_macros.h"
diff --git a/src/butc/lwps.c b/src/butc/lwps.c
index 31c8ad0..1124f11 100644
--- a/src/butc/lwps.c
+++ b/src/butc/lwps.c
@@ -13,24 +13,12 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <string.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <conio.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
 #endif
 
-#include <afs/procmgmt.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <time.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/tcdata.h>
@@ -41,9 +29,9 @@
 #include <afs/volser.h>
 #include <afs/volser_prototypes.h>
 #include <afs/com_err.h>
-#include "error_macros.h"
 #include <afs/afsutil.h>
-#include <errno.h>
+
+#include "error_macros.h"
 #include "butc_xbsa.h"
 #include "butc_internal.h"
 
diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c
index a485659..c8818a3 100644
--- a/src/butc/read_tape.c
+++ b/src/butc/read_tape.c
@@ -10,18 +10,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <afs/cmd.h>
 #include <lock.h>
 #include <afs/tcdata.h>
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
 #include <afs/usd.h>
 
 usd_handle_t fd;
diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c
index b5aa3b5..4081316 100644
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -12,21 +12,6 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <strings.h>
-#endif
-#include <sys/types.h>
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>
@@ -38,6 +23,7 @@
 #include <afs/budb_prototypes.h>
 #include <afs/butm_prototypes.h>
 #include <afs/bucoord_prototypes.h>
+
 #include "error_macros.h"
 #include "butc_internal.h"
 
diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index ca2c436..61c28f8 100644
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -10,7 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
 #include <afs/procmgmt.h>
 #include <roken.h>
 
@@ -18,50 +17,44 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <netinet/in.h>
-#include <sys/time.h>
 #endif
-#include <afs/procmgmt.h>
+
+#include <ctype.h>
+
+#include <rx/rx.h>
+#include <rx/rx_globals.h>
+#include <rx/rxkad.h>
 #include <rx/xdr.h>
+
 #include <afs/afsint.h>
-#include <stdio.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
 #include <afs/nfs.h>
-#include <string.h>
 #include <afs/vlserver.h>
 #include <lwp.h>
 #include <lock.h>
 #include <afs/afsutil.h>
-#include <rx/rx.h>
-#include <rx/rx_globals.h>
-#include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <afs/volser.h>
 #include <ubik.h>
 #include <afs/com_err.h>
-#include <errno.h>
 #include <afs/cmd.h>
 #include <afs/tcdata.h>
 #include <afs/bubasics.h>
-#include <ctype.h>
-#include "error_macros.h"
 #include <afs/budb_errs.h>
 #include <afs/budb_client.h>
 #include <afs/bucoord_prototypes.h>
-#include "afs/butx.h"
+#include <afs/butx.h>
+#include <afs/kautils.h>
+#include <afs/bc.h>
+
+#include "error_macros.h"
 #define XBSA_TCMAIN
 #include "butc_xbsa.h"
 #include "butc_prototypes.h"
-#include <afs/kautils.h>
-#include <afs/bc.h>
 
 #define N_SECURITY_OBJECTS 3
 #define ERRCODE_RANGE 8		/* from error_table.h */
diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index 24492c6..596ed55 100644
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -15,26 +15,11 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsint.h>
-#include <stdio.h>
-#include <string.h>
-#include <afs/procmgmt.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
-#include <sys/stat.h>
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
@@ -44,6 +29,7 @@
 #include <afs/tcdata.h>
 #include <afs/budb_client.h>
 #include <afs/bucoord_prototypes.h>
+
 #include "error_macros.h"
 #include "butc_xbsa.h"
 #include "butc_prototypes.h"
diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c
index 923832b..fbe46a4 100644
--- a/src/butc/tcstatus.c
+++ b/src/butc/tcstatus.c
@@ -12,18 +12,6 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <strings.h>
-#endif
-#include <stdio.h>
-#include <string.h>
 #include <afs/com_err.h>
 #include <lock.h>
 #include <afs/bubasics.h>
@@ -31,10 +19,11 @@
 #include <afs/butc.h>
 #include <afs/budb_client.h>
 #include <afs/bucoord_prototypes.h>
-#include "butc_internal.h"
 
+#include "butc_internal.h"
 #include "error_macros.h"
 #include "butc_xbsa.h"
+
 /* tape coordinator - task status management */
 extern afs_int32 xbsaType;
 
diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 1dcaf90..6d70941 100644
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -17,29 +17,11 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
-#include <sys/types.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-#include <errno.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsint.h>
-#include <stdio.h>
-#include <string.h>
-#include <afs/procmgmt.h>
 #include <afs/afs_assert.h>
 #include <afs/prs_fs.h>
-#include <fcntl.h>
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
@@ -57,6 +39,7 @@
 #include <afs/butm_prototypes.h>
 #include <afs/budb_prototypes.h>
 #include <afs/afsutil.h>
+
 #include "butc_internal.h"
 #include "error_macros.h"
 
diff --git a/src/butc/tdump.c b/src/butc/tdump.c
index db82ccd..ef184af 100644
--- a/src/butc/tdump.c
+++ b/src/butc/tdump.c
@@ -7,11 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h
-#include <sys/file.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
 
 #define BLKSIZE (4096+24)	/* actual block size on our backup tapes */
 
diff --git a/src/butc/test.c b/src/butc/test.c
index 1ce6a25..0453fe1 100644
--- a/src/butc/test.c
+++ b/src/butc/test.c
@@ -6,17 +6,16 @@
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
 #ifdef AFS_AIX_ENV
 #include <sys/statfs.h>
 #endif
-#include <netdb.h>
-#include <sys/errno.h>
+
 #include <lock.h>
-#include <netinet/in.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
@@ -29,9 +28,6 @@
 #include <afs/cmd.h>
 #include <rx/rxkad.h>
 #include <afs/tcdata.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 
 #define SERVERNAME "server1"
 
diff --git a/src/butc/test_budb.c b/src/butc/test_budb.c
index ce86a5d..c324216 100644
--- a/src/butc/test_budb.c
+++ b/src/butc/test_budb.c
@@ -6,13 +6,10 @@
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <afs/budb_client.h>
 #include <afs/budb.h>
diff --git a/src/butm/butm_test.c b/src/butm/butm_test.c
index ef0454c..001faf4 100644
--- a/src/butm/butm_test.c
+++ b/src/butm/butm_test.c
@@ -10,15 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
 #include <afs/com_err.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
 #include <lwp.h>
 #include <afs/butm.h>
 #include "AFS_component_version_number.c"
diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c
index d5390e8..68a8f20 100644
--- a/src/butm/file_tm.c
+++ b/src/butm/file_tm.c
@@ -12,27 +12,18 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#include <fcntl.h>
-#include <errno.h>
+
 #include <limits.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+
 #include <lwp.h>
 #include <afs/com_err.h>
 #include <afs/butm.h>
 #include <afs/usd.h>
+
 #include "error_macros.h"
 #include "butm_prototypes.h"
 
diff --git a/src/butm/test_ftm.c b/src/butm/test_ftm.c
index 218af80..1d86c58 100644
--- a/src/butm/test_ftm.c
+++ b/src/butm/test_ftm.c
@@ -12,24 +12,14 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/time.h>
-#include <netinet/in.h>
-#endif
-#include <afs/afsutil.h>
 #include <limits.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <ctype.h>
+
+#include <afs/afsutil.h>
 #include <lwp.h>
 #include <afs/com_err.h>
 #include <afs/butm.h>
+
 #include "error_macros.h"
 
 int isafile = 0, debugLevel = 1;