Index: uspace/drv/bus/usb/ehci/ehci_regs.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/bus/usb/ehci/ehci_regs.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,4 @@
 #define DRV_EHCI_EHCI_REGS_H
 
-#include <sys/types.h>
 #include <byteorder.h>
 #include <macros.h>
Index: uspace/drv/bus/usb/ohci/ohci_regs.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_regs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/bus/usb/ohci/ohci_regs.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -38,5 +38,4 @@
 
 #include <ddi.h>
-#include <sys/types.h>
 #include <byteorder.h>
 
Index: uspace/drv/bus/usb/uhci/hc.h
===================================================================
--- uspace/drv/bus/usb/uhci/hc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/bus/usb/uhci/hc.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -41,5 +41,5 @@
 #include <macros.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <ddi.h>
 #include <usb/host/hcd.h>
 #include <usb/host/usb_transfer_batch.h>
Index: uspace/drv/bus/usb/uhci/uhci_rh.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/bus/usb/uhci/uhci_rh.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -41,5 +41,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 /** Endpoint number for status change pipe. */
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/char/i8042/i8042.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -41,5 +41,5 @@
 
 #include <io/chardev_srv.h>
-#include <sys/types.h>
+#include <ddi.h>
 #include <fibril_synch.h>
 #include <ddf/driver.h>
Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h
===================================================================
--- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -40,4 +40,5 @@
 #include <abi/fb/visuals.h>
 #include <pixconv.h>
+#include <ddi.h>
 
 #include "amdm37x_dispc_regs.h"
Index: uspace/drv/platform/amdm37x/cm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/clock_control.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/cm/clock_control.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_CLOCK_CONTROL_CM_H
 #define AMDM37x_CLOCK_CONTROL_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/core.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/core.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/cm/core.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_CORE_CM_H
 #define AMDM37x_CORE_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/iva2.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/iva2.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/cm/iva2.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_IVA2_CM_H
 #define AMDM37x_IVA2_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/mpu.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/mpu.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/cm/mpu.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37x_MPU_CM_H
 #define AMDM37x_MPU_CM_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/cm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/cm/usbhost.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/cm/usbhost.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_USBHOST_CM_H
 #define AMDM37x_USBHOST_CM_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 /* AM/DM37x TRM p.447 */
Index: uspace/drv/platform/amdm37x/prm/clock_control.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/clock_control.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/prm/clock_control.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_CLOCK_CONTROL_H
 #define AMDM37X_PRM_CLOCK_CONTROL_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/prm/global_reg.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/global_reg.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/prm/global_reg.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_GLOBAL_REG_H
 #define AMDM37X_PRM_GLOBAL_REG_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/prm/usbhost.h
===================================================================
--- uspace/drv/platform/amdm37x/prm/usbhost.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/prm/usbhost.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,5 +35,6 @@
 #ifndef AMDM37X_PRM_CLOCK_CONTROL_H
 #define AMDM37X_PRM_CLOCK_CONTROL_H
-#include <sys/types.h>
+
+#include <ddi.h>
 #include <macros.h>
 
Index: uspace/drv/platform/amdm37x/uhh.h
===================================================================
--- uspace/drv/platform/amdm37x/uhh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/uhh.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_UHH_H
 #define AMDM37x_UHH_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 #define AMDM37x_UHH_BASE_ADDRESS  0x48064000
Index: uspace/drv/platform/amdm37x/usbtll.h
===================================================================
--- uspace/drv/platform/amdm37x/usbtll.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
+++ uspace/drv/platform/amdm37x/usbtll.h	(revision adc68def3235af7963686c2ea574a62fed50a24b)
@@ -35,6 +35,7 @@
 #ifndef AMDM37x_USBTLL_H
 #define AMDM37x_USBTLL_H
+
 #include <macros.h>
-#include <sys/types.h>
+#include <ddi.h>
 
 #define AMDM37x_USBTLL_BASE_ADDRESS  0x48062000