Index: uspace/drv/bus/usb/ehci/ehci_regs.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,4 +34,5 @@
 #ifndef DRV_EHCI_EHCI_REGS_H
 #define DRV_EHCI_EHCI_REGS_H
+
 #include <sys/types.h>
 #include <byteorder.h>
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 #include <mem.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stdint.h>
+#include <stddef.h>
 
 #include <usb/classes/hub.h>
Index: uspace/drv/bus/usb/ehci/ehci_rh.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/ehci_rh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/usb.h>
Index: uspace/drv/bus/usb/ehci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ehci/endpoint_list.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/endpoint_list.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,6 +40,6 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/ehci/hc.h
===================================================================
--- uspace/drv/bus/usb/ehci/hc.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/hcd.h>
Index: uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "link_pointer.h"
 
Index: uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_LINK_POINTER_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** EHCI link pointer, used by many data structures */
Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/queue_head.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/endpoint.h>
 #include <usb/host/utils/malloc32.h>
Index: uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_SPLIT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "link_pointer.h"
 
Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,6 @@
 #define DRV_EHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "link_pointer.h"
 #include "mem_access.h"
Index: uspace/drv/bus/usb/ohci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ohci/endpoint_list.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/endpoint_list.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,6 @@
 #include <stdlib.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/ohci/hc.h
===================================================================
--- uspace/drv/bus/usb/ohci/hc.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/hc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,5 +44,5 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/hcd.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/endpoint.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <malloc.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <macros.h>
 #include <assert.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #include "completion_codes.h"
Index: uspace/drv/bus/usb/ohci/ohci_rh.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #include <errno.h>
 #include <mem.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <usb/classes/hub.h>
Index: uspace/drv/bus/usb/ohci/ohci_rh.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/ohci/ohci_rh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/usb.h>
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,6 +44,6 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRV_UHCI_HW_STRUCT_LINK_POINTER_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** UHCI link pointer, used by many data structures */
Index: uspace/drv/bus/usb/uhci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 #include <usb/usb.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "link_pointer.h"
Index: uspace/drv/bus/usb/uhci/transfer_list.c
===================================================================
--- uspace/drv/bus/usb/uhci/transfer_list.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/transfer_list.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <libarch/barrier.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/debug.h>
 #include <usb/host/usb_transfer_batch.h>
Index: uspace/drv/bus/usb/uhci/uhci_batch.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/uhci/uhci_batch.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <errno.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <usb/host/usb_transfer_batch.h>
 
Index: uspace/drv/bus/usb/usbhub/status.h
===================================================================
--- uspace/drv/bus/usb/usbhub/status.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbhub/status.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/dev/request.h>
 
Index: uspace/drv/bus/usb/usbmast/bo_trans.h
===================================================================
--- uspace/drv/bus/usb/usbmast/bo_trans.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbmast/bo_trans.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <scsi/spc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include <usb/dev/pipes.h>
Index: uspace/drv/bus/usb/usbmast/cmdw.c
===================================================================
--- uspace/drv/bus/usb/usbmast/cmdw.c	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbmast/cmdw.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #include <byteorder.h>
 #include <mem.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include "cmdw.h"
Index: uspace/drv/bus/usb/usbmast/cmdw.h
===================================================================
--- uspace/drv/bus/usb/usbmast/cmdw.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbmast/cmdw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define CMDW_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/usb.h>
 
Index: uspace/drv/bus/usb/usbmast/scsi_ms.h
===================================================================
--- uspace/drv/bus/usb/usbmast/scsi_ms.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbmast/scsi_ms.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <scsi/spc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include <usb/dev/driver.h>
Index: uspace/drv/bus/usb/usbmast/usbmast.h
===================================================================
--- uspace/drv/bus/usb/usbmast/usbmast.h	(revision 805552d0df94261451a5f7df54c5bd5cf4cddbc5)
+++ uspace/drv/bus/usb/usbmast/usbmast.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <bd_srv.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>