Index: uspace/lib/usbhost/include/usb/host/bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/bus.h	(revision 35c37fc2ef57407c4bf38bf0ac3d777777e3ccd1)
+++ uspace/lib/usbhost/include/usb/host/bus.h	(revision 9efad54470c08d7d51f40a9febdaa103916aec6f)
@@ -109,5 +109,5 @@
 	int (*device_offline)(device_t *);			/**< Optional */
 	endpoint_t *(*device_find_endpoint)(device_t*, usb_target_t, usb_direction_t);
-	endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_desc_t *);
+	endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_descriptors_t *);
 
 	/* Operations on endpoint */
@@ -163,5 +163,5 @@
     const char *);
 
-int bus_endpoint_add(device_t *, const usb_endpoint_desc_t *, endpoint_t **);
+int bus_endpoint_add(device_t *, const usb_endpoint_descriptors_t *, endpoint_t **);
 endpoint_t *bus_find_endpoint(device_t *, usb_target_t, usb_direction_t);
 int bus_endpoint_remove(endpoint_t *);
Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 35c37fc2ef57407c4bf38bf0ac3d777777e3ccd1)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 9efad54470c08d7d51f40a9febdaa103916aec6f)
@@ -46,4 +46,5 @@
 #include <usb/usb.h>
 #include <usb/host/bus.h>
+#include <usbhc_iface.h>
 
 typedef struct bus bus_t;
@@ -59,14 +60,4 @@
 	/** Reference count. */
 	atomic_t refcnt;
-	/** Enpoint number */
-	usb_endpoint_t endpoint;
-	/** Communication direction. */
-	usb_direction_t direction;
-	/** USB transfer type. */
-	usb_transfer_type_t transfer_type;
-	/** Maximum size of data packets. */
-	size_t max_packet_size;
-	/** Additional opportunities per uframe */
-	unsigned packets;
 	/** Reserved bandwidth. */
 	size_t bandwidth;
@@ -80,8 +71,22 @@
 	fibril_condvar_t avail;
 
+	/** Enpoint number */
+	usb_endpoint_t endpoint;
+	/** Communication direction. */
+	usb_direction_t direction;
+	/** USB transfer type. */
+	usb_transfer_type_t transfer_type;
+	/** Maximum size of one packet */
+	size_t max_packet_size;
+
+	/** Maximum size of one transfer */
+	size_t max_transfer_size;
+	/** Number of packats that can be sent in one service interval (not necessarily uframe) */
+	unsigned packets_per_uframe;
+
 	/* This structure is meant to be extended by overriding. */
 } endpoint_t;
 
-extern void endpoint_init(endpoint_t *, device_t *, const usb_endpoint_desc_t *);
+extern void endpoint_init(endpoint_t *, device_t *, const usb_endpoint_descriptors_t *);
 
 extern void endpoint_add_ref(endpoint_t *);