From a1b12b3eab5cb92c797ee5d7d7227c013c01420c Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 22:46:46 +0100
Subject: [PATCH] sys: 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: I66d38e30b43ae636a78a2225271b66756586f5a2
Reviewed-on: http://gerrit.openafs.org/4409
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/sys/afssyscalls.c | 20 +++-----------------
 src/sys/fixit.c       |  7 ++-----
 src/sys/glue.c        |  9 ++-------
 src/sys/icreate.c     |  6 +-----
 src/sys/idec.c        |  8 +++-----
 src/sys/iinc.c        |  9 ++++-----
 src/sys/iopen.c       |  9 +++------
 src/sys/iread.c       |  6 +-----
 src/sys/istat.c       |  6 +-----
 src/sys/iwrite.c      |  6 +-----
 src/sys/pagsh.c       | 32 +++++++++++---------------------
 src/sys/pioctl.c      | 12 +++---------
 src/sys/pioctl_nt.c   |  7 +------
 src/sys/rmtsysc.c     | 22 +++-------------------
 src/sys/rmtsysd.c     | 13 ++-----------
 src/sys/rmtsysnet.c   | 18 ++++--------------
 src/sys/rmtsyss.c     | 14 ++------------
 src/sys/setpag.c      |  9 +++++----
 18 files changed, 52 insertions(+), 161 deletions(-)

diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c
index f947f2f37..cfd076642 100644
--- a/src/sys/afssyscalls.c
+++ b/src/sys/afssyscalls.c
@@ -10,24 +10,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <signal.h>
-#include <sys/errno.h>
 #include <afs/afs_args.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)
-#include <unistd.h>
-#else
-#include <stdio.h>
-#endif
-#ifdef AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
+
 #ifdef AFS_SGI_XFS_IOPS_ENV
-#include "xfsattrs.h"
+# include "xfsattrs.h"
 #endif
-#include <errno.h>
 #include "afssyscalls.h"
 
 #ifdef AFS_DEBUG_IOPS
@@ -49,9 +38,6 @@ static void check_iops(int index, char *fun, char *file, int line);
 
 #else
 #if defined(AFS_SGI_ENV)
-#ifdef AFS_SGI61_ENV
-#include <sys/types.h>
-#endif /* AFS_SGI61_ENV */
 
 #pragma weak xicreate = icreate
 #pragma weak xiinc = iinc
diff --git a/src/sys/fixit.c b/src/sys/fixit.c
index b495112ce..56b6e3e4e 100644
--- a/src/sys/fixit.c
+++ b/src/sys/fixit.c
@@ -32,18 +32,15 @@ to the free list when the files are removed from lost+found
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/file.h>
-#include <dirent.h>
-#include <sys/stat.h>
 #ifdef AFS_HPUX_ENV
 #include <sys/mknod.h>
 #endif
+
 #include <afs/afs_args.h>
 #include <afs/afs.h>
 #include <afs/afssyscalls.h>
-#include <errno.h>
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/sys/glue.c b/src/sys/glue.c
index dfcc84a6e..ff9ad681a 100644
--- a/src/sys/glue.c
+++ b/src/sys/glue.c
@@ -14,15 +14,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <afs/afs_args.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <stdio.h>
-#ifdef AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
+
 #include "afssyscalls.h"
 
 #ifdef AFS_LINUX20_ENV
diff --git a/src/sys/icreate.c b/src/sys/icreate.c
index 455c1612e..092443656 100644
--- a/src/sys/icreate.c
+++ b/src/sys/icreate.c
@@ -6,14 +6,10 @@
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 
 #include "AFS_component_version_number.c"
diff --git a/src/sys/idec.c b/src/sys/idec.c
index 48c6b79fe..3c03b4354 100644
--- a/src/sys/idec.c
+++ b/src/sys/idec.c
@@ -10,16 +10,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <afs/afssyscalls.h>
 #ifdef AFS_HPUX_ENV
 #include <sys/mknod.h>
 #endif
 
