From 0755d8613a4c1b796866c62fd1e1191a5faa62fe Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Mon, 16 Mar 2009 13:26:48 +0000
Subject: [PATCH] DEVEL15-libadmin-prototypes-20090316

LICENSE IPL10
FIXES 124246

prototype the libadmin directory


(cherry picked from commit cff2da10d6f2c4b568c07a331ceb96cbf952576a)
---
 src/libadmin/adminutil/afs_utilAdmin.c        | 22 ++++++++++++++-----
 src/libadmin/adminutil/afs_utilAdmin.h        | 19 +++++++++++-----
 src/libadmin/bos/afs_bosAdmin.c               |  2 ++
 src/libadmin/cfg/cfgclient.c                  |  2 ++
 src/libadmin/cfg/cfgdb.c                      |  3 +++
 src/libadmin/cfg/cfghost.c                    |  3 +++
 src/libadmin/cfg/cfgservers.c                 |  3 +++
 src/libadmin/client/afs_clientAdmin.c         |  1 +
 src/libadmin/kas/afs_kasAdmin.c               |  2 ++
 src/libadmin/pts/afs_ptsAdmin.c               |  2 ++
 src/libadmin/samples/cm_client_config.c       |  8 +++++--
 src/libadmin/samples/cm_local_cell.c          |  4 ++++
 src/libadmin/samples/cm_server_prefs.c        |  4 ++++
 src/libadmin/samples/rxdebug_basic_stats.c    |  4 ++++
 src/libadmin/samples/rxdebug_conns.c          |  4 ++++
 src/libadmin/samples/rxdebug_peers.c          |  4 ++++
 src/libadmin/samples/rxdebug_rx_stats.c       |  4 ++++
 .../samples/rxdebug_supported_stats.c         |  4 ++++
 src/libadmin/samples/rxdebug_version.c        |  4 ++++
 src/libadmin/samples/rxstat_clear_peer.c      |  6 ++++-
 src/libadmin/samples/rxstat_clear_process.c   |  6 ++++-
 src/libadmin/samples/rxstat_disable_peer.c    |  8 ++++---
 src/libadmin/samples/rxstat_disable_process.c |  8 ++++---
 src/libadmin/samples/rxstat_enable_peer.c     |  8 ++++---
 src/libadmin/samples/rxstat_get_peer.c        |  8 +++----
 src/libadmin/samples/rxstat_get_process.c     |  6 ++---
 src/libadmin/samples/rxstat_get_version.c     |  6 ++++-
 src/libadmin/samples/rxstat_query_peer.c      |  8 ++++---
 src/libadmin/test/afscp.c                     |  3 +++
 src/libadmin/test/bos.h                       |  3 +++
 src/libadmin/test/client.h                    |  3 +++
 src/libadmin/test/kas.h                       |  3 +++
 src/libadmin/test/util.h                      |  3 +++
 src/libadmin/test/vos.h                       |  3 +++
 src/libadmin/vos/afs_vosAdmin.c               |  3 ++-
 src/libadmin/vos/lockprocs.h                  |  1 +
 36 files changed, 149 insertions(+), 36 deletions(-)

diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index 8072dcb55..86a1465e0 100644
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -19,7 +19,6 @@ RCSID
 #include <string.h>
 #include <afs/afs_Admin.h>
 #include "afs_AdminInternal.h"
-#include "afs_utilAdmin.h"
 #include <afs/pthread_glock.h>
 #include <afs/cellconfig.h>
 #include <afs/dirpath.h>
@@ -42,6 +41,7 @@ RCSID
 #include <arpa/inet.h>
 #include <netdb.h>
 #endif
+#include "afs_utilAdmin.h"
 
 /*
  * AIX 4.2 has PTHREAD_CREATE_UNDETACHED and not PTHREAD_CREATE_JOINABLE
@@ -1321,7 +1321,11 @@ DestroyRPCStats(void *rpc_specific, afs_status_p st)
  */
 
 int ADMINAPI
