diff --git a/src/rx/rx.c b/src/rx/rx.c
index 6c80715440..f7f6d7955c 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -10,7 +10,7 @@
 /* RX:  Extended Remote Procedure Call */
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 #ifdef KERNEL
 # include "afs/sysincludes.h"
@@ -63,26 +63,12 @@ extern afs_int32 afs_termState;
 # include "afs/rxgen_consts.h"
 #else /* KERNEL */
 # include <roken.h>
-# include <sys/types.h>
-# include <string.h>
-# include <stdarg.h>
-# include <errno.h>
-# ifdef HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+
 # ifdef AFS_NT40_ENV
-#  include <stdlib.h>
-#  include <fcntl.h>
 #  include <afs/afsutil.h>
 #  include <WINNT\afsreg.h>
-# else
-#  include <sys/socket.h>
-#  include <sys/file.h>
-#  include <netdb.h>
-#  include <sys/stat.h>
-#  include <netinet/in.h>
-#  include <sys/time.h>
 # endif
+
 # include "rx_user.h"
 #endif /* KERNEL */
 
diff --git a/src/rx/rx_clock.c b/src/rx/rx_clock.c
index 38e726bcfc..057e1c4b4a 100644
--- a/src/rx/rx_clock.c
+++ b/src/rx/rx_clock.c
@@ -11,7 +11,7 @@
 /* See rx_clock.h for calling conventions */
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 #ifdef AFS_SUN59_ENV
 #include <sys/time_impl.h>
@@ -26,13 +26,7 @@
 #  include "afsincludes.h"
 # endif /* !UKERNEL */
 #else /* KERNEL */
-# include <sys/time.h>
-# ifdef HAVE_SIGNAL_H
-#  include <signal.h>
-# endif
-# include <stdio.h>
-# include <errno.h>
-# include <stdlib.h>
+# include <roken.h>
 #endif
 
 #include "rx.h"
diff --git a/src/rx/rx_clock_nt.c b/src/rx/rx_clock_nt.c
index 1a371e76f2..72bc76e0b0 100644
--- a/src/rx/rx_clock_nt.c
+++ b/src/rx/rx_clock_nt.c
@@ -13,10 +13,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <stdio.h>
-#include <stdlib.h>
 #include <windef.h>
 #include <winbase.h>
 #include "rx_clock.h"
diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c
index 670cda127f..1202f58379 100644
--- a/src/rx/rx_conncache.c
+++ b/src/rx/rx_conncache.c
@@ -14,12 +14,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif /* KERNEL */
+#include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
 #include "rx.h"
 
 /*
diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c
index f822419a10..b520f1657f 100644
--- a/src/rx/rx_event.c
+++ b/src/rx/rx_event.c
@@ -8,7 +8,7 @@
  */
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 #ifdef AFS_SUN59_ENV
 # include <sys/time_impl.h>
@@ -41,16 +41,12 @@ extern void *osi_Alloc();
 # endif
 #else /* KERNEL */
 # include <roken.h>
-# include <stdio.h>
 # include "rx_user.h"
 # ifdef AFS_PTHREAD_ENV
 #  include "rx_pthread.h"
 # else
 #  include "rx_lwp.h"
 # endif
-# ifdef AFS_NT40_ENV
-#  include <malloc.h>
-# endif
 #endif /* KERNEL */
 
 #include "rx.h"
diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c
index 55f3e35bdc..0c7d3aed98 100644
--- a/src/rx/rx_getaddr.c
+++ b/src/rx/rx_getaddr.c
@@ -10,16 +10,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
 #ifndef KERNEL
+
+# include <roken.h>
 # ifndef AFS_NT40_ENV
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <sys/time.h>
-#  include <net/if.h>
-#  include <netinet/in.h>
-#  include <sys/ioctl.h>
-#  include <string.h>
+# include <net/if.h>
 #  if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 #   include <sys/sysctl.h>
 #   ifndef AFS_ARM_DARWIN_ENV
diff --git a/src/rx/rx_globals.c b/src/rx/rx_globals.c
index bc029a8df1..cfaaa04194 100644
--- a/src/rx/rx_globals.c
+++ b/src/rx/rx_globals.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 /* Enable data initialization when the header file is included */
 #define GLOBALSINIT(stuff) = stuff
