diff --git a/ce/ce.c b/ce/ce.c
index f6f2c73..9985318 100644
--- a/ce/ce.c
+++ b/ce/ce.c
@@ -1,6 +1,6 @@
+#include <fs_desc_buffer.h>
 #include <liballoc.h>
 #include <list.h>
-#include <m/fs_desc_buffer.h>
 #include <minmax.h>
 #include <printf.h>
 #include <process.h>
diff --git a/include/m/fs_desc_buffer.h b/include/fs_desc_buffer.h
similarity index 100%
rename from include/m/fs_desc_buffer.h
rename to include/fs_desc_buffer.h
diff --git a/include/m/kb_device.h b/include/kb_device.h
similarity index 100%
rename from include/m/kb_device.h
rename to include/kb_device.h
diff --git a/include/m/path.h b/include/path.h
similarity index 100%
rename from include/m/path.h
rename to include/path.h
diff --git a/include/m/ramdisk_device.h b/include/ramdisk_device.h
similarity index 100%
rename from include/m/ramdisk_device.h
rename to include/ramdisk_device.h
diff --git a/include/m/status.h b/include/status.h
similarity index 100%
rename from include/m/status.h
rename to include/status.h
diff --git a/include/m/syscall_defs.h b/include/syscall_defs.h
similarity index 100%
rename from include/m/syscall_defs.h
rename to include/syscall_defs.h
diff --git a/include/m/terminal_device.h b/include/terminal_device.h
similarity index 100%
rename from include/m/terminal_device.h
rename to include/terminal_device.h
diff --git a/include/m/xdrv_device.h b/include/xdrv_device.h
similarity index 100%
rename from include/m/xdrv_device.h
rename to include/xdrv_device.h
diff --git a/kernel/amd64/bootmain.c b/kernel/amd64/bootmain.c
index 776a1a7..0be6e32 100644
--- a/kernel/amd64/bootmain.c
+++ b/kernel/amd64/bootmain.c
@@ -13,11 +13,11 @@
 #include <libk/std.h>
 #include <limine/limine.h>
 #include <limine/requests.h>
-#include <m/ramdisk_device.h>
 #include <mm/liballoc.h>
 #include <mm/pmm.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
+#include <ramdisk_device.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
 #include <sys/smp.h>
diff --git a/kernel/amd64/intr.c b/kernel/amd64/intr.c
index a08e456..7d6da39 100644
--- a/kernel/amd64/intr.c
+++ b/kernel/amd64/intr.c
@@ -7,13 +7,13 @@
 #include <irq/irq.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/syscall_defs.h>
 #include <mm/liballoc.h>
 #include <proc/reschedule.h>
 #include <sys/debug.h>
 #include <sys/smp.h>
 #include <sys/spin.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 /* 8259 PIC defs. */
 #define PIC1      0x20
diff --git a/kernel/amd64/syscall.c b/kernel/amd64/syscall.c
index 992b6d4..ae3f5ca 100644
--- a/kernel/amd64/syscall.c
+++ b/kernel/amd64/syscall.c
@@ -5,14 +5,14 @@
 #include <amd64/msr.h>
 #include <libk/list.h>
 #include <libk/string.h>
-#include <m/status.h>
-#include <m/syscall_defs.h>
 #include <mm/liballoc.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
+#include <status.h>
 #include <sys/debug.h>
 #include <sys/smp.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 extern void syscall_entry (void);
 
diff --git a/kernel/device/device.c b/kernel/device/device.c
index 7fefbbf..769271b 100644
--- a/kernel/device/device.c
+++ b/kernel/device/device.c
@@ -1,18 +1,18 @@
 #include <device/device.h>
 #include <device/ramdrv.h>
 #include <device/terminal.h>
+#include <kb_device.h>
 #include <libk/fieldlengthof.h>
 #include <libk/rbtree.h>
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/kb_device.h>
-#include <m/ramdisk_device.h>
-#include <m/terminal_device.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <ramdisk_device.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
+#include <terminal_device.h>
+#include <xdrv_device.h>
 
 #if defined(__x86_64__)
 #include <device/ps2_kb.h>
