Index: uspace/app/Makefile.common
===================================================================
--- uspace/app/Makefile.common	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ 	(revision )
@@ -1,92 +1,0 @@
-#
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# - The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-## Common rules for building apps.
-#
-
-# Individual makefiles set:
-#
-#	USPACE_PREFIX	relative path to uspace/ directory
-#	LIBS		libraries to link with (with relative path)
-#	EXTRA_CFLAGS	additional flags to pass to C compiler
-#	JOB		job file name (like appname.job)
-#	OUTPUT		output binary name (like appname)
-#	SOURCES		list of source files
-#
-
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
-
-LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
-LIBBLOCK_PREFIX = $(USPACE_PREFIX)/lib/libblock
-SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
-
-JOB = $(OUTPUT).job
-
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += $(EXTRA_CFLAGS)
-
-.PHONY: all build clean
-
-all: \
-    $(LIBC_PREFIX)/../../../version \
-    $(LIBC_PREFIX)/../../../Makefile.common \
-    $(LIBC_PREFIX)/../../../Makefile.config \
-    $(LIBC_PREFIX)/../../../config.h \
-    $(LIBS) \
-    \
-    $(OUTPUT) $(OUTPUT).disasm
-	-[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-
-clean:
-	rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
-	find . -name '*.o' -follow -exec rm \{\} \;
-
-build: 
-
--include $(DEPEND)
-
-$(OUTPUT).disasm: $(OUTPUT)
-	$(OBJDUMP) -d $< > $@
-
-$(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-
-%.o: %.c $(DEPEND)
-	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
-endif
-
-$(DEPEND):
-	makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
-	-[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,8 +29,7 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
-
-OUTPUT = bdsh
+BINARY = bdsh
 
 SOURCES = \
@@ -60,3 +59,3 @@
 	scli.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -34,5 +34,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -32,5 +32,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -47,5 +47,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,5 +29,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -31,5 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -40,5 +40,5 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <str.h>
 
 #include "errors.h"
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -36,5 +36,5 @@
 #include <getopt.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -38,5 +38,5 @@
 #include <dirent.h>
 #include <sys/types.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/errors.c
===================================================================
--- uspace/app/bdsh/errors.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/errors.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -30,5 +30,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <unistd.h>
Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/exec.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -38,5 +38,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/input.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -32,5 +32,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/app/bdsh/scli.c
===================================================================
--- uspace/app/bdsh/scli.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/scli.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -31,5 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include "config.h"
Index: uspace/app/bdsh/util.c
===================================================================
--- uspace/app/bdsh/util.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/bdsh/util.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,5 +29,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdarg.h>
 #include <stdlib.h>
Index: uspace/app/edit/Makefile
===================================================================
--- uspace/app/edit/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/edit/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,7 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = edit
+BINARY = edit
 
 SOURCES = \
@@ -37,3 +35,3 @@
 	sheet.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/edit/sheet.c
===================================================================
--- uspace/app/edit/sheet.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/edit/sheet.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -50,5 +50,5 @@
 
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <adt/list.h>
Index: uspace/app/getterm/Makefile
===================================================================
--- uspace/app/getterm/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/getterm/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -28,11 +28,7 @@
 #
 
-include ../../../version
-DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
-
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = getterm
+DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+BINARY = getterm
 
 SOURCES = \
@@ -40,3 +36,3 @@
 	version.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/init/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = init
+BINARY = init
 
 SOURCES = \
 	init.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/init/init.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -46,5 +46,5 @@
 #include <malloc.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <devmap.h>
 #include "init.h"
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/klog/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = klog
+BINARY = klog
 
 SOURCES = \
 	klog.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/mkfat/Makefile
===================================================================
--- uspace/app/mkfat/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/mkfat/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -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 = mkfat
+BINARY = mkfat
 
 SOURCES = \
 	mkfat.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/redir/Makefile
===================================================================
--- uspace/app/redir/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/redir/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,10 +29,8 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = redir
+BINARY = redir
 
 SOURCES = \
 	redir.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/redir/redir.c
===================================================================
--- uspace/app/redir/redir.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/redir/redir.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -39,5 +39,5 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <stdio.h>
 #include <task.h>
Index: uspace/app/taskdump/Makefile
===================================================================
--- uspace/app/taskdump/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/taskdump/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -28,8 +28,6 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
 EXTRA_CFLAGS = -Iinclude
-
-OUTPUT = taskdump
+BINARY = taskdump
 
 SOURCES = \
@@ -38,3 +36,3 @@
 	symtab.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tester/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,7 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = tester
+BINARY = tester
 
 SOURCES = \
@@ -53,3 +51,3 @@
 	mm/malloc1.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/tester/tester.c
===================================================================
--- uspace/app/tester/tester.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tester/tester.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -38,5 +38,5 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include "tester.h"
 
Index: uspace/app/tester/vfs/vfs1.c
===================================================================
--- uspace/app/tester/vfs/vfs1.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tester/vfs/vfs1.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -30,5 +30,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <vfs/vfs.h>
 #include <unistd.h>
Index: uspace/app/tetris/Makefile
===================================================================
--- uspace/app/tetris/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,7 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = tetris
+BINARY = tetris
 
 SOURCES = \
@@ -40,3 +38,3 @@
 	screen.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/tetris/input.c
===================================================================
--- uspace/app/tetris/input.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/input.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -52,5 +52,5 @@
 #include <errno.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 
 #include "input.h"
Index: uspace/app/tetris/scores.c
===================================================================
--- uspace/app/tetris/scores.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/scores.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -52,5 +52,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/app/tetris/scores.h
===================================================================
--- uspace/app/tetris/scores.h	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/scores.h	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -48,5 +48,5 @@
 
 #include <sys/time.h>
-#include <string.h>
+#include <str.h>
 
 #define MAXLOGNAME   16
Index: uspace/app/tetris/screen.c
===================================================================
--- uspace/app/tetris/screen.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/screen.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -49,5 +49,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <vfs/vfs.h>
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/tetris/tetris.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -53,5 +53,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <getopt.h>
Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/trace/Makefile	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -29,7 +29,5 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = trace
+BINARY = trace
 
 SOURCES = \
@@ -41,3 +39,3 @@
 	errors.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision 4204ad9995854e56dae719be52c05abf90dee4e7)
+++ uspace/app/trace/trace.c	(revision 12d77106be9d0f1eed699d9bb16b4d8fae4b4348)
@@ -43,5 +43,5 @@
 #include <task.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 #include <bool.h>
 #include <loader/loader.h>