Index: uspace/lib/posix/Makefile
===================================================================
--- uspace/lib/posix/Makefile	(revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e)
+++ uspace/lib/posix/Makefile	(revision b2e121ad525328882607c97cdba1a9ded6137d13)
@@ -37,16 +37,13 @@
 LIBC_FILE = $(LIBC_PREFIX)/libc.a
 
-FIXED_POSIX_LIBRARY = libposixaslibc.a
 FIXED_C_LIBRARY = libc4posix.a
 MERGED_C_LIBRARY = libc.a
 MERGE_LIBRARIES = \
 	$(FIXED_C_LIBRARY) \
-	$(FIXED_POSIX_LIBRARY) \
+	$(LIBRARY).a \
 	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
 	$(LIBSOFTINT_PREFIX)/libsoftint.a
 
 REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
-REDEFS_SHOW_LIBPOSIX = redefs-show-posix-symbols.list
-COLLISIONS_LIST = collisions.list
 
 PRE_DEPEND = $(INCLUDE_LIBC)
@@ -54,6 +51,4 @@
 	$(INCLUDE_LIBC) \
 	$(REDEFS_HIDE_LIBC) \
-	$(REDEFS_SHOW_LIBPOSIX) \
-	$(COLLISIONS_LIST) \
 	libc.o
 
@@ -65,5 +60,4 @@
 	src/fcntl.c \
 	src/fnmatch.c \
-	src/getopt.c \
 	src/locale.c \
 	src/pthread/condvar.c \
@@ -94,11 +88,6 @@
 	ln -s -f -n ../$^ $@
 
-$(FIXED_C_LIBRARY): $(LIBC_FILE) $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
+$(FIXED_C_LIBRARY): $(LIBC_FILE) $(REDEFS_HIDE_LIBC)
 	$(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBC_FILE) $@
-	$(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
-
-$(FIXED_POSIX_LIBRARY): $(LIBRARY).a $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
-	$(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBRARY).a $@
-	$(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
 
 $(MERGED_C_LIBRARY): $(MERGE_LIBRARIES)
@@ -106,13 +95,5 @@
 	$(AR) rc $@ libc.o
 
-$(REDEFS_HIDE_LIBC): $(COLLISIONS_LIST)
-	sed 's/.*/& __helenos_libc_&/' <$(COLLISIONS_LIST) >$@
+$(REDEFS_HIDE_LIBC): $(SOURCES)
+	sed -n -e 's/_HIDE_LIBC_SYMBOL(\(.*\))/\1 __helenos_libc_\1/p' $(SOURCES) >$@
 
-$(REDEFS_SHOW_LIBPOSIX): $(COLLISIONS_LIST)
-	sed 's/.*/posix_& &/' <$(COLLISIONS_LIST) >$@
-
-$(COLLISIONS_LIST): include/posix/*.h include/posix/*/*.h
-	find ./include/posix -name '*.h' -exec \
-		sed -n -e '/^#/d' -e 's/__POSIX_DEF__/\n&/gp' {} \; | \
-		sed -n -e 's/__POSIX_DEF__(\([^)]*\)).*/\1/p' | \
-		sort -u >$@