Index: uspace/app/barber/Makefile
===================================================================
--- uspace/app/barber/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/barber/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,15 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBCOMPRESS_PREFIX)/libcompress.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw compress softrend
 
 BINARY = barber
Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/bdsh/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,7 +29,6 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBCLUI_PREFIX)/libclui.a $(LIBFMTUTIL_PREFIX)/libfmtutil.a
-EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX) -I$(LIBFMTUTIL_PREFIX) \
-	-I. -Icmds/ -Icmds/builtins -Icmds/modules
+LIBS = clui fmtutil
+EXTRA_CFLAGS = -I. -Icmds/ -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 
Index: uspace/app/bithenge/Makefile
===================================================================
--- uspace/app/bithenge/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/bithenge/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,7 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBITHENGE_PREFIX)/libbithenge.a $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBITHENGE_PREFIX)/include -D__HELENOS__
+# TODO: Should be just "bithenge", rest is transitive linker dependencies.
+LIBS = bithenge block
+EXTRA_CFLAGS = -D__HELENOS__
 BINARY = bithenge
 
Index: uspace/app/blkdump/Makefile
===================================================================
--- uspace/app/blkdump/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/blkdump/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSCSI_PREFIX)/include
+LIBS = block scsi
 BINARY = blkdump
 
Index: uspace/app/dltest/Makefile
===================================================================
--- uspace/app/dltest/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/dltest/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,6 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -I$(LIBDLTEST_PREFIX) -DDLTEST_LINKED
-LIBS = $(LIBDLTEST_PREFIX)/libdltest.so.0.0
+EXTRA_CFLAGS = -DDLTEST_LINKED
+LIBS = dltest
 # Need a dynamic link, but possibly still use static libc
 LINK_DYNAMIC = y
Index: uspace/app/download/Makefile
===================================================================
--- uspace/app/download/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/download/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBHTTP_PREFIX)/libhttp.a $(LIBURI_PREFIX)/liburi.a
-EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX)/include -I$(LIBURI_PREFIX)
+LIBS = http uri
 DEFS = -DRELEASE=$(RELEASE)
 BINARY = download
Index: uspace/app/fdisk/Makefile
===================================================================
--- uspace/app/fdisk/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/fdisk/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,11 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = \
-	$(LIBCLUI_PREFIX)/libclui.a \
-	$(LIBFDISK_PREFIX)/libfdisk.a
-
-EXTRA_CFLAGS = \
-	-I$(LIBCLUI_PREFIX) \
-	-I$(LIBFDISK_PREFIX)/include
+LIBS = clui fdisk
 
 BINARY = fdisk
Index: uspace/app/fontviewer/Makefile
===================================================================
--- uspace/app/fontviewer/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/fontviewer/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = fontviewer
Index: uspace/app/gunzip/Makefile
===================================================================
--- uspace/app/gunzip/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/gunzip/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,6 +30,5 @@
 BINARY = gunzip
 
-EXTRA_CFLAGS += -I$(LIBCOMPRESS_PREFIX)
-LIBS = $(LIBCOMPRESS_PREFIX)/libcompress.a
+LIBS = compress
 
 SOURCES = \
Index: uspace/app/kio/Makefile
===================================================================
--- uspace/app/kio/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/kio/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBCLUI_PREFIX)/libclui.a
-EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX)
+LIBS = clui
 BINARY = kio
 
Index: uspace/app/mixerctl/Makefile
===================================================================
--- uspace/app/mixerctl/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/mixerctl/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,9 +30,5 @@
 BINARY = mixerctl
 
-LIBS = \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS = \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = drv
 
 SOURCES = \
Index: uspace/app/mkbd/Makefile
===================================================================
--- uspace/app/mkbd/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/mkbd/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,15 +30,5 @@
 BINARY = mkbd
 
-LIBS = \
-	$(LIBUSBHID_PREFIX)/libusbhid.a \
-	$(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 \
-	-I$(LIBUSBHID_PREFIX)/include 
+LIBS = usb usbdev usbhid drv
 
 SOURCES = \
Index: uspace/app/mkexfat/Makefile
===================================================================
--- uspace/app/mkexfat/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/mkexfat/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
+LIBS = block
 BINARY = mkexfat
 
Index: uspace/app/mkfat/Makefile
===================================================================
--- uspace/app/mkfat/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/mkfat/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
+LIBS = block
 BINARY = mkfat
 
Index: uspace/app/mkmfs/Makefile
===================================================================
--- uspace/app/mkmfs/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/mkmfs/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
+LIBS = block minix
 BINARY = mkmfs
 
Index: uspace/app/modplay/Makefile
===================================================================
--- uspace/app/modplay/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/modplay/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,13 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = \
-	$(LIBTRACKMOD_PREFIX)/libtrackmod.a \
-	$(LIBHOUND_PREFIX)/libhound.a \
-	$(LIBPCM_PREFIX)/libpcm.a
-
-EXTRA_CFLAGS = \
-	-I$(LIBTRACKMOD_PREFIX) \
-	-I$(LIBHOUND_PREFIX)/include \
-	-I$(LIBPCM_PREFIX)/include
+LIBS = trackmod hound pcm
 
 BINARY = modplay
Index: uspace/app/nic/Makefile
===================================================================
--- uspace/app/nic/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/nic/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 USPACE_PREFIX = ../..
 BINARY = nic
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
+LIBS = drv
 
 SOURCES = \
Index: uspace/app/sbi/Makefile
===================================================================
--- uspace/app/sbi/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/sbi/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,6 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBCLUI_PREFIX)/libclui.a
-EXTRA_CFLAGS = -D__HELENOS__ -I$(LIBCLUI_PREFIX)
+LIBS = clui
+EXTRA_CFLAGS = -D__HELENOS__
 
 BINARY = sbi
