Index: uspace/lib/bithenge/src/helenos/common.h
===================================================================
--- uspace/lib/bithenge/src/helenos/common.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/bithenge/src/helenos/common.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -31,5 +31,5 @@
 
 #include <bithenge/os.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <byteorder.h>
 #include <errno.h>
Index: uspace/lib/c/arch/abs32le/include/atomic.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/atomic.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/abs32le/include/atomic.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 #define LIBC_abs32le_ATOMIC_H_
 
-#include <bool.h>
+#include <stdbool.h>
 
 #define LIBC_ARCH_ATOMIC_H_
Index: uspace/lib/c/arch/abs32le/src/entryjmp.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/entryjmp.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/abs32le/src/entryjmp.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -30,5 +30,5 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <entry_point.h>
 
Index: uspace/lib/c/arch/abs32le/src/fibril.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/fibril.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/abs32le/src/fibril.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -31,5 +31,5 @@
 
 #include <fibril.h>
-#include <bool.h>
+#include <stdbool.h>
 
 int context_save(context_t *ctx)
Index: uspace/lib/c/arch/abs32le/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -32,5 +32,5 @@
 #include <sys/types.h>
 #include <unistd.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stacktrace.h>
 
Index: uspace/lib/c/arch/amd64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/amd64/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/amd64/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <stacktrace.h>
Index: uspace/lib/c/arch/arm32/include/atomic.h
===================================================================
--- uspace/lib/c/arch/arm32/include/atomic.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/arm32/include/atomic.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -41,5 +41,5 @@
 
 #include <atomicdflt.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 
Index: uspace/lib/c/arch/arm32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/arm32/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/arm32/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <stacktrace.h>
Index: uspace/lib/c/arch/ia32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ia32/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/ia32/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #include <libarch/config.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stacktrace.h>
 
Index: uspace/lib/c/arch/ia64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ia64/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/ia64/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 
Index: uspace/lib/c/arch/mips32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/mips32/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/mips32/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 
Index: uspace/lib/c/arch/mips64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/mips64/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/mips64/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 
Index: uspace/lib/c/arch/ppc32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/ppc32/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <stacktrace.h>
Index: uspace/lib/c/arch/sparc64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,5 +35,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <libarch/stack.h>
 #include <errno.h>
Index: uspace/lib/c/generic/adt/list.c
===================================================================
--- uspace/lib/c/generic/adt/list.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/adt/list.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 
 #include <adt/list.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /** Check for membership
Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/async.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -109,5 +109,5 @@
 #include <sys/time.h>
 #include <libarch/barrier.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <malloc.h>
 #include <mem.h>
Index: uspace/lib/c/generic/devman.c
===================================================================
--- uspace/lib/c/generic/devman.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/devman.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -45,5 +45,5 @@
 #include <errno.h>
 #include <malloc.h>
-#include <bool.h>
+#include <stdbool.h>
 
 static FIBRIL_MUTEX_INITIALIZE(devman_driver_block_mutex);
Index: uspace/lib/c/generic/double_to_str.c
===================================================================
--- uspace/lib/c/generic/double_to_str.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/double_to_str.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -34,5 +34,5 @@
 #include <stdint.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /*
Index: uspace/lib/c/generic/io/chargrid.c
===================================================================
--- uspace/lib/c/generic/io/chargrid.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/io/chargrid.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #include <unistd.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <as.h>
 #include <io/chargrid.h>
Index: uspace/lib/c/generic/io/io.c
===================================================================
--- uspace/lib/c/generic/io/io.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/io/io.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <str.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <malloc.h>
 #include <async.h>
Index: uspace/lib/c/generic/loc.c
===================================================================
--- uspace/lib/c/generic/loc.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/loc.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <malloc.h>
-#include <bool.h>
+#include <stdbool.h>
 
 static FIBRIL_MUTEX_INITIALIZE(loc_supp_block_mutex);
