Index: boot/arch/arm32/include/types.h
===================================================================
--- boot/arch/arm32/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/arm32/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -37,15 +37,8 @@
 #define BOOT_arm32_TYPES_H
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
-
-typedef uint32_t size_t;
-typedef uint32_t uintptr_t;
-
-typedef uint32_t pfn_t;
-
-typedef int32_t ptrdiff_t;
 
 typedef struct {
Index: boot/arch/ia64/include/types.h
===================================================================
--- boot/arch/ia64/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/ia64/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -30,15 +30,9 @@
 #define BOOT_ia64_TYPES_H_
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define TASKMAP_MAX_RECORDS		32
 #define BOOTINFO_TASK_NAME_BUFLEN	32
 #define MEMMAP_ITEMS			128
-
-typedef uint64_t size_t;
-typedef uint64_t sysarg_t;
-typedef uint64_t uintptr_t;
-
-typedef int64_t ptrdiff_t;
 
 typedef struct {
Index: boot/arch/mips32/include/types.h
===================================================================
--- boot/arch/mips32/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/mips32/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -30,14 +30,9 @@
 #define BOOT_mips32_TYPES_H_
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define TASKMAP_MAX_RECORDS        32
 #define CPUMAP_MAX_RECORDS         32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
-
-typedef uint32_t size_t;
-typedef uint32_t uintptr_t;
-
-typedef int32_t ptrdiff_t;
 
 typedef struct {
Index: boot/arch/ppc32/include/types.h
===================================================================
--- boot/arch/ppc32/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/ppc32/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -30,15 +30,8 @@
 #define BOOT_ppc32_TYPES_H_
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
-
-typedef uint32_t size_t;
-typedef uint32_t uintptr_t;
-typedef uint32_t sysarg_t;
-typedef int32_t native_t;
-
-typedef int32_t ptrdiff_t;
 
 typedef struct {
Index: boot/arch/riscv64/include/types.h
===================================================================
--- boot/arch/riscv64/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/riscv64/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -30,14 +30,9 @@
 #define BOOT_riscv64_TYPES_H_
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define MEMMAP_MAX_RECORDS         32
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
-
-typedef uint64_t size_t;
-typedef uint64_t uintptr_t;
-
-typedef int64_t ptrdiff_t;
 
 typedef struct {
Index: boot/arch/sparc64/include/types.h
===================================================================
--- boot/arch/sparc64/include/types.h	(revision b446b02d16cef27e33c81855d516b2f1a5ce70b2)
+++ boot/arch/sparc64/include/types.h	(revision ce55b43d2fde4827af9a50d151005ef2e652cb21)
@@ -30,15 +30,8 @@
 #define BOOT_sparc64_TYPES_H_
 
-#include <arch/common.h>
+#include <_bits/all.h>
 
 #define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
-
-typedef uint64_t size_t;
-typedef uint64_t uintptr_t;
-typedef uint64_t sysarg_t;
-typedef int64_t native_t;
-
-typedef int64_t ptrdiff_t;
 
 typedef struct {