Index: uspace/drv/bus/usb/vhc/transfer.c
===================================================================
--- uspace/drv/bus/usb/vhc/transfer.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/drv/bus/usb/vhc/transfer.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -32,4 +32,6 @@
 #include <usbvirt/device.h>
 #include <usb/host/bandwidth.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/usb_transfer_batch.h>
 #include <usbvirt/ipc.h>
 #include "vhcd.h"
Index: uspace/lib/usbhost/include/usb/host/bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/bus.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/bus.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -45,4 +45,5 @@
 #include <usb/usb.h>
 #include <usb/request.h>
+#include <usb/host/hcd.h>
 
 #include <assert.h>
Index: uspace/lib/usbhost/include/usb/host/ddf_helpers.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/ddf_helpers.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/ddf_helpers.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -37,11 +37,10 @@
 #define LIBUSBHOST_HOST_DDF_HELPERS_H
 
-#include <usb/host/hcd.h>
-#include <usb/host/bus.h>
-#include <usb/usb.h>
-
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
+#include <usb/usb.h>
+
+#include <usb/host/hcd.h>
 
 typedef int (*driver_init_t)(hcd_t *, const hw_res_list_parsed_t *, ddf_dev_t *);
Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -40,9 +40,9 @@
 #define LIBUSBHOST_HOST_ENDPOINT_H
 
+#include <adt/list.h>
+#include <atomic.h>
+#include <fibril_synch.h>
 #include <stdbool.h>
-#include <adt/list.h>
-#include <fibril_synch.h>
 #include <usb/usb.h>
-#include <atomic.h>
 
 typedef struct bus bus_t;
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -37,16 +37,15 @@
 #define LIBUSBHOST_HOST_HCD_H
 
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/usb.h>
-
 #include <assert.h>
 #include <mem.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <usb/usb.h>
 #include <usbhc_iface.h>
 
 typedef struct hcd hcd_t;
+typedef struct bus bus_t;
+typedef struct device device_t;
+typedef struct usb_transfer_batch usb_transfer_batch_t;
 
 typedef int (*schedule_hook_t)(hcd_t *, usb_transfer_batch_t *);
Index: uspace/lib/usbhost/include/usb/host/usb2_bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -37,9 +37,9 @@
 #define LIBUSBHOST_HOST_USB2_BUS_H
 
-#include <usb/usb.h>
-#include <usb/host/bus.h>
-
 #include <adt/list.h>
 #include <stdbool.h>
+#include <usb/usb.h>
+
+#include <usb/host/bus.h>
 
 typedef struct usb2_bus usb2_bus_t;
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -37,13 +37,15 @@
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
+#include <atomic.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <usb/request.h>
 #include <usb/usb.h>
-#include <usb/request.h>
-#include <usb/host/bus.h>
 #include <usbhc_iface.h>
 
-#include <atomic.h>
-#include <stddef.h>
-#include <errno.h>
-#include <stdint.h>
+#include <usb/host/hcd.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/bus.h>
 
 typedef struct endpoint endpoint_t;
@@ -87,5 +89,8 @@
 } usb_transfer_batch_t;
 
-/** Printf formatting string for dumping usb_transfer_batch_t. */
+/**
+ * Printf formatting string for dumping usb_transfer_batch_t.
+ *  [address:endpoint speed transfer_type-direction buffer_sizeB/max_packet_size]
+ * */
 #define USB_TRANSFER_BATCH_FMT "[%d:%d %s %s-%s %zuB/%zu]"
 
@@ -94,8 +99,8 @@
  */
 #define USB_TRANSFER_BATCH_ARGS(batch) \
-	(batch).target.address, (batch).target.endpoint, \
+	((batch).ep->device->address), ((batch).ep->endpoint), \
 	usb_str_speed((batch).ep->device->speed), \
 	usb_str_transfer_type_short((batch).ep->transfer_type), \
-	usb_str_direction((batch).ep->direction), \
+	usb_str_direction((batch).dir), \
 	(batch).buffer_size, (batch).ep->max_packet_size
 
Index: uspace/lib/usbhost/src/bandwidth.c
===================================================================
--- uspace/lib/usbhost/src/bandwidth.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/bandwidth.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -34,10 +34,11 @@
  */
 
-#include <usb/host/bandwidth.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
-
 #include <assert.h>
 #include <stdlib.h>