diff --git a/src/rx/rx_identity.c b/src/rx/rx_identity.c
index 514d97be59..ae9c694d19 100644
--- a/src/rx/rx_identity.c
+++ b/src/rx/rx_identity.c
@@ -27,8 +27,6 @@
 
 #ifndef KERNEL
 # include <roken.h>
-# include <sys/types.h>
-# include <string.h>
 #else
 # include "afs/sysincludes.h"
 # include "afsincludes.h"
diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index b04429f964..a7c97596b2 100644
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -12,7 +12,7 @@
  */
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 
 #include "rx/rx_kcommon.h"
diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c
index 8ad021bf88..1de0857312 100644
--- a/src/rx/rx_lwp.c
+++ b/src/rx/rx_lwp.c
@@ -21,36 +21,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif /* KERNEL */
+#include <roken.h>
 
-#include <sys/types.h>		/* fd_set on older platforms */
-#include <errno.h>
-#include <signal.h>
-#ifdef AFS_NT40_ENV
-# include <winsock2.h>
-#else
-# include <unistd.h>		/* select() prototype */
-# include <sys/time.h>		/* struct timeval, select() prototype */
-# ifndef FD_SET
-#  include <sys/select.h>	/* fd_set on newer platforms */
-# endif
-# include <sys/socket.h>
-# include <sys/file.h>
-# include <netdb.h>
-# include <sys/stat.h>
-# include <netinet/in.h>
-# include <net/if.h>
-# include <sys/ioctl.h>
-# include <sys/time.h>
-#endif
+#include <lwp.h>
 
 #include "rx.h"
 #include "rx_atomic.h"
 #include "rx_globals.h"
 #include "rx_stats.h"
-#include <lwp.h>
 
 #define MAXTHREADNAMELENGTH 64
 
diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index 1d39f4ebba..c01b857082 100644
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -15,23 +15,11 @@
 # include <afsincludes.h>
 #else
 # include <roken.h>
-# ifdef AFS_NT40_ENV
-#  include <winsock2.h>
-#  include <malloc.h>
-# else
-#  include <sys/param.h>
-# endif
-# include <errno.h>
 # include <afs/errors.h>
 # include "xdr.h"
 # ifdef AFS_PTHREAD_ENV
 #  include "rx.h"
 # endif /* AFS_PTHREAD_ENV */
-# include <stdlib.h>
-# include <string.h>
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 # ifdef AFS_NT40_ENV
 #  ifndef EDQUOT
 #   define EDQUOT WSAEDQUOT
diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c
index c6af54a6d5..cefa0a28a8 100644
--- a/src/rx/rx_multi.c
+++ b/src/rx/rx_multi.c
@@ -11,7 +11,7 @@
 #include <afs/param.h>
 
 #ifdef	KERNEL
-#include "afs/sysincludes.h"
+# include "afs/sysincludes.h"
 #else /* KERNEL */
 # include <roken.h>
 #endif /* KERNEL */
diff --git a/src/rx/rx_null.c b/src/rx/rx_null.c
index 231e7ae482..809fc67b4b 100644
--- a/src/rx/rx_null.c
+++ b/src/rx/rx_null.c
@@ -8,7 +8,7 @@
  */
 
 #include <afsconfig.h>
-#include "afs/param.h"
+#include <afs/param.h>
 
 #ifdef KERNEL
 # ifndef UKERNEL
diff --git a/src/rx/rx_opaque.c b/src/rx/rx_opaque.c
index a1b61d5803..db3e407063 100644
--- a/src/rx/rx_opaque.c
+++ b/src/rx/rx_opaque.c
@@ -27,9 +27,6 @@
 
 #ifndef KERNEL
 # include <roken.h>
-# include <sys/types.h>
-# include <string.h>
-# include <errno.h>
 #else
 # include "afs/sysincludes.h"
 # include "afsincludes.h"
diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index a518bb1528..138ca53515 100644
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -42,25 +42,13 @@
 # endif /* defined(UKERNEL) */
 #else /* KERNEL */
 # include <roken.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <errno.h>
