diff --git a/common/runtime_svc.c b/common/runtime_svc.c
index f997c74a04..e0d56095d6 100644
--- a/common/runtime_svc.c
+++ b/common/runtime_svc.c
@@ -38,7 +38,6 @@ uintptr_t handle_runtime_svc(uint32_t smc_fid,
 	u_register_t x1, x2, x3, x4;
 	int index;
 	unsigned int idx;
-	const rt_svc_desc_t *rt_svc_descs;
 
 	assert(handle);
 	idx = get_unique_oen_from_smc_fid(smc_fid);
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c
index 4ef3a9b0ff..fd7a9e9a29 100644
--- a/plat/arm/common/arm_bl2_setup.c
+++ b/plat/arm/common/arm_bl2_setup.c
@@ -36,12 +36,7 @@ CASSERT(BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl2_base_overflows);
 #pragma weak bl2_plat_arch_setup
 #pragma weak bl2_plat_sec_mem_layout
 
-#if LOAD_IMAGE_V2
-
-#pragma weak bl2_plat_handle_post_image_load
-
-#else /* LOAD_IMAGE_V2 */
-
+#if !LOAD_IMAGE_V2
 /*******************************************************************************
  * This structure represents the superset of information that is passed to
  * BL31, e.g. while passing control to it from BL2, bl31_params