Index: uspace/drv/bus/usb/usbhid/usbhid.c
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
+++ uspace/drv/bus/usb/usbhid/usbhid.c	(revision 945d66cf8dee14cc5321c053cc3ed3c7d7f918bf)
@@ -114,11 +114,12 @@
     const usb_hid_subdriver_mapping_t *mapping)
 {
-	assert(hid_dev != NULL);
-	assert(hid_dev->usb_dev != NULL);
-
-	return (hid_dev->usb_dev->descriptors.device.vendor_id
-	    == mapping->vendor_id
-	    && hid_dev->usb_dev->descriptors.device.product_id
-	    == mapping->product_id);
+	assert(hid_dev);
+	assert(hid_dev->usb_dev);
+	assert(mapping);
+	const usb_standard_device_descriptor_t *d =
+	    usb_device_get_device_descriptor(hid_dev->usb_dev);
+
+	return (d->vendor_id == mapping->vendor_id)
+	    && (d->product_id == mapping->product_id);
 }
 
Index: uspace/drv/bus/usb/usbmid/explore.c
===================================================================
--- uspace/drv/bus/usb/usbmid/explore.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
+++ uspace/drv/bus/usb/usbmid/explore.c	(revision 945d66cf8dee14cc5321c053cc3ed3c7d7f918bf)
@@ -118,5 +118,5 @@
 		usbmid_interface_t *iface = NULL;
 		const int rc = usbmid_spawn_interface_child(usb_dev, &iface,
-		    &usb_dev->descriptors.device, interface);
+			usb_device_get_device_descriptor(usb_dev), interface);
 		if (rc != EOK) {
 			//TODO: Do something about that failure.
@@ -142,5 +142,6 @@
 int usbmid_explore_device(usb_device_t *dev)
 {
-	const unsigned dev_class = dev->descriptors.device.device_class;
+	const unsigned dev_class =
+	    usb_device_get_device_descriptor(dev)->device_class;
 	if (dev_class != USB_CLASS_USE_INTERFACE) {
 		usb_log_warning(
@@ -152,7 +153,9 @@
 	}
 
-	/* Shortcuts to save on typing ;-). */
-	const void *config_descriptor_raw = dev->descriptors.configuration;
-	size_t config_descriptor_size = dev->descriptors.configuration_size;
+	/* Get coonfiguration descriptor. */
+	size_t config_descriptor_size = 0;
+	const void *config_descriptor_raw =
+	    usb_device_get_configuration_descriptor(dev,
+	    &config_descriptor_size);
 	const usb_standard_configuration_descriptor_t *config_descriptor =
 	    config_descriptor_raw;