Index: uspace/drv/bus/usb/usbdiag/Makefile
===================================================================
--- uspace/drv/bus/usb/usbdiag/Makefile	(revision 17f8abc48dec21e22dfc10ddc0458d19184a73a4)
+++ uspace/drv/bus/usb/usbdiag/Makefile	(revision 7faf0f0d6efa841b26c49ec60562635b2657ffdf)
@@ -29,5 +29,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = usbdiag usbdev usb drv
+LIBS = usbdev usb drv
 
 BINARY = usbdiag
Index: uspace/drv/bus/usb/usbdiag/device.c
===================================================================
--- uspace/drv/bus/usb/usbdiag/device.c	(revision 17f8abc48dec21e22dfc10ddc0458d19184a73a4)
+++ uspace/drv/bus/usb/usbdiag/device.c	(revision 7faf0f0d6efa841b26c49ec60562635b2657ffdf)
@@ -36,5 +36,5 @@
 #include <errno.h>
 #include <usb/debug.h>
-#include <usb/diag/iface.h>
+#include <usbdiag_iface.h>
 
 #include "device.h"
@@ -48,5 +48,5 @@
 }
 
-static usb_diag_iface_t diag_interface = {
+static usbdiag_iface_t diag_interface = {
 	.test = some_test,
 };
Index: uspace/drv/bus/usb/usbdiag/main.c
===================================================================
--- uspace/drv/bus/usb/usbdiag/main.c	(revision 17f8abc48dec21e22dfc10ddc0458d19184a73a4)
+++ uspace/drv/bus/usb/usbdiag/main.c	(revision 7faf0f0d6efa841b26c49ec60562635b2657ffdf)
@@ -37,5 +37,5 @@
 #include <usb/debug.h>
 #include <usb/dev/driver.h>
-#include <usb/diag/diag.h>
+#include <usbdiag_iface.h>
 #include <str_error.h>
 
@@ -61,7 +61,7 @@
 	}
 
-	if ((rc = ddf_fun_add_to_category(diag_dev->fun, USB_DIAG_CATEGORY))) {
+	if ((rc = ddf_fun_add_to_category(diag_dev->fun, USBDIAG_CATEGORY))) {
 		usb_log_error("Failed add DDF to category '"
-		    USB_DIAG_CATEGORY "': %s.\n", str_error(rc));
+		    USBDIAG_CATEGORY "': %s.\n", str_error(rc));
 		goto err_bind;
 	}