diff --git a/kernel/device/ps2_kb.c b/kernel/device/ps2_kb.c
index 4040183..c8fe81f 100644
--- a/kernel/device/ps2_kb.c
+++ b/kernel/device/ps2_kb.c
@@ -4,14 +4,14 @@
 #include <device/device.h>
 #include <device/ps2_kb.h>
 #include <irq/irq.h>
+#include <kb_device.h>
 #include <libk/ringbuffer.h>
 #include <libk/std.h>
-#include <m/kb_device.h>
-#include <m/status.h>
 #include <proc/capability.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
 #include <proc/suspension_q.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/smp.h>
diff --git a/kernel/device/ramdrv.c b/kernel/device/ramdrv.c
index 6b9fd9c..0ec03cb 100644
--- a/kernel/device/ramdrv.c
+++ b/kernel/device/ramdrv.c
@@ -2,9 +2,9 @@
 #include <device/ramdrv.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/status.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <status.h>
+#include <xdrv_device.h>
 
 bool ramdrv_init (struct device* device, void* arg) {
   struct ramdrv_init* init = arg;
diff --git a/kernel/device/terminal.c b/kernel/device/terminal.c
index f0ab74a..985a38b 100644
--- a/kernel/device/terminal.c
+++ b/kernel/device/terminal.c
@@ -4,10 +4,10 @@
 #include <device/terminal.h>
 #include <libk/std.h>
 #include <limine/requests.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <proc/capability.h>
 #include <proc/proc.h>
+#include <status.h>
 #include <sys/debug.h>
 
 struct flanterm_context* ft_ctx;
diff --git a/kernel/fs/tarfs.c b/kernel/fs/tarfs.c
index 2ac0bea..f898dee 100644
--- a/kernel/fs/tarfs.c
+++ b/kernel/fs/tarfs.c
@@ -1,17 +1,17 @@
 #include <fs/path.h>
 #include <fs/tarfs.h>
 #include <fs/vfs.h>
+#include <fs_desc_buffer.h>
 #include <libk/align.h>
 #include <libk/minmax.h>
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/fs_desc_buffer.h>
-#include <m/path.h>
-#include <m/status.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <path.h>
+#include <status.h>
 #include <sys/debug.h>
+#include <xdrv_device.h>
 
 static struct tar_file* tar_get_file (struct tarfs* tarfs, const char* filename) {
   for (size_t i = 0; i < TARFS_FILES_MAX; i++) {
diff --git a/kernel/fs/tarfs.h b/kernel/fs/tarfs.h
index 5498ae0..273e84e 100644
--- a/kernel/fs/tarfs.h
+++ b/kernel/fs/tarfs.h
@@ -2,8 +2,8 @@
 #define _KERNEL_FS_TARFS_H
 
 #include <device/device.h>
+#include <fs_desc_buffer.h>
 #include <libk/std.h>
-#include <m/fs_desc_buffer.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
 
diff --git a/kernel/fs/vfs.c b/kernel/fs/vfs.c
index 37d0ab3..f7ff3f7 100644
--- a/kernel/fs/vfs.c
+++ b/kernel/fs/vfs.c
@@ -6,10 +6,10 @@
 #include <libk/lengthof.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 
diff --git a/kernel/fs/vfs.h b/kernel/fs/vfs.h
index 1af9dd4..aeefeae 100644
--- a/kernel/fs/vfs.h
+++ b/kernel/fs/vfs.h
@@ -2,10 +2,10 @@
 #define _KERNEL_FS_VFS_H
 
 #include <device/device.h>
+#include <fs_desc_buffer.h>
 #include <libk/hash.h>
 #include <libk/list.h>
 #include <libk/std.h>
-#include <m/fs_desc_buffer.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/reschedule.h>
diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c
index fcda791..79a9b6c 100644
--- a/kernel/proc/proc.c
+++ b/kernel/proc/proc.c
@@ -1,6 +1,7 @@
 #include <aux/compiler.h>
 #include <aux/elf.h>
 #include <fs/vfs.h>
+#include <fs_desc_buffer.h>
 #include <irq/irq.h>
 #include <libk/align.h>
 #include <libk/list.h>
@@ -8,8 +9,6 @@
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/fs_desc_buffer.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <mm/pmm.h>
 #include <proc/capability.h>
@@ -17,6 +16,7 @@
 #include <proc/procgroup.h>
 #include <proc/reschedule.h>
 #include <proc/resource.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
diff --git a/kernel/syscall/syscall.c b/kernel/syscall/syscall.c
index db7bc05..54540b8 100644
--- a/kernel/syscall/syscall.c
+++ b/kernel/syscall/syscall.c
@@ -7,19 +7,19 @@
 #include <libk/fieldsizeof.h>
 #include <libk/std.h>
 #include <limine/requests.h>
-#include <m/status.h>
-#include <m/syscall_defs.h>
 #include <mm/pmm.h>
 #include <proc/mail.h>
 #include <proc/mutex.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/resource.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
 #include <sys/proc.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 #define DEFINE_SYSCALL(name)                                                                       \
   uintptr_t name (struct proc* UNUSED proc, void* UNUSED regs, struct reschedule_ctx* UNUSED rctx, \
diff --git a/libkb/kb.c b/libkb/kb.c
index 9d0634a..2f754dc 100644
--- a/libkb/kb.c
+++ b/libkb/kb.c
@@ -1,6 +1,6 @@
 #include <kb.h>
-#include <m/kb_device.h>
-#include <m/status.h>
+#include <kb_device.h>
+#include <status.h>
 #include <stdint.h>
 #include <system.h>
 
diff --git a/libkb/kb.h b/libkb/kb.h
index 85a5090..86f1907 100644
--- a/libkb/kb.h
+++ b/libkb/kb.h
@@ -1,7 +1,7 @@
 #ifndef _LIBKB_KB_H
 #define _LIBKB_KB_H
 
-#include <m/kb_device.h>
+#include <kb_device.h>
 #include <stdint.h>
 
 /* \brief Read key from keyboard
diff --git a/libprocess/process.c b/libprocess/process.c
index d846049..c3eed57 100644
--- a/libprocess/process.c
+++ b/libprocess/process.c
@@ -1,6 +1,6 @@
 #include <liballoc.h>
-#include <m/status.h>
 #include <process.h>
+#include <status.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <system.h>
diff --git a/libsystem/str_status.h b/libsystem/str_status.h
index 9f76afc..d108ed6 100644
--- a/libsystem/str_status.h
+++ b/libsystem/str_status.h
@@ -1,7 +1,7 @@
 #ifndef _LIBSYSTEM_STR_STATUS_H
 #define _LIBSYSTEM_STR_STATUS_H
 
-#include <m/status.h>
+#include <status.h>
 
 static const char* str_status[] = {
     [ST_OK] = "ok",
diff --git a/libsystem/syscall.h b/libsystem/syscall.h
index 9b33656..e2189a9 100644
--- a/libsystem/syscall.h
+++ b/libsystem/syscall.h
@@ -1,7 +1,7 @@
 #ifndef _LIBMSL_M_SYSCALL_H
 #define _LIBMSL_M_SYSCALL_H
 
-#include <m/syscall_defs.h>
+#include <syscall_defs.h>
 
 #if defined(__x86_64__)
 #include <amd64/syscall.h>
diff --git a/libsystem/system.h b/libsystem/system.h
index d2bfa87..20787af 100644
--- a/libsystem/system.h
+++ b/libsystem/system.h
@@ -1,7 +1,7 @@
 #ifndef _LIBMSL_M_SYSTEM_H
 #define _LIBMSL_M_SYSTEM_H
 
-#include <m/fs_desc_buffer.h>
+#include <fs_desc_buffer.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/libterminal/terminal.h b/libterminal/terminal.h
index de3be59..8ec53d0 100644
--- a/libterminal/terminal.h
+++ b/libterminal/terminal.h
@@ -1,8 +1,8 @@
 #ifndef _LIBTERMINAL_TERMINAL_TERMINAL_H
 #define _LIBTERMINAL_TERMINAL_TERMINAL_H
 
-#include <m/terminal_device.h>
 #include <stddef.h>
+#include <terminal_device.h>
 
 /* Print a string onto a graphical terminal. Prints len chars */
 void terminal_print (const char* string, size_t len);