diff --git a/Android.mk b/Android.mk
index de7fcca4920e..f72de31ce748 100755
--- a/Android.mk
+++ b/Android.mk
@@ -40,7 +40,7 @@ $(TARGET_KERNEL_CONFIG): $(KERNEL_MAKE_DEPENDENCIES)
 	$(hide) mkdir -p $(dir $@)
 #ifdef OPLUS_ARCH_INJECT
 #Sunliang@ANDROID.BUILD, 2020/04/08, export global native features to kernel
-	source kernel-4.14/oplus_native_features.sh ; \
+	source $(srctree)/oplus_native_features.sh ; \
 	$(PREBUILT_MAKE_PREFIX)$(MAKE) -C $(PRIVATE_DIR) $(KERNEL_MAKE_OPTION) $(KERNEL_DEFCONFIG)
 #endif /* OPLUS_ARCH_INJECT */
 
@@ -52,7 +52,7 @@ $(KERNEL_ZIMAGE_OUT): $(TARGET_KERNEL_CONFIG) $(KERNEL_MAKE_DEPENDENCIES)
 	$(hide) mkdir -p $(dir $@)
 #ifdef OPLUS_ARCH_INJECT
 #Sunliang@ANDROID.BUILD, 2020/04/08, export global native features to kernel
-	source kernel-4.14/oplus_native_features.sh ; \
+	source $(srctree)/oplus_native_features.sh ; \
 	$(PREBUILT_MAKE_PREFIX)$(MAKE) -C $(PRIVATE_DIR) $(KERNEL_MAKE_OPTION)
 #endif /* OPLUS_ARCH_INJECT */
 	$(hide) $(call fixup-kernel-cmd-file,$(KERNEL_OUT)/arch/$(KERNEL_TARGET_ARCH)/boot/compressed/.piggy.xzkern.cmd)
@@ -86,7 +86,7 @@ kernel-menuconfig:
 	$(hide) mkdir -p $(KERNEL_OUT)
 #ifdef OPLUS_ARCH_INJECT
 #Sunliang@ANDROID.BUILD, 2020/04/08, export global native features to kernel
-	source kernel-4.14/oplus_native_features.sh ; \
+	source $(srctree)/oplus_native_features.sh ; \
 	$(MAKE) -C $(KERNEL_DIR) $(KERNEL_MAKE_OPTION) menuconfig
 #endif /* OPLUS_ARCH_INJECT */
 
@@ -94,7 +94,7 @@ menuconfig-kernel savedefconfig-kernel:
 	$(hide) mkdir -p $(KERNEL_OUT)
 #ifdef OPLUS_ARCH_INJECT
 #Sunliang@ANDROID.BUILD, 2020/04/08, export global native features to kernel
-	source kernel-4.14/oplus_native_features.sh ; \
+	source $(srctree)/oplus_native_features.sh ; \
 	$(MAKE) -C $(KERNEL_DIR) $(KERNEL_MAKE_OPTION) $(patsubst %config-kernel,%config,$@)
 #endif /* OPLUS_ARCH_INJECT */
 
diff --git a/drivers/input/oppo_fp_drivers/goodix_optical_fp/Makefile b/drivers/input/oppo_fp_drivers/goodix_optical_fp/Makefile
index 42b58c6f6fa1..6cc45e738c29 100755
--- a/drivers/input/oppo_fp_drivers/goodix_optical_fp/Makefile
+++ b/drivers/input/oppo_fp_drivers/goodix_optical_fp/Makefile
@@ -9,11 +9,7 @@ subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat
 subdir-ccflags-y += -I$(srctree)/drivers/spi/mediatek/$(MTK_PLATFORM)
 subdir-ccflags-y += -I$(srctree)/drivers/spi/trustzone/spi/Tlspi/inc
 
-ifneq ($(filter kernel-4.19, $(LINUX_KERNEL_VERSION)),)
-include $(srctree)/drivers/tee/gud/Makefile.include
-else ifneq ($(filter kernel-4.14 kernel-4.9, $(LINUX_KERNEL_VERSION)),)
 include $(srctree)/drivers/misc/mediatek/gud/Makefile.include
-endif
 
 ccflags-y += -DMTK_PLATFORM
 
