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>

diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c
index f947f2f37520c23f7daa5a071b4119db7fc4c353..cfd07664254ea99d7bf5574f3b113466d1af58a2 100644 (file)
--- 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 b495112ce48d519ef8c117dd01af0791e66e9d0d..56b6e3e4ed77faa1281d0d01f67850a46f968e44 100644 (file)
--- 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 dfcc84a6eaf370e7f36a01707164ef6c272794a1..ff9ad681aa5a14ea5169490fbc465d59769b0615 100644 (file)
--- 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 455c1612e1ee8a45e16c1d5a27f74c963a473ddd..092443656b0e402b0a7fcf5fc41f7ec51805bd6f 100644 (file)
--- 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 48c6b79feefd4f5fb49fae3bceaec04ba7e1ebb8..3c03b4354d4f21fd0ffeded5e19c07c0231849f5 100644 (file)
--- 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 38006d087191b3a7d097277bfa0357e34c62e880..466c21faec6cc57e7e9bc63ca4988edef7c5a376 100644 (file)
--- 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 ce943677ce2369909783e8c4dd5780ecc2d01fb1..7c1a9614d675d842edc29a10cce6ecacc1621da6 100644 (file)
--- 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 c9dc29d54191318e27ef462b9c347d25cb2233ee..4371c5bd18b6072dbb255c686ff888caa4540ce3 100644 (file)
--- 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 5180c250ed72b2e45732b6c58fb038201e2467fd..ff951dd32b52aa9a22aa271242cb42453f52e5ea 100644 (file)
--- 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 0aaa1b6397aa8b95ecde6b385c9afad7adec1408..daa629430f36d8291f3c3393ff6dc6895f1bab0e 100644 (file)
--- 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 20a515ec1e109be74a4fc4d8f8a053c28f656a23..2083bc4a7a4b0365f70607366232d65bb8b309c5 100644 (file)
--- 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 3c0d8af3877a0c2a521c5abdf7be849ab2545ee4..98dd560b1ecbba2375396fea6569f2d73bec5444 100644 (file)
--- 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 5e60602c6ac2c18beb4fde0c0d58fc10557daa0b..e5b3795a2d92f75ea456fd068838cf24f14ac48a 100644 (file)
--- 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 bac6f7ea59216d4f1cefb1e7fd4ceebce105b1a8..d5f029287edad6352dd02a23d2d03890b0b5e50c 100644 (file)
--- 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 5f37d59e93d80e47c9f1cb6e16ab25db577278d1..78ff5e491acd02d0c8c9530e162fd3b4f7959c56 100644 (file)
--- 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 df350d21b7a4a92b0051b722eb973f47a64565af..04d3f681be5d2f8f5c5c64680e31fcddcf4a808f 100644 (file)
--- 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 9cc9d332bd247ef81455e2b229bc0111e1c19973..655b0e5929a6f28eb30b6ce5899ef7948204d4db 100644 (file)
--- 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 b8e4d20db266f715f4536aa1ac1765f7c1ac7c22..3c90279ee7abd7b43881995b122adaa160ed4068 100644 (file)
--- 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