Nucleus

diff --git a/task/clone.c b/task/clone.c
index 3a9f579..bd87f52 100644
--- a/task/clone.c
+++ b/task/clone.c
@@ -3,11 +3,11 @@
  * and copies most of the attributes from the parent task into it.
  */
 
-#include <sys/types.h>
 #include <sys/sched.h>
+#include <sys/types.h>
+#include <nucleus/io.h>
 #include <nucleus/task.h>
 #include <nucleus/vfs.h>
-#include <io.h>
 
 /* Clone a task */
 pid_t
diff --git a/task/exec.c b/task/exec.c
index d4b4c3d..ff80d21 100644
--- a/task/exec.c
+++ b/task/exec.c
@@ -4,11 +4,10 @@
  * and finally jumps into user-mode.
  */
 
-#include <string.h>
-#include <unistd.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/task.h>
 #include <nucleus/vfs.h>
diff --git a/task/signals.c b/task/signals.c
index 47d8c9b..48b075f 100644
--- a/task/signals.c
+++ b/task/signals.c
@@ -4,8 +4,8 @@
  * register signal handlers, which it runs when appropriate.
  */
 
-#include <signal.h>
-#include <errno.h>
+#include <sys/errno.h>
+#include <sys/signal.h>
 #include <nucleus/memory.h>
 #include <nucleus/object.h>
 #include <nucleus/task.h>
diff --git a/task/syscall.c b/task/syscall.c
index ba7937e..f2bf4bb 100644
--- a/task/syscall.c
+++ b/task/syscall.c
@@ -4,17 +4,19 @@
  * and runs the relevant function.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/syscall.h>
+#include <sys/errno.h>
+#include <sys/exec.h>
+#include <sys/file.h>
+#include <sys/fs.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/wait.h>
+#include <sys/mount.h>
+#include <sys/sched.h>
+#include <sys/signal.h>
 #include <sys/stat.h>
+#include <sys/syscall.h>
 #include <sys/utsname.h>
-#include <errno.h>
+#include <sys/wait.h>
 #include <nucleus/cpu.h>
 #include <nucleus/kernel.h>
 #include <nucleus/memory.h>
diff --git a/task/task.c b/task/task.c
index b0268e2..3d84436 100644
--- a/task/task.c
+++ b/task/task.c
@@ -3,13 +3,13 @@
  * implements the Task object.
  */
 
-#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
 #include <nucleus/cpu.h>
-#include <nucleus/task.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/object.h>
+#include <nucleus/task.h>
 #include <nucleus/vfs.h>
 
 void timer_handler(struct InterruptFrame *frame);
diff --git a/task/uid.c b/task/uid.c
index 5b50c90..f6b28fe 100644
--- a/task/uid.c
+++ b/task/uid.c
@@ -4,8 +4,8 @@
  * the required permission when setting any of these attributes.
  */
 
+#include <sys/errno.h>
 #include <sys/types.h>
-#include <errno.h>
 #include <nucleus/task.h>
 
 /* Get the current task's UID */
diff --git a/task/wait.c b/task/wait.c
index 35ee29a..2eb72c3 100644
--- a/task/wait.c
+++ b/task/wait.c
@@ -5,7 +5,7 @@
  * information from it before releasing it.
  */
 
-#include <errno.h>
+#include <sys/errno.h>
 #include <nucleus/task.h>
 
 /* Wait for a child process to change state */