Nucleus

diff --git a/drivers/devices.c b/drivers/devices.c
index 7e1b709..b33f79d 100644
--- a/drivers/devices.c
+++ b/drivers/devices.c
@@ -3,8 +3,8 @@
  * database and controls device initialisation.
  */
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <nucleus/kernel.h>
 #include <nucleus/pci.h>
 
diff --git a/drivers/storage/ata.c b/drivers/storage/ata.c
index bf56afc..a8a27b2 100644
--- a/drivers/storage/ata.c
+++ b/drivers/storage/ata.c
@@ -4,13 +4,12 @@
  * actual hardware.
  */
 
-#include <stdio.h>
 #include <stdint.h>
-#include <string.h>
+#include <sys/errno.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <io.h>
 #include <nucleus/driver.h>
+#include <nucleus/io.h>
+#include <nucleus/lib.h>
 #include <nucleus/vfs.h>
 #include "ide.h"
 
diff --git a/drivers/storage/ide.c b/drivers/storage/ide.c
index 0cc9253..6075192 100644
--- a/drivers/storage/ide.c
+++ b/drivers/storage/ide.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdint.h>
-#include <io.h>
+#include <nucleus/io.h>
 #include <nucleus/pci.h>
 #include "ide.h"
 
diff --git a/drivers/video/bga.c b/drivers/video/bga.c
index 061409a..a131982 100644
--- a/drivers/video/bga.c
+++ b/drivers/video/bga.c
@@ -5,15 +5,14 @@
  */
 
 #include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <sys/errno.h>
 #include <sys/fb.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <io.h>
+#include <sys/file.h>
+#include <sys/stat.h>
 #include <nucleus/driver.h>
+#include <nucleus/io.h>
 #include <nucleus/kernel.h>
+#include <nucleus/lib.h>
 #include <nucleus/memory.h>
 #include <nucleus/pci.h>
 #include <nucleus/vfs.h>