Index: uspace/lib/c/generic/malloc.c
===================================================================
--- uspace/lib/c/generic/malloc.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/malloc.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,5 +35,5 @@
 
 #include <malloc.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <as.h>
 #include <align.h>
Index: uspace/lib/c/generic/private/async.h
===================================================================
--- uspace/lib/c/generic/private/async.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/private/async.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -41,5 +41,5 @@
 #include <fibril_synch.h>
 #include <sys/time.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /** Structures of this type are used to track the timeout events. */
Index: uspace/lib/c/generic/sysinfo.c
===================================================================
--- uspace/lib/c/generic/sysinfo.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/sysinfo.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <malloc.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <unistd.h>
 
Index: uspace/lib/c/generic/time.c
===================================================================
--- uspace/lib/c/generic/time.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/generic/time.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #include <sys/time.h>
 #include <time.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <libarch/barrier.h>
 #include <macros.h>
Index: uspace/lib/c/include/adt/hash_table.h
===================================================================
--- uspace/lib/c/include/adt/hash_table.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/adt/hash_table.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 #include <adt/list.h>
 #include <unistd.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <macros.h>
 
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/async.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -44,5 +44,5 @@
 #include <sys/time.h>
 #include <atomic.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <task.h>
 
Index: uspace/lib/c/include/atomicdflt.h
===================================================================
--- uspace/lib/c/include/atomicdflt.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/atomicdflt.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -41,5 +41,5 @@
 
 #include <stdint.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef struct atomic {
Index: uspace/lib/c/include/bd_srv.h
===================================================================
--- uspace/lib/c/include/bd_srv.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/bd_srv.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 
Index: uspace/lib/c/include/bool.h
===================================================================
--- uspace/lib/c/include/bool.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ 	(revision )
@@ -1,47 +1,0 @@
-/*
- * Copyright (c) 2006 Martin Decky
- * 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 libc
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_BOOL_H_
-#define LIBC_BOOL_H_
-
-#include <libarch/types.h>
-#include <abi/bool.h>
-
-#define false  0
-#define true   1
-
-#endif
-
-/** @}
- */
Index: uspace/lib/c/include/cfg.h
===================================================================
--- uspace/lib/c/include/cfg.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/cfg.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -41,5 +41,5 @@
 #include <adt/list.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /**
Index: uspace/lib/c/include/ddi.h
===================================================================
--- uspace/lib/c/include/ddi.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/ddi.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 #define LIBC_DDI_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/time.h>
Index: uspace/lib/c/include/device/hw_res.h
===================================================================
--- uspace/lib/c/include/device/hw_res.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/device/hw_res.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <ipc/dev_iface.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #define DMA_MODE_ON_DEMAND  0
Index: uspace/lib/c/include/devman.h
===================================================================
--- uspace/lib/c/include/devman.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/devman.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 #include <ipc/loc.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 
 extern async_exch_t *devman_exchange_begin_blocking(devman_interface_t);
Index: uspace/lib/c/include/fibril_synch.h
===================================================================
--- uspace/lib/c/include/fibril_synch.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/fibril_synch.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 #include <libarch/tls.h>
 #include <sys/time.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef struct {
Index: uspace/lib/c/include/ieee_double.h
===================================================================
--- uspace/lib/c/include/ieee_double.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/ieee_double.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -31,5 +31,5 @@
 
 #include <stdint.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /** Represents a non-negative floating point number: significand * 2^exponent */
Index: uspace/lib/c/include/inet/iplink_srv.h
===================================================================
--- uspace/lib/c/include/inet/iplink_srv.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/inet/iplink_srv.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 
Index: uspace/lib/c/include/io/charfield.h
===================================================================
--- uspace/lib/c/include/io/charfield.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/io/charfield.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <io/color.h>
 #include <io/style.h>
