Index: uspace/drv/usbhub/usbhub.c
===================================================================
--- uspace/drv/usbhub/usbhub.c	(revision 4e8e1f51aca228845c8d503a3f52fbf34a47bb20)
+++ uspace/drv/usbhub/usbhub.c	(revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e)
@@ -84,6 +84,5 @@
 	}*/
 
-	result->usb_device = usb_new(usb_hcd_attached_device_info_t);
-	result->usb_device->address = addr;
+	result->address = addr;
 
 	// get hub descriptor
@@ -155,5 +154,5 @@
 	int opResult;
 	usb_target_t target;
-	target.address = hub_info->usb_device->address;
+	target.address = hub_info->address;
 	target.endpoint = 0;
 
@@ -216,5 +215,5 @@
 	dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
 	dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-			hub_info->usb_device->address,
+			hub_info->address,
 			hub_info->port_count);
 	dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
@@ -465,5 +464,5 @@
 
 		usb_target_t target;
-		target.address = hub_info->usb_device->address;
+		target.address = hub_info->address;
 		target.endpoint = 1;/// \TODO get from endpoint descriptor
 		dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d",
@@ -507,5 +506,5 @@
 			if (interrupt) {
 				usb_hub_process_interrupt(
-				        hub_info, hc, port, hub_info->usb_device->address);
+				        hub_info, hc, port, hub_info->address);
 			}
 		}
Index: uspace/drv/usbhub/usbhub.h
===================================================================
--- uspace/drv/usbhub/usbhub.h	(revision 4e8e1f51aca228845c8d503a3f52fbf34a47bb20)
+++ uspace/drv/usbhub/usbhub.h	(revision bfe0eb5569bc22f7f709e68f7bf2fb571641044e)
@@ -36,7 +36,9 @@
 #define DRV_USBHUB_USBHUB_H
 
+#include <ipc/devman.h>
+#include <usb/usb.h>
+#include <driver.h>
+
 #define NAME "usbhub"
-
-#include "usb/hcdhubd.h"
 
 /** basic information about device attached to hub */
@@ -52,9 +54,8 @@
 	/** attached device handles */
 	usb_hub_attached_device_t * attached_devs;
-	/** General usb device info. */
-	usb_hcd_attached_device_info_t * usb_device;
+	/** USB address of the hub. */
+	usb_address_t address;
 	/** General device info*/
 	device_t * device;
-
 } usb_hub_info_t;