Index: uspace/drv/bus/usb/xhci/Makefile
===================================================================
--- uspace/drv/bus/usb/xhci/Makefile	(revision 41924f3000a0433bb9a3bac4c10f0768464cc2e7)
+++ uspace/drv/bus/usb/xhci/Makefile	(revision a1f83a33fab2ba766d665cd2f41debff28491e6d)
@@ -29,16 +29,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBHOST_PREFIX)/libusbhost.a \
-	$(LIBUSBVIRT_PREFIX)/libusbvirt.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBUSBHOST_PREFIX)/include \
-	-I$(LIBUSBVIRT_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = usbhost usbvirt usb drv
 
 BINARY = xhci