diff --git a/include/bl31/bl31.h b/include/bl31/bl31.h
index 8d22dc9..33e4ece 100644
--- a/include/bl31/bl31.h
+++ b/include/bl31/bl31.h
@@ -33,11 +33,6 @@
 
 #include <stdint.h>
 
-/******************************************
- * Forward declarations
- *****************************************/
-struct entry_point_info;
-
 /*******************************************************************************
  * Function prototypes
  ******************************************************************************/
@@ -46,7 +41,6 @@
 void bl31_set_next_image_type(uint32_t type);
 uint32_t bl31_get_next_image_type(void);
 void bl31_prepare_next_image_entry();
-struct entry_point_info *bl31_get_next_image_info(uint32_t type);
 void bl31_register_bl32_init(int32_t (*)(void));
 
 #endif /* __BL31_H__ */
diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index ad08180..714f6e0 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -58,11 +58,11 @@
 /*******************************************************************************
  * Mandatory interrupt management functions
  ******************************************************************************/
-uint32_t ic_get_pending_interrupt_id(void);
-uint32_t ic_get_pending_interrupt_type(void);
-uint32_t ic_acknowledge_interrupt(void);
-uint32_t ic_get_interrupt_type(uint32_t id);
-void ic_end_of_interrupt(uint32_t id);
+uint32_t plat_ic_get_pending_interrupt_id(void);
+uint32_t plat_ic_get_pending_interrupt_type(void);
+uint32_t plat_ic_acknowledge_interrupt(void);
+uint32_t plat_ic_get_interrupt_type(uint32_t id);
+void plat_ic_end_of_interrupt(uint32_t id);
 uint32_t plat_interrupt_type_to_line(uint32_t type,
 				     uint32_t security_state);
 
@@ -152,7 +152,7 @@
 				void *plat_params_from_bl2);
 void bl31_plat_arch_setup(void);
 void bl31_platform_setup(void);
-struct entry_point_info *bl31_get_next_image_info(uint32_t type);
+struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type);
 
 /*******************************************************************************
  * Mandatory PSCI functions (BL3-1)