From 75c14f9d695a484118971ce66455d9eacb3f6fe1 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 25 Mar 2011 10:12:08 +0000
Subject: [PATCH] libadmin: Tidy header includes

Remove headers which are provided by libroken, and reorded header
includes so that they're a bit a more legible.

Add math.h to the list of headers that configure will check for

Change-Id: I530afa77866a0aa3a33f8684ce9cf630aa347812
Reviewed-on: http://gerrit.openafs.org/4384
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 acinclude.m4                                   |  1 +
 src/libadmin/adminutil/afs_utilAdmin.c         | 21 +++++++--------------
 src/libadmin/bos/afs_bosAdmin.c                | 18 ++++--------------
 src/libadmin/cfg/cfgclient.c                   | 11 +----------
 src/libadmin/cfg/cfgdb.c                       |  9 +--------
 src/libadmin/cfg/cfghost.c                     | 16 +---------------
 src/libadmin/cfg/cfginternal.c                 | 24 +++++-------------------
 src/libadmin/cfg/cfgservers.c                  |  8 +-------
 src/libadmin/cfg/test/cfgtest.c                |  8 +-------
 src/libadmin/client/afs_clientAdmin.c          | 23 ++++++-----------------
 src/libadmin/kas/afs_kasAdmin.c                |  5 +----
 src/libadmin/pts/afs_ptsAdmin.c                | 10 ++++++----
 src/libadmin/samples/cm_client_config.c        |  2 +-
 src/libadmin/samples/cm_list_cells.c           |  2 ++
 src/libadmin/samples/cm_local_cell.c           |  1 +
 src/libadmin/samples/cm_server_prefs.c         |  2 +-
 src/libadmin/samples/rxdebug_basic_stats.c     |  2 +-
 src/libadmin/samples/rxdebug_conns.c           |  2 +-
 src/libadmin/samples/rxdebug_peers.c           |  4 ++--
 src/libadmin/samples/rxdebug_rx_stats.c        |  3 +--
 src/libadmin/samples/rxdebug_supported_stats.c |  2 +-
 src/libadmin/samples/rxdebug_version.c         |  2 +-
 src/libadmin/samples/rxstat_clear_peer.c       |  2 +-
 src/libadmin/samples/rxstat_clear_process.c    |  2 +-
 src/libadmin/samples/rxstat_disable_peer.c     |  2 +-
 src/libadmin/samples/rxstat_disable_process.c  |  2 +-
 src/libadmin/samples/rxstat_enable_peer.c      |  2 +-
 src/libadmin/samples/rxstat_enable_process.c   |  7 ++++---
 src/libadmin/samples/rxstat_get_peer.c         |  5 +----
 src/libadmin/samples/rxstat_get_process.c      |  4 +---
 src/libadmin/samples/rxstat_get_version.c      |  3 +--
 src/libadmin/samples/rxstat_query_peer.c       |  3 +--
 src/libadmin/samples/rxstat_query_process.c    |  8 +++++---
 src/libadmin/test/afscp.c                      | 10 ++--------
 src/libadmin/test/client.c                     |  1 -
 src/libadmin/test/kas.c                        |  1 -
 src/libadmin/test/vos.c                        |  7 -------
 src/libadmin/vos/afs_vosAdmin.c                | 21 +++++----------------
 src/libadmin/vos/lockprocs.c                   |  1 -
 src/libadmin/vos/vosutils.c                    |  4 ++--
 src/libadmin/vos/vsprocs.c                     | 10 ++--------
 41 files changed, 76 insertions(+), 195 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 457c55f..8c92b66 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1224,6 +1224,7 @@ AC_CHECK_HEADERS([ \
 		   errno.h \
 		   fcntl.h \
 		   grp.h \
+		   math.h \
 		   mntent.h \
 		   ncurses.h \
 		   netdb.h \
diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index feb3dc0..2251173 100644
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -9,15 +9,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <afs/afs_Admin.h>
-#include <stdio.h>
-#include <string.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
-#include "afs_AdminInternal.h"
 #include <afs/pthread_glock.h>
 #include <afs/cellconfig.h>
 #include <afs/dirpath.h>
@@ -29,18 +28,12 @@
 #include <afs/bnode.h>
 #include <afs/volser.h>
 #include <afs/afscbint.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
+
 #ifdef AFS_NT40_ENV
-# include <winsock2.h>
 # include <afs/krb5_nt.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #endif
+
+#include "afs_AdminInternal.h"
 #include "afs_utilAdmin.h"
 
 /*
diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 85a59b2..dd17a7c 100644
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -9,31 +9,21 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <afs/stds.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-#include "afs_bosAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/bosint.h>
 #include <afs/bnode.h>
 #include <afs/ktime.h>
 #include <afs/dirpath.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include <string.h>
+
+#include "afs_bosAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
 
 typedef struct bos_server {
     int begin_magic;
diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c
index 6ec525f..c9bb930 100644
--- a/src/libadmin/cfg/cfgclient.c
+++ b/src/libadmin/cfg/cfgclient.c
@@ -13,24 +13,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
+#include <roken.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
-
 #include <afs/dirpath.h>
 #include <afs/cellconfig.h>
 #include <afs/kautils.h>
diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c
index 945393b..95238d0 100644
--- a/src/libadmin/cfg/cfgdb.c
+++ b/src/libadmin/cfg/cfgdb.c
@@ -13,16 +13,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+#include <roken.h>
 
 #include <pthread.h>
 
diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c
index 2d95ef5..9fbdb33 100644
--- a/src/libadmin/cfg/cfghost.c
+++ b/src/libadmin/cfg/cfghost.c
@@ -13,29 +13,16 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <roken.h>
 
 #include <pthread.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/vptab.h>
 #include <WINNT/afsreg.h>
-#include <io.h>
 #include <direct.h>
-#else
-#include <unistd.h>
 #endif /* AFS_NT40_ENV */
 
 #include <rx/rx.h>
@@ -49,7 +36,6 @@
 #include <afs/afs_kasAdmin.h>
 #include <afs/afs_ptsAdmin.h>
 
-
 #include <afs/kautils.h>
 #include <afs/bnode.h>
 #include <afs/prerror.h>
diff --git a/src/libadmin/cfg/cfginternal.c b/src/libadmin/cfg/cfginternal.c
index 15587cd..759577e 100644
--- a/src/libadmin/cfg/cfginternal.c
+++ b/src/libadmin/cfg/cfginternal.c
@@ -9,32 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <windows.h>
-#include <winsock2.h>
-#include <io.h>
 #include <WINNT/afsreg.h>
-#else
-#include <unistd.h>
-#include <math.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/param.h>
 #endif /* AFS_NT40_ENV */
-#include <dirent.h>
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
 
 #include <pthread.h>
 
diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c
index dfb4003..9cf79da 100644
--- a/src/libadmin/cfg/cfgservers.c
+++ b/src/libadmin/cfg/cfgservers.c
@@ -17,16 +17,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <ctype.h>
 
 #ifdef AFS_NT40_ENV
diff --git a/src/libadmin/cfg/test/cfgtest.c b/src/libadmin/cfg/test/cfgtest.c
index cf4f90e..b520da5 100644
--- a/src/libadmin/cfg/test/cfgtest.c
+++ b/src/libadmin/cfg/test/cfgtest.c
@@ -11,15 +11,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <pthread.h>
 
diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c
index 81ff702..b26a184 100644
--- a/src/libadmin/client/afs_clientAdmin.c
+++ b/src/libadmin/client/afs_clientAdmin.c
@@ -9,37 +9,23 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include "afs_clientAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <afs/cellconfig.h>
 #ifdef AFS_NT40_ENV
 #include <afs/afssyscalls.h>
-#include <winsock2.h>
 #include <afs/fs_utils.h>
 #define close(x) closesocket(x)
 #else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <afs/venus.h>
-#include <errno.h>
-#include <strings.h>
-#include <unistd.h>
 #endif
-#include <string.h>
-#include <afs/kautils.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include <rx/rx_null.h>
 #include <rx/rxkad.h>
+
+#include <afs/kautils.h>
 #include <afs/dirpath.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_vosAdmin.h>
@@ -49,6 +35,9 @@
 #include <afs/pthread_glock.h>
 #include <afs/sys_prototypes.h>
 
+#include "afs_clientAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /*
  * AFS client administration functions.
  *
diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c
index df083cb..ccbfaec 100644
--- a/src/libadmin/kas/afs_kasAdmin.c
+++ b/src/libadmin/kas/afs_kasAdmin.c
@@ -9,13 +9,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include <afs/stds.h>
 #include <rx/rx.h>
 #include <rx/rxstat.h>
 #include "afs_kasAdmin.h"
diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c
index 8e6aacc..ba8200b 100644
--- a/src/libadmin/pts/afs_ptsAdmin.c
+++ b/src/libadmin/pts/afs_ptsAdmin.c
@@ -9,21 +9,23 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include <afs/stds.h>
+
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-#include "afs_ptsAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
+
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/ptint.h>
 #include <afs/ptserver.h>
 
+#include "afs_ptsAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /*
  * IsValidCellHandle - validate the cell handle for making pts
  * requests.
diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c
index 2f79fe1..34dd62a 100644
--- a/src/libadmin/samples/cm_client_config.c
+++ b/src/libadmin/samples/cm_client_config.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/cm_list_cells.c b/src/libadmin/samples/cm_list_cells.c
index 518d7ca..a82c46d 100644
--- a/src/libadmin/samples/cm_list_cells.c
+++ b/src/libadmin/samples/cm_list_cells.c
@@ -16,11 +16,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index 02aa98b..8260385 100644
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -16,6 +16,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
diff --git a/src/libadmin/samples/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c
index 1b7d817..2e2d029 100644
--- a/src/libadmin/samples/cm_server_prefs.c
+++ b/src/libadmin/samples/cm_server_prefs.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c
index f297808..2e5ca00 100644
--- a/src/libadmin/samples/rxdebug_basic_stats.c
+++ b/src/libadmin/samples/rxdebug_basic_stats.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c
index 07a613c..bd623d6 100644
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c
index fae6001..2438a66 100644
--- a/src/libadmin/samples/rxdebug_peers.c
+++ b/src/libadmin/samples/rxdebug_peers.c
@@ -16,13 +16,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #ifdef IGNORE_SOME_GCC_WARNINGS
  # pragma GCC diagnostic warning "-Wformat"
 #endif
 
-
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index 43e11dd..6dbf9f7 100644
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -16,12 +16,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
-#include <string.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c
index 4a2153a..0169d2d 100644
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c
index 2e17d44..4721f43 100644
--- a/src/libadmin/samples/rxdebug_version.c
+++ b/src/libadmin/samples/rxdebug_version.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c
index 09b516a..6d9d47d 100644
--- a/src/libadmin/samples/rxstat_clear_peer.c
+++ b/src/libadmin/samples/rxstat_clear_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c
index 661e0b1..d9742a6 100644
--- a/src/libadmin/samples/rxstat_clear_process.c
+++ b/src/libadmin/samples/rxstat_clear_process.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c
index d7058b3..a18d8ea 100644
--- a/src/libadmin/samples/rxstat_disable_peer.c
+++ b/src/libadmin/samples/rxstat_disable_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c
index 02d5ffa..e06c1d2 100644
--- a/src/libadmin/samples/rxstat_disable_process.c
+++ b/src/libadmin/samples/rxstat_disable_process.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c
index 92ef0a7..8d8a1a5 100644
--- a/src/libadmin/samples/rxstat_enable_peer.c
+++ b/src/libadmin/samples/rxstat_enable_peer.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/samples/rxstat_enable_process.c b/src/libadmin/samples/rxstat_enable_process.c
index 1878c67..4489daa 100644
--- a/src/libadmin/samples/rxstat_enable_process.c
+++ b/src/libadmin/samples/rxstat_enable_process.c
@@ -16,16 +16,17 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
 
 #ifdef AFS_DARWIN_ENV
 pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 7c962d7..5c9f05e 100644
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -16,17 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
-#include <string.h>
-
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>
diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index f8dd797..b8bdc30 100644
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -16,16 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
-#include <string.h>
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>
diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c
index 7533c7b..4d53771 100644
--- a/src/libadmin/samples/rxstat_get_version.c
+++ b/src/libadmin/samples/rxstat_get_version.c
@@ -16,15 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c
index 67293a0..d52199c 100644
--- a/src/libadmin/samples/rxstat_query_peer.c
+++ b/src/libadmin/samples/rxstat_query_peer.c
@@ -16,15 +16,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
 #include <rx/rx.h>
 #include <rx/rxstat.h>
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/samples/rxstat_query_process.c b/src/libadmin/samples/rxstat_query_process.c
index c6c6da1..eed2091 100644
--- a/src/libadmin/samples/rxstat_query_process.c
+++ b/src/libadmin/samples/rxstat_query_process.c
@@ -16,16 +16,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
+
 
 #ifdef AFS_DARWIN_ENV
 pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c
index 8560eb8..819266f 100644
--- a/src/libadmin/test/afscp.c
+++ b/src/libadmin/test/afscp.c
@@ -13,16 +13,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#include <roken.h>
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <pthread.h>
 
@@ -35,6 +28,7 @@
 
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "common.h"
 #include "bos.h"
 #include "client.h"
diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c
index 0ca179c..86fb30e 100644
--- a/src/libadmin/test/client.c
+++ b/src/libadmin/test/client.c
@@ -33,7 +33,6 @@
 #include <ubik.h>
 #include <ubik_int.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c
index f33f474..d32c0c0 100644
--- a/src/libadmin/test/kas.c
+++ b/src/libadmin/test/kas.c
@@ -17,7 +17,6 @@
 #include <roken.h>
 
 #include "kas.h"
-#include <time.h>
 
 /*
  * Utility functions
diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c
index 455a68d..a9c1ab1 100644
--- a/src/libadmin/test/vos.c
+++ b/src/libadmin/test/vos.c
@@ -16,14 +16,7 @@
 
 #include <roken.h>
 
-#ifndef AFS_NT40_ENV
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <afs/afsutil.h>
-#include <unistd.h>
-#endif
-
 
 #include "vos.h"
 
diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 32e6512..934e5eb 100644
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -9,30 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-#include "afs_vosAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
+
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
 
+#include "afs_vosAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
 /* File descriptors are HANDLE's on NT. The following typedef helps catch
  * type errors. Duplicated from vol/ihandle.h
  */
diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index 4f71d88..85b9133 100644
--- a/src/libadmin/vos/lockprocs.c
+++ b/src/libadmin/vos/lockprocs.c
@@ -13,7 +13,6 @@
 #include <roken.h>
 
 #include "lockprocs.h"
-#include <string.h>
 
 /* Finds an index in VLDB entry that matches the volume type, server, and partition.
  * If type is zero, will match first index of ANY type (RW, BK, or RO).
diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index 9f18ab6..1d767f9 100644
--- a/src/libadmin/vos/vosutils.c
+++ b/src/libadmin/vos/vosutils.c
@@ -12,11 +12,11 @@
 
 #include <roken.h>
 
+#include <afs/afs_AdminErrors.h>
+
 #include "vosutils.h"
 #include "vsprocs.h"
 #include "lockprocs.h"
-#include <afs/afs_AdminErrors.h>
-#include <string.h>
 
 /*
  * VLDB entry conversion routines.
diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index b2d40bb..6c01a62 100644
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -23,19 +23,13 @@
 
 #include <roken.h>
 
+#include <afs/afs_AdminErrors.h>
+
 #include "vsprocs.h"
 #include "vosutils.h"
 #include "lockprocs.h"
 #include "../adminutil/afs_AdminInternal.h"
-#include <afs/afs_AdminErrors.h>
 #include "afs_vosAdmin.h"
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#endif
 
 static afs_int32 GroupEntries(struct rx_connection *server, volintInfo * pntr, afs_int32 count,
              struct qHead *myQueue, afs_int32 apart);
-- 
1.9.4