Index: uspace/srv/hw/cir/fhc/Makefile
===================================================================
--- uspace/srv/hw/cir/fhc/Makefile	(revision e5773c67f253269d60114a343a65721cef2ac0f7)
+++ uspace/srv/hw/cir/fhc/Makefile	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = fhc
+BINARY = fhc
 
 SOURCES = \
 	fhc.c
 
-include ../../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/hw/cir/obio/Makefile
===================================================================
--- uspace/srv/hw/cir/obio/Makefile	(revision e5773c67f253269d60114a343a65721cef2ac0f7)
+++ uspace/srv/hw/cir/obio/Makefile	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = obio
+BINARY = obio
 
 SOURCES = \
 	obio.c
 
-include ../../../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common