diff --git a/api.c b/api.c
index e1f1dd63..3d57b910 100644
--- a/api.c
+++ b/api.c
@@ -29,6 +29,8 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <lite/lite.h>
+#include <uev/uev.h>
 
 #include "config.h"
 #include "finit.h"
@@ -39,9 +41,6 @@
 #include "sig.h"
 #include "service.h"
 
-#include "lite/lite.h"
-#include "uev/uev.h"
-
 uev_t api_watcher;
 
 /* Allowed characters in job/id/name */
diff --git a/client.c b/client.c
index deb372de..cae16c49 100644
--- a/client.c
+++ b/client.c
@@ -27,9 +27,9 @@
 #include <ctype.h>
 #include <getopt.h>
 #include <stdio.h>
+#include <lite/lite.h>
 
 #include "finit.h"
-#include "lite/lite.h"
 
 static int do_send(int cmd, int runlevel)
 {
diff --git a/conf.c b/conf.c
index ac5aa4c9..400ff70a 100644
--- a/conf.c
+++ b/conf.c
@@ -26,14 +26,13 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <string.h>
-
 #include <sys/resource.h>
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "cond.h"
 #include "service.h"
 #include "tty.h"
-#include "lite/lite.h"
 #include "helpers.h"
 
 #define MATCH_CMD(l, c, x) \
diff --git a/exec.c b/exec.c
index 4f53f365..531d0527 100644
--- a/exec.c
+++ b/exec.c
@@ -37,11 +37,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "sig.h"
 #include "helpers.h"
-#include "lite/lite.h"
 
 #define NUM_ARGS    16
 
diff --git a/finit.c b/finit.c
index c638cd4b..c5ca858f 100644
--- a/finit.c
+++ b/finit.c
@@ -28,6 +28,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <sys/stat.h>		/* umask(), mkdir() */
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "conf.h"
@@ -37,7 +38,6 @@
 #include "service.h"
 #include "sig.h"
 #include "tty.h"
-#include "lite/lite.h"
 #include "inetd.h"
 #include "sm.h"
 
diff --git a/helpers.c b/helpers.c
index 37c9bf63..d2c04a6a 100644
--- a/helpers.c
+++ b/helpers.c
@@ -33,11 +33,11 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <utmp.h>
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "helpers.h"
 #include "private.h"
-#include "lite/lite.h"
 
 static int encode(int lvl)
 {
diff --git a/inetd.c b/inetd.c
index 7c200e59..516217e8 100755
--- a/inetd.c
+++ b/inetd.c
@@ -25,9 +25,8 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-
-#include "uev/uev.h"
-#include "lite/lite.h"
+#include <uev/uev.h>
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "inetd.h"
diff --git a/inetd.h b/inetd.h
index 3ca50022..fbaeddb5 100644
--- a/inetd.h
+++ b/inetd.h
@@ -26,9 +26,9 @@
 
 #include <netdb.h>
 #include <net/if.h>
+#include <uev/uev.h>
 
 #include "queue.h"
-#include "uev/uev.h"
 
 typedef struct svc svc_t;
 
diff --git a/initctl.c b/initctl.c
index 8fd864e6..196ac950 100644
--- a/initctl.c
+++ b/initctl.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <lite/lite.h>
 
 #include "config.h"
 #include "finit.h"
@@ -33,8 +34,6 @@
 #include "helpers.h"
 #include "service.h"
 
-#include "lite/lite.h"
-
 typedef struct {
 	char  *cmd;
 	int  (*cb)(char *arg);
diff --git a/pid.c b/pid.c
index 16b45bb4..8dc5ef7c 100644
--- a/pid.c
+++ b/pid.c
@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <lite/lite.h>
 
 #include "helpers.h"
-#include "lite/lite.h"
 
 
 /**
diff --git a/plugin.c b/plugin.c
index 11a37f1e..8e46abd3 100644
--- a/plugin.c
+++ b/plugin.c
@@ -26,6 +26,7 @@
 #include <dirent.h>		/* readdir() et al */
 #include <poll.h>
 #include <string.h>
+#include <lite/lite.h>
 
 #include "config.h"
 #include "finit.h"
@@ -33,7 +34,6 @@
 #include "helpers.h"
 #include "plugin.h"
 #include "queue.h"		/* BSD sys/queue.h API */
-#include "lite/lite.h"
 
 #define is_io_plugin(p) ((p)->io.cb && (p)->io.fd >= 0)
 
diff --git a/plugin.h b/plugin.h
index 05e07210..ce2c6ba0 100644
--- a/plugin.h
+++ b/plugin.h
@@ -24,9 +24,10 @@
 #ifndef FINIT_PLUGIN_H_
 #define FINIT_PLUGIN_H_
 
+#include <uev/uev.h>
+
 #include "queue.h"		/* BSD sys/queue.h API */
 #include "svc.h"
-#include "uev/uev.h"
 
 #define PLUGIN_DEP_MAX  10
 #define PLUGIN_IO_READ  UEV_READ
diff --git a/plugins/alsa-utils.c b/plugins/alsa-utils.c
index ee26b49b..db3170dd 100644
--- a/plugins/alsa-utils.c
+++ b/plugins/alsa-utils.c
@@ -21,10 +21,10 @@
  * THE SOFTWARE.
  */
 
+#include <lite/lite.h>
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void save(void *UNUSED(arg))
 {
diff --git a/plugins/bootmisc.c b/plugins/bootmisc.c
index 37bc862f..31cfed69 100644
--- a/plugins/bootmisc.c
+++ b/plugins/bootmisc.c
@@ -23,12 +23,12 @@
 
 #include <string.h>
 #include <utmp.h>
+#include <lite/lite.h>
 
 #include "../config.h"
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 /*
  * Setup standard FHS 2.3 structure in /var, and write runlevel to UTMP
diff --git a/plugins/dbus.c b/plugins/dbus.c
index 60ecf271..fb18401d 100644
--- a/plugins/dbus.c
+++ b/plugins/dbus.c
@@ -22,12 +22,12 @@
  */
 
 #include <sys/types.h>
+#include <lite/lite.h>
 
 #include "../finit.h"
 #include "../config.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void setup(void *UNUSED(arg))
 {
diff --git a/plugins/hwclock.c b/plugins/hwclock.c
index 75998167..75a93a32 100644
--- a/plugins/hwclock.c
+++ b/plugins/hwclock.c
@@ -21,10 +21,11 @@
  * THE SOFTWARE.
  */
 
+#include <lite/lite.h>
+
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void save(void *UNUSED(arg))
 {
diff --git a/plugins/initctl.c b/plugins/initctl.c
index 3b03f5a2..b275b3c5 100644
--- a/plugins/initctl.c
+++ b/plugins/initctl.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <unistd.h>		/* read() */
 #include <sys/stat.h>
+#include <lite/lite.h>
 
 #include "../finit.h"
 #include "../conf.h"
@@ -37,7 +38,6 @@
 #include "../plugin.h"
 #include "../sig.h"
 #include "../service.h"
-#include "lite/lite.h"
 
 static void parse(void *arg, int fd, int events);
 
diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index 1d027e49..bf6ae5d1 100644
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -21,10 +21,11 @@
  * THE SOFTWARE.
  */
 
+#include <lite/lite.h>
+
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void setup(void *UNUSED(arg))
 {
diff --git a/plugins/tty.c b/plugins/tty.c
index 6aa06152..dc65d809 100644
--- a/plugins/tty.c
+++ b/plugins/tty.c
@@ -27,12 +27,12 @@
 #include <unistd.h>		/* read() */
 #include <sys/inotify.h>
 #include <sys/stat.h>
+#include <lite/lite.h>
 
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
 #include "../tty.h"
-#include "lite/lite.h"
 
 static void watcher(void *arg, int fd, int events);
 
diff --git a/plugins/urandom.c b/plugins/urandom.c
index 5790cda3..149005c1 100644
--- a/plugins/urandom.c
+++ b/plugins/urandom.c
@@ -25,12 +25,12 @@
 #include <sys/stat.h>
 #include <sys/time.h>		/* gettimeofday() */
 #include <sys/types.h>
+#include <lite/lite.h>
 
 #include "../config.h"
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void setup(void *UNUSED(arg))
 {
diff --git a/plugins/x11-common.c b/plugins/x11-common.c
index ff8a8826..6dbbeca7 100644
--- a/plugins/x11-common.c
+++ b/plugins/x11-common.c
@@ -24,11 +24,11 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <lite/lite.h>
 
 #include "../finit.h"
 #include "../helpers.h"
 #include "../plugin.h"
-#include "lite/lite.h"
 
 static void setup(void *UNUSED(arg))
 {
diff --git a/service.c b/service.c
index e17f6267..a5137d91 100755
--- a/service.c
+++ b/service.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <net/if.h>
-#include "lite/lite.h"
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "conf.h"
diff --git a/sig.c b/sig.c
index c108dacf..4934eb0a 100644
--- a/sig.c
+++ b/sig.c
@@ -42,6 +42,7 @@
 #include <string.h>		/* strerror() */
 #include <sys/reboot.h>
 #include <sys/wait.h>
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "conf.h"
@@ -51,7 +52,6 @@
 #include "private.h"
 #include "sig.h"
 #include "service.h"
-#include "lite/lite.h"
 
 static int   stopped = 0;
 static uev_t sighup_watcher, sigint_watcher, sigpwr_watcher;
diff --git a/sig.h b/sig.h
index f0af079d..22a0a2bd 100644
--- a/sig.h
+++ b/sig.h
@@ -26,7 +26,7 @@
 #define FINIT_SIG_H_
 
 #include <signal.h>
-#include "uev/uev.h"
+#include <uev/uev.h>
 
 #define SYNC_SHUTDOWN   "/var/lock/finit.shutdown"
 #define SYNC_STOPPED    "/var/lock/finit.stopped"
diff --git a/svc.c b/svc.c
index 7979d01b..968b6e30 100644
--- a/svc.c
+++ b/svc.c
@@ -23,7 +23,7 @@
  */
 
 #include <stdlib.h>
-#include "lite/lite.h"
+#include <lite/lite.h>
 
 #include "finit.h"
 #include "svc.h"
diff --git a/svc.h b/svc.h
index dc14404a..207fabee 100755
--- a/svc.h
+++ b/svc.h
@@ -28,7 +28,8 @@
 #include <sys/ipc.h>		/* IPC_CREAT */
 #include <sys/shm.h>		/* shmat() */
 #include <sys/types.h>		/* pid_t */
-#include "lite/lite.h"
+#include <lite/lite.h>
+
 #include "inetd.h"
 #include "helpers.h"
 
diff --git a/tty.c b/tty.c
index 5492a665..78d1afd1 100644
--- a/tty.c
+++ b/tty.c
@@ -24,12 +24,12 @@
 
 #include <signal.h>
 #include <sys/wait.h>
+#include <lite/lite.h>
 
 #include "config.h"		/* Generated by configure script */
 #include "finit.h"
 #include "conf.h"
 #include "helpers.h"
-#include "lite/lite.h"
 #include "tty.h"
 
 LIST_HEAD(, tty_node) tty_list = LIST_HEAD_INITIALIZER();