Index: kernel/arch/riscv64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/riscv64/include/arch/istate_struct.ag	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
+++ kernel/arch/riscv64/include/arch/istate_struct.ag	(revision 63e27efdf2fe6d3fa02bbb5ee1da00df5cc07e9d)
@@ -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 83dab11c929c1a48613d4dc70ed8ca9113463484)
+++ kernel/arch/riscv64/include/arch/mm/km.h	(revision 63e27efdf2fe6d3fa02bbb5ee1da00df5cc07e9d)
@@ -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);