Nucleus

diff --git a/memory/fault.c b/memory/fault.c
index 1de4939..80dc5e0 100644
--- a/memory/fault.c
+++ b/memory/fault.c
@@ -8,9 +8,9 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <nucleus/cpu.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/task.h>
 #include "paging.h"
diff --git a/memory/frame.c b/memory/frame.c
index 33ae7ef..428aae9 100644
--- a/memory/frame.c
+++ b/memory/frame.c
@@ -5,11 +5,11 @@
  * as needed.
  */
 
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 
 #define INDEX(a) ((a)/32)
diff --git a/memory/heap.c b/memory/heap.c
index 0e0dbed..a0e696a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -5,10 +5,10 @@
  * can be used to store any kernel data structures.
  */
 
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 
 #define KHEAP_START 0x200000 /* 2MB */
 #define KHEAP_END   0x800000 /* 2MB */
diff --git a/memory/mmap.c b/memory/mmap.c
index b7a99eb..2093bf3 100644
--- a/memory/mmap.c
+++ b/memory/mmap.c
@@ -4,10 +4,10 @@
  * available one and use it.
  */
 
+#include <sys/errno.h>
 #include <sys/mman.h>
-#include <errno.h>
-#include <nucleus/object.h>
 #include <nucleus/memory.h>
+#include <nucleus/object.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
 #include "namespace.h"
diff --git a/memory/page.c b/memory/page.c
index 95b1548..986b4d9 100644
--- a/memory/page.c
+++ b/memory/page.c
@@ -4,8 +4,8 @@
  * is, and the frame tracks where in physical memory the data is located.
  */
 
-#include <nucleus/object.h>
 #include <nucleus/memory.h>
+#include <nucleus/object.h>
 #include "paging.h"
 #include "namespace.h"
 
diff --git a/memory/paging.c b/memory/paging.c
index fe08a96..c88eee1 100644
--- a/memory/paging.c
+++ b/memory/paging.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdint.h>
-#include <string.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include "paging.h"
 
diff --git a/memory/region.c b/memory/region.c
index ef43efc..26cbc37 100644
--- a/memory/region.c
+++ b/memory/region.c
@@ -5,8 +5,8 @@
  * is mapped in the task's virtual address space.
  */
 
-#include <nucleus/object.h>
 #include <nucleus/memory.h>
+#include <nucleus/object.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
 #include "namespace.h"