+
+#include "endpoint.h"
+#include "bus.h"
+
+#include "bandwidth.h"
 
 /** Calculate bandwidth that needs to be reserved for communication with EP.
Index: uspace/lib/usbhost/src/bus.c
===================================================================
--- uspace/lib/usbhost/src/bus.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/bus.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -34,12 +34,12 @@
  */
 
-#include <usb/host/bus.h>
-#include <usb/host/endpoint.h>
+#include <ddf/driver.h>
+#include <errno.h>
+#include <mem.h>
+#include <stdio.h>
 #include <usb/debug.h>
-#include <ddf/driver.h>
-
-#include <mem.h>
-#include <errno.h>
-#include <stdio.h>
+
+#include "endpoint.h"
+#include "bus.h"
 
 /**
Index: uspace/lib/usbhost/src/ddf_helpers.c
===================================================================
--- uspace/lib/usbhost/src/ddf_helpers.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/ddf_helpers.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -34,11 +34,4 @@
  */
 
-#include <usb/classes/classes.h>
-#include <usb/host/bus.h>
-#include <usb/debug.h>
-#include <usb/descriptor.h>
-#include <usb/request.h>
-#include <usb/usb.h>
-
 #include <adt/list.h>
 #include <assert.h>
@@ -48,10 +41,13 @@
 #include <device/hw_res_parsed.h>
 #include <errno.h>
-#include <fibril_synch.h>
-#include <macros.h>
-#include <stdlib.h>
 #include <str_error.h>
+#include <usb/classes/classes.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/usb.h>
 #include <usb_iface.h>
 #include <usbhc_iface.h>
+
+#include "bus.h"
 
 #include "ddf_helpers.h"
Index: uspace/lib/usbhost/src/dma_buffer.c
===================================================================
--- uspace/lib/usbhost/src/dma_buffer.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/dma_buffer.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -33,10 +33,10 @@
  */
 
-#include <usb/host/dma_buffer.h>
-
 #include <align.h>
 #include <as.h>
 #include <ddi.h>
 #include <stddef.h>
+
+#include "dma_buffer.h"
 
 dma_policy_t dma_policy_default = {
Index: uspace/lib/usbhost/src/endpoint.c
===================================================================
--- uspace/lib/usbhost/src/endpoint.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/endpoint.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -35,12 +35,13 @@
  */
 
-#include <usb/host/endpoint.h>
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/bus.h>
-
 #include <assert.h>
 #include <atomic.h>
 #include <mem.h>
 #include <stdlib.h>
+
+#include "usb_transfer_batch.h"
+#include "bus.h"
+
+#include "endpoint.h"
 
 /** Initialize provided endpoint structure.
@@ -153,5 +154,4 @@
 }
 
-
 /**
  * @}
Index: uspace/lib/usbhost/src/hcd.c
===================================================================
--- uspace/lib/usbhost/src/hcd.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/hcd.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -34,14 +34,17 @@
  */
 
-#include <usb/debug.h>
-#include <usb/descriptor.h>
-#include <usb/request.h>
-
 #include <assert.h>
 #include <async.h>
 #include <errno.h>
 #include <macros.h>
+#include <str_error.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/request.h>
 #include <usb_iface.h>
-#include <str_error.h>
+
+#include "bus.h"
+#include "endpoint.h"
+#include "usb_transfer_batch.h"
 
 #include "hcd.h"
Index: uspace/lib/usbhost/src/usb2_bus.c
===================================================================
--- uspace/lib/usbhost/src/usb2_bus.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/usb2_bus.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -34,18 +34,19 @@
  */
 
-#include <usb/host/usb2_bus.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/ddf_helpers.h>
-#include <usb/debug.h>
-#include <usb/request.h>
-#include <usb/descriptor.h>
-#include <usb/usb.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <macros.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/request.h>
+#include <usb/usb.h>
+
+#include "endpoint.h"
+#include "ddf_helpers.h"
+
+#include "usb2_bus.h"
 
 /** Ops receive generic bus_t pointer. */
Index: uspace/lib/usbhost/src/usb_transfer_batch.c
===================================================================
--- uspace/lib/usbhost/src/usb_transfer_batch.c	(revision b60eac1278186f1cc2c19ceab05c690a4dfe93f4)
+++ uspace/lib/usbhost/src/usb_transfer_batch.c	(revision 64fea02b3a398193cf6c055c00be47f314631de1)
@@ -33,14 +33,14 @@
  */
 
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <str_error.h>
 #include <usb/debug.h>
 
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <str_error.h>
+#include "endpoint.h"
+#include "bus.h"
 
+#include "usb_transfer_batch.h"
 
 /** Create a batch on given endpoint.