From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 8 Sep 2011 10:26:39 +0000 (+0100)
Subject: Remove redundant header includes
X-Git-Tag: openafs-stable-1_8_0pre1~2535
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=83b76f564b0972c6163656637b2d64d06895e41a

Remove redundant header includes

Remove includes of system headers where roken.h already takes care of
including them. This simplifies the source tree, reduces the amount of
work done by the compiler, and ensures that all of our headers are
included with the correct guards

The list of files to edit was generated with the following script:

list=`grep include external/heimdal/roken/roken.h.in                \
         | sed -e's/#include//g' | sort | uniq`;                    \
for A in `find . -name *.c | xargs grep -l roken.h                  \
             | grep -v external/ | grep -v WINNT/`; do              \
     found=0;                                                       \
     for B in $list; do                                             \
         if grep "$B" $A > /dev/null; then                          \
              echo "$A : $B";                                       \
              found=1;                                              \
         fi;                                                        \
     done;                                                          \
     if [ $found == 1 ] ; then mvim -f $A; fi;                      \
done

Change-Id: I2edbda550a129709b1dc6860b17d6a8a7509af58
Reviewed-on: http://gerrit.openafs.org/5815
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 0a6a995..50e750b 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -72,17 +72,8 @@
 #include "afsd.h"
 
 #include <afs/afsutil.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <sys/file.h>
-#include <errno.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 
 /* darwin dirent.h doesn't give us the prototypes we want if KERNEL is
@@ -95,11 +86,6 @@
 # include <dirent.h>
 #endif
 
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_FS_TYPES_H
 #include <sys/fs_types.h>
 #endif
@@ -132,29 +118,14 @@
 #include <sys/fstyp.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <ctype.h>
 
-#include <netinet/in.h>
 #include <afs/afs_args.h>
 #include <afs/cellconfig.h>
-#include <ctype.h>
 #include <afs/afssyscalls.h>
 #include <afs/afsutil.h>
 #include <afs/sys_prototypes.h>
 
-#ifdef AFS_SGI61_ENV
-#include <unistd.h>
-#include <libelf.h>
-#include <dwarf.h>
-#include <libdwarf.h>
-void set_staticaddrs(void);
-#endif /* AFS_SGI61_ENV */
 #if defined(AFS_SGI62_ENV) && !defined(AFS_SGI65_ENV)
 #include <sym.h>
 #include <symconst.h>
@@ -165,7 +136,6 @@ void set_staticaddrs(void);
 
 #ifdef AFS_DARWIN_ENV
 #ifdef AFS_DARWIN80_ENV
-#include <sys/ioctl.h>
 #include <sys/xattr.h>
 #endif
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 6665aae..71410db 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -20,25 +20,9 @@
 
 #include <assert.h>
 #include <afs/afsutil.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/file.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <dirent.h>
 #include <sys/wait.h>
 
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_FS_TYPES_H
 #include <sys/fs_types.h>
 #endif
@@ -75,24 +59,16 @@
 #include <sys/fstyp.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <ctype.h>
 
-#include <netinet/in.h>
+#include <afs/opr.h>
 #include <afs/afs_args.h>
 #include <afs/cellconfig.h>
-#include <ctype.h>
 #include <afs/afssyscalls.h>
 #include <afs/afsutil.h>
 
 #ifdef AFS_DARWIN_ENV
 #ifdef AFS_DARWIN80_ENV
-#include <sys/ioctl.h>
 #include <sys/xattr.h>
 #endif
 #include <mach/mach.h>
diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 511c42b..7307111 100644
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -88,9 +88,6 @@ static char lcell[MAXCELLCHARS];
 #define BUFSIZ 4096
 #endif
 
-#ifdef	AFS_HPUX_ENV
-#include <unistd.h>
-#endif
 #if	defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV)
 static struct flock fileWlock = { F_WRLCK, 0, 0, 0, 0, 0 };
 static struct flock fileRlock = { F_RDLCK, 0, 0, 0, 0, 0 };
