Index: boot/arch/arm32/include/mm.h
===================================================================
--- boot/arch/arm32/include/mm.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/arm32/include/mm.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -43,5 +43,5 @@
 #define BOOT_arm32__MM_H
 
-#include <typedefs.h>
+#include <stddef.h>
 
 /** Describe "section" page table entry (one-level paging with 1 MB sized pages). */
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/arm32/src/mm.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -34,5 +34,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/asm.h>
 #include <arch/mm.h>
Index: boot/arch/arm32/src/putchar.c
===================================================================
--- boot/arch/arm32/src/putchar.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/arm32/src/putchar.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/main.h>
 #include <putchar.h>
Index: boot/arch/ia64/include/pal.h
===================================================================
--- boot/arch/ia64/include/pal.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ia64/include/pal.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -31,5 +31,5 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 /*
Index: boot/arch/ia64/include/sal.h
===================================================================
--- boot/arch/ia64/include/sal.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ia64/include/sal.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -31,5 +31,5 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 /*
Index: boot/arch/ia64/src/putchar.c
===================================================================
--- boot/arch/ia64/src/putchar.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ia64/src/putchar.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -27,5 +27,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/arch.h>
 #include <putchar.h>
Index: boot/arch/ia64/src/ski.c
===================================================================
--- boot/arch/ia64/src/ski.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ia64/src/ski.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -28,5 +28,5 @@
 
 #include <arch/ski.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 #define SKI_INIT_CONSOLE	20
Index: boot/arch/mips32/src/putchar.c
===================================================================
--- boot/arch/mips32/src/putchar.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/mips32/src/putchar.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -27,5 +27,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/arch.h>
 #include <putchar.h>
Index: boot/arch/ppc32/include/asm.h
===================================================================
--- boot/arch/ppc32/include/asm.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ppc32/include/asm.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_ppc32_ASM_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/main.h>
 
Index: boot/arch/ppc32/include/main.h
===================================================================
--- boot/arch/ppc32/include/main.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ppc32/include/main.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_ppc32_MAIN_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
Index: boot/arch/ppc32/src/ofw.c
===================================================================
--- boot/arch/ppc32/src/ofw.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/ppc32/src/ofw.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -28,5 +28,5 @@
 
 #include <genarch/ofw.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <putchar.h>
 #include <str.h>
Index: boot/arch/riscv64/include/asm.h
===================================================================
--- boot/arch/riscv64/include/asm.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/riscv64/include/asm.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_riscv64_ASM_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 extern void jump_to_kernel(void *, uintptr_t)
Index: boot/arch/riscv64/include/ucb.h
===================================================================
--- boot/arch/riscv64/include/ucb.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/riscv64/include/ucb.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 
 #define CSR_MTOHOST    0x780
Index: boot/arch/riscv64/src/main.c
===================================================================
--- boot/arch/riscv64/src/main.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/riscv64/src/main.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -31,5 +31,5 @@
 #include <arch/asm.h>
 #include <version.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <printf.h>
 #include <macros.h>
Index: boot/arch/riscv64/src/putchar.c
===================================================================
--- boot/arch/riscv64/src/putchar.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/riscv64/src/putchar.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -27,5 +27,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/arch.h>
 #include <putchar.h>
Index: boot/arch/sparc64/include/asm.h
===================================================================
--- boot/arch/sparc64/include/asm.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/sparc64/include/asm.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -31,5 +31,5 @@
 #define BOOT_sparc64_ASM_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 extern void jump_to_kernel(uintptr_t physmem_start, bootinfo_t *bootinfo,
Index: boot/arch/sparc64/include/main.h
===================================================================
--- boot/arch/sparc64/include/main.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/sparc64/include/main.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_sparc64_MAIN_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
Index: boot/arch/sparc64/include/ofw.h
===================================================================
--- boot/arch/sparc64/include/ofw.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/sparc64/include/ofw.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_sparc64_OFW_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 #define OFW_ADDRESS_CELLS  2
Index: boot/arch/sparc64/src/ofw.c
===================================================================
--- boot/arch/sparc64/src/ofw.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/arch/sparc64/src/ofw.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #include <arch/ofw.h>
 #include <genarch/ofw.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <printf.h>
 #include <halt.h>
Index: boot/genarch/include/ofw.h
===================================================================
--- boot/genarch/include/ofw.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/include/ofw.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_OFW_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <stdarg.h>
 
Index: boot/genarch/include/ofw_tree.h
===================================================================
--- boot/genarch/include/ofw_tree.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/include/ofw_tree.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_OFW_TREE_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <genarch/ofw.h>
 
Index: boot/genarch/src/efi.c
===================================================================
--- boot/genarch/src/efi.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/src/efi.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -29,5 +29,5 @@
 #include <genarch/efi.h>
 #include <arch/types.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 void *efi_vendor_table_find(efi_system_table_t *st, efi_guid_t guid)
Index: boot/genarch/src/multiplication.c
===================================================================
--- boot/genarch/src/multiplication.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/src/multiplication.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -33,5 +33,5 @@
 
 #include <genarch/multiplication.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 /** Set 1 to return INT64_MAX or INT64_MIN on overflow */
