Index: uspace/drv/block/ata_bd/ata_bd.c
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
+++ uspace/drv/block/ata_bd/ata_bd.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -58,11 +58,11 @@
 #include <scsi/spc.h>
 #include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stddef.h>
 #include <str.h>
 #include <loc.h>
-#include <sys/types.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <byteorder.h>
 #include <task.h>
Index: uspace/drv/block/ata_bd/ata_bd.h
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.h	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
+++ uspace/drv/block/ata_bd/ata_bd.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,7 +39,8 @@
 #include <bd_srv.h>
 #include <ddf/driver.h>
-#include <sys/types.h>
 #include <fibril_synch.h>
 #include <str.h>
+#include <stdint.h>
+#include <stddef.h>
 #include "ata_hw.h"
 
Index: uspace/drv/block/ata_bd/ata_hw.h
===================================================================
--- uspace/drv/block/ata_bd/ata_hw.h	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
+++ uspace/drv/block/ata_bd/ata_hw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define __ATA_HW_H__
 
-#include <sys/types.h>
+#include <stdint.h>
 
 enum {