@@ -1109,10 +1106,6 @@ ktc_curpag(void)
   */
 
 #if 0
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <krb.h>
 #endif
diff --git a/src/auth/test/ktctest.c b/src/auth/test/ktctest.c
index 80508a8..931b2b0 100644
--- a/src/auth/test/ktctest.c
+++ b/src/auth/test/ktctest.c
@@ -13,10 +13,7 @@
 #include <afs/param.h>
 #include <roken.h>
 
-#include <stdlib.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <errno.h>
 
 #include <afs/stds.h>
 #include <afs/afsutil.h>
diff --git a/src/auth/userok.c b/src/auth/userok.c
index fff3e8a..1e6f856 100644
--- a/src/auth/userok.c
+++ b/src/auth/userok.c
@@ -20,7 +20,6 @@
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_identity.h>
-#include <stdio.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 
diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index 874655a..2d54598 100644
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -21,7 +21,6 @@
 #include <afs/afsutil.h>
 #include <afs/cellconfig.h>
 #include <rx/rx.h>
-#include <sys/stat.h>
 #include <rx/xdr.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 2b8d88d..169685b 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -558,15 +558,7 @@ tweak_config(void)
  * It writes warning messages to the standard error output if certain
  * fundamental errors occur.
  *
- * This routine requires
- *
- * #include <sys/types.h>
- * #include <sys/stat.h>
- * #include <fcntl.h>
- * #include <unistd.h>
- * #include <stdlib.h>
- *
- * and has been tested on:
+ * This routine has been tested on:
  *
  * AIX 4.2
  * Digital Unix 4.0D
diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c
index 1d5f2af..ad2f641 100644
--- a/src/bozo/cronbnodeops.c
+++ b/src/bozo/cronbnodeops.c
@@ -15,10 +15,6 @@
 
 #include <ctype.h>
 
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#endif
-
 #include <lwp.h>
 #include <afs/ktime.h>
 #include <afs/afsutil.h>
diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c
index 83abdb3..d5ceab0 100644
--- a/src/bozo/ezbnodeops.c
+++ b/src/bozo/ezbnodeops.c
@@ -15,9 +15,6 @@
 
 #include <lwp.h>
 #include <rx/rx.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#endif
 
 #include <afs/afsutil.h>
 #include "bnode.h"
diff --git a/src/budb/server.c b/src/budb/server.c
index e107aaa..add09f4 100644
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -13,8 +13,6 @@
 
 #include <roken.h>
 
-#include <fcntl.h>
-
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif
diff --git a/src/comerr/error_table_nt.c b/src/comerr/error_table_nt.c
index 822df2f..06eb3e8 100755
--- a/src/comerr/error_table_nt.c
+++ b/src/comerr/error_table_nt.c
@@ -32,10 +32,6 @@
 # endif
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "internal.h"
 
 char *current_token = (char *)NULL;
@@ -73,8 +69,6 @@ typedef
 #define YYLTYPE yyltype
 #endif
 
-#include <stdio.h>
-
 #ifndef __cplusplus
 #ifndef __STDC__
 #define const
@@ -942,23 +936,15 @@ yyparse(YYPARSE_PARAM)
  *
  * For copyright info, see mit-sipb-cr.h.
  */
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
 #include <afs/param.h>
-#include <string.h>
 #include <assert.h>
 #include <ctype.h>
 #ifdef AFS_NT40_ENV
-#include <sys/types.h>
 #include <afs/afsutil.h>
-#else
-#include <sys/time.h>
 #endif
 #include <sys/timeb.h>
 #include "error_table.h"
 #include "mit-sipb-cr.h"
