Index: kernel/arch/riscv64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/riscv64/include/arch/istate_struct.ag	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ kernel/arch/riscv64/include/arch/istate_struct.ag	(revision b4d08a4998b6c0f63a4c0991d02110916baf536d)
@@ -36,5 +36,9 @@
                 },
                 {
-                        negative-guard: KERNEL,
+                        negative-guard : KERNEL,
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
                         include : <stdint.h>
                 }
Index: kernel/arch/riscv64/include/arch/mm/km.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/km.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ kernel/arch/riscv64/include/arch/mm/km.h	(revision b4d08a4998b6c0f63a4c0991d02110916baf536d)
@@ -36,5 +36,6 @@
 #define KERN_riscv64_KM_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
 
 extern void km_identity_arch_init(void);
Index: kernel/arch/riscv64/src/userspace.c
===================================================================
--- kernel/arch/riscv64/src/userspace.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ kernel/arch/riscv64/src/userspace.c	(revision b4d08a4998b6c0f63a4c0991d02110916baf536d)
@@ -34,5 +34,4 @@
 
 #include <abi/proc/uarg.h>
-#include <stdbool.h>
 #include <userspace.h>