8 files changed, 16 insertions, 24 deletions

diff --git a/kernel/bump.c b/kernel/common/bump.c
index 8b7bd53..1e07837 100644
--- a/kernel/bump.c
+++ b/kernel/common/bump.c
@@ -1,6 +1,6 @@
-#include <bump.h>
-#include <common.h>
-#include <log.h>
+#include <early/bump.h>
+#include <sys/log.h>
+#include <sys/mem.h>
 
 static char eheap[EHEAP_SIZE] = {0};
 static size_t eheap_off = 0;
diff --git a/kernel/cpio.c b/kernel/common/cpio.c
index 565b073..c8f7850 100644
--- a/kernel/cpio.c
+++ b/kernel/common/cpio.c
@@ -1,7 +1,5 @@
-#include <cpio.h>
-#include <types.h>
-#include <common.h>
-#include <log.h>
+#include <sys/cpio.h>
+#include <sys/log.h>
 
 static uint32_t parse_hex(const char *p)
 {
diff --git a/kernel/dtb.c b/kernel/common/dtb.c
index 7647767..b345db0 100644
--- a/kernel/dtb.c
+++ b/kernel/common/dtb.c
@@ -1,7 +1,5 @@
-
-#include <dtb.h>
-#include <bump.h>
-#include <common.h>
+#include <early/dtb.h>
+#include <early/bump.h>
 
 struct dt_node *dt_parse(void *fdt) {
     struct fdt_header *hdr = fdt;
diff --git a/kernel/elf.c b/kernel/common/elf.c
index 69c4128..871eee7 100644
--- a/kernel/elf.c
+++ b/kernel/common/elf.c
@@ -1,5 +1,4 @@
-#include <elf.h>
-#include <common.h>
+#include <sys/elf.h>
 
 int elf_chk_header(struct elf_header *header) {
     uint32_t magic_chk;
diff --git a/kernel/log.c b/kernel/common/log.c
index 84b52d3..88136f2 100644
--- a/kernel/log.c
+++ b/kernel/common/log.c
@@ -1,5 +1,5 @@
-#include <log.h>
-#include <types.h>
+#include <sys/log.h>
+
 __attribute__((section(".ringbuf"), aligned(64)))
 volatile char log_ring[RINGBUF_SIZE];
 static int pos = 0;
diff --git a/kernel/mem.c b/kernel/common/mem.c
index 2a6bd35..fee0761 100644
--- a/kernel/mem.c
+++ b/kernel/common/mem.c
@@ -1,7 +1,5 @@
-#include <types.h>
-#include <mem.h>
-#include <dtb.h>
-#include <common.h>
+#include <sys/mem.h>
+#include <early/dtb.h>
 
 static struct page *free_list;
 
diff --git a/kernel/kernel.c b/kernel/riscv/kernel.c
index de556e7..4e72e2a 100644
--- a/kernel/kernel.c
+++ b/kernel/riscv/kernel.c
@@ -1,8 +1,7 @@
-#include <types.h>
-#include <dtb.h>
-#include <bump.h>
-#include <log.h>
-#include <cpio.h>
+#include <sys/log.h>
+#include <sys/mem.h>
+#include <sys/cpio.h>
+#include <early/bump.h>
 
 #define KERNEL_SIZE 3 * 1024 * 1024
 
diff --git a/kernel/start.S b/kernel/riscv/start.S
index ecec47b..ecec47b 100644
--- a/kernel/start.S
+++ b/kernel/riscv/start.S