diff --git a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm.c b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm.c
index f105b882b..606a7b7b7 100644
--- a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm.c
+++ b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm.c
@@ -14,7 +14,7 @@
 
 #include <lib/mtk_init/mtk_init.h>
 #include <lib/pm/mtk_pm.h>
-#include <lpm/mt_lp_rm.h>
+#include <lpm_v2/mt_lp_rm.h>
 #include "mt_cpu_pm.h"
 #include "mt_cpu_pm_cpc.h"
 #include "mt_cpu_pm_mbox.h"
@@ -773,11 +773,13 @@ static int cpupm_pwr_state_valid(unsigned int afflv, unsigned int state)
 static int cpupm_invoke(unsigned int func_id, void *priv)
 {
 	int ret = MTK_CPUPM_E_OK;
+#ifdef CPU_PM_SUSPEND_NOTIFY
 	int i, reverse = 0;
 	struct cpupm_invoke_data *save_status = (struct cpupm_invoke_data *) priv;
+	unsigned int cpu_status;
+#endif
 	struct cpupm_pwr_req *req = (struct cpupm_pwr_req *)priv;
 	unsigned int pwr_req = req->req;
-	unsigned int cpu_status;
 
 	switch (func_id) {
 #ifdef CPU_PM_SUSPEND_NOTIFY
diff --git a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm_smc.h b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm_smc.h
index 8b643b066..5cd2f5c6d 100644
--- a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm_smc.h
+++ b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_cpu_pm_smc.h
@@ -7,9 +7,9 @@
 #ifndef MT_CPU_PM_SMC_H
 #define MT_CPU_PM_SMC_H
 
-#include <lpm/mt_lp_rm.h>
-#include <lpm/mt_lpm_dispatch.h>
-#include <lpm/mt_lpm_smc.h>
+#include <lpm_v2/mt_lp_rm.h>
+#include <lpm_v2/mt_lpm_dispatch.h>
+#include <lpm_v2/mt_lpm_smc.h>
 
 void cpupm_smc_init(void);
 
diff --git a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_lp_irqremain.c b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_lp_irqremain.c
index ded1a60fe..563e6b565 100644
--- a/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_lp_irqremain.c
+++ b/plat/mediatek/drivers/cpu_pm/cpcv5_4/mt_lp_irqremain.c
@@ -12,7 +12,7 @@
 #include <platform_def.h>
 
 #include <lib/pm/mtk_pm.h>
-#include <lpm/mt_lp_rm.h>
+#include <lpm_v2/mt_lp_rm.h>
 #include "mt_cpu_pm.h"
 #include "mt_lp_irqremain.h"
 
diff --git a/plat/mediatek/drivers/cpu_pm/cpcv5_4/rules.mk b/plat/mediatek/drivers/cpu_pm/cpcv5_4/rules.mk
index 9819d0e56..c6937e107 100644
--- a/plat/mediatek/drivers/cpu_pm/cpcv5_4/rules.mk
+++ b/plat/mediatek/drivers/cpu_pm/cpcv5_4/rules.mk
@@ -29,8 +29,6 @@ $(eval $(call add_defined_option,CPU_PM_DOMAIN_CORE_ONLY))
 $(eval $(call add_defined_option,CPU_PM_CORE_ARCH64_ONLY))
 $(eval $(call add_defined_option,CPU_PM_TINYSYS_SUPPORT))
 
-$(eval $(call add_defined_option,CPU_PM_SUSPEND_NOTIFY))
-
 $(eval $(call add_defined_option,CPU_PM_PWR_REQ))
 $(eval $(call add_defined_option,CPU_PM_PWR_REQ_DEBUG))