-#include <stdio.h>
 
 /*
  * Copyright 2000, International Business Machines Corporation and others.
diff --git a/src/dir/test/dtest.c b/src/dir/test/dtest.c
index e32abdd..e881c67 100644
--- a/src/dir/test/dtest.c
+++ b/src/dir/test/dtest.c
@@ -13,8 +13,6 @@
 
 #include <roken.h>
 
-#include <stdarg.h>
-
 #include <afs/dir.h>
 
 long fidCounter = 0;
diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index 4868ba0..c54bf6a 100644
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -55,7 +55,6 @@ struct afsconf_dir *KA_conf;	/* for getting cell info */
 int MinHours = 0;
 int npwSums = KA_NPWSUMS;	/* needs to be variable sometime */
 
-#include <stdarg.h>
 #if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
 #undef vfprintf
 #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream)
diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c
index 7fcdf40..fa6217e 100644
--- a/src/kauth/klogin.c
+++ b/src/kauth/klogin.c
@@ -33,8 +33,6 @@
 #include <lastlog.h>
 #include <ttyent.h>
 
-#include <grp.h>
-
 static gid_t tty_gid(int default_gid);
 static void getloginname(struct utmp *up);
 
diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c
index b171512..b3aba45 100644
--- a/src/kauth/user_nt.c
+++ b/src/kauth/user_nt.c
@@ -204,14 +204,8 @@ static int krbONE = 1;
  * <mit-cpyright.h>.
  */
 
-#include <string.h>
-#include <time.h>
-
 #include "krb.h"
 
-#include <sys/types.h>
-#include <winsock2.h>
-
 static int swap_bytes;
 
 /*
diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index eab3c8e..75c4ccb 100644
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -17,7 +17,6 @@
 #include <rx/rxstat.h>
 
 #ifdef AFS_NT40_ENV
-# include <winsock2.h>
 # include <afs/krb5_nt.h>
 #endif
 
diff --git a/src/libadmin/samples/cm_list_cells.c b/src/libadmin/samples/cm_list_cells.c
index a82c46d..b85d58c 100644
--- a/src/libadmin/samples/cm_list_cells.c
+++ b/src/libadmin/samples/cm_list_cells.c
@@ -19,7 +19,6 @@
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index 8260385..9803a5e 100644
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -19,7 +19,6 @@
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 5c9f05e..fb860a0 100644
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -49,9 +49,6 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #include <afs/bosint.h>
 #include <ubik.h>
 #include <ubik_int.h>
-#ifndef AFS_NT40_ENV
-#include <arpa/inet.h>		/* for inet_ntoa() */
-#endif
 
 void
 Usage(void)
diff --git a/src/ptserver/display.c b/src/ptserver/display.c
index bc93420..eca2f9b 100644
--- a/src/ptserver/display.c
+++ b/src/ptserver/display.c
@@ -13,12 +13,6 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-
 #include "ptserver.h"
 #include "display.h"
 
diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index dc1e107..d60e928 100644
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -128,7 +128,6 @@ rxi_calltrace(unsigned int event, struct rx_call *call)
 }
 
 #ifdef DUMPTRACE
-#include <errno.h>
 #ifdef AFS_NT40_ENV
 #include <afs/afsutil.h>
 #endif
diff --git a/src/rx/rx_xmit_nt.c b/src/rx/rx_xmit_nt.c
index a9842ad..86fdc68 100644
--- a/src/rx/rx_xmit_nt.c
+++ b/src/rx/rx_xmit_nt.c
@@ -19,7 +19,6 @@
 
 #if defined(AFS_NT40_ENV)
 # include <roken.h>
-# include <winsock2.h>
 # if (_WIN32_WINNT < 0x0501)
 #  undef _WIN32_WINNT
 #  define _WIN32_WINNT 0x0501
@@ -59,7 +58,6 @@ INT
 #include "rx_packet.h"
 #include "rx_xmit_nt.h"
 #include <malloc.h>
