diff --git a/arch/risc-v/src/mpfs/mpfs_fpga_canfd.c b/arch/risc-v/src/mpfs/mpfs_fpga_canfd.c
index cf2ee85b6e377..71c2a0fa8e2c1 100644
--- a/arch/risc-v/src/mpfs/mpfs_fpga_canfd.c
+++ b/arch/risc-v/src/mpfs/mpfs_fpga_canfd.c
@@ -47,8 +47,11 @@
 
 #include <arch/board/board.h>
 
-#include "hardware/mpfs_fpga_canfd.h"
+#include "mpfs_fpga_canfd.h"
 #include "riscv_internal.h"
+#include "mpfs_memorymap.h"
+
+#include "hardware/mpfs_fpga_canfd.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/mpfs/mpfs_fpga_canfd.h b/arch/risc-v/src/mpfs/mpfs_fpga_canfd.h
index d7dc98098bba0..9bc78552b3eb7 100644
--- a/arch/risc-v/src/mpfs/mpfs_fpga_canfd.h
+++ b/arch/risc-v/src/mpfs/mpfs_fpga_canfd.h
@@ -37,13 +37,6 @@
 
 #ifdef CONFIG_MPFS_HAVE_CANFD
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <arch/board/board.h>
-#include "hardware/mpfs_fpga_canfd.h"
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/