Index: uspace/app/sportdmp/Makefile
===================================================================
--- uspace/app/sportdmp/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/sportdmp/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = sportdmp
 
Index: uspace/app/sysinst/Makefile
===================================================================
--- uspace/app/sysinst/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/sysinst/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -28,12 +28,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = \
-    $(LIBBLOCK_PREFIX)/libblock.a \
-    $(LIBFDISK_PREFIX)/libfdisk.a \
-
-EXTRA_CFLAGS = \
-    -I$(LIBBLOCK_PREFIX) \
-    -I$(LIBFDISK_PREFIX)/include \
-    -Iinclude
+LIBS = block fdisk
 
 BINARY = sysinst
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/tester/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,13 +30,7 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBBLOCK_PREFIX)/libblock.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-
-EXTRA_CFLAGS = \
-	-I$(LIBBLOCK_PREFIX) \
-	-I$(LIBSOFTFLOAT_PREFIX) \
-	-I$(LIBDRV_PREFIX)/include
+# TODO: softfloat testing should be done via unit tests.
+LIBS = block softfloat drv
+EXTRA_CFLAGS = -I$(LIBSOFTFLOAT_PREFIX)
 
 BINARY = tester
Index: uspace/app/usbinfo/Makefile
===================================================================
--- uspace/app/usbinfo/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/usbinfo/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,14 +30,5 @@
 BINARY = usbinfo
 
-LIBS = \
-	$(LIBUSBHID_PREFIX)/libusbhid.a \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBUSBHID_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
+LIBS = usb usbhid usbdev drv
 
 SOURCES = \
Index: uspace/app/vcalc/Makefile
===================================================================
--- uspace/app/vcalc/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/vcalc/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = vcalc
Index: uspace/app/vdemo/Makefile
===================================================================
--- uspace/app/vdemo/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/vdemo/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = vdemo
Index: uspace/app/viewer/Makefile
===================================================================
--- uspace/app/viewer/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/viewer/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = viewer
Index: uspace/app/vlaunch/Makefile
===================================================================
--- uspace/app/vlaunch/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/vlaunch/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = vlaunch
Index: uspace/app/vterm/Makefile
===================================================================
--- uspace/app/vterm/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/vterm/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,16 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBGRAPH_PREFIX)/libgraph.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX) \
-	-I$(LIBGRAPH_PREFIX)
+# TODO: Should be just "gui graph", rest is transitive dependencies.
+LIBS = gui graph draw softrend compress
 
 BINARY = vterm
Index: uspace/app/vuhid/Makefile
===================================================================
--- uspace/app/vuhid/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/vuhid/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -32,17 +32,5 @@
 BINARY = vuh
 
-LIBS = \
-	$(LIBUSBVIRT_PREFIX)/libusbvirt.a \
-	$(LIBUSBHID_PREFIX)/libusbhid.a \
-	$(LIBUSBDEV_PREFIX)/libusbdev.a \
-	$(LIBUSB_PREFIX)/libusb.a \
-	$(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = \
-	-I$(LIBUSB_PREFIX)/include \
-	-I$(LIBUSBDEV_PREFIX)/include \
-	-I$(LIBUSBHID_PREFIX)/include \
-	-I$(LIBUSBVIRT_PREFIX)/include \
-	-I$(LIBDRV_PREFIX)/include
-
+LIBS = usb usbdev usbhid usbvirt drv
 
 SOURCES_INTERFACES = \
Index: uspace/app/wavplay/Makefile
===================================================================
--- uspace/app/wavplay/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/wavplay/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -30,13 +30,5 @@
 BINARY = wavplay
 
-LIBS = \
-	$(LIBHOUND_PREFIX)/libhound.a \
-	$(LIBDRV_PREFIX)/libdrv.a \
-	$(LIBPCM_PREFIX)/libpcm.a
-
-EXTRA_CFLAGS = \
-	-I$(LIBDRV_PREFIX)/include \
-	-I$(LIBHOUND_PREFIX)/include \
-	-I$(LIBPCM_PREFIX)/include
+LIBS = drv hound pcm
 
 SOURCES = \
Index: uspace/app/wifi_supplicant/Makefile
===================================================================
--- uspace/app/wifi_supplicant/Makefile	(revision b63b02ec1ec110cc8397bdc301aaba9426cf74c4)
+++ uspace/app/wifi_supplicant/Makefile	(revision 6d15572dfd149e15e038621d23fb73f4628be9de)
@@ -29,6 +29,5 @@
 USPACE_PREFIX = ../..
 BINARY = wifi_supplicant
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
+LIBS = drv
 
 SOURCES = \