-#include <errno.h>
 
 
 /*
diff --git a/src/rx/test/rxperf.c b/src/rx/test/rxperf.c
index f37ff9a..67f2418 100644
--- a/src/rx/test/rxperf.c
+++ b/src/rx/test/rxperf.c
@@ -43,42 +43,12 @@ nn * We are using getopt since we want it to be possible to link to
 #include <afs/param.h>
 #include <roken.h>
 
-#include <stdarg.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <winsock2.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #endif
+
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <signal.h>
-#ifdef HAVE_ERRX
-#include <err.h>		/* not stricly right, but if we have a errx() there
-				 * is hopefully a err.h */
-#endif
+
 #include <rx/rx.h>
 #include <rx/rx_null.h>
 #include <rx/rx_globals.h>
diff --git a/src/rx/test/testclient.c b/src/rx/test/testclient.c
index 949a8bc..90c315e 100644
--- a/src/rx/test/testclient.c
+++ b/src/rx/test/testclient.c
@@ -13,27 +13,15 @@
 #include <afs/param.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <winsock2.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#include <sys/stat.h>
-#include <signal.h>
 
 #include <afs/opr.h>
 #include <rx/rx_clock.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <rx/rx_null.h>
-#include <errno.h>
 #include <afs/afsutil.h>
 
 #ifndef osi_Alloc
@@ -421,7 +409,6 @@ Quit(char *msg)
  *
  * Open file descriptors until file descriptor n or higher is returned.
  */
