Index: uspace/app/barber/Makefile
===================================================================
--- uspace/app/barber/Makefile	(revision 22299ed9a3c298d5c73fceaefb6a619c975bdee1)
+++ uspace/app/barber/Makefile	(revision f5b6fb534ad9788da66bfd5a40acf7fd8f6effa1)
@@ -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