rx: Tidy header includes

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

Change-Id: I7bb08d7ec7a75b485f7f619fd4d8179d4c7349f0
Reviewed-on: http://gerrit.openafs.org/4403
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 6c80715440ba03ef8a5624d44283b0523eee5b60..f7f6d7955c9821701524fce72daf5c6140cd0a77 100644 (file)
--- 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 38e726bcfc79a840d370543a177b60cfc4e2419a..057e1c4b4a9b1706ea8610e664d28f822b144b34 100644 (file)
--- 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 1a371e76f2c1f7be43a9b77877afd0d04550107c..72bc76e0b03d6773d7cd492c24afe97eb19b50e1 100644 (file)
--- 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 670cda127f987c2f0d90a64d48c837740f05565f..1202f583793fc25244847d21572b246a69ea0907 100644 (file)
--- 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 f822419a107f41cf3af61d038306f9184c877c2a..b520f1657fe85dd05f801692d0e3779023797954 100644 (file)
--- 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 55f3e35bdceda29533d8fcefb7a0ceeee739e090..0c7d3aed983c15144e8c1393be252b1496b57bf1 100644 (file)
--- 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 bc029a8df1336662aefb5ee5c783ae7f577959d6..cfaaa04194e5c1a76a41d6cc6067a450de53cd35 100644 (file)
--- 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 514d97be59c40c4bda5401ebcc6b1f79c2f6d1e8..ae9c694d195b4ba6ebe493f2e685bb0029d23b64 100644 (file)
--- 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 b04429f964ad8e0d1708dc73534d9013d0564d69..a7c97596b26571beb35dea75dd60411f92562504 100644 (file)
--- 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 8ad021bf887b7bbba32a4009b9195716461c0a09..1de085731221aee9a1d6af53c314120778f129bc 100644 (file)
--- 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 1d39f4ebba2ec35e5b716f87bf3b8d141795b392..c01b85708253b581bdda384d775144da6fe0d241 100644 (file)
--- 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 c6af54a6d54f50d96c944086dcaa095d2ebe68fc..cefa0a28a8e3c7d7121576373a03988bae7d3aa6 100644 (file)
--- 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 231e7ae48289cdbe03ffe26d600b3a644f0a0ad8..809fc67b4bc05e3f5bbd114c2edb0f4f69641530 100644 (file)
--- 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 a1b61d5803ab75b5742d5a3a021615edcf5ccc55..db3e4070638553e1f629abd4da2a7ca028093227 100644 (file)
--- 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 a518bb1528a50df99035576d1ba7aff62c3793f3..138ca53515083b58829f3fb1e0c09c7d77f844d7 100644 (file)
--- 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 9c3edac3c82da5521950855ce0f2e50bfd2c0aec..87a2c05d38940ced0f176545ab8f6c1a93b6602c 100644 (file)
--- 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 <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 <roken.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 53121e8af231845b94d30deaea047f7c10e7f4c0..61025eeb8534de26798ee503f82fadbafdbf2787 100644 (file)
--- 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 13935f3683d1367e738b3ca5964866ce4eb8f986..d6325e1b83341eeca0d5c726dcc8a95e3256a334 100644 (file)
--- 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 eee07a47a3d668a1113f69e046e69417abcc8f9e..ded4722115c5460444eff3cf24c45e9298b1a51f 100644 (file)
--- 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 e9a836336d052fcab27457ff55912cfcb038bd09..e4b59bba5f8c68c5bcc965c146c3b2b60a2f1403 100644 (file)
--- 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 <sys/types.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
+#include <roken.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 bb088e641dd807444e0f162da6a90ee814643fe0..884627e4b4665f59376538b7e25232ad60f6693c 100644 (file)
--- 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 f32c71dd0f4eda624213a08e22342a691f1b39ae..da7855a1fc24f5ebd1327aa56cbd1295336cd945 100644 (file)
--- 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 8f8ddc94204f83763f799902fcd28561786fcdc9..14378ebb9ca787b9281cc99d6ceb1f82f7639014 100644 (file)
--- 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 28db315084f4292fb4a15a5c73815b16aee972eb..a7301d36467cb380836a0e3778eac400de0a0acc 100644 (file)
--- 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 82c5648c85840887243f7248a88b0d1feebd0510..c30b4e2d95b2af5cc012513a9bb4a910814878bd 100644 (file)
--- 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 bf1a571e5e2879c4b29484d6da89da1e529b44ea..c1925ed703d7e53e3e5f7f3e19d11d2adc6e8e8c 100644 (file)
--- 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 8e2c4cbd028a271110743acc058f4c7fae35a23c..b3af0dce2512872ef36a2005dcdd4c1063742e8e 100644 (file)
--- 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 0dd5daa0cdada639ea7315ee0eccf5d0e0678d24..f6af534e13f71143bcbfafa08e74f46d254011d2 100644 (file)
--- 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 abeb44d6c960e8afcc6f2db4b61df9a7b8bc30b4..6f14cb7c62cb6fa594eec7c7a4f9dc137aa20fb7 100644 (file)
--- 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 68da60a581a240f08813028e74f9d6edea7700d2..a6e8e0ccf330c269e975a32f3917fb53772de985 100644 (file)
--- 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"