diff --git a/plugins/procps.c b/plugins/procps.c
index 2cbcc4a4..a6cd8708 100644
--- a/plugins/procps.c
+++ b/plugins/procps.c
@@ -31,6 +31,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "conf.h"
 #include "log.h"
 
 #ifndef SYSCTL_PATH
diff --git a/plugins/rtc.c b/plugins/rtc.c
index 993fcf92..9058c967 100644
--- a/plugins/rtc.c
+++ b/plugins/rtc.c
@@ -35,6 +35,8 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "private.h"
+#include "conf.h"
 #include "log.h"
 
 /*
diff --git a/plugins/urandom.c b/plugins/urandom.c
index a64bbb02..57668fa0 100644
--- a/plugins/urandom.c
+++ b/plugins/urandom.c
@@ -38,6 +38,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "conf.h"
 #include "log.h"
 
 #ifndef RANDOM_BYTES
diff --git a/plugins/x11-common.c b/plugins/x11-common.c
index cd222074..122c8cae 100644
--- a/plugins/x11-common.c
+++ b/plugins/x11-common.c
@@ -33,6 +33,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "conf.h"
 #include "log.h"
 
 static void setup(void *arg)
diff --git a/src/conf.c b/src/conf.c
index 3906edc4..91926aad 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -50,6 +50,25 @@
 
 #define BOOTSTRAP (runlevel == INIT_LEVEL)
 
+int   runlevel  = INIT_LEVEL;	/* Bootstrap 'S' */
+int   cfglevel  = RUNLEVEL;	/* Fallback if no configured runlevel */
+int   cmdlevel  = 0;		/* runlevel override from cmdline */
+int   prevlevel = -1;
+int   debug     = 0;		/* debug mode from kernel cmdline */
+int   rescue    = 0;		/* rescue mode from kernel cmdline */
+int   single    = 0;		/* single user mode from kernel cmdline */
+int   bootstrap = 1;		/* set while bootstrapping (for TTYs) */
+int   kerndebug = 0;		/* set if /proc/sys/kernel/printk > 7 */
+int   syncsec   = 0;		/* reboot delay */
+int   readiness = SVC_NOTIFY_PID;
+char *finit_conf= NULL;
+char *finit_rcsd= NULL;
+char *fstab     = NULL;
+char *sdown     = NULL;
+char *network   = NULL;
+char *hostname  = NULL;
+char *osheading = NULL;
+
 int logfile_size_max = 200000;	/* 200 kB */
 int logfile_count_max = 5;
 
diff --git a/src/conf.h b/src/conf.h
index 972197b8..c1d99f0b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -27,6 +27,24 @@
 #include "cgroup.h"
 #include "svc.h"
 
+extern int   runlevel;
+extern int   cfglevel;
+extern int   cmdlevel;
+extern int   prevlevel;
+extern int   debug;
+extern int   rescue;
+extern int   single;
+extern int   bootstrap;
+extern int   kerndebug;
+extern int   syncsec;
+extern int   readiness;
+extern char *fstab;
+extern char *sdown;
+extern char *network;
+extern char *hostname;
+extern char *runparts;
+extern char *osheading;
+
 extern int logfile_size_max;
 extern int logfile_count_max;
 
diff --git a/src/finit.c b/src/finit.c
index bed9cb50..b5e88ac9 100644
--- a/src/finit.c
+++ b/src/finit.c
@@ -59,25 +59,6 @@
 #include "util.h"
 #include "utmp-api.h"
 
-int   runlevel  = INIT_LEVEL;	/* Bootstrap 'S' */
-int   cfglevel  = RUNLEVEL;	/* Fallback if no configured runlevel */
-int   cmdlevel  = 0;		/* runlevel override from cmdline */
-int   prevlevel = -1;
-int   debug     = 0;		/* debug mode from kernel cmdline */
-int   rescue    = 0;		/* rescue mode from kernel cmdline */
-int   single    = 0;		/* single user mode from kernel cmdline */
-int   bootstrap = 1;		/* set while bootstrapping (for TTYs) */
-int   kerndebug = 0;		/* set if /proc/sys/kernel/printk > 7 */
-int   syncsec   = 0;		/* reboot delay */
-int   readiness = SVC_NOTIFY_PID;
-char *finit_conf= NULL;
-char *finit_rcsd= NULL;
-char *fstab     = NULL;
-char *sdown     = NULL;
-char *network   = NULL;
-char *hostname  = NULL;
-char *osheading = NULL;
-
 uev_ctx_t *ctx  = NULL;		/* Main loop context */
 svc_t *wdog     = NULL;		/* No watchdog by default */
 
diff --git a/src/finit.h b/src/finit.h
index c0f4c8eb..860dfd91 100644
--- a/src/finit.h
+++ b/src/finit.h
@@ -116,25 +116,6 @@ struct init_request {
 	char	data[368];
 };
 
-extern int    runlevel;
-extern int    cfglevel;
-extern int    cmdlevel;
-extern int    prevlevel;
-extern int    debug;
-extern int    rescue;
-extern int    single;
-extern int    bootstrap;
-extern int    kerndebug;
-extern int    syncsec;
-extern int    readiness;
-extern char  *fstab;
-extern char  *sdown;
-extern char  *network;
-extern char  *hostname;
-extern char  *runparts;
-extern char  *osheading;
-extern uev_ctx_t *ctx;
-
 #endif /* FINIT_H_ */
 
 /**
diff --git a/src/helpers.c b/src/helpers.c
index b942a2cf..ecbcab86 100644
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -40,6 +40,7 @@
 
 #include "finit.h"
 #include "helpers.h"
+#include "conf.h"
 #include "log.h"
 #include "private.h"
 #include "sig.h"
diff --git a/src/private.h b/src/private.h
index f1b6f37b..76850e8f 100644
--- a/src/private.h
+++ b/src/private.h
@@ -41,6 +41,8 @@ extern int   service_interval;
 extern char *fsck_mode;
 extern char *fsck_repair;
 
+extern uev_ctx_t *ctx;
+
 int          api_init         (uev_ctx_t *ctx);
 int          api_exit         (void);
 void         conf_flush_events(void);
diff --git a/src/schedule.c b/src/schedule.c
index c5d463d9..3f24193d 100644
--- a/src/schedule.c
+++ b/src/schedule.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "finit.h"
+#include "private.h"
 #include "log.h"
 #include "schedule.h"
 
diff --git a/src/svc.c b/src/svc.c
index 7b114de5..d9102e1f 100644
--- a/src/svc.c
+++ b/src/svc.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "finit.h"
+#include "conf.h"
 #include "svc.h"
 #include "helpers.h"
 #include "pid.h"