diff --git a/headers/private/kernel/arch/riscv64/arch_debug.h b/headers/private/kernel/arch/riscv64/arch_debug.h
new file mode 100644
index 0000000000..57bd5b8e45
--- /dev/null
+++ b/headers/private/kernel/arch/riscv64/arch_debug.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_ARCH_RISCV64_DEBUG_H
+#define _KERNEL_ARCH_RISCV64_DEBUG_H
+
+
+#include <SupportDefs.h>
+
+
+struct arch_debug_registers {
+};
+
+
+#endif	// _KERNEL_ARCH_RISCV64_DEBUG_H
diff --git a/headers/private/kernel/arch/riscv64/arch_system_info.h b/headers/private/kernel/arch/riscv64/arch_system_info.h
new file mode 100644
index 0000000000..401e04ae30
--- /dev/null
+++ b/headers/private/kernel/arch/riscv64/arch_system_info.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_ARCH_RISCV64_SYSTEM_INFO_H
+#define _KERNEL_ARCH_RISCV64_SYSTEM_INFO_H
+
+
+/* nothing to be seen here yet */
+
+
+#endif	/* _KRENEL_ARCH_RISCV64_SYSTEM_INFO_H */
diff --git a/headers/private/kernel/arch/riscv64/arch_vm_translation_map.h b/headers/private/kernel/arch/riscv64/arch_vm_translation_map.h
new file mode 100644
index 0000000000..853d7202c0
--- /dev/null
+++ b/headers/private/kernel/arch/riscv64/arch_vm_translation_map.h
@@ -0,0 +1,26 @@
+/*
+** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the MIT License.
+*/
+#ifndef _KERNEL_ARCH_RISCV64_VM_TRANSLATION_MAP_H
+#define _KERNEL_ARCH_RISCV64_VM_TRANSLATION_MAP_H
+
+#include <arch/vm_translation_map.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void riscv64_translation_map_change_asid(VMTranslationMap *map);
+
+status_t riscv64_map_address_range(addr_t virtualAddress,
+	phys_addr_t physicalAddress, size_t size);
+void riscv64_unmap_address_range(addr_t virtualAddress, size_t size);
+status_t riscv64_remap_address_range(addr_t *virtualAddress, size_t size,
+	bool unmap);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KERNEL_ARCH_RISCV64_VM_TRANSLATION_MAP_H */
diff --git a/headers/private/system/arch/riscv64/arch_commpage_defs.h b/headers/private/system/arch/riscv64/arch_commpage_defs.h
new file mode 100644
index 0000000000..18f187011f
--- /dev/null
+++ b/headers/private/system/arch/riscv64/arch_commpage_defs.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2007, Travis Geiselbrecht. All rights reserved.
+ * Copyright 2019, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _SYSTEM_ARCH_RISCV64_COMMPAGE_DEFS_H
+#define _SYSTEM_ARCH_RISCV64_COMMPAGE_DEFS_H
+
+#ifndef _SYSTEM_COMMPAGE_DEFS_H
+#       error Must not be included directly. Include <commpage_defs.h> instead!
+#endif
+
+/*
+#define COMMPAGE_ENTRY_RISCV64_SYSCALL (COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 0)
+#define COMMPAGE_ENTRY_RISCV64_MEMCPY  (COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
+*/
+
+#endif  /* _SYSTEM_ARCH_RISCV64_COMMPAGE_DEFS_H */
diff --git a/headers/private/kernel/arch/riscv64/arch_config.h b/headers/private/system/arch/riscv64/arch_config.h
similarity index 100%
rename from headers/private/kernel/arch/riscv64/arch_config.h
rename to headers/private/system/arch/riscv64/arch_config.h
diff --git a/headers/private/system/arch/riscv64/arch_real_time_data.h b/headers/private/system/arch/riscv64/arch_real_time_data.h
new file mode 100644
index 0000000000..4d63960eed
--- /dev/null
+++ b/headers/private/system/arch/riscv64/arch_real_time_data.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018 Haiku Inc. All Rights Reserved.
+ * Copyright 2006, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+ * Copyright 2019, Adrien Destugues <pulkomandy@pulkomandy.tk>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_ARCH_REAL_TIME_DATA_H
+#define _KERNEL_ARCH_REAL_TIME_DATA_H
+
+#include <StorageDefs.h>
+#include <SupportDefs.h>
+
+
+struct arch_real_time_data {
+	bigtime_t	system_time_offset;
+	uint32		system_time_conversion_factor;
+	uint32		_padding;
+};
+
+#endif	/* _KERNEL_ARCH_REAL_TIME_DATA_H */
+