Index: uspace/srv/fs/cdfs/Makefile
===================================================================
--- uspace/srv/fs/cdfs/Makefile	(revision 3abf70c73779dc7dc5529512275597a1d116e82d)
+++ uspace/srv/fs/cdfs/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,7 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
-EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) \
-    -I$(LIBSCSI_PREFIX)/include
+LIBS = block fs scsi
 BINARY = cdfs