diff --git a/Makefile b/Makefile
index e455635..52c0491 100644
--- a/Makefile
+++ b/Makefile
@@ -537,15 +537,15 @@
 endif
 
 ifeq (${ARCH},aarch64)
-BL1_CFLAGS += -DIMAGE_AT_EL3
+BL1_CPPFLAGS += -DIMAGE_AT_EL3
 ifeq ($(BL2_AT_EL3),1)
-BL2_CFLAGS += -DIMAGE_AT_EL3
+BL2_CPPFLAGS += -DIMAGE_AT_EL3
 else
-BL2_CFLAGS += -DIMAGE_AT_EL1
+BL2_CPPFLAGS += -DIMAGE_AT_EL1
 endif
-BL2U_CFLAGS += -DIMAGE_AT_EL1
-BL31_CFLAGS += -DIMAGE_AT_EL3
-BL32_CFLAGS += -DIMAGE_AT_EL1
+BL2U_CPPFLAGS += -DIMAGE_AT_EL1
+BL31_CPPFLAGS += -DIMAGE_AT_EL3
+BL32_CPPFLAGS += -DIMAGE_AT_EL1
 endif
 
 # Include the CPU specific operations makefile, which provides default
diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S
index c83824d..92891ce 100644
--- a/include/lib/cpus/aarch64/cpu_macros.S
+++ b/include/lib/cpus/aarch64/cpu_macros.S
@@ -25,10 +25,6 @@
 /* Word size for 64-bit CPUs */
 #define CPU_WORD_SIZE			8
 
-#if defined(IMAGE_BL1) || defined(IMAGE_BL31) ||(defined(IMAGE_BL2) && BL2_AT_EL3)
-#define IMAGE_AT_EL3
-#endif
-
 /*
  * Whether errata status needs reporting. Errata status is printed in debug
  * builds for both BL1 and BL31 images.
diff --git a/plat/socionext/uniphier/platform.mk b/plat/socionext/uniphier/platform.mk
index 3f8a1f8..cbe75d6 100644
--- a/plat/socionext/uniphier/platform.mk
+++ b/plat/socionext/uniphier/platform.mk
@@ -17,8 +17,8 @@
 ALLOW_RO_XLAT_TABLES			:= 1
 
 ifeq ($(ALLOW_RO_XLAT_TABLES),1)
-BL31_CFLAGS += -DPLAT_RO_XLAT_TABLES=1
-BL32_CFLAGS += -DPLAT_RO_XLAT_TABLES=1
+BL31_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
+BL32_CPPFLAGS += -DPLAT_RO_XLAT_TABLES=1
 endif
 
 # Cortex-A53 revision r0p4-51rel0