Index: uspace/lib/posix/Makefile
===================================================================
--- uspace/lib/posix/Makefile	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/Makefile	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -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
Index: uspace/lib/posix/include/libc
===================================================================
--- uspace/lib/posix/include/libc	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
+++ uspace/lib/posix/include/libc	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -0,0 +1,1 @@
+../../c/include
Index: uspace/lib/posix/include/posix/assert.h
===================================================================
--- uspace/lib/posix/include/posix/assert.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2018 Jiri Svoboda
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_ASSERT_H_
-#define POSIX_ASSERT_H_
-
-/*
- * Just a pass-through to libc assert.
- */
-#include "libc/assert.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/ctype.h
===================================================================
--- uspace/lib/posix/include/posix/ctype.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/ctype.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,5 +37,5 @@
 #define POSIX_CTYPE_H_
 
-#include "libc/ctype.h"
+#include <libc/ctype.h>
 
 /* Obsolete Functions and Macros */
Index: uspace/lib/posix/include/posix/dirent.h
===================================================================
--- uspace/lib/posix/include/posix/dirent.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2013 Vojtech Horky
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-/** @file
- */
-
-#ifndef POSIX_DIRENT_H_
-#define POSIX_DIRENT_H_
-
-/*
- * Just a pass-through to libc dirent.
- */
-#include "libc/dirent.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/dlfcn.h
===================================================================
--- uspace/lib/posix/include/posix/dlfcn.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/dlfcn.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,5 +34,5 @@
 #define POSIX_DLFCN_H_
 
-#include "libc/dlfcn.h"
+#include <libc/dlfcn.h>
 
 #define RTLD_LAZY 1
Index: uspace/lib/posix/include/posix/errno.h
===================================================================
--- uspace/lib/posix/include/posix/errno.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2018 Jiri Svoboda
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_ERRNO_H_
-#define POSIX_ERRNO_H_
-
-/*
- * Just a pass-through to libc errno.
- */
-#include "libc/errno.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/fcntl.h
===================================================================
--- uspace/lib/posix/include/posix/fcntl.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/fcntl.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_FCNTL_H_
 
-#include "sys/types.h"
+#include <sys/types.h>
 
 #undef O_CREAT
Index: uspace/lib/posix/include/posix/getopt.h
===================================================================
--- uspace/lib/posix/include/posix/getopt.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/getopt.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,6 +35,6 @@
 #define POSIX_GETOPT_H
 
-#include "unistd.h"
-#include "libc/getopt.h"
+#include <unistd.h>
+#include <libc/getopt.h>
 
 #endif
Index: uspace/lib/posix/include/posix/inttypes.h
===================================================================
--- uspace/lib/posix/include/posix/inttypes.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2011 Petr Koupy
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-/** @file Fixed size integer types.
- */
-
-#ifndef POSIX_INTTYPES_H_
-#define POSIX_INTTYPES_H_
-
-/*
- * Just a pass-through to libc inttypes.
- */
-#include "libc/inttypes.h"
-
-#endif /* POSIX_INTTYPES_H_ */
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/iso646.h
===================================================================
--- uspace/lib/posix/include/posix/iso646.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2018 Jiri Svoboda
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_ISO646_H_
-#define POSIX_ISO646_H_
-
-/*
- * Just a pass-through to libc iso646.
- */
-#include "libc/iso646.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/limits.h
===================================================================
--- uspace/lib/posix/include/posix/limits.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/limits.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_LIMITS_H_
 
-#include "libc/limits.h"
+#include <libc/limits.h>
 
 #undef PATH_MAX
Index: uspace/lib/posix/include/posix/locale.h
===================================================================
--- uspace/lib/posix/include/posix/locale.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/locale.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_LOCALE_H_
 
-#include <_bits/NULL.h>
+#include <stddef.h>
 
 #ifndef __locale_t_defined
Index: uspace/lib/posix/include/posix/malloc.h
===================================================================
--- uspace/lib/posix/include/posix/malloc.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,43 +1,0 @@
-/*
- * Copyright (c) 2012 Vojtech Horky
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-#ifndef POSIX_MALLOC_H_
-#define POSIX_MALLOC_H_
-
-/*
- * Just a pass-through to libc malloc.
- */
-#include "libc/malloc.h"
-
-#endif /* POSIX_MALLOC_H_ */
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/math.h
===================================================================
--- uspace/lib/posix/include/posix/math.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2018 Jiri Svoboda
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_MATH_H_
-#define POSIX_MATH_H_
-
-/*
- * Just a pass-through to libc math.h
- */
-#include "libc/math.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/pthread.h
===================================================================
--- uspace/lib/posix/include/posix/pthread.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/pthread.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,5 +33,5 @@
 #define POSIX_PTHREAD_H_
 
