Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision aff1880223dc65a807007d2fbf259e14f2baa53d)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision 6c5abf95c6e7fcfe7c108ad823d88482468e5ed0)
@@ -41,4 +41,5 @@
 
 #include <usb/usb.h>
+#include <usb/debug.h>
 #include <usb/dev/pipes.h>
 #include <usb/classes/classes.h>
Index: uspace/drv/bus/usb/usbhub/utils.c
===================================================================
--- uspace/drv/bus/usb/usbhub/utils.c	(revision aff1880223dc65a807007d2fbf259e14f2baa53d)
+++ uspace/drv/bus/usb/usbhub/utils.c	(revision 6c5abf95c6e7fcfe7c108ad823d88482468e5ed0)
@@ -34,5 +34,4 @@
  */
 #include <ddf/driver.h>
-#include <bool.h>
 #include <errno.h>
 
@@ -40,4 +39,6 @@
 #include <usb/descriptor.h>
 #include <usb/classes/hub.h>
+#include <usb/debug.h>
+
 
 #include "usbhub.h"
@@ -45,69 +46,4 @@
 
 
-size_t USB_HUB_MAX_DESCRIPTOR_SIZE = 71;
-
-//*********************************************
-//
-//  various utils
-//
-//*********************************************
-
-//hub descriptor utils
-
-/**
- * create uint8_t array with serialized descriptor
- *
- * @param descriptor
- * @return newly created serializd descriptor pointer
- */
-void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor) {
-	//base size
-	size_t size = 7;
-	//variable size according to port count
-	size_t var_size = (descriptor->ports_count + 7) / 8;
-	size += 2 * var_size;
-	uint8_t *result = malloc(size);
-	//size
-	if (result)
-		usb_serialize_hub_descriptor(descriptor, result);
-	return result;
-}
-
-/**
- * serialize descriptor into given buffer
- *
- * The buffer size is not checked.
- * @param descriptor
- * @param serialized_descriptor
- */
-void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor,
-    void *serialized_descriptor)
-{
-	//base size
-	uint8_t *sdescriptor = serialized_descriptor;
-	size_t size = 7;
-	//variable size according to port count
-	size_t var_size = (descriptor->ports_count + 7) / 8;
-	size += 2 * var_size;
-	//size
-	sdescriptor[0] = size;
-	//descriptor type
-	sdescriptor[1] = USB_DESCTYPE_HUB;
-	sdescriptor[2] = descriptor->ports_count;
-	/// @fixme handling of endianness??
-	sdescriptor[3] = descriptor->hub_characteristics / 256;
-	sdescriptor[4] = descriptor->hub_characteristics % 256;
-	sdescriptor[5] = descriptor->pwr_on_2_good_time;
-	sdescriptor[6] = descriptor->current_requirement;
-
-	size_t i;
-	for (i = 0; i < var_size; ++i) {
-		sdescriptor[7 + i] = descriptor->devices_removable[i];
-	}
-	for (i = 0; i < var_size; ++i) {
-		sdescriptor[7 + var_size + i] = 255;
-	}
-}
-/*----------------------------------------------------------------------------*/
 /**
  * Deserialize descriptor into given pointer
Index: uspace/drv/bus/usb/usbhub/utils.h
===================================================================
--- uspace/drv/bus/usb/usbhub/utils.h	(revision aff1880223dc65a807007d2fbf259e14f2baa53d)
+++ uspace/drv/bus/usb/usbhub/utils.h	(revision 6c5abf95c6e7fcfe7c108ad823d88482468e5ed0)
@@ -38,21 +38,7 @@
 #define USBHUB_UTILS_H
 
-#include <adt/list.h>
-#include <bool.h>
-#include <ddf/driver.h>
-#include <fibril_synch.h>
+#include <usb/usb.h>
 
-#include <usb/classes/hub.h>
-#include <usb/usb.h>
-#include <usb/debug.h>
-#include <usb/dev/request.h>
-
-#include "usbhub.h"
-
-
-void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor);
-
-void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor,
-    void *serialized_descriptor);
+#define USB_HUB_MAX_DESCRIPTOR_SIZE 71
 
 int usb_deserialize_hub_desriptor(