Index: uspace/lib/usbdev/include/usb/dev/driver.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/driver.h	(revision fd9b3a67d971bf91778227fddbe37bbf536f7257)
+++ uspace/lib/usbdev/include/usb/dev/driver.h	(revision 6a5d05bd2551e64111bea4f9332dd7448c26ce84)
@@ -37,11 +37,6 @@
 #define LIBUSBDEV_DRIVER_H_
 
-#include <usb/hc.h>
-#include <usb/dev/alternate_ifaces.h>
-#include <usb/dev/usb_device_connection.h>
+#include <usb/dev/device.h>
 #include <usb/dev/pipes.h>
-#include <usb_iface.h>
-
-typedef struct usb_device usb_device_t;
 
 /** USB driver ops. */
@@ -98,37 +93,4 @@
 int usb_driver_main(const usb_driver_t *);
 
-int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
-void usb_device_destroy_ddf(ddf_dev_t *);
-
-const char* usb_device_get_name(usb_device_t *);
-ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *, fun_type_t, const char *);
-
-async_exch_t * usb_device_bus_exchange_begin(usb_device_t *);
-void usb_device_bus_exchange_end(async_exch_t *);
-
-int usb_device_select_interface(usb_device_t *, uint8_t,
-    const usb_endpoint_description_t **);
-
-int usb_device_create_pipes(usb_device_t *usb_dev,
-    const usb_endpoint_description_t **endpoints);
-void usb_device_destroy_pipes(usb_device_t *);
-
-usb_pipe_t *usb_device_get_default_pipe(usb_device_t *);
-usb_endpoint_mapping_t * usb_device_get_mapped_ep_desc(usb_device_t *,
-    const usb_endpoint_description_t *);
-usb_endpoint_mapping_t * usb_device_get_mapped_ep(usb_device_t *,
-    usb_endpoint_t);
-
-int usb_device_get_iface_number(usb_device_t *);
-
-const usb_standard_device_descriptor_t *
-usb_device_get_device_descriptor(usb_device_t *);
-const void * usb_device_get_configuration_descriptor(usb_device_t *, size_t *);
-const usb_alternate_interfaces_t * usb_device_get_alternative_ifaces(
-    usb_device_t *);
-
-void * usb_device_data_alloc(usb_device_t *, size_t);
-void * usb_device_data_get(usb_device_t *);
-
 #endif
 /**