diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index 8557ef8396..be3fe07ad6 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -37,7 +37,6 @@
 
 #include <nuttx/irq.h>
 
-#include "riscv_sbi.h"
 #include "riscv_common_memorymap.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_ipi.h b/arch/risc-v/src/common/riscv_ipi.h
index 8c3989d7ee..5d8d2a400b 100644
--- a/arch/risc-v/src/common/riscv_ipi.h
+++ b/arch/risc-v/src/common/riscv_ipi.h
@@ -26,6 +26,7 @@
  ****************************************************************************/
 
 #include "riscv_internal.h"
+#include "riscv_sbi.h"
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_mtimer.c b/arch/risc-v/src/common/riscv_mtimer.c
index 0efc19b093..b611c3dd99 100644
--- a/arch/risc-v/src/common/riscv_mtimer.c
+++ b/arch/risc-v/src/common/riscv_mtimer.c
@@ -27,8 +27,9 @@
 
 #include <arch/barriers.h>
 
-#include "riscv_mtimer.h"
 #include "riscv_internal.h"
+#include "riscv_mtimer.h"
+#include "riscv_sbi.h"
 
 /****************************************************************************
  * Private Types
diff --git a/arch/risc-v/src/nuttsbi/sbi_mcall.c b/arch/risc-v/src/nuttsbi/sbi_mcall.c
index 02f0eeb2a9..24536ef5da 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mcall.c
+++ b/arch/risc-v/src/nuttsbi/sbi_mcall.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 
 #include "riscv_internal.h"
+#include "riscv_sbi.h"
 
 #include "sbi_mcall.h"
 #include "sbi_internal.h"
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_start.c b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
index 89a771d256..652bf9082b 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_start.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
@@ -31,6 +31,7 @@
 
 #include <debug.h>
 #include "riscv_internal.h"
+#include "riscv_sbi.h"
 #include "chip.h"
 
 #include "qemu_rv_userspace.h"
@@ -253,4 +254,4 @@ void sbi_late_initialize(void)
   riscv_append_pmp_region(NAPOT_RW, 0, SIZE_HALF);
   riscv_append_pmp_region(NAPOT_RWX, SIZE_HALF, SIZE_HALF);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/boards/risc-v/qemu-rv/rv-virt/src/qemu_rv_appinit.c b/boards/risc-v/qemu-rv/rv-virt/src/qemu_rv_appinit.c
index 345d85f489..786a08d771 100644
--- a/boards/risc-v/qemu-rv/rv-virt/src/qemu_rv_appinit.c
+++ b/boards/risc-v/qemu-rv/rv-virt/src/qemu_rv_appinit.c
@@ -41,6 +41,7 @@
 #include "qemu_rv_rptun.h"
 
 #include "riscv_internal.h"
+#include "riscv_sbi.h"
 #include "romfs.h"
 
 #ifdef CONFIG_USERLED