diff --git a/include/runtime_services/pmf.h b/include/runtime_services/pmf.h
index 55828e2..d2ed412 100644
--- a/include/runtime_services/pmf.h
+++ b/include/runtime_services/pmf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -27,7 +27,7 @@
 /*
  * Defines for PMF SMC function ids.
  */
-#ifdef AARCH32
+#ifndef __aarch64__
 #define PMF_SMC_GET_TIMESTAMP	0x82000010
 #else
 #define PMF_SMC_GET_TIMESTAMP	0xC2000010
diff --git a/include/runtime_services/psci.h b/include/runtime_services/psci.h
index 1ecfc63..f93ee40 100644
--- a/include/runtime_services/psci.h
+++ b/include/runtime_services/psci.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -67,7 +67,7 @@
 /*
  * Architecture-specific SMC function IDs
  */
-#ifndef AARCH32
+#ifdef __aarch64__
 #define SMC_PSCI_CPU_SUSPEND		SMC_PSCI_CPU_SUSPEND_AARCH64
 #define SMC_PSCI_CPU_ON			SMC_PSCI_CPU_ON_AARCH64
 #define SMC_PSCI_AFFINITY_INFO		SMC_PSCI_AFFINITY_INFO_AARCH64