Index: uspace/lib/usbhost/include/usb/host/ddf_helpers.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/ddf_helpers.h	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/include/usb/host/ddf_helpers.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -37,8 +37,11 @@
 #define LIBUSBHOST_HOST_DDF_HELPERS_H
 
+#include <usb/host/hcd.h>
+#include <usb/host/usb_bus.h>
+#include <usb/usb.h>
+
+#include <ddf/driver.h>
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
-#include <usb/host/hcd.h>
-#include <usbhc_iface.h>
 
 int hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -37,10 +37,12 @@
 #define LIBUSBHOST_HOST_HCD_H
 
-#include <assert.h>
-#include <adt/list.h>
-#include <usbhc_iface.h>
-
+#include <usb/host/endpoint.h>
 #include <usb/host/usb_bus.h>
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/usb.h>
+
+#include <assert.h>
+#include <usbhc_iface.h>
+#include <sys/types.h>
 
 typedef struct hcd hcd_t;
Index: uspace/lib/usbhost/include/usb/host/usb_bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_bus.h	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/include/usb/host/usb_bus.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -40,9 +40,11 @@
 #define LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
 
+#include <usb/host/endpoint.h>
+#include <usb/usb.h>
+
 #include <adt/list.h>
 #include <fibril_synch.h>
-#include <usb/usb.h>
+#include <stdbool.h>
 
-#include <usb/host/endpoint.h>
 
 /** Bytes per second in FULL SPEED */
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -37,9 +37,11 @@
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
-#include <adt/list.h>
+#include <usb/host/endpoint.h>
+#include <usb/usb.h>
 
+#include <assert.h>
+#include <stdbool.h>
+#include <sys/types.h>
 #include <usbhc_iface.h>
-#include <usb/usb.h>
-#include <usb/host/endpoint.h>
 
 #define USB_SETUP_PACKET_SIZE 8
Index: uspace/lib/usbhost/src/ddf_helpers.c
===================================================================
--- uspace/lib/usbhost/src/ddf_helpers.c	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/src/ddf_helpers.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -34,12 +34,23 @@
  */
 
-#include <usb_iface.h>
 #include <usb/classes/classes.h>
 #include <usb/debug.h>
 #include <usb/descriptor.h>
 #include <usb/request.h>
+#include <usb/usb.h>
+
+#include <adt/list.h>
+#include <assert.h>
+#include <async.h>
+#include <ddf/driver.h>
+#include <ddf/interrupt.h>
+#include <device/hw_res_parsed.h>
 #include <devman.h>
 #include <errno.h>
+#include <fibril_synch.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <str_error.h>
+#include <usb_iface.h>
 
 #include "ddf_helpers.h"
Index: uspace/lib/usbhost/src/endpoint.c
===================================================================
--- uspace/lib/usbhost/src/endpoint.c	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/src/endpoint.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -33,8 +33,8 @@
  */
 
+#include <usb/host/endpoint.h>
+
 #include <assert.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <usb/host/endpoint.h>
 
 /** Allocate ad initialize endpoint_t structure.
Index: uspace/lib/usbhost/src/hcd.c
===================================================================
--- uspace/lib/usbhost/src/hcd.c	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/src/hcd.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -34,9 +34,11 @@
  */
 
-#include <errno.h>
-#include <str_error.h>
-#include <usb_iface.h>
 #include <usb/debug.h>
 #include <usb/request.h>
+
+#include <assert.h>
+#include <async.h>
+#include <errno.h>
+#include <usb_iface.h>
 
 #include "hcd.h"
Index: uspace/lib/usbhost/src/usb_bus.c
===================================================================
--- uspace/lib/usbhost/src/usb_bus.c	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/src/usb_bus.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -33,11 +33,11 @@
  */
 
-#include <stdbool.h>
+#include <usb/host/usb_bus.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <macros.h>
-
-#include <usb/debug.h>
-#include <usb/host/usb_bus.h>
+#include <stdbool.h>
+
 
 /** Endpoint compare helper function.
Index: uspace/lib/usbhost/src/usb_transfer_batch.c
===================================================================
--- uspace/lib/usbhost/src/usb_transfer_batch.c	(revision 19d21728130e07ccef09fa48851460ad8733e6e8)
+++ uspace/lib/usbhost/src/usb_transfer_batch.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -32,12 +32,14 @@
  * USB transfer transaction structures (implementation).
  */
+
+#include <usb/host/usb_transfer_batch.h>
+#include <usb/debug.h>
+
+#include <assert.h>
 #include <errno.h>
 #include <macros.h>
-
-#include <usb/usb.h>
-#include <usb/debug.h>
-
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/hcd.h>
+#include <mem.h>
+#include <stdlib.h>
+#include <usbhc_iface.h>
 
 /** Allocate and initialize usb_transfer_batch structure.