Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -51,5 +51,5 @@
 #include <usb/classes/hub.h>
 #include <usb/dev/poll.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 
 #include "usbhub.h"
Index: uspace/lib/drv/include/usb_iface.h
===================================================================
--- uspace/lib/drv/include/usb_iface.h	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/lib/drv/include/usb_iface.h	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -43,55 +43,4 @@
 typedef async_sess_t usb_dev_session_t;
 
-/** USB speeds. */
-typedef enum {
-	/** USB 1.1 low speed (1.5Mbits/s). */
-	USB_SPEED_LOW,
-	/** USB 1.1 full speed (12Mbits/s). */
-	USB_SPEED_FULL,
-	/** USB 2.0 high speed (480Mbits/s). */
-	USB_SPEED_HIGH,
-	/** USB 3.0 super speed (5Gbits/s). */
-	USB_SPEED_SUPER,
-	/** Psuedo-speed serving as a boundary. */
-	USB_SPEED_MAX
-} usb_speed_t;
-
-/** USB endpoint number type.
- * Negative values could be used to indicate error.
- */
-typedef int16_t usb_endpoint_t;
-
-/** USB address type.
- * Negative values could be used to indicate error.
- */
-typedef int16_t usb_address_t;
-
-/** USB transfer type. */
-typedef enum {
-	USB_TRANSFER_CONTROL = 0,
-	USB_TRANSFER_ISOCHRONOUS = 1,
-	USB_TRANSFER_BULK = 2,
-	USB_TRANSFER_INTERRUPT = 3
-} usb_transfer_type_t;
-
-/** USB data transfer direction. */
-typedef enum {
-	USB_DIRECTION_IN,
-	USB_DIRECTION_OUT,
-	USB_DIRECTION_BOTH
-} usb_direction_t;
-
-/** USB complete address type.
- * Pair address + endpoint is identification of transaction recipient.
- */
-typedef union {
-	struct {
-		usb_address_t address;
-		usb_endpoint_t endpoint;
-		uint32_t stream;
-	} __attribute__((packed));
-	uint64_t packed;
-} usb_target_t;
-
 extern usb_dev_session_t *usb_dev_connect(devman_handle_t);
 extern usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
Index: uspace/lib/drv/include/usbhc_iface.h
===================================================================
--- uspace/lib/drv/include/usbhc_iface.h	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/lib/drv/include/usbhc_iface.h	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -41,6 +41,56 @@
 
 #include "ddf/driver.h"
-#include "usb_iface.h"
 #include <async.h>
+
+/** USB speeds. */
+typedef enum {
+	/** USB 1.1 low speed (1.5Mbits/s). */
+	USB_SPEED_LOW,
+	/** USB 1.1 full speed (12Mbits/s). */
+	USB_SPEED_FULL,
+	/** USB 2.0 high speed (480Mbits/s). */
+	USB_SPEED_HIGH,
+	/** USB 3.0 super speed (5Gbits/s). */
+	USB_SPEED_SUPER,
+	/** Psuedo-speed serving as a boundary. */
+	USB_SPEED_MAX
+} usb_speed_t;
+
+/** USB endpoint number type.
+ * Negative values could be used to indicate error.
+ */
+typedef int16_t usb_endpoint_t;
+
+/** USB address type.
+ * Negative values could be used to indicate error.
+ */
+typedef int16_t usb_address_t;
+
+/** USB transfer type. */
+typedef enum {
+	USB_TRANSFER_CONTROL = 0,
+	USB_TRANSFER_ISOCHRONOUS = 1,
+	USB_TRANSFER_BULK = 2,
+	USB_TRANSFER_INTERRUPT = 3
+} usb_transfer_type_t;
+
+/** USB data transfer direction. */
+typedef enum {
+	USB_DIRECTION_IN,
+	USB_DIRECTION_OUT,
+	USB_DIRECTION_BOTH
+} usb_direction_t;
+
+/** USB complete address type.
+ * Pair address + endpoint is identification of transaction recipient.
+ */
+typedef union {
+	struct {
+		usb_address_t address;
+		usb_endpoint_t endpoint;
+		uint32_t stream;
+	} __attribute__((packed));
+	uint64_t packed;
+} usb_target_t;
 
 typedef struct usb_pipe_desc {
Index: uspace/lib/usb/include/usb/usb.h
===================================================================
--- uspace/lib/usb/include/usb/usb.h	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/lib/usb/include/usb/usb.h	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -39,5 +39,5 @@
 #include <stdint.h>
 #include <types/common.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 
 /** Convert 16bit value from native (host) endianness to USB endianness. */
Index: uspace/lib/usbdev/include/usb/dev/pipes.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -37,5 +37,5 @@
 #include <usb/usb.h>
 #include <usb/descriptor.h>
-#include <usbhc_iface.h>
+#include <usb_iface.h>
 
 #include <stdbool.h>
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 5ff5dc587b62bc1f03ece3bd7934c0aa959ff139)
+++ uspace/lib/usbdev/src/pipes.c	(revision 3cdaa7fe8c618e722683a161c68f1de35d864b77)
@@ -36,5 +36,4 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
-#include <usbhc_iface.h>
 
 #include <assert.h>