diff --git a/src/kernel/cpu/cpu.c b/src/kernel/cpu/cpu.c
index d2162bc..fd506bc 100644
--- a/src/kernel/cpu/cpu.c
+++ b/src/kernel/cpu/cpu.c
@@ -1,4 +1,4 @@
-#include <interrupts.h>
+#include <cpu/interrupts.h>
 
 void cpu_init()
 {
diff --git a/src/kernel/cpu/interrupts.c b/src/kernel/cpu/interrupts.c
index 381a419..e2db3be 100644
--- a/src/kernel/cpu/interrupts.c
+++ b/src/kernel/cpu/interrupts.c
@@ -1,4 +1,4 @@
-#include <interrupts.h>
+#include <cpu/interrupts.h>
 #include <stdint.h>
 #include <memory.h>
 #include <cpu.h>
diff --git a/src/kernel/include/interrupts.h b/src/kernel/include/cpu/interrupts.h
similarity index 100%
rename from src/kernel/include/interrupts.h
rename to src/kernel/include/cpu/interrupts.h
diff --git a/src/kernel/memory/vmm.c b/src/kernel/memory/vmm.c
index 7ceed69..fd46010 100644
--- a/src/kernel/memory/vmm.c
+++ b/src/kernel/memory/vmm.c
@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <memory.h>
 #include <debug.h>
+#include <string.h>
 
 #define FLAGS_MASK (PAGE_SIZE-1)
 #define MASK_FLAGS(addr) ((uint64_t)addr & ~FLAGS_MASK)