Include all the libinitd headers from initd.h

Rather than having all the programs include each header they need, just
have initd.h include all the headers that define interfaces in libinitd.

17 files changed, 9 insertions, 25 deletions

diff --git a/lib/initd.h b/lib/initd.h
index 273f289..af5eff6 100644
--- a/lib/initd.h
+++ b/lib/initd.h
@@ -2,8 +2,11 @@
 #define _initd_h_
 
 #include <stdbool.h>
+#include "str.h"
 #include "types.h"
+#include "util.h"
 #include "rdep.h"
+#include "installrm.h"
 
 #ifndef DEF_INITD_DIR
 #define DEF_INITD_DIR "/etc/init.d"
diff --git a/lib/installrm.c b/lib/installrm.c
index dda218a..b803e8b 100644
--- a/lib/installrm.c
+++ b/lib/installrm.c
@@ -13,6 +13,7 @@
 #include <glob.h>
 #include "installrm.h"
 #include "rcint.h"
+#include "initd.h"
 
 static bool installrm_verbose = false;
 static void install_level_links(const initd_list_t *ilp,
diff --git a/lib/installrm.h b/lib/installrm.h
index 75991d8..e8d744a 100644
--- a/lib/installrm.h
+++ b/lib/installrm.h
@@ -2,7 +2,7 @@
 #define _installrm_h_
 
 #include <stdbool.h>
-#include "initd.h"
+#include "types.h"
 
 extern bool initd_installrm_links(const initd_list_t *ilp,
 				const char *dir, initd_sk_t sk);
diff --git a/lib/rdep.c b/lib/rdep.c
index 1c74eac..542f671 100644
--- a/lib/rdep.c
+++ b/lib/rdep.c
@@ -8,6 +8,7 @@
 #include <stdarg.h>
 #include "types.h"
 #include "rdep.h"
+#include "initd.h"
 
 static bool rdep_verbose = false;
 static dep_t *add_all_active(const initd_list_t *pool,
diff --git a/lib/rdep.h b/lib/rdep.h
index a1d8466..d562be4 100644
--- a/lib/rdep.h
+++ b/lib/rdep.h
@@ -2,7 +2,6 @@
 #define _dep_h_
 
 #include <stdbool.h>
-#include "initd.h"
 #include "types.h"
 
 extern initd_list_t *initd_add_recurse_deps(initd_list_t *pool,
diff --git a/src/install_initd.c b/src/install_initd.c
index 9650b75..03b9b2a 100644
--- a/src/install_initd.c
+++ b/src/install_initd.c
@@ -7,9 +7,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
-#include "installrm.h"
 
 #ifndef _GNU_SOURCE
 char *program_invocation_name = NULL;
diff --git a/src/remove_initd.c b/src/remove_initd.c
index 61a31b6..2cdd241 100644
--- a/src/remove_initd.c
+++ b/src/remove_initd.c
@@ -7,9 +7,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
-#include "installrm.h"
 
 #ifndef _GNU_SOURCE
 char *program_invocation_name = NULL;
diff --git a/test/tactive.c b/test/tactive.c
index cc4ac18..1439386 100644
--- a/test/tactive.c
+++ b/test/tactive.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "initd.h"
-#include "str.h"
 
 static void print_actives(const initd_list_t *ilp);
 static void print_rc_string(const initd_t *ip, initd_sk_t sk);
diff --git a/test/tadd-deps1.c b/test/tadd-deps1.c
index 570f345..b11c419 100644
--- a/test/tadd-deps1.c
+++ b/test/tadd-deps1.c
@@ -3,8 +3,6 @@
 #endif
 #include <stdio.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
 
 static void print_sk_list(const initd_list_t *list, initd_sk_t sk);
 
diff --git a/test/tadd-deps2.c b/test/tadd-deps2.c
index 846f385..c5c736d 100644
--- a/test/tadd-deps2.c
+++ b/test/tadd-deps2.c
@@ -3,8 +3,6 @@
 #endif
 #include <stdio.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
 
 static void print_sk_list(const initd_list_t *list, initd_sk_t sk);
 
diff --git a/test/tdep.c b/test/tdep.c
index 02192dc..932d78c 100644
--- a/test/tdep.c
+++ b/test/tdep.c
@@ -3,7 +3,7 @@
 #endif
 #include <stdio.h>
 #include <string.h>
-#include "types.h"
+#include "initd.h"
 
 static void print_dep(dep_t *sa);
 
diff --git a/test/tinstall.c b/test/tinstall.c
index ff661d6..8fd26fa 100644
--- a/test/tinstall.c
+++ b/test/tinstall.c
@@ -3,9 +3,6 @@
 #endif
 #include <stdio.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
-#include "installrm.h"
 
 static void print_sk_list(const initd_list_t *list, initd_sk_t sk);
 
diff --git a/test/tparse.c b/test/tparse.c
index 8d04490..45ac295 100644
--- a/test/tparse.c
+++ b/test/tparse.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "initd.h"
-#include "str.h"
 
 static void print_initd(initd_t *ip);
 static void print_level(initd_rc_t rc);
diff --git a/test/trem-deps.c b/test/trem-deps.c
index a4b79b1..a3d6fa4 100644
--- a/test/trem-deps.c
+++ b/test/trem-deps.c
@@ -3,8 +3,6 @@
 #endif
 #include <stdio.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
 
 static void print_sk_list(const initd_list_t *list, initd_sk_t sk);
 static bool check_scripts_active(const initd_list_t *list, dep_t *scripts);
diff --git a/test/tremove.c b/test/tremove.c
index 6432ebb..ebd595d 100644
--- a/test/tremove.c
+++ b/test/tremove.c
@@ -3,9 +3,6 @@
 #endif
 #include <stdio.h>
 #include "initd.h"
-#include "types.h"
-#include "rdep.h"
-#include "installrm.h"
 
 static void print_sk_list(const initd_list_t *list, initd_sk_t sk);
 
diff --git a/test/tstr.c b/test/tstr.c
index a200b8c..c70cbe5 100644
--- a/test/tstr.c
+++ b/test/tstr.c
@@ -3,7 +3,7 @@
 #endif
 #include <stdio.h>
 #include <string.h>
-#include "str.h"
+#include "initd.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/test/tstrarg.c b/test/tstrarg.c
index 3e03e7b..151d9a2 100644
--- a/test/tstrarg.c
+++ b/test/tstrarg.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <error.h>
 #include <errno.h>
-#include "str.h"
+#include "initd.h"
 
 int main(int argc, char *argv[])
 {