Index: uspace/drv/bus/adb/cuda_adb/Makefile
===================================================================
--- uspace/drv/bus/adb/cuda_adb/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/adb/cuda_adb/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = cuda_adb
 
Index: uspace/drv/bus/isa/Makefile
===================================================================
--- uspace/drv/bus/isa/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/isa/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = isa
 
Index: uspace/drv/bus/pci/pciintel/Makefile
===================================================================
--- uspace/drv/bus/pci/pciintel/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/pci/pciintel/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = pciintel
 
Index: uspace/drv/bus/usb/ehci/Makefile
===================================================================
--- uspace/drv/bus/usb/ehci/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/ehci/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -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 usbdev
 
 BINARY = ehci
Index: uspace/drv/bus/usb/ohci/Makefile
===================================================================
--- uspace/drv/bus/usb/ohci/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/ohci/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -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 usbdev
 
 BINARY = ohci
Index: uspace/drv/bus/usb/uhci/Makefile
===================================================================
--- uspace/drv/bus/usb/uhci/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/uhci/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -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 usbdev
 
 BINARY = uhci
Index: uspace/drv/bus/usb/usbflbk/Makefile
===================================================================
--- uspace/drv/bus/usb/usbflbk/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/usbflbk/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,13 +29,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = usbdev usb drv
 
 BINARY = usbflbk
Index: uspace/drv/bus/usb/usbhid/Makefile
===================================================================
--- uspace/drv/bus/usb/usbhid/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/usbhid/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,16 +29,7 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBHID_PREFIX)/libusbhid.a \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
+LIBS = usbhid usbdev usb drv
 
-EXTRA_CFLAGS += \
-	-I. \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBUSBHID_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+EXTRA_CFLAGS += -I.
 
 BINARY = usbhid
Index: uspace/drv/bus/usb/usbhub/Makefile
===================================================================
--- uspace/drv/bus/usb/usbhub/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/usbhub/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,13 +30,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = usbdev usb drv
 
 BINARY = usbhub
Index: uspace/drv/bus/usb/usbmast/Makefile
===================================================================
--- uspace/drv/bus/usb/usbmast/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/usbmast/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,15 +29,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a \
-	$(LIBSCSI_PREFIX)/libscsi.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include \
-	-I$(LIBSCSI_PREFIX)/include
+LIBS = usbdev usb drv scsi
 
 BINARY = usbmast
Index: uspace/drv/bus/usb/usbmid/Makefile
===================================================================
--- uspace/drv/bus/usb/usbmid/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/usbmid/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,13 +29,5 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = usbdev usb drv
 
 BINARY = usbmid
Index: uspace/drv/bus/usb/vhc/Makefile
===================================================================
--- uspace/drv/bus/usb/vhc/Makefile	(revision 04649677bb4fbe5c0b699c27add4f8664d9a15fc)
+++ uspace/drv/bus/usb/vhc/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,17 +29,6 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSBHOST_PREFIX)/libusbhost.a \
-	$(LIBUSBVIRT_PREFIX)/libusbvirt.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
+LIBS = usbdev usbhost usbvirt usb drv
 
-EXTRA_CFLAGS += \
-	-I$(LIBUSBVIRT_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBUSBHOST_PREFIX)/include \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
 BINARY = vhc