-# include <stdlib.h>
 # include <assert.h>
-# include <string.h>
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 # if defined(AFS_NT40_ENV)
-#  include <winsock2.h>
 #  ifndef EWOULDBLOCK
 #   define EWOULDBLOCK WSAEWOULDBLOCK
 #  endif
 #  include "rx_user.h"
 #  include "rx_xmit_nt.h"
-# else
-#  include <sys/socket.h>
-#  include <netinet/in.h>
 # endif
 # include <lwp.h>
 #endif /* KERNEL */
diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index 9c3edac3c8..87a2c05d38 100644
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -18,29 +18,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif /* KERNEL */
+#include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifndef AFS_NT40_ENV
-# include <sys/socket.h>
-# include <sys/file.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <net/if.h>
-# include <sys/ioctl.h>
-# include <sys/time.h>
-# include <unistd.h>
-# include <assert.h>
-#endif
-#include <sys/stat.h>
+#include <assert.h>
 
 #include "rx.h"
 #include "rx_globals.h"
diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 53121e8af2..61025eeb85 100644
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -53,19 +53,6 @@
 # include "afs/lock.h"
 #else /* KERNEL */
 # include <roken.h>
-# include <sys/types.h>
-# include <string.h>
-# ifdef AFS_NT40_ENV
-#  include <winsock2.h>
-# else /* !AFS_NT40_ENV */
-#  include <sys/socket.h>
-#  include <sys/file.h>
-#  include <netdb.h>
-#  include <netinet/in.h>
-#  include <sys/stat.h>
-#  include <sys/time.h>
-#  include <unistd.h>
-# endif /* !AFS_NT40_ENV */
 #endif /* KERNEL */
 
 #include "rx.h"
diff --git a/src/rx/rx_stats.c b/src/rx/rx_stats.c
index 13935f3683..d6325e1b83 100644
--- a/src/rx/rx_stats.c
+++ b/src/rx/rx_stats.c
@@ -33,7 +33,6 @@
 
 #if !defined(KERNEL)
 #include <roken.h>
-#include <string.h>
 #endif
 
 #ifdef KERNEL
diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index eee07a47a3..ded4722115 100644
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -10,9 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif /* KERNEL */
+#include <roken.h>
 
 #ifndef RXDEBUG
 char rxi_tracename[80] = "\0Tracing not compiled in";
@@ -24,14 +22,6 @@ main(int argc, char **argv)
 }
 #endif
 #else
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <unistd.h>
-#endif
 
 #include "rx.h"
 #include "rx_atomic.h"
diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index e9a836336d..e4b59bba5f 100644
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -14,28 +14,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifndef KERNEL
-# include <roken.h>
-#endif /* KERNEL */
+#include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
 #ifdef AFS_NT40_ENV
 # include <WINNT/syscfg.h>
 #else
-# include <sys/socket.h>
-# include <sys/file.h>
-# include <netdb.h>
-# include <sys/stat.h>
-# include <netinet/in.h>
-# include <sys/time.h>
 # include <net/if.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
 #endif
-#include <fcntl.h>
 #if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV)
 # include <sys/syscall.h>
 #endif
@@ -57,10 +42,6 @@
 #endif
 #endif
 
-#ifndef AFS_NT40_ENV
-# include <sys/time.h>
-#endif
-
 #include "rx.h"
 #include "rx_atomic.h"
 #include "rx_globals.h"
diff --git a/src/rx/xdr.c b/src/rx/xdr.c
index bb088e641d..884627e4b4 100644
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -32,7 +32,6 @@
 
 #ifndef KERNEL
 # include <roken.h>
-# include <string.h>
 #endif
 
 
@@ -53,8 +52,6 @@
 #ifndef AFS_LINUX20_ENV
 #include <sys/systm.h>
 #endif
-#else
-#include <stdio.h>
 #endif
 #include "xdr.h"
 #include "rx.h"
diff --git a/src/rx/xdr_afsuuid.c b/src/rx/xdr_afsuuid.c
index f32c71dd0f..da7855a1fc 100644
--- a/src/rx/xdr_afsuuid.c
+++ b/src/rx/xdr_afsuuid.c
@@ -12,21 +12,16 @@
  */
 
 #include <afsconfig.h>