-#include <sys/stat.h>
 void
 OpenFD(int n)
 {
diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c
index f04e07c..3eae762 100644
--- a/src/rx/test/testserver.c
+++ b/src/rx/test/testserver.c
@@ -13,21 +13,9 @@
 #include <afs/param.h>
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#include <winsock2.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/time.h>
 #endif
-#include <signal.h>
-#include <sys/stat.h>
 
 #include <afs/opr.h>
 #include <rx/rx_clock.h>
@@ -342,7 +330,6 @@ Quit(char *msg)
  *
  * Open file descriptors until file descriptor n or higher is returned.
  */
-#include <sys/stat.h>
 void
 OpenFD(int n)
 {
diff --git a/src/rx/xdr_refernce.c b/src/rx/xdr_refernce.c
index 09c5522..61d4f93 100644
--- a/src/rx/xdr_refernce.c
+++ b/src/rx/xdr_refernce.c
@@ -29,9 +29,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif
+#include <roken.h>
 
 #include "rx.h"
 
@@ -48,8 +46,6 @@
  */
 
 #include "xdr.h"
-#include <stdio.h>
-#include <string.h>
 #define LASTUNSIGNED	((u_int)0-1)
 
 /*
diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 3acc734..30e5d39 100644
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -364,7 +364,6 @@ c_output(char *infile, char *define, int extend, char *outfile, int append)
 	}
 	f_print(fout, "#ifdef AFS_NT40_ENV\n");
 	f_print(fout, "#define AFS_RXGEN_EXPORT __declspec(dllexport)\n");
-        f_print(fout, "#include <winsock2.h>\n");
 	f_print(fout, "#endif /* AFS_NT40_ENV */\n");
     }
     if (currfile && (include = extendfile(currfile, ".h"))) {
diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c
index eaf0d04..936e352 100644
--- a/src/rxkad/bg-fcrypt.c
+++ b/src/rxkad/bg-fcrypt.c
@@ -667,11 +667,6 @@ rxkad_DecryptPacket(const struct rx_connection * rx_connection_not_used,
  * the test case. Use TEST_KERNEL to get the mangled names.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <time.h>
-
 const char the_quick[] = "The quick brown fox jumps over the lazy dogs.\0\0";
 
 const unsigned char key1[8] =
diff --git a/src/rxkad/test/stress_c.c b/src/rxkad/test/stress_c.c
index f5d8d0f..9b6d551 100644
--- a/src/rxkad/test/stress_c.c
+++ b/src/rxkad/test/stress_c.c
@@ -12,16 +12,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <afs/stds.h>
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
+
 #include <afs/com_err.h>
 #include <afs/afsutil.h>
 #include <rx/rxkad.h>
diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c
index 1234578..857ec39 100644
--- a/src/rxstat/rxstat.c
+++ b/src/rxstat/rxstat.c
@@ -19,8 +19,6 @@
 #include <rx/rxstat.h>
 #if defined(KERNEL) && !defined(UKERNEL)
 #include "sys/errno.h"
-#else /* KERNEL && !UKERNEL */
-#include <errno.h>
 #endif /* KERNEL && !UKERNEL */
 
 /*
diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c
index e5e4a4d..13431b1 100644
--- a/src/sys/pioctl_nt.c
+++ b/src/sys/pioctl_nt.c
@@ -15,7 +15,6 @@
 
 #include <windows.h>
 #include <winioctl.h>
-#include <winsock2.h>
 #define SECURITY_WIN32
 #include <security.h>
 #include <nb30.h>
diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index f3c0b96..339bf04 100644
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -11,12 +11,13 @@
 #include <afs/param.h>
 
 #include <roken.h>
+
+#include <assert.h>
+
 #include <afs/opr.h>
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <errno.h>
-#include <assert.h>
 #include <afs/afsutil.h>
 
 #define UBIK_INTERNALS
diff --git a/src/update/client.c b/src/update/client.c
index a9be509..a5f0024 100644
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -19,8 +19,6 @@
 #include <WINNT/afsevent.h>
 #include <sys/utime.h>
 #include <direct.h>
-#include <process.h>
-#include <afs/procmgmt.h>
 #endif
 
 #ifdef	AFS_AIX_ENV
diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c
index f11267a..7c51c95 100644
--- a/src/usd/usd_file.c
+++ b/src/usd/usd_file.c
@@ -20,9 +20,6 @@
 #ifdef AFS_DARWIN_ENV
 #include <sys/ioccom.h>
 #endif
-#if defined(AFS_DUX40_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV) || (defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN100_ENV))
-#include <sys/ioctl.h>
-#endif
 #ifndef AFS_DARWIN100_ENV
 #include <sys/mtio.h>
 #endif
diff --git a/src/usd/usd_nt.c b/src/usd/usd_nt.c
index b2e09e6..8574fb9 100644
--- a/src/usd/usd_nt.c
+++ b/src/usd/usd_nt.c
@@ -14,7 +14,6 @@
 
 #include <windows.h>
 #include <winioctl.h>
-#include <sys/stat.h>
 #include <crtdbg.h>
 
 #include <afs/errmap_nt.h>
diff --git a/src/util/readdir_nt.c b/src/util/readdir_nt.c
index 3435495..18fb4d4 100644
--- a/src/util/readdir_nt.c
+++ b/src/util/readdir_nt.c
@@ -24,7 +24,6 @@
 #include <afs/errmap_nt.h>
 #include <windows.h>
 #include <winbase.h>
-#include <dirent.h>
 
 /* opendir() - The case insensitive version of opendir */
 DIR *
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index ebe9fbc..08b7d82 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -68,7 +68,6 @@ int serverLogSyslogFacility = LOG_DAEMON;
 char *serverLogSyslogTag = 0;
 #endif
 
-#include <stdarg.h>
 int LogLevel;
 int mrafsStyleLogs = 0;
 static int threadIdLogs = 0;
diff --git a/src/util/uuid.c b/src/util/uuid.c
index 8946eb1..5aaff37 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -50,7 +50,6 @@
 
 # ifdef AFS_NT40_ENV
 #  include <rpc.h>
-#  include <process.h>
 # else
 #  include <net/if.h>
 #  if !defined(AFS_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
diff --git a/src/util/winsock_nt.c b/src/util/winsock_nt.c
index 7418b75..5605ada 100644
--- a/src/util/winsock_nt.c
+++ b/src/util/winsock_nt.c
@@ -15,7 +15,6 @@
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <sys/timeb.h>
 #include <afs/afsutil.h>
 
diff --git a/src/venus/afsio.c b/src/venus/afsio.c
index c19ca2e..3f35b69 100644
--- a/src/venus/afsio.c
+++ b/src/venus/afsio.c
@@ -36,31 +36,27 @@
 
 #include <roken.h>
 
-#include <stdio.h>
 #ifdef AFS_NT40_ENV
 #include <windows.h>
 #define _CRT_RAND_S
-#include <process.h>
 #include <afs/smb_iocons.h>
 #include <afs/afsd.h>
 #include <afs/cm_ioctl.h>
 #include <afs/pioctl_nt.h>
 #include <WINNT/syscfg.h>
 #else
-#include <netdb.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG 1
 #endif
-#include <sys/stat.h>
+
+#include <afs/opr.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>
 #include <afs/vlserver.h>
 #include <afs/ihandle.h>
 #include <afs/com_err.h>
 #include <afs/afscp.h>
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
+
 #ifdef HAVE_DIRECT_H
 #include <direct.h>
 #endif
diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index dd1b458..3db1c06 100644
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -106,10 +106,6 @@ struct ncp_sb_info {
 #define _KERNEL 1
 #endif
 
-#ifndef	AFS_OSF_ENV
-#include <sys/param.h>
-#endif
-
 #ifndef AFS_LINUX20_ENV
 #include <nlist.h>
 #endif
@@ -119,7 +115,6 @@ struct ncp_sb_info {
 #endif
 
 #include <afs/stds.h>
-#include <sys/types.h>
 
 #if defined(AFS_OSF_ENV)
 #define	KERNEL
@@ -128,7 +123,6 @@ struct ncp_sb_info {
 #ifdef	_KERN_LOCK_H_
 #include FFFFF
 #endif
-#include <sys/time.h>
 #include <kern/lock.h>
 #include <sys/vnode.h>
 #include <arch/alpha/pmap.h>
@@ -187,10 +181,6 @@ struct vnode foo;
 #include <sys/user.h>
 #endif
 
-#ifndef AFS_LINUX20_ENV
-#include <sys/socket.h>
-#endif
-
 #ifndef AFS_LINUX26_ENV
 #include <sys/file.h>
 #endif
@@ -213,8 +203,6 @@ struct vnode foo;
 # include <netinet/in.h>	/* struct in_addr */
 #endif
 
-#include <arpa/inet.h>		/* inet_ntoa() */
-
 #if defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV)
 #ifdef       AFS_SGI_ENV
 #include <sys/vnode.h>
@@ -339,7 +327,6 @@ typedef enum _spustate {	/* FROM /etc/conf/h/_types.h */
 #endif
 #endif
 #endif
-#include <signal.h>
 #endif
 
 /* AFS includes */
@@ -626,9 +613,6 @@ PrintIPAddr(int addr)
 
 #ifdef AFS_LINUX20_ENV
 /* Find symbols in a live kernel. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #ifdef AFS_LINUX26_ENV
 #define KSYMS "/proc/kallsyms"
diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c
index eb5bc23..d4e902c 100644
--- a/src/vfsck/inode.c
+++ b/src/vfsck/inode.c
@@ -77,7 +77,6 @@
 #endif /* AFS_OSF_ENV */
 
 #include <afs/osi_inode.h>
-#include <pwd.h>
 #include "fsck.h"
 
 #ifdef AFS_SUN_ENV
diff --git a/src/vfsck/pass1.c b/src/vfsck/pass1.c
index 3619b01..bb8046a 100644
--- a/src/vfsck/pass1.c
+++ b/src/vfsck/pass1.c
@@ -33,7 +33,6 @@
 #include <ufs/dir.h>
 #undef	_KERNEL
 #undef	_BSD
-#include <stdio.h>
 #else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
diff --git a/src/vfsck/proplist.c b/src/vfsck/proplist.c
index 956afae..9546371 100644
--- a/src/vfsck/proplist.c
+++ b/src/vfsck/proplist.c
@@ -29,7 +29,6 @@
 #undef	_BSD
 
 #include <afs/osi_inode.h>
-#include <pwd.h>
 #include "fsck.h"
 
 struct prop_entry_desc {
diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index 242a375..4b8dd44 100644
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -96,7 +96,6 @@ extern int isdirty;
 #ifdef	AFS_SUN5_ENV
 #include <sys/mntent.h>
 #include <sys/mnttab.h>
-#include <sys/stat.h>
 #include <sys/vfstab.h>
 
 offset_t llseek();
@@ -1016,7 +1015,6 @@ mounted(name)
 #if	defined(AFS_HPUX101_ENV)
 
 #include "libfs.h"
-#include <sys/stat.h>
 #include <sys/fcntl.h>
 
 int seek_options;
diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 0bf3428..da1d2df 100644
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -409,7 +409,6 @@ ginode(inum)
 #define	__ASSERT_H__
 
 #ifdef AFS_SGI_XFS_IOPS_ENV
-#include <dirent.h>
 #include <afs/xfsattrs.h>
 /* xfs_ListViceInodes
  *
diff --git a/src/vol/ntops.c b/src/vol/ntops.c
index f012ca0..1260d2a 100644
--- a/src/vol/ntops.c
+++ b/src/vol/ntops.c
@@ -27,7 +27,6 @@
 #include "vnode.h"
 #include "volume.h"
 #include "viceinode.h"
-#include <dirent.h>
 #include <afs/errmap_nt.h>
 
 #define BASEFILEATTRIBUTE FILE_ATTRIBUTE_NORMAL
diff --git a/src/vol/partition.c b/src/vol/partition.c
index 1004146..0d2a5fc 100644
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -77,7 +77,6 @@
 #endif
 #endif
 #ifdef AFS_SUN5_ENV
-#include <unistd.h>
 #include <sys/mnttab.h>
 #include <sys/mntent.h>
 #else
@@ -111,7 +110,6 @@
 #include "ntops.h"
 #else
 #include "namei_ops.h"
-#include <dirent.h>
 #endif /* AFS_NT40_ENV */
 #endif /* AFS_NAMEI_ENV */
 #include "vnode.h"
@@ -119,7 +117,6 @@
 #include "partition.h"
 
 #if defined(AFS_HPUX_ENV)
-#include <sys/types.h>
 #include <sys/privgrp.h>
 #endif /* defined(AFS_HPUX_ENV) */
 
@@ -705,8 +702,6 @@ VAttachPartitions(void)
 #endif
 
 #ifdef AFS_NT40_ENV
-#include <string.h>
-#include <sys/stat.h>
 /* VValidVPTEntry
  *
  * validate names in vptab.
diff --git a/src/vol/physio.c b/src/vol/physio.c
index c41584d..674b00c 100644
--- a/src/vol/physio.c
+++ b/src/vol/physio.c
@@ -27,7 +27,6 @@
 
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <errno.h>
 #include <afs/afssyscalls.h>
 #include "nfs.h"
 #include "ihandle.h"
diff --git a/src/vol/salvsync-client.c b/src/vol/salvsync-client.c
index da60056..1a8c845 100644
--- a/src/vol/salvsync-client.c
+++ b/src/vol/salvsync-client.c
@@ -19,11 +19,7 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#endif
-
-#include <rx/xdr.h>
+#include <afs/opr.h>
 #include <afs/afsint.h>
 #include "nfs.h"
 #include <afs/errors.h>
diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index 350f402..67f50d1 100644
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -31,11 +31,7 @@
 
 #include <stddef.h>
 
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#endif
-
-#include <rx/xdr.h>
+#include <afs/opr.h>
 #include <afs/afsint.h>
 #include "nfs.h"
 #include <afs/errors.h>