From 4281e46464af4bc0033a93b9618726385f12fa0f Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 22:20:08 +0100
Subject: [PATCH] rxdebug: 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: I47f804e455d0251dc30c5d5be2433f3ee7611fae
Reviewed-on: http://gerrit.openafs.org/4404
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/rxdebug/rxdebug.c     | 25 +------------------------
 src/rxdebug/rxdumptrace.c | 18 +++++-------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c
index b6e1bcf866..29c7f4a5c7 100644
--- a/src/rxdebug/rxdebug.c
+++ b/src/rxdebug/rxdebug.c
@@ -9,36 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <sys/stat.h>
 #include <afs/afsutil.h>
-#include <afs/stds.h>
 #include <afs/cmd.h>
 
-#include <stdio.h>
-
 #include <rx/rx_user.h>
 #include <rx/rx_clock.h>
 #include <rx/rx_queue.h>
diff --git a/src/rxdebug/rxdumptrace.c b/src/rxdebug/rxdumptrace.c
index a20bb08d54..69f95b22ce 100644
--- a/src/rxdebug/rxdumptrace.c
+++ b/src/rxdebug/rxdumptrace.c
@@ -12,14 +12,11 @@
 
 
 #ifdef RXDEBUG
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <unistd.h>
-#endif
+
+#include <roken.h>
+
+#include <afs/afsutil.h>
+
 #include "rx.h"
 #include "rx_globals.h"
 #include "rx_trace.h"
@@ -37,11 +34,6 @@ struct rx_trace {
     afs_uint32 event;
 };
 
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <afs/afsutil.h>
-#endif
-
 int
 main(int argc, char **argv)
 {