Index: kernel/arch/riscv64/src/cpu/cpu.c
===================================================================
--- kernel/arch/riscv64/src/cpu/cpu.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/cpu/cpu.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -36,5 +36,4 @@
 #include <cpu.h>
 #include <arch.h>
-#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
@@ -57,5 +56,5 @@
 }
 
-void cpu_print_report(cpu_t* cpu)
+void cpu_print_report(cpu_t *cpu)
 {
 }
Index: kernel/arch/riscv64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/riscv64/src/debug/stacktrace.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/debug/stacktrace.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -34,4 +34,5 @@
 
 #include <stacktrace.h>
+#include <stdbool.h>
 #include <syscall/copy.h>
 #include <typedefs.h>
Index: kernel/arch/riscv64/src/mm/km.c
===================================================================
--- kernel/arch/riscv64/src/mm/km.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/mm/km.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -32,4 +32,5 @@
 
 #include <arch/mm/km.h>
+#include <stdbool.h>
 #include <typedefs.h>
 
Index: kernel/arch/riscv64/src/mm/page.c
===================================================================
--- kernel/arch/riscv64/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/mm/page.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -39,5 +39,4 @@
 #include <mm/page.h>
 #include <mm/as.h>
-#include <typedefs.h>
 #include <align.h>
 #include <config.h>
Index: kernel/arch/riscv64/src/riscv64.c
===================================================================
--- kernel/arch/riscv64/src/riscv64.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/riscv64.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -34,5 +34,5 @@
 
 #include <arch.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
Index: kernel/arch/riscv64/src/userspace.c
===================================================================
--- kernel/arch/riscv64/src/userspace.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/riscv64/src/userspace.c	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -33,9 +33,7 @@
  */
 
+#include <abi/proc/uarg.h>
+#include <stdbool.h>
 #include <userspace.h>
-#include <typedefs.h>
-#include <arch.h>
-#include <abi/proc/uarg.h>
-#include <mm/as.h>
 
 void userspace(uspace_arg_t *kernel_uarg)