Nucleus

diff --git a/vfs/devfs/file.c b/vfs/devfs/file.c
index 0217a8e..f0e8d26 100644
--- a/vfs/devfs/file.c
+++ b/vfs/devfs/file.c
@@ -1,9 +1,9 @@
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <nucleus/driver.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/direntry.c b/vfs/direntry.c
index de7f02a..62ced1f 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -2,7 +2,7 @@
  * This file implements the Directory Entry object and associated operations.
  */
 
-#include <string.h>
+#include <nucleus/lib.h>
 #include <nucleus/object.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/ext2fs/file.c b/vfs/ext2fs/file.c
index a84da51..8d4e7a5 100644
--- a/vfs/ext2fs/file.c
+++ b/vfs/ext2fs/file.c
@@ -1,5 +1,5 @@
-#include <string.h>
-#include <errno.h>
+#include <sys/errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/vfs.h>
 #include "ext2fs.h"
 
diff --git a/vfs/ext2fs/inode.c b/vfs/ext2fs/inode.c
index 2208ab6..5c39023 100644
--- a/vfs/ext2fs/inode.c
+++ b/vfs/ext2fs/inode.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include <string.h>
+#include <nucleus/lib.h>
 #include <nucleus/vfs.h>
 #include "ext2fs.h"
 
diff --git a/vfs/ext2fs/super.c b/vfs/ext2fs/super.c
index f7949f0..5983c95 100644
--- a/vfs/ext2fs/super.c
+++ b/vfs/ext2fs/super.c
@@ -1,8 +1,7 @@
-#include <unistd.h>
-#include <fcntl.h>
+#include <sys/errno.h>
+#include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
 #include "ext2fs.h"
diff --git a/vfs/file.c b/vfs/file.c
index 8d7e7cc..4a726a2 100644
--- a/vfs/file.c
+++ b/vfs/file.c
@@ -7,9 +7,9 @@
  * generic version.
  */
 
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/object.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/files.c b/vfs/files.c
index c285e51..87cc794 100644
--- a/vfs/files.c
+++ b/vfs/files.c
@@ -4,14 +4,13 @@
  * of the file-based system calls that need to use a file descriptor.
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
+#include <sys/errno.h>
+#include <sys/file.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <nucleus/lib.h>
+#include <nucleus/memory.h>
 #include <nucleus/object.h>
 #include <nucleus/task.h>
-#include <nucleus/memory.h>
 #include <nucleus/vfs.h>
 
 /* Structure for a Files namespace */
diff --git a/vfs/fstype.c b/vfs/fstype.c
index f157a71..d1949f7 100644
--- a/vfs/fstype.c
+++ b/vfs/fstype.c
@@ -4,8 +4,8 @@
  * by the VFS to keep track of the installed file systems.
  */
 
-#include <string.h>
-#include <errno.h>
+#include <sys/errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/object.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/inode.c b/vfs/inode.c
index 903efd1..f1fdfd7 100644
--- a/vfs/inode.c
+++ b/vfs/inode.c
@@ -7,11 +7,11 @@
  * operation can be called on the particular inode.
  */
 
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <nucleus/object.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
+#include <nucleus/object.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/mount.c b/vfs/mount.c
index a321d34..a6700ee 100644
--- a/vfs/mount.c
+++ b/vfs/mount.c
@@ -3,9 +3,10 @@
  * mount system call.
  */
 
-#include <string.h>
+#include <sys/errno.h>
+#include <sys/mount.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
diff --git a/vfs/namespace.c b/vfs/namespace.c
index 1d560a9..e4cf5a0 100644
--- a/vfs/namespace.c
+++ b/vfs/namespace.c
@@ -3,9 +3,9 @@
  * task's file system.  It tracks a task's root and current working directory.
  */
 
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/object.h>
 #include <nucleus/task.h>
diff --git a/vfs/open.c b/vfs/open.c
index cbc4bac..f0fb004 100644
--- a/vfs/open.c
+++ b/vfs/open.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdarg.h>
-#include <string.h>
+#include <sys/errno.h>
+#include <sys/file.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/object.h>
 #include <nucleus/task.h>
diff --git a/vfs/stat.c b/vfs/stat.c
index 037a77f..2d3ef06 100644
--- a/vfs/stat.c
+++ b/vfs/stat.c
@@ -2,9 +2,9 @@
  * This file implements the stat system call and similar system calls.
  */
 
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/tmpfs/file.c b/vfs/tmpfs/file.c
index 9851ec3..841dadc 100644
--- a/vfs/tmpfs/file.c
+++ b/vfs/tmpfs/file.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/vfs.h>
 
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 9f8bc2b..eed0cc4 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -5,6 +5,7 @@
  * IPC and device management.
  */
 
+#include <sys/mount.h>
 #include <sys/stat.h>
 #include <nucleus/object.h>
 #include <nucleus/vfs.h>