+#include <afs/afssyscalls.h>
+
 main(argc, argv)
      char **argv;
 {
diff --git a/src/sys/iinc.c b/src/sys/iinc.c
index 38006d087..466c21fae 100644
--- a/src/sys/iinc.c
+++ b/src/sys/iinc.c
@@ -10,16 +10,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <afs/afssyscalls.h>
 #ifdef AFS_HPUX_ENV
 #include <sys/mknod.h>
 #endif
 
+#include <afs/afssyscalls.h>
+
+
 main(argc, argv)
      char **argv;
 {
diff --git a/src/sys/iopen.c b/src/sys/iopen.c
index ce943677c..7c1a9614d 100644
--- a/src/sys/iopen.c
+++ b/src/sys/iopen.c
@@ -10,17 +10,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "afssyscalls.h"
 #ifdef AFS_HPUX_ENV
 #include <sys/mknod.h>
 #endif
 
+#include "afssyscalls.h"
+
 #include "AFS_component_version_number.c"
 
 void
diff --git a/src/sys/iread.c b/src/sys/iread.c
index c9dc29d54..4371c5bd1 100644
--- a/src/sys/iread.c
+++ b/src/sys/iread.c
@@ -10,11 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
+#include <roken.h>
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/sys/istat.c b/src/sys/istat.c
index 5180c250e..ff951dd32 100644
--- a/src/sys/istat.c
+++ b/src/sys/istat.c
@@ -10,11 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
+#include <roken.h>
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/sys/iwrite.c b/src/sys/iwrite.c
index 0aaa1b639..daa629430 100644
--- a/src/sys/iwrite.c
+++ b/src/sys/iwrite.c
@@ -10,11 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
+#include <roken.h>
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c
index 20a515ec1..2083bc4a7 100644
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -10,33 +10,23 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#ifdef AFS_AIX51_ENV
-#include <sys/cred.h>
-#ifdef HAVE_SYS_PAG_H
-#include <sys/pag.h>
+# ifdef AFS_AIX51_ENV
+#  include <sys/cred.h>
+#  ifdef HAVE_SYS_PAG_H
+#   include <sys/pag.h>
+#  endif
+# endif
 #endif
-#include <errno.h>
-#endif
-#endif
-#include <stdio.h>
-#include <stdlib.h>
+
 #include <limits.h>
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <pwd.h>
-#ifdef AFS_KERBEROS_ENV
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-#include "rx/rx.h"
-#include "sys_prototypes.h"
+#include <rx/rx.h>
 #include <afs/auth.h>
 
+#include "sys_prototypes.h"
+
 #include "AFS_component_version_number.c"
 
 int
diff --git a/src/sys/pioctl.c b/src/sys/pioctl.c
index 3c0d8af38..98dd560b1 100644
--- a/src/sys/pioctl.c
+++ b/src/sys/pioctl.c
@@ -16,17 +16,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <signal.h>
+
+#include <roken.h>
 
 #include <afs/afs_args.h>
-#if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)
-#include <unistd.h>
-#else
-#include <stdio.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
+
 #include "afssyscalls.h"
 #include "sys_prototypes.h"
 
diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c
index 5e60602c6..e5b3795a2 100644
--- a/src/sys/pioctl_nt.c
+++ b/src/sys/pioctl_nt.c
@@ -9,16 +9,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
 #include <windows.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
 #include <winioctl.h>
 #include <winsock2.h>
 #define SECURITY_WIN32
diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c
index bac6f7ea5..d5f029287 100644
--- a/src/sys/rmtsysc.c
+++ b/src/sys/rmtsysc.c
@@ -15,29 +15,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <errno.h>
 #include <limits.h>
-#include <sys/types.h>
+
 #include <afs/vice.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/file.h>
-#endif
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
 #include <rx/xdr.h>
+
 #include "rmtsys.h"
 #include "sys_prototypes.h"
 
diff --git a/src/sys/rmtsysd.c b/src/sys/rmtsysd.c
index 5f37d59e9..78ff5e491 100644
--- a/src/sys/rmtsysd.c
+++ b/src/sys/rmtsysd.c
@@ -16,20 +16,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <sys/types.h>
-#include <sys/ioctl.h>
 #include <afs/vice.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <stdio.h>
 #include <rx/xdr.h>
+
 #include "rmtsys.h"
 #include "sys_prototypes.h"
 
diff --git a/src/sys/rmtsysnet.c b/src/sys/rmtsysnet.c
index df350d21b..04d3f681b 100644
--- a/src/sys/rmtsysnet.c
+++ b/src/sys/rmtsysnet.c
@@ -9,25 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <afs/afs_consts.h>
 
-#include <errno.h>
-#include <sys/param.h>
-#include <sys/types.h>
+#include <roken.h>
+
+#include <afs/afs_consts.h>
 #include <afs/vice.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/file.h>
-#endif
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
 #include <afs/afsint.h>
 #include <afs/venus.h>
 #include <rx/xdr.h>
+
 #include "rmtsys.h"
 
 
diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c
index 9cc9d332b..655b0e592 100644
--- a/src/sys/rmtsyss.c
+++ b/src/sys/rmtsyss.c
@@ -15,21 +15,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
 #include <afs/vice.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <errno.h>
 #include <rx/xdr.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <stdarg.h>
+
 /*#include <afs/cellconfig.h>*/
 #include "rmtsys.h"
 #include "sys_prototypes.h"
diff --git a/src/sys/setpag.c b/src/sys/setpag.c
index b8e4d20db..3c90279ee 100644
--- a/src/sys/setpag.c
+++ b/src/sys/setpag.c
@@ -15,14 +15,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <afs/afs_args.h>
-#include <afs/sys_prototypes.h>
-#include <unistd.h>
-#include <stdio.h>
 #if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV)
 # include <sys/syscall.h>
 #endif
+
+#include <afs/afs_args.h>
+#include <afs/sys_prototypes.h>
+
 #include "afssyscalls.h"
 
 #ifdef AFS_AIX32_ENV
-- 
2.39.5