Index: uspace/srv/hid/compositor/Makefile
===================================================================
--- uspace/srv/hid/compositor/Makefile	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/srv/hid/compositor/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -29,14 +29,5 @@
 USPACE_PREFIX = ../../..
 
-LIBS = \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX) \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = draw softrend drv compress
 
 BINARY = compositor
Index: uspace/srv/hid/input/Makefile
===================================================================
--- uspace/srv/hid/input/Makefile	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/srv/hid/input/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -30,6 +30,5 @@
 USPACE_PREFIX = ../../..
 BINARY = input
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 
 SOURCES = \
Index: uspace/srv/hid/isdv4_tablet/Makefile
===================================================================
--- uspace/srv/hid/isdv4_tablet/Makefile	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/srv/hid/isdv4_tablet/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = isdv4_tablet
 
Index: uspace/srv/hid/output/Makefile
===================================================================
--- uspace/srv/hid/output/Makefile	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/srv/hid/output/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -30,6 +30,5 @@
 USPACE_PREFIX = ../../..
 BINARY = output
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 
 SOURCES = \
Index: uspace/srv/hid/rfb/Makefile
===================================================================
--- uspace/srv/hid/rfb/Makefile	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/srv/hid/rfb/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBGRAPH_PREFIX)/libgraph.a
-EXTRA_CFLAGS = -I$(LIBGRAPH_PREFIX)
+LIBS = graph
 BINARY = rfb