diff --git a/include/aarch64/arch.h b/include/aarch64/arch.h
index 143dc6c58f3953574c83055500be4373bc1a71d0..4548926cecd0eab1474b62881e8a6bbfd39d6e77 100644
--- a/include/aarch64/arch.h
+++ b/include/aarch64/arch.h
@@ -70,6 +70,16 @@
  ******************************************************************************/
 #define CPUECTLR_EL1	S3_1_C15_C2_1
 
+/*******************************************************************************
+ * Generic timer memory mapped registers & offsets
+ ******************************************************************************/
+#define CNTCR_OFF			0x000
+#define CNTFID_OFF			0x020
+
+#define CNTCR_EN			(1 << 0)
+#define CNTCR_HDBG			(1 << 1)
+#define CNTCR_FCREQ(x)			(1 << (8 + (x)))
+
 /*******************************************************************************
  * System register bit definitions
  ******************************************************************************/
diff --git a/include/aarch64/arch_helpers.h b/include/aarch64/arch_helpers.h
index 85c04812460ee51c81cf4494e82b285f0844eb0b..12ab570ef53207a976be89b13496ffa492ccd4d0 100644
--- a/include/aarch64/arch_helpers.h
+++ b/include/aarch64/arch_helpers.h
@@ -33,16 +33,6 @@
 
 #include <arch.h>
 
-/*******************************************************************************
- * Generic timer memory mapped registers & offsets
- ******************************************************************************/
-#define CNTCR_OFF			0x000
-#define CNTFID_OFF			0x020
-
-#define CNTCR_EN			(1 << 0)
-#define CNTCR_HDBG			(1 << 1)
-#define CNTCR_FCREQ(x)			(1 << (8 + (x)))
-
 #ifndef __ASSEMBLY__
 
 /*******************************************************************************
diff --git a/include/psci.h b/include/psci.h
index 70322c48216103ff60b9faddf3e9e61468662b6b..2a033d0ce17caebf46fdba60cfb3e439a4c68e18 100644
--- a/include/psci.h
+++ b/include/psci.h
@@ -143,9 +143,6 @@ typedef struct {
  * Function & Data prototypes
  ******************************************************************************/
 extern unsigned int psci_version(void);
-extern int psci_cpu_on(unsigned long,
-		       unsigned long,
-		       unsigned long);
 extern int __psci_cpu_suspend(unsigned int, unsigned long, unsigned long);
 extern int __psci_cpu_off(void);
 extern int psci_affinity_info(unsigned long, unsigned int);