Nucleus

diff --git a/kernel/acpi/acpi.c b/kernel/acpi/acpi.c
index 64443b1..e77bbbd 100644
--- a/kernel/acpi/acpi.c
+++ b/kernel/acpi/acpi.c
@@ -4,8 +4,8 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include "acpi.h"
 
diff --git a/kernel/acpi/apic.c b/kernel/acpi/apic.c
index 5c2297d..6051636 100644
--- a/kernel/acpi/apic.c
+++ b/kernel/acpi/apic.c
@@ -5,13 +5,13 @@
  * a non-SMP system, and fall back on the PIC.
  */
 
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
-#include <nucleus/memory.h>
+#include <stdint.h>
 #include <nucleus/cpu.h>
+#include <nucleus/io.h>
+#include <nucleus/lib.h>
+#include <nucleus/memory.h>
 #include <nucleus/task.h>
-#include <io.h>
 #include "acpi.h"
 
 void cpu_load(void);
diff --git a/kernel/acpi/dsdt.c b/kernel/acpi/dsdt.c
index 15510a1..ef203fa 100644
--- a/kernel/acpi/dsdt.c
+++ b/kernel/acpi/dsdt.c
@@ -4,8 +4,8 @@
  * information on IO ports, IRQs, memory mappings and power management.
  */
 
+#include <nucleus/io.h>
 #include <nucleus/kernel.h>
-#include <io.h>
 #include "acpi.h"
 
 /* Parse the DSDT for information */
diff --git a/kernel/acpi/fadt.c b/kernel/acpi/fadt.c
index 92ce4c1..cd85323 100644
--- a/kernel/acpi/fadt.c
+++ b/kernel/acpi/fadt.c
@@ -5,7 +5,7 @@
  * Description Table.
  */
 
-#include <io.h>
+#include <nucleus/io.h>
 #include "acpi.h"
 
 /* Preferred Power Management Profile */
diff --git a/kernel/acpi/pci.c b/kernel/acpi/pci.c
index b7c74c1..07f2ee5 100644
--- a/kernel/acpi/pci.c
+++ b/kernel/acpi/pci.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <io.h>
+#include <nucleus/io.h>
 #include <nucleus/pci.h>
 
 /* PCI Configuration Ports */
diff --git a/kernel/gdt.c b/kernel/gdt.c
index b9cebb6..7e8a1a4 100644
--- a/kernel/gdt.c
+++ b/kernel/gdt.c
@@ -8,11 +8,11 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <sys/types.h>
-#include <nucleus/memory.h>
-#include <nucleus/kernel.h>
 #include <nucleus/cpu.h>
+#include <nucleus/kernel.h>
+#include <nucleus/lib.h>
+#include <nucleus/memory.h>
 #include "desc.h"
 
 /* GDT Entry Indicies */
diff --git a/kernel/idt.c b/kernel/idt.c
index 37d38d6..dc596f4 100644
--- a/kernel/idt.c
+++ b/kernel/idt.c
@@ -6,12 +6,12 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <nucleus/cpu.h>
+#include <nucleus/io.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/task.h>
-#include <io.h>
 #include "desc.h"
 
 /* Structure for an IDT Entry */
diff --git a/kernel/main.c b/kernel/main.c
index b7d8eb8..90c102d 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -5,17 +5,18 @@
  */
 
 #include <stdint.h>
-#include <string.h>
-#include <unistd.h>
+#include <sys/exec.h>
+#include <sys/fs.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
-#include "multiboot.h"
-#include "desc.h"
 #include "acpi/acpi.h"
+#include "desc.h"
+#include "multiboot.h"
 
 extern char _bss[], _end[];
 void page_fault_handler(struct InterruptFrame *frame);
diff --git a/kernel/panic.c b/kernel/panic.c
index 68b68b5..46d9b5d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -5,10 +5,10 @@
  * be compiled in.
  */
 
-#include <string.h>
 #include <nucleus/cpu.h>
+#include <nucleus/io.h>
 #include <nucleus/kernel.h>
-#include <io.h>
+#include <nucleus/lib.h>
 
 /* Kernel panic */
 _Noreturn void
diff --git a/kernel/pic.c b/kernel/pic.c
index 566abb2..6437185 100644
--- a/kernel/pic.c
+++ b/kernel/pic.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdint.h>
-#include <io.h>
+#include <nucleus/io.h>
 
 /* Initialise the PIT to a specified frequency */
 static void
diff --git a/kernel/printf.c b/kernel/printf.c
index 858f26e..89199b4 100644
--- a/kernel/printf.c
+++ b/kernel/printf.c
@@ -4,11 +4,11 @@
  * screen.
  */
 
-#include <string.h>
+#include <nucleus/io.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/task.h>
-#include <io.h>
 
 /* Print formatted text to debug port */
 void
diff --git a/kernel/uname.c b/kernel/uname.c
index 10e52c0..a9ec735 100644
--- a/kernel/uname.c
+++ b/kernel/uname.c
@@ -3,13 +3,13 @@
  * kernel to a buffer for userspace to read.
  */
 
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/utsname.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 
 static const char *SYSNAME = "Nucleus";
-static const char *RELEASE = "0.9.2";
+static const char *RELEASE = "0.9.3";
 static const char *VERSION = "SMP PREEMPT "__DATE__" "__TIME__;
 static const char *MACHINE = "x86";