Index: uspace/lib/c/arch/riscv64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/faddr.h	(revision 33f86a3f832f902f56ec98dab6a41d9841df0947)
+++ uspace/lib/c/arch/riscv64/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
@@ -36,5 +36,5 @@
 #define LIBC_riscv64_FADDR_H_
 
-#include <libarch/types.h>
+#include <sys/types.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: uspace/lib/c/arch/riscv64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision 33f86a3f832f902f56ec98dab6a41d9841df0947)
+++ uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
@@ -39,5 +39,5 @@
 #include <stdint.h>
 #include <abi/syscall.h>
-#include <libarch/types.h>
+#include <sys/types.h>
 
 #define __syscall0  __syscall