9 files changed, 14 insertions, 17 deletions
diff --git a/src/kernel/fs/ata_pio.c b/src/kernel/fs/ata_pio.c
index d577ea1..d3544ba 100644
--- a/src/kernel/fs/ata_pio.c
+++ b/src/kernel/fs/ata_pio.c
@@ -1,5 +1,5 @@
 #include <kernel/io/io.h>
-#include <kernel/lib/alloc.h>
+#include <mlibc/stdlib.h>
 #include <kernel/fs/ata_pio.h>
 #include <kernel/interrupts/interrupts.h>
 
diff --git a/src/kernel/fs/atapi_pio.c b/src/kernel/fs/atapi_pio.c
index 4f986d9..e64cd75 100644
--- a/src/kernel/fs/atapi_pio.c
+++ b/src/kernel/fs/atapi_pio.c
@@ -19,9 +19,7 @@ void ATAPI_read(uint16_t nblocks, uint32_t lba) {
     regs.ds = 0;
     regs.si = ATAPI_PIO_DAPACK;
 
-    paging_disable();
-    int32(LBA_READ_INT, &regs);
-    paging_enable();
+    v86(LBA_READ_INT, &regs);
 }
 
 void ATAPI_granular_read(uint32_t nblocks, uint32_t lba, uint8_t *output) {
diff --git a/src/kernel/fs/install.c b/src/kernel/fs/install.c
index 5a2cc61..dfe3009 100644
--- a/src/kernel/fs/install.c
+++ b/src/kernel/fs/install.c
@@ -1,9 +1,9 @@
 #include <kernel/graphics/vesa.h>
 #include <kernel/fs/ata_pio.h>
 #include <kernel/fs/marfs/marfs.h>
-#include <kernel/lib/alloc.h>
 #include <kernel/fs/iso9660/iso9660.h>
-#include "atapi_pio.h"
+#include <kernel/fs/atapi_pio.h>
+#include <mlibc/stdlib.h>
 
 void install_melvix() {
     info("You're booting from a CD, Melvix will only run after an install");
diff --git a/src/kernel/fs/iso9660/iso9660.c b/src/kernel/fs/iso9660/iso9660.c
index 728d3cb..f8eddd4 100644
--- a/src/kernel/fs/iso9660/iso9660.c
+++ b/src/kernel/fs/iso9660/iso9660.c
@@ -2,7 +2,7 @@
 #include <kernel/lib/lib.h>
 #include <kernel/fs/atapi_pio.h>
 #include <kernel/fs/iso9660/iso9660.h>
-#include <kernel/lib/alloc.h>
+#include <mlibc/stdlib.h>
 
 struct ISO9660_entity *ISO9660_get(char **dirs, uint8_t dirs_sz) {
     ATAPI_read(1, 0x10);
diff --git a/src/kernel/fs/marfs/directory.c b/src/kernel/fs/marfs/directory.c
index f7783bb..bf19fc7 100644
--- a/src/kernel/fs/marfs/directory.c
+++ b/src/kernel/fs/marfs/directory.c
@@ -1,8 +1,7 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <kernel/lib/alloc.h>
-#include <kernel/lib/lib.h>
-#include "marfs.h"
+#include <mlibc/stdlib.h>
+#include <kernel/fs/marfs/marfs.h>
 
 uint32_t marfs_new_dir(uint32_t uid) { return marfs_new_file(0, 0, uid, 0, 1); }
 
diff --git a/src/kernel/fs/marfs/disklevel.c b/src/kernel/fs/marfs/disklevel.c
index b6fc8c2..f54dea1 100644
--- a/src/kernel/fs/marfs/disklevel.c
+++ b/src/kernel/fs/marfs/disklevel.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include "marfs.h"
+#include <kernel/fs/marfs/marfs.h>
 
 void marfs_format(void) {
     // Create superblock
diff --git a/src/kernel/fs/marfs/new_file.c b/src/kernel/fs/marfs/new_file.c
index 7b06621..ebc8152 100644
--- a/src/kernel/fs/marfs/new_file.c
+++ b/src/kernel/fs/marfs/new_file.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <kernel/lib/alloc.h>
-#include "marfs.h"
+#include <mlibc/stdlib.h>
+#include <kernel/fs/marfs/marfs.h>
 
 static uint8_t last_maxlevel = 0;
 
diff --git a/src/kernel/fs/marfs/read_whole_file.c b/src/kernel/fs/marfs/read_whole_file.c
index 86aae5f..0d3af26 100644
--- a/src/kernel/fs/marfs/read_whole_file.c
+++ b/src/kernel/fs/marfs/read_whole_file.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <kernel/lib/alloc.h>
-#include "marfs.h"
+#include <mlibc/stdlib.h>
+#include <kernel/fs/marfs/marfs.h>
 
 static uint8_t last_maxlevel = 0;
 
diff --git a/src/kernel/fs/marfs/sectorlevel.c b/src/kernel/fs/marfs/sectorlevel.c
index 7575f8c..d8795fa 100644
--- a/src/kernel/fs/marfs/sectorlevel.c
+++ b/src/kernel/fs/marfs/sectorlevel.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <kernel/lib/alloc.h>
+#include <mlibc/stdlib.h>
 #include <kernel/fs/ata_pio.h>
-#include "marfs.h"
+#include <kernel/fs/marfs/marfs.h>
 
 uint8_t marfs_init(struct ATA_INTERFACE *_iface) {
     iface = _iface;