diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index 7e2e912..e2ba11d 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -50,8 +50,6 @@
  * Mandatory common functions
  ******************************************************************************/
 uint64_t plat_get_syscnt_freq(void);
-void enable_mmu_el1(void);
-void enable_mmu_el3(void);
 int plat_get_image_source(const char *image_name,
 			uintptr_t *dev_handle,
 			uintptr_t *image_spec);
@@ -180,8 +178,18 @@
 unsigned int plat_get_aff_state(unsigned int, unsigned long);
 
 /*******************************************************************************
+ * Optional BL3-1 functions (may be overridden)
+ ******************************************************************************/
+void bl31_plat_enable_mmu();
+
+/*******************************************************************************
  * Mandatory BL3-2 functions (only if platform contains a BL3-2)
  ******************************************************************************/
 void bl32_platform_setup(void);
 
+/*******************************************************************************
+ * Optional BL3-2 functions (may be overridden)
+ ******************************************************************************/
+void bl32_plat_enable_mmu();
+
 #endif /* __PLATFORM_H__ */