Index: boot/arch/arm32/src/main.c
===================================================================
--- boot/arch/arm32/src/main.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/arch/arm32/src/main.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -44,4 +44,5 @@
 #include <macros.h>
 #include <align.h>
+#include <stdbool.h>
 #include <str.h>
 #include <errno.h>
Index: boot/arch/ia64/src/ski.c
===================================================================
--- boot/arch/ia64/src/ski.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/arch/ia64/src/ski.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -28,4 +28,5 @@
 
 #include <arch/ski.h>
+#include <stdbool.h>
 #include <stddef.h>
 
Index: boot/generic/include/stdbool.h
===================================================================
--- boot/generic/include/stdbool.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/generic/include/stdbool.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+/** @file
+ */
+
+#ifndef BOOT_STDBOOL_H_
+#define BOOT_STDBOOL_H_
+
+#define false  0
+#define true   1
+
+#define bool _Bool
+
+#endif
+
+/** @}
+ */
Index: boot/generic/include/stddef.h
===================================================================
--- boot/generic/include/stddef.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/include/stddef.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -39,9 +39,4 @@
 #define NULL  ((void *) 0)
 
-#define false  0
-#define true   1
-
-typedef uint8_t bool;
-
 #endif
 
Index: boot/generic/include/str.h
===================================================================
--- boot/generic/include/str.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/include/str.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -33,4 +33,5 @@
 #define BOOT_STR_H_
 
+#include <stdbool.h>
 #include <stddef.h>
 
Index: boot/generic/src/inflate.c
===================================================================
--- boot/generic/src/inflate.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/src/inflate.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -65,4 +65,5 @@
  */
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <errno.h>
Index: boot/generic/src/printf_core.c
===================================================================
--- boot/generic/src/printf_core.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/src/printf_core.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -37,4 +37,6 @@
 #include <printf.h>
 #include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <macros.h>
 #include <str.h>
Index: boot/generic/src/str.c
===================================================================
--- boot/generic/src/str.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/src/str.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -98,6 +98,8 @@
  */
 
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <str.h>
-#include <errno.h>
 
 /** Check the condition if wchar_t is signed */