diff --git a/Makefile b/Makefile
index 3305e52..d6d7be8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@ SRC = $(shell pwd)
 DEP = $(SRC)/dep_root
 STRIP = strip
 CC ?= cc
-CFLAGS += -I$(DEP)/include -I$(DEP)/include/ncursestw -I$(SRC)/include -I$(SRC) -Wall -Wextra -DPALERAIN_VERSION=\"2.0.0\" -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable
+CFLAGS += -I$(DEP)/include -I$(DEP)/include/ncursestw -I$(SRC)/include -I$(SRC)
+CFLAGS += -Wall -Wextra -DPALERAIN_VERSION=\"2.0.0\" -Wall -Wextra -Wno-unused-parameter
+CFLAGS += -Wno-unused-variable -I$(SRC)/src
 LIBS += $(DEP)/lib/libimobiledevice-1.0.a $(DEP)/lib/libirecovery-1.0.a $(DEP)/lib/libusbmuxd-2.0.a $(DEP)/lib/libimobiledevice-glue-1.0.a $(DEP)/lib/libplist-2.0.a -pthread
 ifeq ($(TARGET_OS),)
 TARGET_OS = $(shell uname -s)
diff --git a/include/common.h b/include/common.h
index 48245f7..e038872 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,7 +1,6 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include "lockdown_helper.h"
 #include "xxd-embedded.h"
 #include "kerninfo.h"
 #include <stdbool.h>
diff --git a/src/kerninfo.h b/include/kerninfo.h
similarity index 100%
rename from src/kerninfo.h
rename to include/kerninfo.h
diff --git a/src/devhelper.c b/src/devhelper.c
index 5ecdd50..52520ae 100644
--- a/src/devhelper.c
+++ b/src/devhelper.c
@@ -34,7 +34,7 @@
 #include <libtvcontrol.h>
 #endif
 
-#include "common.h"
+#include <common.h>
 
 irecv_device_event_context_t irecvctx = NULL;
 
diff --git a/src/dfuhelper.c b/src/dfuhelper.c
index bc7840b..6a56933 100644
--- a/src/dfuhelper.c
+++ b/src/dfuhelper.c
@@ -24,8 +24,8 @@
 #include <libirecovery.h>
 #include <usbmuxd.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
 
 #define FORMAT_KEY_VALUE 1
 #define FORMAT_XML 2
diff --git a/src/exec_checkra1n.c b/src/exec_checkra1n.c
index 1c43ae7..b21fe83 100644
--- a/src/exec_checkra1n.c
+++ b/src/exec_checkra1n.c
@@ -17,8 +17,8 @@
 
 extern char **environ;
 
-#include "common.h"
-#include "xxd-embedded.h"
+#include <common.h>
+#include <xxd-embedded.h>
 char* pongo_path = NULL;
 
 void exec_checkra1n() {
diff --git a/src/log.c b/src/log.c
index 4b18722..a5bc097 100644
--- a/src/log.c
+++ b/src/log.c
@@ -5,8 +5,8 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
 
 int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxname, char *__restrict format, ...)
 {
diff --git a/src/main.c b/src/main.c
index 0890be1..34dda1b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,10 +24,10 @@
 
 #include <libimobiledevice/libimobiledevice.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
-#include "xxd-embedded.h"
-#include "kerninfo.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
+#include <xxd-embedded.h>
+#include <kerninfo.h>
 
 #define CMD_LEN_MAX 512
 #define OVERRIDE_MAGIC 0xd803b376
diff --git a/src/optparse.c b/src/optparse.c
index f2116e2..c3cb35c 100644
--- a/src/optparse.c
+++ b/src/optparse.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <errno.h>
-#include "common.h"
+#include <common.h>
 
 
 static struct option longopts[] = {
diff --git a/src/override_file.c b/src/override_file.c
index 60dac34..78d5c82 100644
--- a/src/override_file.c
+++ b/src/override_file.c
@@ -11,7 +11,8 @@
 #include <getopt.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include "common.h"
+
+#include <common.h>
 
 int override_file(override_file_t *finfo, niarelap_file_t** orig, unsigned int *orig_len, char *filename) {
 	int ret = 0;
diff --git a/src/pongo_helper.c b/src/pongo_helper.c
index de70711..0814816 100644
--- a/src/pongo_helper.c
+++ b/src/pongo_helper.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>           // mmap, munmap
 #include <sys/stat.h>           // fstst
 
-#include "common.h"
+#include <common.h>
 
 int found_pongo = 0; 
 
diff --git a/src/pongo_usb.c b/src/pongo_usb.c
index c0d5a48..c38db4f 100644
--- a/src/pongo_usb.c
+++ b/src/pongo_usb.c
@@ -37,7 +37,8 @@
 #include <unistd.h>             // close
 #include <sys/mman.h>           // mmap, munmap
 #include <sys/stat.h>           // fstst
-#include "common.h"
+
+#include <common.h>
 #define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)
 
 // Keep in sync with Pongo
diff --git a/src/window.c b/src/window.c
index 5aada9c..40aebc7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -11,8 +11,8 @@
 #include <locale.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "tui.h"
+#include <common.h>
+#include <tui.h>
 
 #define MSG_COLOR 1
 #define ICON_COLOR 2