diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h
index ecb261a..4a5c3e0 100644
--- a/include/lib/utils_def.h
+++ b/include/lib/utils_def.h
@@ -80,8 +80,8 @@
 # define  U(_x)		(_x)
 # define ULL(_x)	(_x)
 #else
-# define  U(_x)		(_x##u)
-# define ULL(_x)	(_x##ull)
+# define  U(_x)		(_x##U)
+# define ULL(_x)	(_x##ULL)
 #endif
 
 /* Register size of the current architecture. */
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h
index 9e6c7d2..95e986b 100644
--- a/include/plat/arm/common/arm_def.h
+++ b/include/plat/arm/common/arm_def.h
@@ -279,11 +279,11 @@
  * AArch64 builds
  */
 #ifdef AARCH64
-#define PLAT_PHY_ADDR_SPACE_SIZE			(1ull << 36)
-#define PLAT_VIRT_ADDR_SPACE_SIZE			(1ull << 36)
+#define PLAT_PHY_ADDR_SPACE_SIZE			(1ULL << 36)
+#define PLAT_VIRT_ADDR_SPACE_SIZE			(1ULL << 36)
 #else
-#define PLAT_PHY_ADDR_SPACE_SIZE			(1ull << 32)
-#define PLAT_VIRT_ADDR_SPACE_SIZE			(1ull << 32)
+#define PLAT_PHY_ADDR_SPACE_SIZE			(1ULL << 32)
+#define PLAT_VIRT_ADDR_SPACE_SIZE			(1ULL << 32)
 #endif