diff --git a/include/bl31/bl31.h b/include/bl31/bl31.h
index b8c603a..a5539d9 100644
--- a/include/bl31/bl31.h
+++ b/include/bl31/bl31.h
@@ -41,6 +41,7 @@
 /*******************************************************************************
  * Function prototypes
  ******************************************************************************/
+extern void bl31_arch_setup(void);
 extern void bl31_next_el_arch_setup(uint32_t security_state);
 extern void bl31_set_next_image_type(uint32_t type);
 extern uint32_t bl31_get_next_image_type(void);
diff --git a/include/bl31/runtime_svc.h b/include/bl31/runtime_svc.h
index ab2137d..90d6700 100644
--- a/include/bl31/runtime_svc.h
+++ b/include/bl31/runtime_svc.h
@@ -261,6 +261,7 @@
 extern uint64_t __RT_SVC_DESCS_START__;
 extern uint64_t __RT_SVC_DESCS_END__;
 extern uint64_t get_exception_stack(uint64_t mpidr);
+extern void runtime_exceptions(void);
 extern void fault_handler(void *handle);
 #endif /*__ASSEMBLY__*/
 #endif /* __RUNTIME_SVC_H__ */
diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h
index a41e82b..32167eb 100644
--- a/include/lib/aarch64/arch.h
+++ b/include/lib/aarch64/arch.h
@@ -330,16 +330,4 @@
 
 #define EC_BITS(x)			(x >> ESR_EC_SHIFT) & ESR_EC_MASK
 
-#ifndef __ASSEMBLY__
-/*******************************************************************************
- * Function prototypes
- ******************************************************************************/
-
-extern void early_exceptions(void);
-extern void runtime_exceptions(void);
-extern void bl1_arch_setup(void);
-extern void bl2_arch_setup(void);
-extern void bl31_arch_setup(void);
-#endif /*__ASSEMBLY__*/
-
 #endif /* __ARCH_H__ */