diff --git a/plat/arm/board/fvp/fvp_cpu_errata.mk b/plat/arm/board/fvp/fvp_cpu_errata.mk
index ab39d5e..342bc9f 100644
--- a/plat/arm/board/fvp/fvp_cpu_errata.mk
+++ b/plat/arm/board/fvp/fvp_cpu_errata.mk
@@ -11,22 +11,20 @@
 ifeq (${ERRATA_ABI_SUPPORT}, 1)
 ifeq (${ERRATA_NON_ARM_INTERCONNECT}, 1)
 ifeq (${CTX_INCLUDE_AARCH32_REGS}, 0)
+CORTEX_A710_H_INC	:= 1
 CORTEX_A78_H_INC	:= 1
+CORTEX_A78_AE_H_INC	:= 1
+CORTEX_A78C_H_INC	:= 1
+CORTEX_X3_H_INC		:= 1
 NEOVERSE_N2_H_INC	:= 1
 NEOVERSE_V1_H_INC	:= 1
-CORTEX_A78_AE_H_INC	:= 1
-CORTEX_A710_H_INC	:= 1
-CORTEX_X3_H_INC		:= 1
-CORTEX_A78C_H_INC	:= 1
-CORTEX_X2_H_INC		:= 1
+$(eval $(call add_define, CORTEX_A710_H_INC))
 $(eval $(call add_define, CORTEX_A78_H_INC))
+$(eval $(call add_define, CORTEX_A78_AE_H_INC))
+$(eval $(call add_define, CORTEX_A78C_H_INC))
+$(eval $(call add_define, CORTEX_X3_H_INC))
 $(eval $(call add_define, NEOVERSE_N2_H_INC))
 $(eval $(call add_define, NEOVERSE_V1_H_INC))
-$(eval $(call add_define, CORTEX_A78_AE_H_INC))
-$(eval $(call add_define, CORTEX_A710_H_INC))
-$(eval $(call add_define, CORTEX_X3_H_INC))
-$(eval $(call add_define, CORTEX_A78C_H_INC))
-$(eval $(call add_define, CORTEX_X2_H_INC))
 endif
 endif
 endif