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 */