diff --git a/arch/risc-v/src/common/Make.defs b/arch/risc-v/src/common/Make.defs
index 25f008df278..68f0dbc5276 100644
--- a/arch/risc-v/src/common/Make.defs
+++ b/arch/risc-v/src/common/Make.defs
@@ -104,7 +104,11 @@ CMN_ASRCS += riscv_vpu.S
 endif
 
 ifeq ($(CONFIG_ARCH_RV_HAVE_APLIC),y)
-CMN_CSRCS += riscv_aia.c
+CMN_CSRCS += riscv_aplic.c
+endif
+
+ifeq ($(CONFIG_ARCH_RV_HAVE_IMSIC),y)
+CMN_CSRCS += riscv_imsic.c
 endif
 
 ifeq ($(CONFIG_RISCV_SEMIHOSTING_HOSTFS),y)