diff --git a/arch/risc-v/src/bl602/bl602_allocateheap.c b/arch/risc-v/src/bl602/bl602_allocateheap.c
index 4d41404c7de..1b8fceb4cc5 100644
--- a/arch/risc-v/src/bl602/bl602_allocateheap.c
+++ b/arch/risc-v/src/bl602/bl602_allocateheap.c
@@ -24,6 +24,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/arch.h>
+
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/c906/c906_allocateheap.c b/arch/risc-v/src/c906/c906_allocateheap.c
index 04e587a6c7d..8f692a0f8a3 100644
--- a/arch/risc-v/src/c906/c906_allocateheap.c
+++ b/arch/risc-v/src/c906/c906_allocateheap.c
@@ -23,9 +23,11 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/userspace.h>
 
+#include <nuttx/arch.h>
 #include <arch/board/board.h>
 
 #include "c906.h"
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index 5368ffd3f66..71918b0eccb 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -178,8 +178,6 @@ void riscv_addregion(void);
 # define riscv_addregion()
 #endif
 
-void up_allocate_heap(FAR void **heap_start, size_t *heap_size);
-
 /* IRQ initialization *******************************************************/
 
 void riscv_ack_irq(int irq);
diff --git a/arch/risc-v/src/fe310/fe310_allocateheap.c b/arch/risc-v/src/fe310/fe310_allocateheap.c
index 8e65f3fa945..462c9ebb58e 100644
--- a/arch/risc-v/src/fe310/fe310_allocateheap.c
+++ b/arch/risc-v/src/fe310/fe310_allocateheap.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/arch.h>
 #include <arch/board/board.h>
 
 #include "fe310.h"
diff --git a/arch/risc-v/src/k210/k210_allocateheap.c b/arch/risc-v/src/k210/k210_allocateheap.c
index a4601d40fe9..b435a4aadcc 100644
--- a/arch/risc-v/src/k210/k210_allocateheap.c
+++ b/arch/risc-v/src/k210/k210_allocateheap.c
@@ -23,9 +23,11 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/userspace.h>
 
+#include <nuttx/arch.h>
 #include <arch/board/board.h>
 
 #include "k210.h"
diff --git a/arch/risc-v/src/litex/litex_allocateheap.c b/arch/risc-v/src/litex/litex_allocateheap.c
index 7349cc7e804..a97728e3b06 100644
--- a/arch/risc-v/src/litex/litex_allocateheap.c
+++ b/arch/risc-v/src/litex/litex_allocateheap.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/arch.h>
 #include <arch/board/board.h>
 
 #include "litex.h"