diff --git a/src/soc/amd/common/block/cpu/mca/mca.c b/src/soc/amd/common/block/cpu/mca/mca.c
index c7d3e6f711..2d91894491 100644
--- a/src/soc/amd/common/block/cpu/mca/mca.c
+++ b/src/soc/amd/common/block/cpu/mca/mca.c
@@ -7,6 +7,7 @@
 #include <cpu/x86/msr.h>
 #include <console/console.h>
 #include <types.h>
+#include "mca_common_defs.h"
 
 static void mca_print_error(unsigned int bank)
 {
diff --git a/src/soc/amd/common/block/cpu/mca/mca_common.c b/src/soc/amd/common/block/cpu/mca/mca_common.c
index 0a375089f2..f029966dc7 100644
--- a/src/soc/amd/common/block/cpu/mca/mca_common.c
+++ b/src/soc/amd/common/block/cpu/mca/mca_common.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/mca.h>
 #include <cpu/x86/msr.h>
+#include "mca_common_defs.h"
 
 void check_mca(void)
 {
diff --git a/src/soc/amd/common/block/cpu/mca/mca_common_defs.h b/src/soc/amd/common/block/cpu/mca/mca_common_defs.h
index 41d73d8fe2..8142371664 100644
--- a/src/soc/amd/common/block/cpu/mca/mca_common_defs.h
+++ b/src/soc/amd/common/block/cpu/mca/mca_common_defs.h
@@ -6,6 +6,8 @@
 #include <amdblocks/mca.h>
 #include <cper.h>
 
+void mca_check_all_banks(void);
+void build_bert_mca_error(struct mca_bank_status *mci);
 enum cper_x86_check_type error_to_chktype(struct mca_bank_status *mci);
 void fill_generic_section(cper_proc_generic_error_section_t *sec, struct mca_bank_status *mci);
 
diff --git a/src/soc/amd/common/block/cpu/mca/mcax.c b/src/soc/amd/common/block/cpu/mca/mcax.c
index cb01e1d6f6..fecac0a11f 100644
--- a/src/soc/amd/common/block/cpu/mca/mcax.c
+++ b/src/soc/amd/common/block/cpu/mca/mcax.c
@@ -6,6 +6,7 @@
 #include <cpu/x86/msr.h>
 #include <console/console.h>
 #include <types.h>
+#include "mca_common_defs.h"
 
 static void mca_print_error(unsigned int bank)
 {
diff --git a/src/soc/amd/common/block/include/amdblocks/mca.h b/src/soc/amd/common/block/include/amdblocks/mca.h
index 70a83ab7f7..c84f23215a 100644
--- a/src/soc/amd/common/block/include/amdblocks/mca.h
+++ b/src/soc/amd/common/block/include/amdblocks/mca.h
@@ -12,8 +12,6 @@ struct mca_bank_status {
 };
 
 void check_mca(void);
-void mca_check_all_banks(void);
-void build_bert_mca_error(struct mca_bank_status *mci);
 bool mca_has_expected_bank_count(void);
 bool mca_is_valid_bank(unsigned int bank);
 const char *mca_get_bank_name(unsigned int bank);