Index: boot/genarch/src/ofw.c
===================================================================
--- boot/genarch/src/ofw.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/src/ofw.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -31,5 +31,5 @@
 #include <genarch/ofw.h>
 #include <printf.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <str.h>
 #include <align.h>
Index: boot/genarch/src/ofw_tree.c
===================================================================
--- boot/genarch/src/ofw_tree.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/genarch/src/ofw_tree.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #include <genarch/ofw.h>
 #include <arch/ofw.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <str.h>
 #include <balloc.h>
Index: boot/generic/include/balloc.h
===================================================================
--- boot/generic/include/balloc.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/balloc.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_BALLOC_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 typedef struct {
Index: boot/generic/include/inflate.h
===================================================================
--- boot/generic/include/inflate.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/inflate.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
 #define BOOT_INFLATE_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 extern int inflate(void *, size_t, void *, size_t);
Index: boot/generic/include/memstr.h
===================================================================
--- boot/generic/include/memstr.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/memstr.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -33,5 +33,5 @@
 #define BOOT_MEMSTR_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 extern void *memcpy(void *, const void *, size_t)
Index: boot/generic/include/printf.h
===================================================================
--- boot/generic/include/printf.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/printf.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -33,5 +33,5 @@
 #define BOOT_PRINT_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <stdarg.h>
 #include <printf_verify.h>
Index: boot/generic/include/printf_core.h
===================================================================
--- boot/generic/include/printf_core.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/printf_core.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -33,5 +33,5 @@
 #define BOOT_PRINTF_CORE_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <stdarg.h>
 
Index: boot/generic/include/stddef.h
===================================================================
--- boot/generic/include/stddef.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
+++ boot/generic/include/stddef.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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.
+ */
+
+/** @file
+ */
+
+#ifndef BOOT_STDDEF_H_
+#define BOOT_STDDEF_H_
+
+#include <stdint.h>
+#include <arch/common.h>
+#include <arch/types.h>
+
+#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 aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/include/str.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -33,5 +33,5 @@
 #define BOOT_STR_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 /**< Common Unicode characters */
Index: ot/generic/include/typedefs.h
===================================================================
--- boot/generic/include/typedefs.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ 	(revision )
@@ -1,49 +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.
- */
-
-/** @file
- */
-
-#ifndef BOOT_TYPEDEFS_H_
-#define BOOT_TYPEDEFS_H_
-
-#include <stdint.h>
-#include <arch/common.h>
-#include <arch/types.h>
-
-#define NULL  ((void *) 0)
-
-#define false  0
-#define true   1
-
-typedef uint8_t bool;
-
-#endif
-
-/** @}
- */
Index: boot/generic/src/balloc.c
===================================================================
--- boot/generic/src/balloc.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/src/balloc.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -28,5 +28,5 @@
 
 #include <balloc.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <align.h>
 
Index: boot/generic/src/inflate.c
===================================================================
--- boot/generic/src/inflate.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/src/inflate.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -65,5 +65,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <errno.h>
 #include <memstr.h>
Index: boot/generic/src/memstr.c
===================================================================
--- boot/generic/src/memstr.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/src/memstr.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -28,5 +28,5 @@
 
 #include <memstr.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 /** Move memory block without overlapping.
Index: boot/generic/src/vprintf.c
===================================================================
--- boot/generic/src/vprintf.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ boot/generic/src/vprintf.c	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -30,5 +30,5 @@
  */
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <printf.h>
 #include <printf_core.h>
Index: tools/pack.py
===================================================================
--- tools/pack.py	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
+++ tools/pack.py	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -159,5 +159,5 @@
 	header.write("#ifndef BOOT_COMPONENTS_H_\n")
 	header.write("#define BOOT_COMPONENTS_H_\n\n")
-	header.write("#include <typedefs.h>\n\n")
+	header.write("#include <stddef.h>\n\n")
 	header.write("#define COMPONENTS  %d\n\n" % cnt)
 	header.write("typedef struct {\n")
@@ -180,5 +180,5 @@
 	data.write(' * Generated by: tools/pack.py         *\n')
 	data.write(' ***************************************/\n\n')
-	data.write("#include <typedefs.h>\n")
+	data.write("#include <stddef.h>\n")
 	data.write("#include <arch/%s.h>\n\n" % COMPONENTS)
 	data.write("component_t components[] = {\n")