Index: boot/arch/riscv64/include/types.h
===================================================================
--- boot/arch/riscv64/include/types.h	(revision 0a78e4fc664e59673629dee0fb20855def1120d4)
+++ boot/arch/riscv64/include/types.h	(revision 8ddaaacd4f1ffc7cd429e863b42a92bfe0fbf899)
@@ -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 {