From c40be933628653f10ecd1ddbb51bf1b786c3b1f3 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 21:58:29 +0000
Subject: [PATCH] kauth: 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.

This adds arpa/inet.h to the list of headers that configure checks for

Change-Id: I1792ede4be761238bb05567c1d763ed63f50051e
Reviewed-on: http://gerrit.openafs.org/4330
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 acinclude.m4              |  1 +
 src/kauth/admin_tools.c   | 16 +++++-----------
 src/kauth/authclient.c    | 17 +++--------------
 src/kauth/client.c        | 19 ++++---------------
 src/kauth/crypt.c         |  4 ++--
 src/kauth/decode_ticket.c |  3 +++
 src/kauth/ka-forwarder.c  | 14 ++------------
 src/kauth/ka_util.c       | 13 ++++---------
 src/kauth/kaauxdb.c       |  9 ---------
 src/kauth/kadatabase.c    |  8 +-------
 src/kauth/kalocalcell.c   |  9 +--------
 src/kauth/kalog.c         |  9 ---------
 src/kauth/kaprocs.c       | 25 +++++++------------------
 src/kauth/kas.c           | 15 +++------------
 src/kauth/kaserver.c      | 23 +++++------------------
 src/kauth/katoken.c       | 14 ++------------
 src/kauth/kautils.c       | 20 ++++++--------------
 src/kauth/kdb.c           | 11 +++--------
 src/kauth/kkids.c         | 14 +++-----------
 src/kauth/klog.c          | 12 +++---------
 src/kauth/klogin.c        | 13 +------------
 src/kauth/knfs.c          | 13 +++----------
 src/kauth/kpasswd.c       | 25 ++++++-------------------
 src/kauth/kpwvalid.c      |  3 +--
 src/kauth/krb_tf.c        | 12 +-----------
 src/kauth/krb_udp.c       | 14 +-------------
 src/kauth/manyklog.c      | 12 +++---------
 src/kauth/rebuild.c       | 18 ++----------------
 src/kauth/user.c          | 18 ++++++------------
 src/kauth/user_nt.c       |  4 ----
 30 files changed, 82 insertions(+), 306 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9f3390abe..457c55f74 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1216,6 +1216,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 AC_CHECK_HEADERS([ \
+		   arpa/inet.h \
 		   arpa/nameser.h \
 		   curses.h\
 		   direct.h \
diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index a65cf1959..6509b32aa 100644
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -14,33 +14,27 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
 #include <ctype.h>
-#include <string.h>
 
-    /* These two needed for rxgen output to work */
-#include <sys/types.h>
-#include <rx/xdr.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
-#include <stdio.h>
+#include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
 #include <lock.h>
 #define UBIK_LEGACY_CALLITER 1
 #include <ubik.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#endif
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 #include "kauth.h"
 #include "kauth_internal.h"
 #include "kautils.h"
diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 22a96309a..70237a699 100644
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -11,6 +11,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -19,28 +20,16 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
+#include <hcrypto/des.h>
+
 #define UBIK_LEGACY_CALLITER 1
 
-#include <afs/stds.h>
 #include <afs/pthread_glock.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 #include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
 
 #include "kauth.h"
 #include "kautils.h"
diff --git a/src/kauth/client.c b/src/kauth/client.c
index 9a9890593..7f5015cf1 100644
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -9,28 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
+
 #include <afs/pthread_glock.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <crypt.h>
-#endif
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#if !defined(__USE_XOPEN)
-#define __USE_XOPEN
-#endif
-#include <unistd.h>
-#endif
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
 
 #include "kauth.h"
 #include "kautils.h"
diff --git a/src/kauth/crypt.c b/src/kauth/crypt.c
index dcee3bea9..e44be122b 100644
--- a/src/kauth/crypt.c
+++ b/src/kauth/crypt.c
@@ -34,14 +34,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 /* This crypt() implementation is only used by the Andrew string_to_key
  * function on Windows. All Unix platforms use their own crypt() 
  * implementation
  */
 
 #include <windows.h>
-#include <stdlib.h>
-#include <string.h>
 
 /*
  * UNIX password, and DES, encryption.
diff --git a/src/kauth/decode_ticket.c b/src/kauth/decode_ticket.c
index 55b47bc24..76e18044c 100644
--- a/src/kauth/decode_ticket.c
+++ b/src/kauth/decode_ticket.c
@@ -10,11 +10,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <hcrypto/des.h>
+
 #include <afs/com_err.h>
 #include <afs/auth.h>
 #include <rx/rxkad.h>
+
 #include "kautils.h"
 
 static char *whoami;
diff --git a/src/kauth/ka-forwarder.c b/src/kauth/ka-forwarder.c
index 091e7c6ef..8d82acc57 100644
--- a/src/kauth/ka-forwarder.c
+++ b/src/kauth/ka-forwarder.c
@@ -32,21 +32,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
 #include <afs/stds.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <netdb.h>
+#include <roken.h>
+
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
 
 #if	HAVE_GETOPT_H
 #include <getopt.h>
diff --git a/src/kauth/ka_util.c b/src/kauth/ka_util.c
index e7e4acf9e..a3e0b8b57 100644
--- a/src/kauth/ka_util.c
+++ b/src/kauth/ka_util.c
@@ -8,25 +8,20 @@
  *		     therefore the database must be quiescent for the
  *		     output of this program to be valid.
  */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/file.h>
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #include <lock.h>
-#include <netinet/in.h>
 #define UBIK_INTERNALS
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
+
 #include "kauth.h"
 #include "kaserver.h"
 #include "kautils.h"
diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c
index 887f82348..97c42c19f 100644
--- a/src/kauth/kaauxdb.c
+++ b/src/kauth/kaauxdb.c
@@ -16,15 +16,6 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <string.h>
 #include <rx/rxkad.h>
 #define UBIK_INTERNALS
 #include <ubik.h>
diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c
index e691350dc..8864bc88c 100644
--- a/src/kauth/kadatabase.c
+++ b/src/kauth/kadatabase.c
@@ -12,17 +12,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsutil.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kaserver.h"
diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 0eaaf44e4..68d11b499 100644
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -13,19 +13,12 @@
 #include <roken.h>
 
 #include <afs/pthread_glock.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+
 #include "kauth.h"
 #include "kautils.h"
-#include <afs/afsutil.h>
 
 #ifdef UKERNEL
 #include "afs_usrops.h"
diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c
index 0bc16d7cc..0b209ffbe 100644
--- a/src/kauth/kalog.c
+++ b/src/kauth/kalog.c
@@ -21,15 +21,6 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <afs/afsutil.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
 #include <afs/afsutil.h>
 #include "kauth.h"
 #include "kalog.h"
diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c
index 365994f94..8dc0fe301 100644
--- a/src/kauth/kaprocs.c
+++ b/src/kauth/kaprocs.c
@@ -9,25 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif
 
-#include <afs/stds.h>
-#include <errno.h>
 #include "kauth.h"
-#include <sys/types.h>
-#include <time.h>
-#ifdef AFS_NT40_ENV
-#include <afs/afsutil.h>
-#else
-#include <sys/resource.h>
-#include <sys/file.h>
-#endif
-#include <stdio.h>
 
 #define HC_DEPRECATED
 #include <hcrypto/des.h>
@@ -38,22 +32,17 @@
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/com_err.h>
+#include <afs/afsutil.h>
+#include <afs/audit.h>
 
 #include "kautils.h"
 #include "kaserver.h"
 #include "kalog.h"
 #include "kaport.h"
 #include "kauth_internal.h"
-#include "afs/audit.h"
 
 #include "kadatabase.h"
 #include "kaprocs.h"
diff --git a/src/kauth/kas.c b/src/kauth/kas.c
index 736b229f9..fa57df58d 100644
--- a/src/kauth/kas.c
+++ b/src/kauth/kas.c
@@ -10,25 +10,17 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
+#ifdef AFS_NT40_ENV
+#include <WINNT/afsevent.h>
 #endif
 
-#include <sys/types.h>
 #include <rx/xdr.h>
-
 #include <lock.h>
 #include <ubik.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#else
-#include <WINNT/afsevent.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <afs/com_err.h>
 #include <afs/cmd.h>
@@ -37,7 +29,6 @@
 #include "kauth_internal.h"
 #include "kautils.h"
 
-
 int
 main(int argc, char *argv[])
 {
diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index a058dc4aa..df5a485c9 100644
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -9,29 +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>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-#include "kalog.h"		/* for OpenLog() */
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
 #endif
+
+
 #include <lwp.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -44,7 +30,8 @@
 #include <afs/com_err.h>
 #include <afs/audit.h>
 #include <ubik.h>
-#include <sys/stat.h>
+
+#include "kalog.h"		/* for OpenLog() */
 #include "kauth.h"
 #include "kauth_internal.h"
 #include "kautils.h"
diff --git a/src/kauth/katoken.c b/src/kauth/katoken.c
index 90107cc18..71521b0ab 100644
--- a/src/kauth/katoken.c
+++ b/src/kauth/katoken.c
@@ -13,6 +13,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -20,26 +21,15 @@
 # include "afsincludes.h"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
 #include <afs/pthread_glock.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-#include <string.h>
-/* netinet/in.h and cellconfig.h  are needed together */
 #include <afs/cellconfig.h>
-    /* these are needed together */
+#include <afs/auth.h>
 #include <lock.h>
 #include <ubik.h>
 
 #include "kauth.h"
 #include "kautils.h"
-#include <afs/auth.h>
 
 
 afs_int32
diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c
index 8dd6242a1..ddf92ee81 100644
--- a/src/kauth/kautils.c
+++ b/src/kauth/kautils.c
@@ -9,26 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/afsutil.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 <sys/file.h>
-#endif
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
 #include <ctype.h>
+
+#include <hcrypto/des.h>
+
+#include <afs/afsutil.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <hcrypto/des.h>
+
 #include "kauth.h"
 #include "kautils.h"
 
diff --git a/src/kauth/kdb.c b/src/kauth/kdb.c
index 5d73f6d22..081a52a2e 100644
--- a/src/kauth/kdb.c
+++ b/src/kauth/kdb.c
@@ -10,18 +10,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <fcntl.h>
-#include <sys/types.h>
-#include <time.h>
-#include <stdio.h>
-#ifndef AFS_NT40_ENV
-#include <strings.h>
-#endif
 #include <afs/cmd.h>
+#include <afs/afsutil.h>
+
 #include "kauth.h"
 #include "kalog.h"
-#include <afs/afsutil.h>
 
 #ifdef AUTH_DBM_LOG
 
diff --git a/src/kauth/kkids.c b/src/kauth/kkids.c
index 5d9fb7a6c..fb2f5b062 100644
--- a/src/kauth/kkids.c
+++ b/src/kauth/kkids.c
@@ -14,26 +14,18 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <afs/fs_utils.h>
 #else
-#include <unistd.h>
-#include <netinet/in.h>
 #include <afs/venus.h>
 #endif
-#include <signal.h>
-#include <afs/stds.h>
+
 #include <rx/xdr.h>
 #include <afs/prs_fs.h>
-#include <stdlib.h>
-#include <string.h>
 #include <afs/sys_prototypes.h>
 #include <afs/afs_consts.h>
 
diff --git a/src/kauth/klog.c b/src/kauth/klog.c
index 31df3b8f6..3c273ad42 100644
--- a/src/kauth/klog.c
+++ b/src/kauth/klog.c
@@ -9,23 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <string.h>
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#include <pwd.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"
diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c
index 97da77a84..7fcdf40a8 100644
--- a/src/kauth/klogin.c
+++ b/src/kauth/klogin.c
@@ -21,29 +21,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
-#include <sys/param.h>
 
 #define quota(a,b,c,d) 0
 
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/file.h>
 #include <afs/afsutil.h>
 #include <sgtty.h>
 #include <utmp.h>
-#include <signal.h>
-#include <pwd.h>
-#include <stdio.h>
 #include <lastlog.h>
-#include <errno.h>
 #include <ttyent.h>
 
-
-#include <syslog.h>
-
 #include <grp.h>
 
 static gid_t tty_gid(int default_gid);
diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c
index 6852e44a7..4b4be5a53 100644
--- a/src/kauth/knfs.c
+++ b/src/kauth/knfs.c
@@ -13,19 +13,12 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <ctype.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <time.h>
-#include <netdb.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <string.h>
+
 #include <afs/vice.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>
diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c
index 220b46059..031f8953d 100644
--- a/src/kauth/kpasswd.c
+++ b/src/kauth/kpasswd.c
@@ -10,40 +10,27 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <limits.h>
 
-#include <rx/xdr.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
+#include <rx/xdr.h>
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#endif
-#include <string.h>
-#include <signal.h>
 #include <afs/com_err.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kkids.h"
 
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
-#include <limits.h>
 
 
 /* This code borrowed heavily from the log program.  Here is the intro comment
diff --git a/src/kauth/kpwvalid.c b/src/kauth/kpwvalid.c
index 89957051e..710bdefc9 100644
--- a/src/kauth/kpwvalid.c
+++ b/src/kauth/kpwvalid.c
@@ -10,9 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif
diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c
index ed48dd50f..9bd3eae52 100644
--- a/src/kauth/krb_tf.c
+++ b/src/kauth/krb_tf.c
@@ -49,19 +49,9 @@
 
 #include <roken.h>
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#endif
-#include <string.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#include <errno.h>
 #include <afs/auth.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"
diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c
index 5685b1b64..c59fbce18 100644
--- a/src/kauth/krb_udp.c
+++ b/src/kauth/krb_udp.c
@@ -14,6 +14,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -21,21 +22,9 @@
 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <errno.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <afs/errmap_nt.h>
-#define snprintf _snprintf
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
 #endif
-#include <string.h>
-#include <afs/afsutil.h>
-#include <time.h>
 
 #define HC_DEPRECATED
 #include <hcrypto/des.h>
@@ -48,7 +37,6 @@
 #include <afs/auth.h>
 #include <ubik.h>
 
-
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"
diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c
index 0a0c84bea..83c432e9f 100644
--- a/src/kauth/manyklog.c
+++ b/src/kauth/manyklog.c
@@ -9,23 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#include <pwd.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "assert.h"
diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c
index eed9d7455..2722b3571 100644
--- a/src/kauth/rebuild.c
+++ b/src/kauth/rebuild.c
@@ -12,25 +12,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
+#include <hcrypto/des.h>
+
 #include <ubik.h>
 #include <afs/cmd.h>
-#include <hcrypto/des.h>
 #include <rx/rxkad.h>
-
 #include <afs/com_err.h>
 
 #include "kauth.h"
diff --git a/src/kauth/user.c b/src/kauth/user.c
index 28220528e..af509feac 100644
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -12,19 +12,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
+
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
-#include <afs/stds.h>
-#include <signal.h>
 #include <afs/com_err.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/ptint.h>
@@ -40,8 +35,7 @@
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <rx/rxkad.h>		/* max ticket lifetime */
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 
 #include "kauth.h"
 #include "kautils.h"
diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c
index e471474bc..60ce3b87d 100644
--- a/src/kauth/user_nt.c
+++ b/src/kauth/user_nt.c
@@ -16,10 +16,6 @@
 
 #include <windows.h>
 #include <rpc.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>		/* sprintf */
-#include <malloc.h>
 #include <afs/kautils.h>
 #include <afs/cm.h>
 #include <afs/cm_config.h>
-- 
2.39.5