Index: uspace/srv/bd/ata_bd/Makefile
===================================================================
--- uspace/srv/bd/ata_bd/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/ata_bd/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = ata_bd
+BINARY = ata_bd
 
 SOURCES = \
 	ata_bd.c
 
-include ../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/bd/file_bd/Makefile
===================================================================
--- uspace/srv/bd/file_bd/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/file_bd/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = file_bd
+BINARY = file_bd
 
 SOURCES = \
 	file_bd.c
 
-include ../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/bd/gxe_bd/Makefile
===================================================================
--- uspace/srv/bd/gxe_bd/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/gxe_bd/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = gxe_bd
+BINARY = gxe_bd
 
 SOURCES = \
 	gxe_bd.c
 
-include ../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/bd/part/guid_part/Makefile
===================================================================
--- uspace/srv/bd/part/guid_part/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/part/guid_part/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -28,12 +28,12 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
 
 # Correct name is 'guid_part' but must use this because of FAT 8.3 names.
-OUTPUT = g_part
+BINARY = g_part
 
 SOURCES = \
 	guid_part.c
 
-include ../../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/bd/part/mbr_part/Makefile
===================================================================
--- uspace/srv/bd/part/mbr_part/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/part/mbr_part/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -29,11 +29,10 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
-
-OUTPUT = mbr_part
+BINARY = mbr_part
 
 SOURCES = \
 	mbr_part.c
 
-include ../../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/bd/rd/Makefile
===================================================================
--- uspace/srv/bd/rd/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/bd/rd/Makefile	(revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = rd
+BINARY = rd
 
 SOURCES = \
 	rd.c
 
-include ../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common