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