diff --git a/Makefile b/Makefile
index 6050a68..2932cad 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ FEATURES_INC=
 
 CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=-Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual
-CFLAGS+=-Wsign-compare -Iincludes -std=c99 -pedantic
+CFLAGS+=-Wsign-compare -Iinclude/kore -std=c99 -pedantic
 CFLAGS+=-DPREFIX='"$(PREFIX)"' -fstack-protector-all
 LDFLAGS=-rdynamic -lssl -lcrypto
 
diff --git a/includes/http.h b/include/kore/http.h
similarity index 100%
rename from includes/http.h
rename to include/kore/http.h
diff --git a/includes/jsonrpc.h b/include/kore/jsonrpc.h
similarity index 100%
rename from includes/jsonrpc.h
rename to include/kore/jsonrpc.h
diff --git a/includes/kore.h b/include/kore/kore.h
similarity index 100%
rename from includes/kore.h
rename to include/kore/kore.h
diff --git a/includes/pgsql.h b/include/kore/pgsql.h
similarity index 100%
rename from includes/pgsql.h
rename to include/kore/pgsql.h
diff --git a/includes/python_api.h b/include/kore/python_api.h
similarity index 100%
rename from includes/python_api.h
rename to include/kore/python_api.h
diff --git a/includes/python_methods.h b/include/kore/python_methods.h
similarity index 100%
rename from includes/python_methods.h
rename to include/kore/python_methods.h
diff --git a/includes/tasks.h b/include/kore/tasks.h
similarity index 100%
rename from includes/tasks.h
rename to include/kore/tasks.h