Index: uspace/lib/posix/Makefile
===================================================================
--- uspace/lib/posix/Makefile	(revision b2aaaa00b7abd466c2256891323a234b0eb49464)
+++ uspace/lib/posix/Makefile	(revision 42da5ed63dc4e81e1aed2c903e5dbd1b1045978c)
@@ -31,7 +31,5 @@
 LIBRARY = libposix
 
-EXTRA_CFLAGS = -Iinclude/
-
-INCLUDE_LIBC = ./include/libc
+EXTRA_CFLAGS = -Iinclude/posix
 
 EXPORT_FILES = \
@@ -77,5 +75,7 @@
 
 EXPORT_CPPFLAGS = \
-	-isystem $$(HELENOS_EXPORT_ROOT)/include \
+	-isystem $$(HELENOS_EXPORT_ROOT)/include/posix \
+	-isystem $$(HELENOS_EXPORT_ROOT)/include/libc \
+	-idirafter $$(HELENOS_EXPORT_ROOT)/include \
 	$(COMMON_CPPFLAGS)
 
@@ -92,8 +92,4 @@
 
 include $(USPACE_PREFIX)/Makefile.common
-
-$(INCLUDE_LIBC): $(shell find ../c/include -name '*.h')
-	cp -r -L --remove-destination -T ../c/include $@
-	find ../c/include -type f -and -not -name '*.h' -delete
 
 export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
@@ -122,22 +118,9 @@
 	mkdir -p $(EXPORT_DIR)/include
 	rm -rf $(EXPORT_DIR)/include.new
-	cp -r -L -T ./include/posix $(EXPORT_DIR)/include.new
-	cp -r -L -T ./include/libc $(EXPORT_DIR)/include.new/libc
-	cp -r -L ../c/arch/$(UARCH)/include/* $(EXPORT_DIR)/include.new/libc
+	cp -r -L -T ./include $(EXPORT_DIR)/include.new
+	cp -r -L ../c/arch/$(UARCH)/include/libarch $(EXPORT_DIR)/include.new/libc
 	cp -r -L $(ROOT_PATH)/abi/include/* $(EXPORT_DIR)/include.new
 	mkdir -p $(EXPORT_DIR)/include.new/libclui
 	cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
-
-	find "$(EXPORT_DIR)/include.new/libc" "$(EXPORT_DIR)/include.new/libclui" -name '*.h' -exec sed \
-		-e 's:#include <:#include <libc/:' \
-		-e 's:#include <libc/abi/:#include <abi/:' \
-		-e 's:#include <libc/_bits/:#include <_bits/:' \
-		-e 's:#include <libc/libc/:#include <libc/:' \
-		-i {} \;
-	find "$(EXPORT_DIR)/include.new" -name '*.h' -exec sed \
-		-e 's:#include "posix/:#include ":' \
-		-e 's:#include <posix/:#include <:' \
-		-i {} \;
-
 	rm -rf $(EXPORT_DIR)/include
 	mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include