Index: uspace/app/tmon/Makefile
===================================================================
--- uspace/app/tmon/Makefile	(revision fc338e0106f262c2c03301e6708b4ee2a6b365ef)
+++ uspace/app/tmon/Makefile	(revision 6a1211c7d0b8ed8ef4be1bafd0ec035d46c2c2d7)
@@ -30,5 +30,5 @@
 BINARY = tmon
 
-LIBS = drv usbdiag
+LIBS = drv
 
 SOURCES = \
Index: uspace/app/tmon/list.c
===================================================================
--- uspace/app/tmon/list.c	(revision fc338e0106f262c2c03301e6708b4ee2a6b365ef)
+++ uspace/app/tmon/list.c	(revision 6a1211c7d0b8ed8ef4be1bafd0ec035d46c2c2d7)
@@ -38,5 +38,5 @@
 #include <devman.h>
 #include <loc.h>
-#include <usb/diag/diag.h>
+#include <usbdiag_iface.h>
 #include "commands.h"
 
@@ -70,6 +70,6 @@
 	int rc;
 
-	if ((rc = loc_category_get_id(USB_DIAG_CATEGORY, &diag_cat, 0))) {
-		printf(NAME ": Error resolving category '%s'", USB_DIAG_CATEGORY);
+	if ((rc = loc_category_get_id(USBDIAG_CATEGORY, &diag_cat, 0))) {
+		printf(NAME ": Error resolving category '%s'", USBDIAG_CATEGORY);
 		return 1;
 	}
Index: uspace/app/tmon/test.c
===================================================================
--- uspace/app/tmon/test.c	(revision fc338e0106f262c2c03301e6708b4ee2a6b365ef)
+++ uspace/app/tmon/test.c	(revision 6a1211c7d0b8ed8ef4be1bafd0ec035d46c2c2d7)
@@ -40,6 +40,5 @@
 #include <errno.h>
 #include <str_error.h>
-#include <usb/diag/diag.h>
-#include <usb/diag/iface.h>
+#include <usbdiag_iface.h>
 #include "commands.h"
 
@@ -53,6 +52,6 @@
 	int rc;
 
-	if ((rc = loc_category_get_id(USB_DIAG_CATEGORY, &diag_cat, 0))) {
-		printf(NAME ": Error resolving category '%s'", USB_DIAG_CATEGORY);
+	if ((rc = loc_category_get_id(USBDIAG_CATEGORY, &diag_cat, 0))) {
+		printf(NAME ": Error resolving category '%s'", USBDIAG_CATEGORY);
 		return rc;
 	}
@@ -116,10 +115,10 @@
 
 static int bulk_worker(devman_handle_t fun) {
-	async_sess_t *sess = usb_diag_connect(fun);
+	async_sess_t *sess = usbdiag_connect(fun);
 	async_exch_t *exch = async_exchange_begin(sess);
 
 	// TODO: do some testing
 	int y;
-	int rc = usb_diag_test(exch, 4200, &y);
+	int rc = usbdiag_test(exch, 4200, &y);
 
 	if (rc) {
@@ -130,5 +129,5 @@
 
 	async_exchange_end(exch);
-	usb_diag_disconnect(sess);
+	usbdiag_disconnect(sess);
 	return 0;
 }