headers.h: consolidate all random system includes into one file

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

19 files changed, 18 insertions, 107 deletions

diff --git a/libsbutil/get_sandbox_debug_log.c b/libsbutil/get_sandbox_debug_log.c
index 2f7442a..6a1b4fa 100644
--- a/libsbutil/get_sandbox_debug_log.c
+++ b/libsbutil/get_sandbox_debug_log.c
@@ -10,13 +10,7 @@
  *   Copyright (C) 2002 Brad House <brad@mainstreetsoftworks.com>
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 void get_sandbox_debug_log(char *path)
diff --git a/libsbutil/get_sandbox_lib.c b/libsbutil/get_sandbox_lib.c
index 375282c..762ed1d 100644
--- a/libsbutil/get_sandbox_lib.c
+++ b/libsbutil/get_sandbox_lib.c
@@ -10,9 +10,7 @@
  *   Copyright (C) 2002 Brad House <brad@mainstreetsoftworks.com>
  */
 
-#include <errno.h>
-#include <stdio.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 void get_sandbox_lib(char *path)
diff --git a/libsbutil/get_sandbox_log.c b/libsbutil/get_sandbox_log.c
index 77f1208..2811737 100644
--- a/libsbutil/get_sandbox_log.c
+++ b/libsbutil/get_sandbox_log.c
@@ -10,13 +10,7 @@
  *   Copyright (C) 2002 Brad House <brad@mainstreetsoftworks.com>
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 void get_sandbox_log(char *path)
diff --git a/libsbutil/get_sandbox_rc.c b/libsbutil/get_sandbox_rc.c
index cdbdb73..ba383e3 100644
--- a/libsbutil/get_sandbox_rc.c
+++ b/libsbutil/get_sandbox_rc.c
@@ -10,9 +10,7 @@
  *   Copyright (C) 2002 Brad House <brad@mainstreetsoftworks.com>
  */
 
-#include <errno.h>
-#include <stdio.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 void get_sandbox_rc(char *path)
diff --git a/libsbutil/get_tmp_dir.c b/libsbutil/get_tmp_dir.c
index 75ee40f..0421492 100644
--- a/libsbutil/get_tmp_dir.c
+++ b/libsbutil/get_tmp_dir.c
@@ -10,10 +10,7 @@
  *   Copyright (C) 2002 Brad House <brad@mainstreetsoftworks.com>
  */
 
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 int get_tmp_dir(char *path)
diff --git a/libsbutil/include/rcscripts/rcutil.h b/libsbutil/include/rcscripts/rcutil.h
index 516d41e..c33f60e 100644
--- a/libsbutil/include/rcscripts/rcutil.h
+++ b/libsbutil/include/rcscripts/rcutil.h
@@ -10,13 +10,6 @@
 #ifndef __RCUTIL_H__
 #define __RCUTIL_H__
 
-#include <stddef.h>
-#include <sys/types.h>
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "rcscripts/rctypes.h"
 #include "rcscripts/util/debug.h"
 #include "rcscripts/util/string.h"
diff --git a/libsbutil/is_env_off.c b/libsbutil/is_env_off.c
index e8cd977..3eb56f4 100644
--- a/libsbutil/is_env_off.c
+++ b/libsbutil/is_env_off.c
@@ -7,10 +7,7 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 bool is_env_off (const char *env)
diff --git a/libsbutil/is_env_on.c b/libsbutil/is_env_on.c
index 9736779..4d68b3d 100644
--- a/libsbutil/is_env_on.c
+++ b/libsbutil/is_env_on.c
@@ -7,10 +7,7 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
 bool is_env_on (const char *env)