-util_RPCStatsGetBegin(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsGetBegin(struct rx_connection *conn, 
+		      int (*rpc) (struct rx_connection *,
+				  afs_uint32, afs_uint32 *,
+				  afs_uint32 *, afs_uint32 *,
+				  afs_uint32 *, struct rpcStats *),
 		      void **iterationIdP, afs_status_p st)
 {
     int rc = 0;
@@ -1515,7 +1519,9 @@ util_RPCStatsGetDone(const void *iterationId, afs_status_p st)
  */
 
 int ADMINAPI
-util_RPCStatsStateGet(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateGet(struct rx_connection *conn, 
+		      int (*rpc) (struct rx_connection *,
+			      	  afs_RPCStatsState_p),
 		      afs_RPCStatsState_p state, afs_status_p st)
 {
     int rc = 0;
@@ -1571,7 +1577,8 @@ util_RPCStatsStateGet(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsStateEnable(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateEnable(struct rx_connection *conn, 
+		         int (*rpc) (struct rx_connection *),
 			 afs_status_p st)
 {
     int rc = 0;
@@ -1622,7 +1629,8 @@ util_RPCStatsStateEnable(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsStateDisable(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateDisable(struct rx_connection *conn, 
+			  int (*rpc) (struct rx_connection *),
 			  afs_status_p st)
 {
     int rc = 0;
@@ -1676,7 +1684,9 @@ util_RPCStatsStateDisable(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsClear(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsClear(struct rx_connection *conn, 
+		   int (*rpc) (struct rx_connection *,
+			       afs_RPCStatsClearFlag_t),
 		   afs_RPCStatsClearFlag_t flag, afs_status_p st)
 {
     int rc = 0;
diff --git a/src/libadmin/adminutil/afs_utilAdmin.h b/src/libadmin/adminutil/afs_utilAdmin.h
index d51b3bcf2..c07ea7ce5 100644
--- a/src/libadmin/adminutil/afs_utilAdmin.h
+++ b/src/libadmin/adminutil/afs_utilAdmin.h
@@ -48,7 +48,12 @@ extern int ADMINAPI CellHandleIsValid(const void *cellHandle,
 				      afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsGetBegin(struct rx_connection *conn,
-					  int (*rpc) (), void **iterationIdP,
+					  int (*rpc) (struct rx_connection *,
+						      afs_uint32, afs_uint32 *,
+						      afs_uint32 *, afs_uint32 *,
+						      afs_uint32 *, 
+						      struct rpcStats *), 
+					  void **iterationIdP,
 					  afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsGetNext(const void *iterationId,
@@ -59,18 +64,22 @@ extern int ADMINAPI util_RPCStatsGetDone(const void *iterationId,
 					 afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateGet(struct rx_connection *conn,
-					  int (*rpc) (),
+					  int (*rpc) (struct rx_connection *,
+						      afs_RPCStatsState_p),
 					  afs_RPCStatsState_p state,
 					  afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateEnable(struct rx_connection *conn,
-					     int (*rpc) (), afs_status_p st);
+					     int (*rpc) (struct rx_connection *), 
+					     afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateDisable(struct rx_connection *conn,
-					      int (*rpc) (), afs_status_p st);
+					      int (*rpc) (struct rx_connection *), 
+					      afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsClear(struct rx_connection *conn,
-				       int (*rpc) (),
+				       int (*rpc) (struct rx_connection *, 
+					           afs_RPCStatsClearFlag_t),
 				       afs_RPCStatsClearFlag_t flag,
 				       afs_status_p st);
 
diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 6ad03a7a4..13f57219a 100644
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -15,6 +15,8 @@ RCSID
 
 #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>
diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c
index 9ac669f7b..500c37346 100644
--- a/src/libadmin/cfg/cfgclient.c
+++ b/src/libadmin/cfg/cfgclient.c
@@ -26,6 +26,8 @@ RCSID
 #include <string.h>
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c
index 52ba126cd..8f29c0024 100644
--- a/src/libadmin/cfg/cfgdb.c
+++ b/src/libadmin/cfg/cfgdb.c
@@ -27,6 +27,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_bosAdmin.h>
diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c
index dee571235..4ccd59f8c 100644
--- a/src/libadmin/cfg/cfghost.c
+++ b/src/libadmin/cfg/cfghost.c
@@ -39,6 +39,9 @@ RCSID
 #include <unistd.h>
 #endif /* AFS_NT40_ENV */
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c
index fd98aa551..a56dda42c 100644
--- a/src/libadmin/cfg/cfgservers.c
+++ b/src/libadmin/cfg/cfgservers.c
@@ -37,6 +37,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_bosAdmin.h>
diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c
index 725c26d2d..5a37786b2 100644
--- a/src/libadmin/client/afs_clientAdmin.c
+++ b/src/libadmin/client/afs_clientAdmin.c
@@ -38,6 +38,7 @@ RCSID
 #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/dirpath.h>
diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c
index d3bbdce1d..2038470bd 100644
--- a/src/libadmin/kas/afs_kasAdmin.c
+++ b/src/libadmin/kas/afs_kasAdmin.c
@@ -17,6 +17,8 @@ RCSID
 #include <string.h>
 
 #include <afs/stds.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include "afs_kasAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c
index 07286a1d6..e6e43f733 100644
--- a/src/libadmin/pts/afs_ptsAdmin.c
+++ b/src/libadmin/pts/afs_ptsAdmin.c
@@ -15,6 +15,8 @@ RCSID
 
 #include <stdio.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>
diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c
index 48ec35761..866ff991d 100644
--- a/src/libadmin/samples/cm_client_config.c
+++ b/src/libadmin/samples/cm_client_config.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -34,7 +38,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: cm_client_config <host> <port>\n");
     exit(1);
@@ -107,7 +111,7 @@ main(int argc, char *argv[])
     }
 
 
-    printf("\nClient configuration for %s (port %d):\n\n", srvrName,
+    printf("\nClient configuration for %s (port %ld):\n\n", srvrName,
 	   srvrPort);
     printf("    clientVersion:  %d\n", config.clientVersion);
     printf("    serverVersion:  %d\n", config.serverVersion);
diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index a814ac3b9..51e60918a 100644
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -23,6 +23,10 @@ RCSID
 #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/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c
index cdae973a2..76ccd6287 100644
--- a/src/libadmin/samples/cm_server_prefs.c
+++ b/src/libadmin/samples/cm_server_prefs.c
@@ -23,6 +23,10 @@ RCSID
 #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/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c
index 6289eeedb..728aa6a60 100644
--- a/src/libadmin/samples/rxdebug_basic_stats.c
+++ b/src/libadmin/samples/rxdebug_basic_stats.c
@@ -23,6 +23,10 @@ RCSID
 #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/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c
index 2e0ff99fb..c405ca30e 100644
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -23,6 +23,10 @@ RCSID
 #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/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c
index c0a3a3d61..17bcb40f2 100644
--- a/src/libadmin/samples/rxdebug_peers.c
+++ b/src/libadmin/samples/rxdebug_peers.c
@@ -23,6 +23,10 @@ RCSID
 #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/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index 2a3de6b8b..9d4dbda63 100644
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -24,6 +24,10 @@ RCSID
 #include <pthread.h>
 #endif
 #include <string.h>
+
+#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/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c
index 0d5062d99..7bf67e3e1 100644
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -23,6 +23,10 @@ RCSID
 #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/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c
index d88aea0f9..500686181 100644
--- a/src/libadmin/samples/rxdebug_version.c
+++ b/src/libadmin/samples/rxdebug_version.c
@@ -23,6 +23,10 @@ RCSID
 #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_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c
index 7c4de27fa..7827ddc5d 100644
--- a/src/libadmin/samples/rxstat_clear_peer.c
+++ b/src/libadmin/samples/rxstat_clear_peer.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -36,7 +40,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern int RXSTATS_ClearPeerRPCStats();
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_clear_peer <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c
index b17eb6d2d..d77adda82 100644
--- a/src/libadmin/samples/rxstat_clear_process.c
+++ b/src/libadmin/samples/rxstat_clear_process.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -36,7 +40,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern int RXSTATS_ClearProcessRPCStats();
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_clear_process <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c
index 2690e343d..ef80be2b0 100644
--- a/src/libadmin/samples/rxstat_disable_peer.c
+++ b/src/libadmin/samples/rxstat_disable_peer.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_DisablePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_disable_peer <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c
index 1012a5d43..a174b03b0 100644
--- a/src/libadmin/samples/rxstat_disable_process.c
+++ b/src/libadmin/samples/rxstat_disable_process.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_DisableProcessRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_disable_process <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c
index 8b6929ef7..ce8ebc9ca 100644
--- a/src/libadmin/samples/rxstat_enable_peer.c
+++ b/src/libadmin/samples/rxstat_enable_peer.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_EnablePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_enable_peer <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 0632411ea..6bc52e217 100644
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -26,6 +26,9 @@ RCSID
 
 #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>
@@ -37,7 +40,6 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-#include <rx/rxstat.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>
@@ -56,10 +58,8 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #include <arpa/inet.h>		/* for inet_ntoa() */
 #endif
 
-extern int RXSTATS_RetrievePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_get_peer <cell> <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index 6c7bc3571..9e7d780ba 100644
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -25,6 +25,9 @@ RCSID
 #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>
@@ -36,7 +39,6 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-#include <rx/rxstat.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>
@@ -52,8 +54,6 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #include <ubik.h>
 #include <ubik_int.h>
 
-extern int RXSTATS_RetrieveProcessRPCStats();
-
 void
 Usage()
 {
diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c
index c49d89ea0..e15627a90 100644
--- a/src/libadmin/samples/rxstat_get_version.c
+++ b/src/libadmin/samples/rxstat_get_version.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -34,7 +38,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_get_version <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c
index 2845f3afd..abfc6aebd 100644
--- a/src/libadmin/samples/rxstat_query_peer.c
+++ b/src/libadmin/samples/rxstat_query_peer.c
@@ -23,6 +23,10 @@ RCSID
 #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>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_QueryPeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_query_peer <host> <port>\n");
     exit(1);
diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c
index af0fb22a8..7b7400689 100644
--- a/src/libadmin/test/afscp.c
+++ b/src/libadmin/test/afscp.c
@@ -27,6 +27,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/afs_clientAdmin.h>
diff --git a/src/libadmin/test/bos.h b/src/libadmin/test/bos.h
index dd873fb87..3319d7051 100644
--- a/src/libadmin/test/bos.h
+++ b/src/libadmin/test/bos.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_bosAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/test/client.h b/src/libadmin/test/client.h
index 0ba0910bc..c2e4783ab 100644
--- a/src/libadmin/test/client.h
+++ b/src/libadmin/test/client.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#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/test/kas.h b/src/libadmin/test/kas.h
index 199c439f1..9984a3396 100644
--- a/src/libadmin/test/kas.h
+++ b/src/libadmin/test/kas.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_kasAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/test/util.h b/src/libadmin/test/util.h
index 98f22f6b4..5ea0bfb7e 100644
--- a/src/libadmin/test/util.h
+++ b/src/libadmin/test/util.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_utilAdmin.h>
 
diff --git a/src/libadmin/test/vos.h b/src/libadmin/test/vos.h
index fc9111376..39a64d52b 100644
--- a/src/libadmin/test/vos.h
+++ b/src/libadmin/test/vos.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_vosAdmin.h>
 #include <afs/afs_utilAdmin.h>
diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 15d170129..492c461b6 100644
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -30,12 +30,13 @@ RCSID
 #endif
 #include "afs_vosAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
-#include <afs/afs_utilAdmin.h>
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
 #include <afs/partition.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
+#include <afs/afs_utilAdmin.h>
 #include "vosutils.h"
 #include "vsprocs.h"
 #include "lockprocs.h"
diff --git a/src/libadmin/vos/lockprocs.h b/src/libadmin/vos/lockprocs.h
index 38b9dbc89..e84e4e5f6 100644
--- a/src/libadmin/vos/lockprocs.h
+++ b/src/libadmin/vos/lockprocs.h
@@ -16,6 +16,7 @@
 #include <afs/voldefs.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/vlserver.h>
 #include <afs/nfs.h>
 #include <afs/afsint.h>
-- 
2.39.5