-#include "time.h"
+#include <time.h>
 
 typedef void *pthread_t;
Index: uspace/lib/posix/include/posix/pwd.h
===================================================================
--- uspace/lib/posix/include/posix/pwd.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/pwd.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_PWD_H_
 
-#include "sys/types.h"
+#include <sys/types.h>
 
 struct passwd {
Index: uspace/lib/posix/include/posix/setjmp.h
===================================================================
--- uspace/lib/posix/include/posix/setjmp.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,39 +1,0 @@
-/*
- * Copyright (c) 2013 Vojtech Horky
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-/*
- * Just a pass-through to libc setjmp.
- */
-#include "libc/setjmp.h"
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/signal.h
===================================================================
--- uspace/lib/posix/include/posix/signal.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/signal.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,6 +36,6 @@
 #define POSIX_SIGNAL_H_
 
-#include "sys/types.h"
-#include <posix/ucontext.h>
+#include <sys/types.h>
+#include <ucontext.h>
 
 extern void __posix_default_signal_handler(int signo);
Index: uspace/lib/posix/include/posix/stdarg.h
===================================================================
--- uspace/lib/posix/include/posix/stdarg.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2012 Vojtech Horky
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_STDARG_H_
-#define POSIX_STDARG_H_
-
-/*
- * Just a pass-through to libc stdarg.
- */
-#include "libc/stdarg.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/stdbool.h
===================================================================
--- uspace/lib/posix/include/posix/stdbool.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2017 Vojtech Horky
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-/** @file
- */
-
-#ifndef POSIX_STDBOOL_H_
-#define POSIX_STDBOOL_H_
-
-/*
- * Just a pass-through to libc stdbool.
- */
-#include "libc/stdbool.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/stddef.h
===================================================================
--- uspace/lib/posix/include/posix/stddef.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2011 Petr Koupy
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-/** @file Standard type definitions.
- */
-
-#ifndef POSIX_STDDEF_H_
-#define POSIX_STDDEF_H_
-
-/*
- * Just a pass-through to libc stddef.
- */
-#include "libc/stddef.h"
-
-#endif /* POSIX_STDDEF_H_ */
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/stdint.h
===================================================================
--- uspace/lib/posix/include/posix/stdint.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/*
- * Copyright (c) 2018 Jiri Svoboda
- * 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.
- */
-
-/** @addtogroup libposix
- * @{
- */
-
-#ifndef POSIX_STDINT_H_
-#define POSIX_STDINT_H_
-
-/*
- * Just a pass-through to libc stdint.
- */
-#include "libc/stdint.h"
-
-#endif
-
-/** @}
- */
Index: uspace/lib/posix/include/posix/stdio.h
===================================================================
--- uspace/lib/posix/include/posix/stdio.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/stdio.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,11 +37,11 @@
 #define POSIX_STDIO_H_
 
-#include "libc/stdio.h"
+#include <libc/stdio.h>
 
-#include "stddef.h"
-#include "libc/io/verify.h"
-#include "sys/types.h"
-#include "stdarg.h"
-#include "limits.h"
+#include <stddef.h>
+#include <io/verify.h>
+#include <sys/types.h>
+#include <stdarg.h>
+#include <limits.h>
 
 extern FILE *fdopen(int, const char *);
Index: uspace/lib/posix/include/posix/stdlib.h
===================================================================
--- uspace/lib/posix/include/posix/stdlib.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/stdlib.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,8 +37,8 @@
 #define POSIX_STDLIB_H_
 
-#include "libc/stdlib.h"
-#include "sys/types.h"
+#include <libc/stdlib.h>
+#include <sys/types.h>
 
-#include <_bits/NULL.h>
+#include <stddef.h>
 
 /* Environment Access */
Index: uspace/lib/posix/include/posix/string.h
===================================================================
--- uspace/lib/posix/include/posix/string.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/string.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -44,14 +44,13 @@
  */
 
-#include <_bits/NULL.h>
-#include <_bits/size_t.h>
+#include <stddef.h>
 
-#include "libc/mem.h"
+#include <libc/mem.h>
 #ifdef _HELENOS_SOURCE
 #undef _HELENOS_SOURCE
-#include "libc/string.h"
+#include <libc/string.h>
 #define _HELENOS_SOURCE
 #else
-#include "libc/string.h"
+#include <libc/string.h>
 #endif
 
Index: uspace/lib/posix/include/posix/strings.h
===================================================================
--- uspace/lib/posix/include/posix/strings.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/strings.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,5 +37,5 @@
 #define POSIX_STRINGS_H_
 
-#include "libc/types/common.h"
+#include <types/common.h>
 
 /* Search Functions */
Index: uspace/lib/posix/include/posix/sys/mman.h
===================================================================
--- uspace/lib/posix/include/posix/sys/mman.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/sys/mman.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_SYS_MMAN_H_
 
-#include "types.h"
+#include <sys/types.h>
 #include <abi/mm/as.h>
 
Index: uspace/lib/posix/include/posix/sys/stat.h
===================================================================
--- uspace/lib/posix/include/posix/sys/stat.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/sys/stat.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,6 +37,6 @@
 #define POSIX_SYS_STAT_H_
 
-#include "types.h"
-#include "../time.h"
+#include <sys/types.h>
+#include <time.h>
 
 /* values are the same as on Linux */
Index: uspace/lib/posix/include/posix/sys/time.h
===================================================================
--- uspace/lib/posix/include/posix/sys/time.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/sys/time.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,5 +34,5 @@
 #define POSIX_SYS_TIME_H_
 
-#include "libc/time.h"
+#include <time.h>
 
 struct timeval {
Index: uspace/lib/posix/include/posix/sys/types.h
===================================================================
--- uspace/lib/posix/include/posix/sys/types.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/sys/types.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,6 +37,6 @@
 #define POSIX_SYS_TYPES_H_
 
-#include "libc/offset.h"
-#include "libc/types/common.h"
+#include <offset.h>
+#include <types/common.h>
 
 typedef unsigned int ino_t;
Index: uspace/lib/posix/include/posix/sys/wait.h
===================================================================
--- uspace/lib/posix/include/posix/sys/wait.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/sys/wait.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_SYS_WAIT_H_
 
-#include "types.h"
+#include <sys/types.h>
 
 #undef WIFEXITED
Index: uspace/lib/posix/include/posix/time.h
===================================================================
--- uspace/lib/posix/include/posix/time.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/time.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,9 +37,7 @@
 #define POSIX_TIME_H_
 
-#include "sys/types.h"
-
-#include <_bits/NULL.h>
-
-#include "libc/time.h"
+#include <stddef.h>
+#include <sys/types.h>
+#include <libc/time.h>
 
 #ifndef __locale_t_defined
Index: uspace/lib/posix/include/posix/ucontext.h
===================================================================
--- uspace/lib/posix/include/posix/ucontext.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/ucontext.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 #define POSIX_UCONTEXT_H_
 
-#include "sys/types.h"
+#include <sys/types.h>
 
 typedef int sig_atomic_t;
Index: uspace/lib/posix/include/posix/unistd.h
===================================================================
--- uspace/lib/posix/include/posix/unistd.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/include/posix/unistd.h	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -37,6 +37,6 @@
 #define POSIX_UNISTD_H_
 
-#include "sys/types.h"
-#include "stddef.h"
+#include <stddef.h>
+#include <sys/types.h>
 
 #define SEEK_SET  0
Index: uspace/lib/posix/src/ctype.c
===================================================================
--- uspace/lib/posix/src/ctype.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/ctype.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,5 +34,5 @@
  */
 
-#include "posix/ctype.h"
+#include <ctype.h>
 
 /**
Index: uspace/lib/posix/src/dlfcn.c
===================================================================
--- uspace/lib/posix/src/dlfcn.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/dlfcn.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -32,5 +32,5 @@
 
 #include "internal/common.h"
-#include "posix/dlfcn.h"
+#include <dlfcn.h>
 
 int dlclose(void *handle)
Index: uspace/lib/posix/src/fcntl.c
===================================================================
--- uspace/lib/posix/src/fcntl.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/fcntl.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,8 +34,6 @@
 
 #include "internal/common.h"
-#include "posix/fcntl.h"
-
-#include "libc/vfs/vfs.h"
-
+#include <fcntl.h>
+#include <vfs/vfs.h>
 #include <errno.h>
 
Index: uspace/lib/posix/src/fnmatch.c
===================================================================
--- uspace/lib/posix/src/fnmatch.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/fnmatch.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -43,12 +43,12 @@
  */
 
-#include "libc/stdbool.h"
-#include "posix/ctype.h"
-#include "posix/string.h"
-#include "posix/stdlib.h"
+#include <stdbool.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "internal/common.h"
-#include "posix/fnmatch.h"
+#include <fnmatch.h>
 
 /* Returned by _match... functions. */
Index: uspace/lib/posix/src/locale.c
===================================================================
--- uspace/lib/posix/src/locale.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/locale.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,10 +34,10 @@
 
 #include "internal/common.h"
-#include "posix/locale.h"
+#include <locale.h>
 
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/string.h"
+#include <limits.h>
+#include <string.h>
 
 /*
Index: uspace/lib/posix/src/pthread/condvar.c
===================================================================
--- uspace/lib/posix/src/pthread/condvar.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/condvar.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,6 +33,6 @@
  */
 
-#include "posix/pthread.h"
-#include "errno.h"
+#include <pthread.h>
+#include <errno.h>
 #include "../internal/common.h"
 
Index: uspace/lib/posix/src/pthread/keys.c
===================================================================
--- uspace/lib/posix/src/pthread/keys.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/keys.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,6 +33,6 @@
  */
 
-#include "posix/stdlib.h"
-#include "posix/pthread.h"
+#include <stdlib.h>
+#include <pthread.h>
 #include <errno.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pthread/mutex.c
===================================================================
--- uspace/lib/posix/src/pthread/mutex.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/mutex.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,5 +33,5 @@
  */
 
-#include "posix/pthread.h"
+#include <pthread.h>
 #include <errno.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pthread/threads.c
===================================================================
--- uspace/lib/posix/src/pthread/threads.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/threads.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,7 +33,7 @@
  */
 
-#include "posix/pthread.h"
-#include "errno.h"
-#include "posix/stdlib.h"
+#include <pthread.h>
+#include <errno.h>
+#include <stdlib.h>
 #include <fibril.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pwd.c
===================================================================
--- uspace/lib/posix/src/pwd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pwd.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,7 +33,7 @@
  */
 
-#include "libc/stdbool.h"
-#include "posix/pwd.h"
-#include "posix/string.h"
+#include <stdbool.h>
+#include <pwd.h>
+#include <string.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/posix/src/signal.c
===================================================================
--- uspace/lib/posix/src/signal.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/signal.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -33,14 +33,14 @@
  */
 
-#include "posix/signal.h"
+#include <signal.h>
 #include "internal/common.h"
-#include "posix/limits.h"
-#include "posix/stdlib.h"
-#include "posix/string.h"
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <errno.h>
 
-#include "libc/fibril_synch.h"
-#include "libc/task.h"
+#include <fibril_synch.h>
+#include <task.h>
 
 /*
Index: uspace/lib/posix/src/stdio.c
===================================================================
--- uspace/lib/posix/src/stdio.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/stdio.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 
 #include "internal/common.h"
-#include "posix/stdio.h"
+#include <stdio.h>
 
 #include <assert.h>
@@ -43,16 +43,15 @@
 #include <tmpfile.h>
 
-#include "posix/fcntl.h"
-#include "posix/stdlib.h"
-#include "posix/string.h"
-#include "posix/sys/stat.h"
-#include "posix/sys/types.h"
-#include "posix/unistd.h"
-
-#include "libc/stdio.h"
-#include "libc/io/printf_core.h"
-#include "libc/str.h"
-#include "libc/malloc.h"
-#include "libc/adt/list.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <io/printf_core.h>
+#include <str.h>
+#include <malloc.h>
+#include <adt/list.h>
 
 /**
Index: uspace/lib/posix/src/stdlib.c
===================================================================
--- uspace/lib/posix/src/stdlib.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/stdlib.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,19 +35,19 @@
 
 #include "internal/common.h"
-#include "posix/stdlib.h"
+#include <stdlib.h>
 
 #include <errno.h>
 #include <tmpfile.h>
 
-#include "posix/fcntl.h"
-#include "posix/limits.h"
-#include "posix/string.h"
-#include "posix/sys/stat.h"
-#include "posix/unistd.h"
-
-#include "libc/qsort.h"
-#include "libc/str.h"
-#include "libc/vfs/vfs.h"
-#include "libc/stats.h"
+#include <fcntl.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <qsort.h>
+#include <str.h>
+#include <vfs/vfs.h>
+#include <stats.h>
 
 /**
Index: uspace/lib/posix/src/string.c
===================================================================
--- uspace/lib/posix/src/string.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/string.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -36,5 +36,5 @@
 
 #include "internal/common.h"
-#include "posix/string.h"
+#include <string.h>
 
 #include <assert.h>
@@ -42,10 +42,9 @@
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/stdlib.h"
-#include "posix/signal.h"
-
-#include "libc/str.h"
-#include "libc/str_error.h"
+#include <limits.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <str.h>
+#include <str_error.h>
 
 /**
Index: uspace/lib/posix/src/strings.c
===================================================================
--- uspace/lib/posix/src/strings.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/strings.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,11 +35,11 @@
 
 #include "internal/common.h"
-#include "posix/strings.h"
+#include <strings.h>
 
-#include "posix/string.h"
-#include "posix/ctype.h"
+#include <string.h>
+#include <ctype.h>
 
-#include "libc/mem.h"
-#include "libc/str.h"
+#include <mem.h>
+#include <str.h>
 
 /**
Index: uspace/lib/posix/src/sys/mman.c
===================================================================
--- uspace/lib/posix/src/sys/mman.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/mman.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -34,8 +34,8 @@
 
 #include "../internal/common.h"
-#include <posix/sys/mman.h>
-#include <posix/sys/types.h>
-#include <libc/as.h>
-#include <posix/unistd.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <as.h>
+#include <unistd.h>
 
 void *mmap(void *start, size_t length, int prot, int flags, int fd,
Index: uspace/lib/posix/src/sys/stat.c
===================================================================
--- uspace/lib/posix/src/sys/stat.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/stat.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,9 +35,9 @@
 
 #include "../internal/common.h"
-#include "posix/sys/stat.h"
-#include "libc/vfs/vfs.h"
+#include <sys/stat.h>
+#include <vfs/vfs.h>
 
 #include <errno.h>
-#include "libc/mem.h"
+#include <mem.h>
 
 /**
Index: uspace/lib/posix/src/sys/wait.c
===================================================================
--- uspace/lib/posix/src/sys/wait.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/wait.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,13 +35,13 @@
 
 #include "../internal/common.h"
-#include "posix/sys/wait.h"
+#include <sys/wait.h>
 
-#include "libc/task.h"
+#include <task.h>
 #include <assert.h>
 
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/signal.h"
+#include <limits.h>
+#include <signal.h>
 
 int __posix_wifexited(int status)
Index: uspace/lib/posix/src/time.c
===================================================================
--- uspace/lib/posix/src/time.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/time.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,20 +35,19 @@
 
 #include "internal/common.h"
-#include "posix/sys/types.h"
-#include "posix/sys/time.h"
-#include "posix/time.h"
-
-#include "posix/ctype.h"
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <ctype.h>
 
 #include <errno.h>
 
-#include "posix/signal.h"
+#include <signal.h>
 #include <assert.h>
 
-#include "libc/async.h"
-#include "libc/malloc.h"
-#include "libc/task.h"
-#include "libc/stddef.h"
-#include "libc/time.h"
+#include <async.h>
+#include <malloc.h>
+#include <task.h>
+#include <stddef.h>
 
 // TODO: test everything in this file
Index: uspace/lib/posix/src/unistd.c
===================================================================
--- uspace/lib/posix/src/unistd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/unistd.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -35,17 +35,17 @@
 
 #include "internal/common.h"
-#include "posix/unistd.h"
+#include <unistd.h>
 
 #include <errno.h>
 
-#include "posix/dirent.h"
-#include "posix/string.h"
-#include "posix/sys/types.h"
-#include "posix/fcntl.h"
-
-#include "libc/task.h"
-#include "libc/stats.h"
-#include "libc/malloc.h"
-#include "libc/vfs/vfs.h"
+#include <dirent.h>
+#include <string.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include <task.h>
+#include <stats.h>
+#include <malloc.h>
+#include <vfs/vfs.h>
 
 #include <libarch/config.h>
Index: uspace/lib/posix/test/stdio.c
===================================================================
--- uspace/lib/posix/test/stdio.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/test/stdio.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -29,5 +29,5 @@
 #include <pcut/pcut.h>
 #include <str.h>
-#include "posix/stdio.h"
+#include <stdio.h>
 
 PCUT_INIT;
Index: uspace/lib/posix/test/stdlib.c
===================================================================
--- uspace/lib/posix/test/stdlib.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/test/stdlib.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -29,8 +29,8 @@
 #include <pcut/pcut.h>
 #include <str.h>
-#include "posix/fcntl.h"
-#include "posix/stdio.h"
-#include "posix/stdlib.h"
-#include "posix/unistd.h"
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 PCUT_INIT;
Index: uspace/lib/posix/test/unistd.c
===================================================================
--- uspace/lib/posix/test/unistd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/test/unistd.c	(revision 8591b31e206885d6be362b4e18a8f5cc3266ec67)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <pcut/pcut.h>
-#include "posix/fcntl.h"
-#include "posix/stdlib.h"
-#include "posix/unistd.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 PCUT_INIT;