diff --git a/drivers/input/oppo_fp_drivers/silead_optical_fp/Makefile b/drivers/input/oppo_fp_drivers/silead_optical_fp/Makefile
index 594c0ae5a40e..0bf0e0d7a813 100755
--- a/drivers/input/oppo_fp_drivers/silead_optical_fp/Makefile
+++ b/drivers/input/oppo_fp_drivers/silead_optical_fp/Makefile
@@ -14,11 +14,7 @@ subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat/$(MTK_PLA
 ifeq ($(CONFIG_TRUSTONIC_TEE_SUPPORT),y)
 subdir-ccflags-y += -I$(srctree)/drivers/spi/trustzone/spi/Tlspi/inc
 
-ifneq ($(filter kernel-4.19, $(LINUX_KERNEL_VERSION)),)
-include $(srctree)/drivers/tee/gud/Makefile.include
-else ifneq ($(filter kernel-4.14 kernel-4.9, $(LINUX_KERNEL_VERSION)),)
 include $(srctree)/drivers/misc/mediatek/gud/Makefile.include
-endif
 
 endif
 endif
diff --git a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5696267/services/system/rogue/rgx_mtk/Kbuild.mk b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5696267/services/system/rogue/rgx_mtk/Kbuild.mk
index 2899586e5bb3..b5b138f0fafc 100644
--- a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5696267/services/system/rogue/rgx_mtk/Kbuild.mk
+++ b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5696267/services/system/rogue/rgx_mtk/Kbuild.mk
@@ -44,7 +44,7 @@ ccflags-y += \
 	-I$(srctree)/drivers/staging/android/ion \
 	-I$(srctree)/drivers/staging/android/ion/mtk
 
-ifeq ($(kernel_ver),kernel-4.19)
+ifeq ($(PATCHLEVEL),19)
 ccflags-y += \
 	-I$(srctree)/drivers/gpu/mediatek \
 	-I$(srctree)/drivers/gpu/mediatek/ged/include \
diff --git a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5720833/services/system/rogue/rgx_mtk/Kbuild.mk b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5720833/services/system/rogue/rgx_mtk/Kbuild.mk
index 2899586e5bb3..b5b138f0fafc 100644
--- a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5720833/services/system/rogue/rgx_mtk/Kbuild.mk
+++ b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5720833/services/system/rogue/rgx_mtk/Kbuild.mk
@@ -44,7 +44,7 @@ ccflags-y += \
 	-I$(srctree)/drivers/staging/android/ion \
 	-I$(srctree)/drivers/staging/android/ion/mtk
 
-ifeq ($(kernel_ver),kernel-4.19)
+ifeq ($(PATCHLEVEL),19)
 ccflags-y += \
 	-I$(srctree)/drivers/gpu/mediatek \
 	-I$(srctree)/drivers/gpu/mediatek/ged/include \
diff --git a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5776728/services/system/rogue/rgx_mtk/Kbuild.mk b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5776728/services/system/rogue/rgx_mtk/Kbuild.mk
index 2899586e5bb3..b5b138f0fafc 100644
--- a/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5776728/services/system/rogue/rgx_mtk/Kbuild.mk
+++ b/drivers/misc/mediatek/gpu/gpu_rgx/m1.13ED5776728/services/system/rogue/rgx_mtk/Kbuild.mk
@@ -44,7 +44,7 @@ ccflags-y += \
 	-I$(srctree)/drivers/staging/android/ion \
 	-I$(srctree)/drivers/staging/android/ion/mtk
 
-ifeq ($(kernel_ver),kernel-4.19)
+ifeq ($(PATCHLEVEL),19)
 ccflags-y += \
 	-I$(srctree)/drivers/gpu/mediatek \
 	-I$(srctree)/drivers/gpu/mediatek/ged/include \
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6769.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6769.h
index 3de917bc024c..81d48e0eb3a0 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6769.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6769.h
@@ -22,15 +22,15 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 #define RT9471D 0
 #define RT9467 1
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6779.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6779.h
index 3649ba687234..fbffeaab8e86 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6779.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6779.h
@@ -17,19 +17,19 @@
 #include <mt-plat/mtk_charger.h>
 #include <mt-plat/mtk_battery.h>
 
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/misc/mtk_gauge_time_service.h"
+#include "../../supply/mediatek/misc/mtk_gauge_time_service.h"
 
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/charger_class.h"
+#include "../../supply/mediatek/charger/charger_class.h"
 
 /* PD */
-#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
 
-#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 
 struct charger_manager;
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
 //====================================================================//
 /* mtk_pe40_intf begin */
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6779Q.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6779Q.h
index 2fd95887918a..7b62ddf47a02 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6779Q.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6779Q.h
@@ -18,22 +18,20 @@
 #include <mt-plat/mtk_charger.h>
 #include <mt-plat/mtk_battery.h>
 
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/misc/mtk_gauge_time_service.h"
-
 #include <mt-plat/charger_class.h>
 
 /* PD */
-#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
 
-#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 
 struct charger_manager;
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe40_intf.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe40_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 //====================================================================//
 /* mtk_pe40_intf begin */
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6785.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6785.h
index 0822fe788602..d02bfb7fd9e1 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6785.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6785.h
@@ -22,15 +22,15 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 typedef enum {
 	STEP_CHG_STATUS_STEP1 = 0,	/*16C~44C*/
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6853.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6853.h
index c6d555893817..41187f728fe0 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6853.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6853.h
@@ -21,14 +21,14 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 typedef enum {
 	STEP_CHG_STATUS_STEP1 = 0,	/*16C~44C*/
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6853R.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6853R.h
index 159feacf1085..fcbb598d1979 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6853R.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6853R.h
@@ -22,14 +22,14 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 typedef enum {
 	STEP_CHG_STATUS_STEP1 = 0,	/*16C~44C*/
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6873.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6873.h
index f413edbddb39..3a36ee04337f 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6873.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6873.h
@@ -21,14 +21,14 @@
 #include <linux/uaccess.h>
 
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/misc/mtk_gauge_time_service.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/include/mt-plat/charger_class.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../supply/mediatek/misc/mtk_gauge_time_service.h"
+#include "../../../misc/mediatek/include/mt-plat/charger_class.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
 
 
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6873R.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6873R.h
index 16c07bb54dad..b7e2858e936a 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6873R.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6873R.h
@@ -22,14 +22,14 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 typedef enum {
 	STEP_CHG_STATUS_STEP1 = 0,	/*16C~44C*/
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6885.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6885.h
index d5354c7f070b..42cf35a98eaa 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6885.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6885.h
@@ -21,27 +21,14 @@
 #include <linux/uaccess.h>
 
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/misc/mtk_gauge_time_service.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/include/mt-plat/charger_class.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../supply/mediatek/misc/mtk_gauge_time_service.h"
+#include "../../../misc/mediatek/include/mt-plat/charger_class.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
-
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/misc/mtk_gauge_time_service.h"
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/charger_class.h"
-
-/* PD */
-//#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-
-//#include "../../../../kernel-4.9/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
-
-//struct charger_manager;
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-//#include "../../../../kernel-4.9/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
 //====================================================================//
 /* mtk_pe40_intf begin */
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6885R.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6885R.h
index 987491de5bbe..a93e1c6f2c2a 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6885R.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6885R.h
@@ -22,15 +22,15 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 #ifdef OPLUS_FEATURE_CHG_BASIC
 /* Jianchao.Shi@BSP.CHG.Basic, 2018/11/09, sjc Add for charging */
diff --git a/drivers/power/oplus/charger_ic/oplus_battery_mtk6889R.h b/drivers/power/oplus/charger_ic/oplus_battery_mtk6889R.h
index d101d195c498..a4a3a8fc143d 100755
--- a/drivers/power/oplus/charger_ic/oplus_battery_mtk6889R.h
+++ b/drivers/power/oplus/charger_ic/oplus_battery_mtk6889R.h
@@ -22,15 +22,15 @@
 #include <linux/uaccess.h>
 
 #include <mt-plat/charger_class.h>
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/tcpm.h"
-#include "../../../../kernel-4.14/drivers/misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/tcpm.h"
+#include "../../../misc/mediatek/typec/tcpc/inc/mtk_direct_charge_vdm.h"
 struct charger_manager;
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pe20_intf.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_pdc_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe_intf.h"
+#include "../../supply/mediatek/charger/mtk_pe20_intf.h"
+#include "../../supply/mediatek/charger/mtk_pdc_intf.h"
 
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_init.h"
-#include "../../../../kernel-4.14/drivers/power/supply/mediatek/charger/mtk_charger_intf.h"
+#include "../../supply/mediatek/charger/mtk_charger_init.h"
+#include "../../supply/mediatek/charger/mtk_charger_intf.h"
 
 typedef enum {
 	STEP_CHG_STATUS_STEP1 = 0,	/*16C~44C*/
diff --git a/drivers/soc/oplus/system/slabtrace/slabtrace.h b/drivers/soc/oplus/system/slabtrace/slabtrace.h
index 1084e2c46e30..e80af9a0556e 100755
--- a/drivers/soc/oplus/system/slabtrace/slabtrace.h
+++ b/drivers/soc/oplus/system/slabtrace/slabtrace.h
@@ -30,15 +30,15 @@
 
 #ifdef CONFIG_OPLUS_SYSTEM_KERNEL_QCOM
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
-#include <../../../../kernel/msm-4.19/mm/internal.h>
-#include <../../../../kernel/msm-4.19/mm/slab.h>
+#include <../../../../../mm/internal.h>
+#include <../../../../../mm/slab.h>
 #else
-#include <../../../../kernel/msm-4.14/mm/internal.h>
-#include <../../../../kernel/msm-4.14/mm/slab.h>
+#include <../../../../../mm/internal.h>
+#include <../../../../../mm/slab.h>
 #endif //(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
 #else
-#include <../../../../../kernel-4.19/mm/slab.h>
-#include <../../../../../kernel-4.19/mm/internal.h>
+#include <../../../../../mm/slab.h>
+#include <../../../../../mm/internal.h>
 #endif
 
 #if defined(CONFIG_OPLUS_FEATURE_SLABTRACE_DEBUG)