Index: kernel/arch/riscv64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/riscv64/include/arch/boot/boot.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/boot/boot.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -44,5 +44,6 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <config.h>
 
Index: kernel/arch/riscv64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/riscv64/include/arch/fpu_context.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/fpu_context.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_riscv64_FPU_CONTEXT_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 typedef struct {
Index: kernel/arch/riscv64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/asid.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/mm/asid.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_riscv64_ASID_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define ASID_MAX_ARCH  4096
Index: kernel/arch/riscv64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/frame.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/mm/frame.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -43,6 +43,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
 extern void frame_low_arch_init(void);
 extern void frame_high_arch_init(void);
Index: kernel/arch/riscv64/include/arch/mm/page.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/page.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -212,5 +212,5 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <typedefs.h>
+#include <stdint.h>
 
 /** Page Table Entry. */
Index: kernel/arch/riscv64/include/arch/proc/task.h
===================================================================
--- kernel/arch/riscv64/include/arch/proc/task.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/include/arch/proc/task.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_riscv64_TASK_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 typedef struct {