-#include "afs/param.h"
-
+#include <afs/param.h>
 
 #if defined(KERNEL) && !defined(UKERNEL)
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
-#if 0
-#define bzero(A, C) memset((A), 0, (C))
-#endif
 #else
 #include <sys/param.h>
 #include <sys/systm.h>
 #endif
-#else
-#include <stdio.h>
+#include <roken.h>
 #endif
 #include "xdr.h"
 
diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c
index 8f8ddc9420..14378ebb9c 100644
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -51,17 +51,11 @@
 #include <sys/param.h>
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
-#if 0
-#define bzero(A,C) memset((A), 0, (C))
-#endif
 #else
 #ifndef AFS_DARWIN90_ENV
 #include <sys/systm.h>
 #endif
 #endif /* AFS_LINUX20_ENV */
-#else
-#include <stdio.h>
-#include <string.h>
 #endif
 #include "xdr.h"
 
diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c
index 28db315084..a7301d3646 100644
--- a/src/rx/xdr_arrayn.c
+++ b/src/rx/xdr_arrayn.c
@@ -51,15 +51,11 @@
 #include <sys/param.h>
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
-#if 0
-#define bzero(A,C) memset((A), 0, (C))
-#endif
 #else
 #include <sys/systm.h>
 #endif
 #else
-#include <stdio.h>
-#include <string.h>
+#include <roken.h>
 #endif
 #include "xdr.h"
 
diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c
index 82c5648c85..c30b4e2d95 100644
--- a/src/rx/xdr_int32.c
+++ b/src/rx/xdr_int32.c
@@ -28,11 +28,7 @@
  */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
 
 
 #ifndef	NeXT
@@ -40,7 +36,7 @@
 #if defined(KERNEL) && !defined(UKERNEL)
 #include <sys/param.h>
 #else
-#include <stdio.h>
+#include <roken.h>
 #endif
 #include "xdr.h"
 
diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c
index bf1a571e5e..c1925ed703 100644
--- a/src/rx/xdr_int64.c
+++ b/src/rx/xdr_int64.c
@@ -15,7 +15,7 @@
 #include <sys/systm.h>
 #endif
 #else
-#include <stdio.h>
+#include <roken.h>
 #endif
 #include "xdr.h"
 
diff --git a/src/rx/xdr_len.c b/src/rx/xdr_len.c
index 8e2c4cbd02..b3af0dce25 100644
--- a/src/rx/xdr_len.c
+++ b/src/rx/xdr_len.c
@@ -28,7 +28,7 @@
 #ifdef KERNEL
 # include "afs/sysincludes.h"
 #else
-# include <stdlib.h>
+# include <roken.h>
 #endif
 
 #include "xdr.h"
diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c
index 0dd5daa0cd..f6af534e13 100644
--- a/src/rx/xdr_mem.c
+++ b/src/rx/xdr_mem.c
@@ -43,11 +43,8 @@
 #ifdef KERNEL
 # include "afs/sysincludes.h"
 #else
-# include <string.h>
+# include <roken.h>
 # include <limits.h>
-# ifndef AFS_NT40_ENV
-#  include <netinet/in.h>
-# endif
 #endif
 
 #include "xdr.h"
diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c
index abeb44d6c9..6f14cb7c62 100644
--- a/src/rx/xdr_rec.c
+++ b/src/rx/xdr_rec.c
@@ -46,19 +46,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+#include <roken.h>
 #include "xdr.h"
-#ifndef AFS_NT40_ENV
-#include <sys/time.h>
-#include <netinet/in.h>
-#endif
-
-#include <string.h>
-
 
 /*  * A record is composed of one or more record fragments.
  * A record fragment is a two-byte header followed by zero to
diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 68da60a581..a6e8e0ccf3 100644
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -34,11 +34,6 @@
 # endif /* !UKERNEL */
 #else /* KERNEL */
 # include <roken.h>
-# include <sys/types.h>
-# include <stdio.h>
-# ifndef AFS_NT40_ENV
-#  include <netinet/in.h>
-# endif
 #endif /* KERNEL */
 
 #include "rx.h"