Index: uspace/drv/block/ahci/Makefile
===================================================================
--- uspace/drv/block/ahci/Makefile	(revision d51838f190d8e49cb00493b84858f7ad93996014)
+++ uspace/drv/block/ahci/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = drv
 BINARY = ahci
 
Index: uspace/drv/block/ata_bd/Makefile
===================================================================
--- uspace/drv/block/ata_bd/Makefile	(revision d51838f190d8e49cb00493b84858f7ad93996014)
+++ uspace/drv/block/ata_bd/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
+LIBS = drv scsi
 BINARY = ata_bd
 
Index: uspace/drv/block/ddisk/Makefile
===================================================================
--- uspace/drv/block/ddisk/Makefile	(revision d51838f190d8e49cb00493b84858f7ad93996014)
+++ uspace/drv/block/ddisk/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -28,6 +28,5 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
+LIBS = drv scsi
 BINARY = ddisk