diff --git a/libsbutil/sb_close.c b/libsbutil/sb_close.c
index 3d9c023..003f9ad 100644
--- a/libsbutil/sb_close.c
+++ b/libsbutil/sb_close.c
@@ -7,15 +7,9 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
-
 /* General purpose function to _reliably_ close a file
  *
  * Returns 0 if successful or negative number on error (and errno set)
diff --git a/libsbutil/sb_open.c b/libsbutil/sb_open.c
index 2d9c403..2e405c6 100644
--- a/libsbutil/sb_open.c
+++ b/libsbutil/sb_open.c
@@ -7,15 +7,9 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
-
 static int (*sbio_open)(const char *, int, mode_t) = (void *)open;
 
 
diff --git a/libsbutil/sb_read.c b/libsbutil/sb_read.c
index 43fe3c7..5374576 100644
--- a/libsbutil/sb_read.c
+++ b/libsbutil/sb_read.c
@@ -7,15 +7,9 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
-
 /* General purpose function to _reliably_ read from a file.
  *
  * Returns total read bytes or -1 on error.
diff --git a/libsbutil/sb_write.c b/libsbutil/sb_write.c
index 32f52f1..3979c8c 100644
--- a/libsbutil/sb_write.c
+++ b/libsbutil/sb_write.c
@@ -7,15 +7,9 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "sbutil.h"
 
-
 /* General purpose function to _reliably_ write to a file
  *
  * If returned value is less than count, there was a fatal
diff --git a/libsbutil/sbutil.h b/libsbutil/sbutil.h
index 068f77b..6195b35 100644
--- a/libsbutil/sbutil.h
+++ b/libsbutil/sbutil.h
@@ -13,10 +13,7 @@
 #ifndef __SBUTIL_H__
 #define __SBUTIL_H__
 
-#include <limits.h>
-
-#include "config.h"
-#include "localdecls.h"
+#include "headers.h"
 #include "include/rcscripts/rcutil.h"
 
 #define SANDBOX_CONF_FILE      ETCDIR "/sandbox.conf"
diff --git a/libsbutil/src/config.c b/libsbutil/src/config.c
index 3f4e6e1..664ec2a 100644
--- a/libsbutil/src/config.c
+++ b/libsbutil/src/config.c
@@ -8,10 +8,7 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 /* This handles simple 'entry="bar"' type variables.  If it is more complex
diff --git a/libsbutil/src/debug.c b/libsbutil/src/debug.c
index 1d84b74..26f926a 100644
--- a/libsbutil/src/debug.c
+++ b/libsbutil/src/debug.c
@@ -8,14 +8,7 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 volatile static bool debug_enabled = TRUE;
diff --git a/libsbutil/src/dynbuf.c b/libsbutil/src/dynbuf.c
index 16bbdcc..c9186a7 100644
--- a/libsbutil/src/dynbuf.c
+++ b/libsbutil/src/dynbuf.c
@@ -8,12 +8,7 @@
  * Licensed under the GPL-2
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 #define DYNAMIC_BUFFER_SIZE (sizeof (char) * 2 * 1024)
diff --git a/libsbutil/src/file.c b/libsbutil/src/file.c
index c94cae1..5956406 100644
--- a/libsbutil/src/file.c
+++ b/libsbutil/src/file.c
@@ -8,16 +8,7 @@
  * Licensed under the GPL-2
  */
 
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 bool
diff --git a/libsbutil/src/simple-regex.c b/libsbutil/src/simple-regex.c
index 0e0020b..61eff6d 100644
--- a/libsbutil/src/simple-regex.c
+++ b/libsbutil/src/simple-regex.c
@@ -49,11 +49,7 @@
  *
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 /* Macro to check if a regex_data_t pointer is valid */
diff --git a/libsbutil/src/string.c b/libsbutil/src/string.c
index 3e23417..4ebb61c 100644
--- a/libsbutil/src/string.c
+++ b/libsbutil/src/string.c
@@ -8,9 +8,7 @@
  * Licensed under the GPL-2
  */
 
-#include <string.h>
-#include <stdlib.h>
-
+#include "headers.h"
 #include "rcscripts/rcutil.h"
 
 char *