Index: uspace/lib/c/include/io/con_srv.h
===================================================================
--- uspace/lib/c/include/io/con_srv.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/io/con_srv.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -44,5 +44,5 @@
 #include <io/pixel.h>
 #include <io/style.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/time.h>
 #include <sys/types.h>
Index: uspace/lib/c/include/io/console.h
===================================================================
--- uspace/lib/c/include/io/console.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/io/console.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -41,5 +41,5 @@
 #include <io/keycode.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 
Index: uspace/lib/c/include/io/window.h
===================================================================
--- uspace/lib/c/include/io/window.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/io/window.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 #define LIBC_IO_WINDOW_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <async.h>
Index: uspace/lib/c/include/ipc/vfs.h
===================================================================
--- uspace/lib/c/include/ipc/vfs.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/ipc/vfs.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <ipc/common.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #define FS_NAME_MAXLEN  20
Index: uspace/lib/c/include/loc.h
===================================================================
--- uspace/lib/c/include/loc.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/loc.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <ipc/loc.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef void (*loc_cat_change_cb_t)(void);
Index: uspace/lib/c/include/nic/nic.h
===================================================================
--- uspace/lib/c/include/nic/nic.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/nic/nic.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 
 #include <nic/eth_phys.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /** Ethernet address length. */
Index: uspace/lib/c/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/include/rtld/dynamic.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/rtld/dynamic.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 #define LIBC_RTLD_DYNAMIC_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <rtld/elf_dyn.h>
 #include <libarch/rtld/dynamic.h>
