From 24f229af511a45b88f98e272b00ca08a467a6f69 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 22:23:20 +0100
Subject: [PATCH] rxgen: Tidy up header includes

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

Change-Id: Idd399da7de85541fb84da55246168788a2ef88da
Reviewed-on: http://gerrit.openafs.org/4405
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/rxgen/rpc_clntout.c |  3 +--
 src/rxgen/rpc_cout.c    |  4 +---
 src/rxgen/rpc_hout.c    | 10 +---------
 src/rxgen/rpc_main.c    | 14 ++------------
 src/rxgen/rpc_parse.c   |  5 ++---
 src/rxgen/rpc_scan.c    |  4 +---
 src/rxgen/rpc_svcout.c  |  3 +--
 src/rxgen/rpc_util.c    |  9 +--------
 8 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/src/rxgen/rpc_clntout.c b/src/rxgen/rpc_clntout.c
index 30b9e6e99..c063b2945 100644
--- a/src/rxgen/rpc_clntout.c
+++ b/src/rxgen/rpc_clntout.c
@@ -35,9 +35,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index 2b874a584..3d8f47578 100644
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -35,10 +35,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c
index ac73b2c03..9df8cf7f8 100644
--- a/src/rxgen/rpc_hout.c
+++ b/src/rxgen/rpc_hout.c
@@ -35,18 +35,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 0825d346a..3acc734c8 100644
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -36,21 +36,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
-#include <string.h>
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 782477db6..f410830dd 100644
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -35,11 +35,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
+
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index 5526d709d..c406be574 100644
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -37,11 +37,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
-#include <string.h>
 
 #include "rpc_scan.h"
 #include "rpc_parse.h"
diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index 42eaf39a5..953e06ed6 100644
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -35,9 +35,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 2d5c1a1c1..d79813dfb 100644
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -35,15 +35,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
-- 
2.39.5