diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index 374c7b29ed..e348f637f7 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -14,32 +14,13 @@ #include #include -#include -#include -#include -#include -#include -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef AFS_NT40_ENV -#include -#else -#include -#include -#endif -#ifdef BOZO_SAVE_CORES -#include -#endif -#include -#include -#include /* signal(), kill(), wait(), etc. */ #include #include #include #include #include + #include "bnode.h" #include "bosprototypes.h" diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 7545b2d97e..5d74868bcc 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -9,30 +9,14 @@ #include #include +#include #include #include -#include -#include -#include -#include -#ifdef AFS_NT40_ENV -#include -#include -#include -#else -#include -#include -#include -#include -#include -#endif /* AFS_NT40_ENV */ -#include -#include /* signal(), kill(), wait(), etc. */ -#include +#include + #include "bnode.h" -#include #include #include #include @@ -40,12 +24,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c index e3795e5368..5aab9de316 100644 --- a/src/bozo/bos_util.c +++ b/src/bozo/bos_util.c @@ -22,20 +22,16 @@ #include #include +#include -#include -#include -#include -#include -#include +#include +#include #include #include #include #include #include -#include -#include int main(int argc, char **argv) diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c index c21d37dbe8..2ec18a6f3f 100644 --- a/src/bozo/bosoprocs.c +++ b/src/bozo/bosoprocs.c @@ -9,37 +9,24 @@ #include #include +#include #include -#include -#include #ifdef AFS_NT40_ENV -#include -#include #include -#else -#include -#include #endif /* AFS_NT40_ENV */ + #include #include #include -#include #include #include -#include -#include -#include -#ifdef HAVE_STDINT_H -# include -#endif #include #include #include #include #include -#include #include "bnode.h" #include "bosint.h" diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c index a964c3846b..5d1eaecbc9 100644 --- a/src/bozo/bosserver.c +++ b/src/bozo/bosserver.c @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -17,51 +18,35 @@ # pragma GCC diagnostic warning "-Wdeprecated-declarations" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_SYS_RESOURCE_H #include #endif + #ifdef AFS_NT40_ENV -#include #include -#include #include -#else -#include -#include -#include #endif /* AFS_NT40_ENV */ -#include + #include #include #include -#include "bosint.h" -#include "bnode.h" -#include "bosprototypes.h" #include #include #include #include #include #include -#include /* signal(), kill(), wait(), etc. */ #include #include + #if defined(AFS_SGI_ENV) #include #endif +#include "bosint.h" +#include "bnode.h" +#include "bosprototypes.h" + #define BOZO_LWP_STACKSIZE 16000 extern struct bnode_ops fsbnode_ops, dafsbnode_ops, ezbnode_ops, cronbnode_ops; diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c index 4f0205bfe7..f4eeab1858 100644 --- a/src/bozo/cronbnodeops.c +++ b/src/bozo/cronbnodeops.c @@ -13,22 +13,16 @@ #include #include -#include -#include -#include -#include #include -#include + #ifdef AFS_NT40_ENV #include #endif -#include -#include - +#include #include #include -#include /* signal(), kill(), wait(), etc. */ + #include "bnode.h" #include "bosprototypes.h" diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c index 0cfd3e74f0..2a8f397e6c 100644 --- a/src/bozo/ezbnodeops.c +++ b/src/bozo/ezbnodeops.c @@ -13,20 +13,13 @@ #include #include -#include -#include -#include #include #include #ifdef AFS_NT40_ENV #include #endif -#include -#include - #include -#include /* signal(), kill(), wait(), etc. */ #include "bnode.h" #include "bosprototypes.h" diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c index e5684a11e3..ed4f02d57f 100644 --- a/src/bozo/fsbnodeops.c +++ b/src/bozo/fsbnodeops.c @@ -13,27 +13,10 @@ #include #include -#include #include #include -#include -#include -#ifdef AFS_SUN5_ENV -#include -#endif -#ifdef AFS_NT40_ENV -#include -#include -#else -#include - -#include -#include - -#endif /* AFS_NT40_ENV */ -#include -#include /* signal(), kill(), wait(), etc. */ #include + #include "bnode.h" #include "bosprototypes.h" diff --git a/src/bozo/smail-notifier.c b/src/bozo/smail-notifier.c index 3c52be3da9..4f8da1f324 100644 --- a/src/bozo/smail-notifier.c +++ b/src/bozo/smail-notifier.c @@ -9,16 +9,10 @@ #include #include - - #include -#include -#include -#include -#include -#include -#include -#include + +#include + #include /*