Index: uspace/lib/c/include/sort.h
===================================================================
--- uspace/lib/c/include/sort.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/sort.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef int (* sort_cmp_t)(void *, void *, void *);
Index: uspace/lib/c/include/stacktrace.h
===================================================================
--- uspace/lib/c/include/stacktrace.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/stacktrace.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef struct {
Index: uspace/lib/c/include/stats.h
===================================================================
--- uspace/lib/c/include/stats.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/stats.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <thread.h>
 #include <stdint.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <abi/sysinfo.h>
Index: uspace/lib/c/include/stdbool.h
===================================================================
--- uspace/lib/c/include/stdbool.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
+++ uspace/lib/c/include/stdbool.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_BOOL_H_
+#define LIBC_BOOL_H_
+
+#include <libarch/types.h>
+#include <abi/bool.h>
+
+#define false  0
+#define true   1
+
+#define __bool_true_false_are_defined 1
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/c/include/str.h
===================================================================
--- uspace/lib/c/include/str.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/str.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <mem.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #define U_SPECIAL  '?'
Index: uspace/lib/c/include/sys/stat.h
===================================================================
--- uspace/lib/c/include/sys/stat.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/sys/stat.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <ipc/vfs.h>
 #include <ipc/loc.h>
Index: uspace/lib/c/include/sysinfo.h
===================================================================
--- uspace/lib/c/include/sysinfo.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/c/include/sysinfo.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <abi/sysinfo.h>
 
Index: uspace/lib/clui/tinput.c
===================================================================
--- uspace/lib/clui/tinput.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/clui/tinput.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -40,5 +40,5 @@
 #include <errno.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <tinput.h>
 
Index: uspace/lib/draw/codec/tga.c
===================================================================
--- uspace/lib/draw/codec/tga.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/draw/codec/tga.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <byteorder.h>
 #include <align.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <pixconv.h>
 #include "tga.h"
Index: uspace/lib/draw/drawctx.h
===================================================================
--- uspace/lib/draw/drawctx.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/draw/drawctx.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <compose.h>
Index: uspace/lib/draw/path.c
===================================================================
--- uspace/lib/draw/path.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/draw/path.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,5 +35,5 @@
 
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <malloc.h>
 
Index: uspace/lib/draw/source.h
===================================================================
--- uspace/lib/draw/source.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/draw/source.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <transform.h>
Index: uspace/lib/draw/surface.h
===================================================================
--- uspace/lib/draw/surface.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/draw/surface.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <io/pixelmap.h>
 
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/drv/generic/driver.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -45,5 +45,5 @@
 #include <stdio.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <stdlib.h>
Index: uspace/lib/drv/include/usbhc_iface.h
===================================================================
--- uspace/lib/drv/include/usbhc_iface.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/drv/include/usbhc_iface.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -42,5 +42,5 @@
 #include "ddf/driver.h"
 #include <usb/usb.h>
-#include <bool.h>
+#include <stdbool.h>
 
 int usbhc_request_address(async_exch_t *, usb_address_t *, bool, usb_speed_t);
Index: uspace/lib/graph/graph.h
===================================================================
--- uspace/lib/graph/graph.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/graph/graph.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <loc.h>
 #include <async.h>
Index: uspace/lib/gui/minimal.h
===================================================================
--- uspace/lib/gui/minimal.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/gui/minimal.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #define GUI_MINIMAL_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <io/pixel.h>
Index: uspace/lib/gui/window.c
===================================================================
--- uspace/lib/gui/window.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/gui/window.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -34,5 +34,5 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <stdio.h>
Index: uspace/lib/nic/src/nic_addr_db.c
===================================================================
--- uspace/lib/nic/src/nic_addr_db.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/nic/src/nic_addr_db.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <mem.h>
Index: uspace/lib/nic/src/nic_rx_control.c
===================================================================
--- uspace/lib/nic/src/nic_rx_control.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/nic/src/nic_rx_control.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <mem.h>
Index: uspace/lib/posix/include/posix/stdbool.h
===================================================================
--- uspace/lib/posix/include/posix/stdbool.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ 	(revision )
@@ -1,55 +1,0 @@
-/*
- * Copyright (c) 2011 Jiri Zarevucky
- * 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 Boolean type and values.
- */
-
-#ifndef POSIX_STDBOOL_H_
-#define POSIX_STDBOOL_H_
-
-#ifdef LIBC_BOOL_H_
-
-#if (!defined(POSIX_STDIO_H_)) && \
-    (!defined(POSIX_STDLIB_H_)) && \
-    (!defined(POSIX_STRING_H_))
-	#error "You can't include bool.h and stdbool.h at the same time."
-#endif
-
-#endif /* LIBC_BOOL_H */
-
-#define LIBC_BOOL_H_
-
-#define bool _Bool
-#define true 1
-#define false 0
-#define __bool_true_false_are_defined 1
-
-#endif /* POSIX_STDBOOL_H_ */
Index: uspace/lib/posix/source/fnmatch.c
===================================================================
--- uspace/lib/posix/source/fnmatch.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/fnmatch.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -44,5 +44,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "posix/stdbool.h"
+#include "libc/stdbool.h"
 #include "posix/ctype.h"
 #include "posix/string.h"
Index: uspace/lib/posix/source/pwd.c
===================================================================
--- uspace/lib/posix/source/pwd.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/pwd.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,5 +35,5 @@
 #define LIBPOSIX_INTERNAL
 
-#include "posix/stdbool.h"
+#include "libc/stdbool.h"
 #include "posix/pwd.h"
 #include "posix/string.h"
Index: uspace/lib/posix/source/stdio.c
===================================================================
--- uspace/lib/posix/source/stdio.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/stdio.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,7 +36,4 @@
 #define LIBPOSIX_INTERNAL
 
-/* Has to be first. */
-#include "posix/stdbool.h"
-
 #include "internal/common.h"
 #include "posix/stdio.h"
@@ -51,4 +48,5 @@
 #include "libc/stdio.h"
 #include "libc/io/printf_core.h"
+#include "libc/stdbool.h"
 #include "libc/str.h"
 #include "libc/malloc.h"
Index: uspace/lib/posix/source/stdio/scanf.c
===================================================================
--- uspace/lib/posix/source/stdio/scanf.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/stdio/scanf.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,7 +35,4 @@
 #define LIBPOSIX_INTERNAL
 
-/* Must be first. */
-#include "posix/stdbool.h"
-
 #include "posix/assert.h"
 #include "posix/errno.h"
@@ -50,4 +47,5 @@
 #include "../internal/common.h"
 #include "libc/malloc.h"
+#include "libc/stdbool.h"
 
 /** Unified data type for possible data sources for scanf. */
Index: uspace/lib/posix/source/stdlib/strtold.c
===================================================================
--- uspace/lib/posix/source/stdlib/strtold.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/stdlib/strtold.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,8 +35,6 @@
 #define LIBPOSIX_INTERNAL
 
-/* Must be first. */
-#include "posix/stdbool.h"
-
 #include "../internal/common.h"
+#include "libc/stdbool.h"
 #include "posix/stdlib.h"
 
Index: uspace/lib/posix/source/time.c
===================================================================
--- uspace/lib/posix/source/time.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/posix/source/time.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,7 +36,4 @@
 #define LIBPOSIX_INTERNAL
 
-/* Must be first. */
-#include "posix/stdbool.h"
-
 #include "internal/common.h"
 #include "posix/time.h"
@@ -50,4 +47,5 @@
 #include "libc/task.h"
 #include "libc/stats.h"
+#include "libc/stdbool.h"
 #include "libc/sys/time.h"
 
Index: uspace/lib/softrend/filter.h
===================================================================
--- uspace/lib/softrend/filter.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/softrend/filter.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #define SOFTREND_FILTER_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <io/pixelmap.h>
 
Index: uspace/lib/softrend/pixconv.h
===================================================================
--- uspace/lib/softrend/pixconv.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/softrend/pixconv.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 #define SOFTREND_PIXCONV_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <io/pixel.h>
 
Index: uspace/lib/softrend/rectangle.h
===================================================================
--- uspace/lib/softrend/rectangle.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/softrend/rectangle.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -38,5 +38,5 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 extern bool rectangle_intersect(
Index: uspace/lib/softrend/transform.h
===================================================================
--- uspace/lib/softrend/transform.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/softrend/transform.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -37,5 +37,5 @@
 #define SOFTREND_TRANSFORM_H_
 
-#include <bool.h>
+#include <stdbool.h>
 
 #ifndef PI
Index: uspace/lib/usb/include/usb/hc.h
===================================================================
--- uspace/lib/usb/include/usb/hc.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usb/include/usb/hc.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <devman.h>
 #include <ddf/driver.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <usb/usb.h>
Index: uspace/lib/usb/include/usb/usb.h
===================================================================
--- uspace/lib/usb/include/usb/usb.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usb/include/usb/usb.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -35,5 +35,5 @@
 #define LIBUSB_USB_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <byteorder.h>
Index: uspace/lib/usbdev/src/dp.c
===================================================================
--- uspace/lib/usbdev/src/dp.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usbdev/src/dp.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -45,5 +45,5 @@
 #include <errno.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <usb/dev/dp.h>
 #include <usb/descriptor.h>
Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -36,5 +36,5 @@
 #define LIBUSBHOST_HOST_ENDPOINT_H
 
-#include <bool.h>
+#include <stdbool.h>
 #include <adt/list.h>
 #include <fibril_synch.h>
Index: uspace/lib/usbhost/src/usb_endpoint_manager.c
===================================================================
--- uspace/lib/usbhost/src/usb_endpoint_manager.c	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usbhost/src/usb_endpoint_manager.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -33,5 +33,5 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
Index: uspace/lib/usbvirt/include/usbvirt/ipc.h
===================================================================
--- uspace/lib/usbvirt/include/usbvirt/ipc.h	(revision 69c1995350adfe31ce9f6f2a6810575aa43f26bf)
+++ uspace/lib/usbvirt/include/usbvirt/ipc.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
@@ -39,5 +39,5 @@
 #include <ipc/common.h>
 #include <usb/usb.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <usbvirt/device.h>
 #include <async.h>