Index: boot/arch/arm32/include/mm.h
===================================================================
--- boot/arch/arm32/include/mm.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/arm32/include/mm.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -42,6 +42,4 @@
 #ifndef BOOT_arm32__MM_H
 #define BOOT_arm32__MM_H
-
-#include <stddef.h>
 
 /** Describe "section" page table entry (one-level paging with 1 MB sized pages). */
Index: boot/arch/arm32/include/types.h
===================================================================
--- boot/arch/arm32/include/types.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/arm32/include/types.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -37,4 +37,6 @@
 #define BOOT_arm32_TYPES_H
 
+#include <arch/common.h>
+
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/arm32/src/mm.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -34,5 +34,5 @@
  */
 
-#include <stddef.h>
+#include <stdint.h>
 #include <arch/asm.h>
 #include <arch/mm.h>
Index: boot/arch/arm32/src/putchar.c
===================================================================
--- boot/arch/arm32/src/putchar.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/arm32/src/putchar.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -36,7 +36,8 @@
  */
 
-#include <stddef.h>
 #include <arch/main.h>
 #include <putchar.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <str.h>
 
Index: boot/arch/ia64/include/pal.h
===================================================================
--- boot/arch/ia64/include/pal.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/ia64/include/pal.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -32,4 +32,5 @@
 #include <arch/types.h>
 #include <stddef.h>
+#include <stdint.h>
 
 /*
Index: boot/arch/ia64/include/sal.h
===================================================================
--- boot/arch/ia64/include/sal.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/ia64/include/sal.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -32,4 +32,5 @@
 #include <arch/types.h>
 #include <stddef.h>
+#include <stdint.h>
 
 /*
Index: boot/arch/ia64/include/ski.h
===================================================================
--- boot/arch/ia64/include/ski.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/ia64/include/ski.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,4 +30,5 @@
 #define BOOT_ia64_SKI_H_
 
+#include <stddef.h>
 #include <str.h>
 
Index: boot/arch/ia64/src/putchar.c
===================================================================
--- boot/arch/ia64/src/putchar.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/ia64/src/putchar.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -27,7 +27,7 @@
  */
 
-#include <stddef.h>
 #include <arch/arch.h>
 #include <putchar.h>
+#include <stddef.h>
 #include <str.h>
 #include <arch/ski.h>
Index: boot/arch/mips32/include/types.h
===================================================================
--- boot/arch/mips32/include/types.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/mips32/include/types.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,4 +30,6 @@
 #define BOOT_mips32_TYPES_H_
 
+#include <arch/common.h>
+
 #define TASKMAP_MAX_RECORDS        32
 #define CPUMAP_MAX_RECORDS         32
Index: boot/arch/mips32/src/putchar.c
===================================================================
--- boot/arch/mips32/src/putchar.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/mips32/src/putchar.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -28,4 +28,5 @@
 
 #include <stddef.h>
+#include <stdint.h>
 #include <arch/arch.h>
 #include <putchar.h>
Index: boot/arch/ppc32/include/types.h
===================================================================
--- boot/arch/ppc32/include/types.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/ppc32/include/types.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,4 +30,6 @@
 #define BOOT_ppc32_TYPES_H_
 
+#include <arch/common.h>
+
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
Index: boot/arch/riscv64/include/types.h
===================================================================
--- boot/arch/riscv64/include/types.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/riscv64/include/types.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -29,4 +29,6 @@
 #ifndef BOOT_riscv64_TYPES_H_
 #define BOOT_riscv64_TYPES_H_
+
+#include <arch/common.h>
 
 #define MEMMAP_MAX_RECORDS         32
Index: boot/arch/sparc64/include/asm.h
===================================================================
--- boot/arch/sparc64/include/asm.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/sparc64/include/asm.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -31,5 +31,5 @@
 #define BOOT_sparc64_ASM_H_
 
-#include <stddef.h>
+#include <stdint.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 d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/sparc64/include/main.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,5 +30,5 @@
 #define BOOT_sparc64_MAIN_H_
 
-#include <stddef.h>
+#include <stdint.h>
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
Index: boot/arch/sparc64/include/ofw.h
===================================================================
--- boot/arch/sparc64/include/ofw.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/sparc64/include/ofw.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,5 +30,5 @@
 #define BOOT_sparc64_OFW_H_
 
-#include <stddef.h>
+#include <stdint.h>
 
 #define OFW_ADDRESS_CELLS  2
Index: boot/arch/sparc64/include/types.h
===================================================================
--- boot/arch/sparc64/include/types.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/sparc64/include/types.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -30,4 +30,6 @@
 #define BOOT_sparc64_TYPES_H_
 
+#include <arch/common.h>
+
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
Index: boot/arch/sparc64/src/ofw.c
===================================================================
--- boot/arch/sparc64/src/ofw.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/arch/sparc64/src/ofw.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -37,4 +37,5 @@
 #include <genarch/ofw.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <printf.h>
 #include <halt.h>
Index: boot/genarch/src/multiplication.c
===================================================================
--- boot/genarch/src/multiplication.c	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/genarch/src/multiplication.c	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -33,5 +33,5 @@
 
 #include <genarch/multiplication.h>
-#include <stddef.h>
+#include <stdint.h>
 
 /** Set 1 to return INT64_MAX or INT64_MIN on overflow */
Index: boot/generic/include/putchar.h
===================================================================
--- boot/generic/include/putchar.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/generic/include/putchar.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -36,4 +36,6 @@
 #define BOOT_PUTCHAR_H_
 
+#include <stddef.h>
+
 extern void putchar(const wchar_t);
 
Index: boot/generic/include/stddef.h
===================================================================
--- boot/generic/include/stddef.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/generic/include/stddef.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -33,5 +33,4 @@
 #define BOOT_STDDEF_H_
 
-#include <stdint.h>
 #include <arch/common.h>
 #include <arch/types.h>
Index: boot/generic/include/stdint.h
===================================================================
--- boot/generic/include/stdint.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
+++ boot/generic/include/stdint.h	(revision 978058442db039c0933d980de7486f93414ed1c0)
@@ -33,4 +33,7 @@
 #define BOOT_STDINT_H_
 
+#include <arch/common.h>
+#include <arch/types.h>
+
 #define INT8_MIN  INT8_C(0x80)
 #define INT8_MAX  INT8_C(0x7F)