Index: uspace/drv/bus/usb/usbflbk/main.c
===================================================================
--- uspace/drv/bus/usb/usbflbk/main.c	(revision 6785b538d1d589cbbed2c1fbe3c6dc068f7c0a05)
+++ uspace/drv/bus/usb/usbflbk/main.c	(revision 2dc5a9ff32f8362e05d413f795fc2fe2bcc1b774)
@@ -49,5 +49,5 @@
 {
 	usb_log_info("Pretending to control %s `%s'.\n",
-	    dev->interface_no < 0 ? "device" : "interface",
+	    usb_device_get_iface_number(dev) < 0 ? "device" : "interface",
 	    usb_device_get_name(dev));
 	return EOK;
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 6785b538d1d589cbbed2c1fbe3c6dc068f7c0a05)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 2dc5a9ff32f8362e05d413f795fc2fe2bcc1b774)
@@ -272,5 +272,6 @@
 	rc = usbhid_req_set_report(
 	    usb_device_get_default_pipe(hid_dev->usb_dev),
-	    hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT,
+	    usb_device_get_iface_number(hid_dev->usb_dev),
+	    USB_HID_REPORT_TYPE_OUTPUT,
 	    kbd_dev->output_buffer, kbd_dev->output_size);
 	if (rc != EOK) {
@@ -583,5 +584,5 @@
 
 	usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
-	    hid_dev->usb_dev->interface_no, IDLE_RATE);
+	    usb_device_get_iface_number(hid_dev->usb_dev), IDLE_RATE);
 
 
@@ -789,5 +790,6 @@
 	rc = usbhid_req_set_protocol(
 	    usb_device_get_default_pipe(hid_dev->usb_dev),
-	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
+	    usb_device_get_iface_number(hid_dev->usb_dev),
+	    USB_HID_PROTOCOL_BOOT);
 
 	if (rc != EOK) {
Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision 6785b538d1d589cbbed2c1fbe3c6dc068f7c0a05)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision 2dc5a9ff32f8362e05d413f795fc2fe2bcc1b774)
@@ -65,5 +65,5 @@
 	}
 
-	if (dev->interface_no < 0) {
+	if (usb_device_get_iface_number(dev) < 0) {
 		usb_log_error("Failed to add HID device: endpoints not found."
 		    "\n");
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 6785b538d1d589cbbed2c1fbe3c6dc068f7c0a05)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 2dc5a9ff32f8362e05d413f795fc2fe2bcc1b774)
@@ -316,5 +316,5 @@
 	// TODO: how to know if the device supports the request???
 	usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
-	    hid_dev->usb_dev->interface_no, IDLE_RATE);
+	    usb_device_get_iface_number(hid_dev->usb_dev), IDLE_RATE);
 	return EOK;
 }
@@ -427,5 +427,6 @@
 	rc = usbhid_req_set_protocol(
 	    usb_device_get_default_pipe(hid_dev->usb_dev),
-	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
+	    usb_device_get_iface_number(hid_dev->usb_dev),
+	    USB_HID_PROTOCOL_BOOT);
 
 	if (rc != EOK) {
Index: uspace/drv/bus/usb/usbmast/bo_trans.c
===================================================================
--- uspace/drv/bus/usb/usbmast/bo_trans.c	(revision 6785b538d1d589cbbed2c1fbe3c6dc068f7c0a05)
+++ uspace/drv/bus/usb/usbmast/bo_trans.c	(revision 2dc5a9ff32f8362e05d413f795fc2fe2bcc1b774)
@@ -202,5 +202,5 @@
 	    usb_device_get_default_pipe(mdev->usb_dev),
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-	    0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
+	    0xFF, 0, usb_device_get_iface_number(mdev->usb_dev), NULL, 0);
 }
 
@@ -242,5 +242,6 @@
 	    usb_device_get_default_pipe(mdev->usb_dev),
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-	    0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);
+	    0xFE, 0, usb_device_get_iface_number(mdev->usb_dev), &max_lun, 1,
+	    &data_recv_len);
 	if (rc != EOK) {
 		return rc;