diff --git a/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Kbuild
index 4108ca6bcf..fe5ac61bc1 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Kbuild
@@ -104,12 +104,12 @@ EXTRA_CFLAGS += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/audio-kernel/asoc/codecs/csra66x0/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/csra66x0/Kbuild
index 41f0b90e03..6d13729e6e 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/csra66x0/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/csra66x0/Kbuild
@@ -90,11 +90,11 @@ ccflags-y += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/audio-kernel/asoc/codecs/ep92/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/ep92/Kbuild
index 0e5a5ba373..57e8939810 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/ep92/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/ep92/Kbuild
@@ -91,11 +91,11 @@ ccflags-y += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/Kbuild
index c7625627f7..91277453c8 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/Kbuild
@@ -153,11 +153,11 @@ EXTRA_CFLAGS += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/audio-kernel/asoc/codecs/rouleur/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/rouleur/Kbuild
index 97965788b5..494992922d 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/rouleur/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/rouleur/Kbuild
@@ -99,11 +99,11 @@ EXTRA_CFLAGS += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Kbuild b/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Kbuild
index c9ad70128f..81a5c500a1 100644
--- a/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Kbuild
+++ b/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Kbuild
@@ -112,11 +112,11 @@ EXTRA_CFLAGS += -Wheader-guard
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/ipc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/audio-kernel/soc/Module.symvers
 endif
 
 # Module information used by KBuild framework
diff --git a/qcom/opensource/camera-kernel/Makefile b/qcom/opensource/camera-kernel/Makefile
index ad46b7ad9b..2a67c7e90f 100644
--- a/qcom/opensource/camera-kernel/Makefile
+++ b/qcom/opensource/camera-kernel/Makefile
@@ -1,7 +1,7 @@
 # Makefile for use with Android's kernel/build system
 
 KBUILD_OPTIONS += CAMERA_KERNEL_ROOT=$(KERNEL_SRC)/$(M)
-KBUILD_OPTIONS += KERNEL_ROOT=$(ROOT_DIR)/$(KERNEL_DIR)
+KBUILD_OPTIONS += KERNEL_ROOT=$(KERNEL_SRC)
 KBUILD_OPTIONS += MODNAME=camera
 KBUILD_OPTIONS += BOARD_PLATFORM=pineapple
 KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(OUT_DIR)/../sm8650-modules/qcom/opensource/mmrm-driver/Module.symvers
diff --git a/qcom/opensource/dataipa/drivers/platform/msm/gsi/gsi_trace.h b/qcom/opensource/dataipa/drivers/platform/msm/gsi/gsi_trace.h
index 3b481fec3c..d6dc9ad23b 100644
--- a/qcom/opensource/dataipa/drivers/platform/msm/gsi/gsi_trace.h
+++ b/qcom/opensource/dataipa/drivers/platform/msm/gsi/gsi_trace.h
@@ -49,7 +49,7 @@ TRACE_EVENT(
 /* This part must be outside protection */
 #ifndef GSI_TRACE_INCLUDE_PATH
 #ifdef CONFIG_IPA_VENDOR_DLKM
-#define GSI_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/dataipa/drivers/platform/msm/gsi
+#define GSI_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/dataipa/drivers/platform/msm/gsi
 #else
 #define GSI_TRACE_INCLUDE_PATH ../../techpack/dataipa/drivers/platform/msm/gsi
 #endif
diff --git a/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h b/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
index 7eb499f646..a7c9d590a3 100644
--- a/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
+++ b/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
@@ -72,7 +72,7 @@ TRACE_EVENT(
 /* This part must be outside protection */
 #ifndef RNDIS_TRACE_INCLUDE_PATH
 #ifdef CONFIG_IPA_VENDOR_DLKM
-#define RNDIS_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients
+#define RNDIS_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_clients
 #else
 #define RNDIS_TRACE_INCLUDE_PATH ../../techpack/dataipa/drivers/platform/msm/ipa/ipa_clients
 #endif
diff --git a/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h b/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
index 8507f79885..e6ad9b1678 100644
--- a/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
+++ b/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
@@ -394,7 +394,7 @@ TRACE_EVENT(
 /* This part must be outside protection */
 #ifndef IPA_TRACE_INCLUDE_PATH
 #ifdef CONFIG_IPA_VENDOR_DLKM
-#define IPA_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3
+#define IPA_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/dataipa/drivers/platform/msm/ipa/ipa_v3
 #else
 #define IPA_TRACE_INCLUDE_PATH ../../techpack/dataipa/drivers/platform/msm/ipa/ipa_v3
 #endif
diff --git a/qcom/opensource/datarmnet-ext/aps/Makefile b/qcom/opensource/datarmnet-ext/aps/Makefile
index a61f88d157..ba6bb51670 100644
--- a/qcom/opensource/datarmnet-ext/aps/Makefile
+++ b/qcom/opensource/datarmnet-ext/aps/Makefile
@@ -3,7 +3,7 @@ RMNET_APS_SELECT := CONFIG_RMNET_APS=m
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS += $(RMNET_APS_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
diff --git a/qcom/opensource/datarmnet-ext/offload/Makefile b/qcom/opensource/datarmnet-ext/offload/Makefile
index a3de75d638..4e7a12a66e 100644
--- a/qcom/opensource/datarmnet-ext/offload/Makefile
+++ b/qcom/opensource/datarmnet-ext/offload/Makefile
@@ -3,7 +3,7 @@ RMNET_OFFLOAD_SELECT := CONFIG_RMNET_OFFLOAD=m
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS += $(RMNET_OFFLOAD_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
diff --git a/qcom/opensource/datarmnet-ext/perf/Makefile b/qcom/opensource/datarmnet-ext/perf/Makefile
index 3c29013a02..2f46f0edae 100644
--- a/qcom/opensource/datarmnet-ext/perf/Makefile
+++ b/qcom/opensource/datarmnet-ext/perf/Makefile
@@ -4,9 +4,9 @@ RMNET_PERF_SELECT := CONFIG_RMNET_PERF=m
 DATARMNET_CORE_PATH := datarmnet/core
 DATARMNET_SHS_PATH := datarmnet-ext/shs
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 RMNET_SHS_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_SHS_PATH)
-RMNET_SHS_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_SHS_PATH)
+RMNET_SHS_INC_DIR := $(RMNET_SHS_PATH)
 
 KBUILD_OPTIONS += $(RMNET_PERF_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
diff --git a/qcom/opensource/datarmnet-ext/perf_tether/Makefile b/qcom/opensource/datarmnet-ext/perf_tether/Makefile
index d3bb61102e..7c2f399d82 100644
--- a/qcom/opensource/datarmnet-ext/perf_tether/Makefile
+++ b/qcom/opensource/datarmnet-ext/perf_tether/Makefile
@@ -3,7 +3,7 @@ RMNET_PERF_TETHER_SELECT := CONFIG_RMNET_PERF_TETHER=m
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS += $(RMNET_PERF_TETHER_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
diff --git a/qcom/opensource/datarmnet-ext/sch/Makefile b/qcom/opensource/datarmnet-ext/sch/Makefile
index 41b9ff6b7d..979bd09701 100644
--- a/qcom/opensource/datarmnet-ext/sch/Makefile
+++ b/qcom/opensource/datarmnet-ext/sch/Makefile
@@ -3,7 +3,7 @@ RMNET_SCH_SELECT := CONFIG_RMNET_SCH=m
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS += $(RMNET_SCH_SELECT)
 KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
diff --git a/qcom/opensource/datarmnet-ext/shs/Makefile b/qcom/opensource/datarmnet-ext/shs/Makefile
index 387a431e4e..3811f2270f 100644
--- a/qcom/opensource/datarmnet-ext/shs/Makefile
+++ b/qcom/opensource/datarmnet-ext/shs/Makefile
@@ -2,7 +2,7 @@ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS := RMNET_SHS_ROOT=$(PWD)
 KBUILD_OPTIONS += MODNAME?=rmnet_shs
diff --git a/qcom/opensource/datarmnet-ext/wlan/Makefile b/qcom/opensource/datarmnet-ext/wlan/Makefile
index 2854398a8e..9e5745c0fd 100644
--- a/qcom/opensource/datarmnet-ext/wlan/Makefile
+++ b/qcom/opensource/datarmnet-ext/wlan/Makefile
@@ -3,7 +3,7 @@ RMNET_WLAN_SELECT := CONFIG_RMNET_WLAN=m
 
 DATARMNET_CORE_PATH := datarmnet/core
 RMNET_CORE_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_CORE_PATH)
-RMNET_CORE_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_CORE_PATH)
+RMNET_CORE_INC_DIR := $(RMNET_CORE_PATH)
 
 KBUILD_OPTIONS += $(RMNET_WLAN_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
diff --git a/qcom/opensource/datarmnet/core/dfc.h b/qcom/opensource/datarmnet/core/dfc.h
index 2f6c2e3bb0..e2e6d15cf7 100644
--- a/qcom/opensource/datarmnet/core/dfc.h
+++ b/qcom/opensource/datarmnet/core/dfc.h
@@ -18,14 +18,14 @@
 #ifndef RMNET_TRACE_INCLUDE_PATH
 #if defined(CONFIG_RMNET_LA_PLATFORM)
 #ifdef CONFIG_ARCH_KHAJE
-#define RMNET_TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #else
-#define RMNET_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #endif /* CONFIG_ARCH_KHAJE */
 #elif defined(__arch_um__)
 #define RMNET_TRACE_INCLUDE_PATH ../../datarmnet/core
 #else
-#define RMNET_TRACE_INCLUDE_PATH ../../../../../../../datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #endif /* defined(CONFIG_RMNET_LA_PLATFORM) */
 #endif /* RMNET_TRACE_INCLUDE_PATH */
 
diff --git a/qcom/opensource/datarmnet/core/rmnet_trace.h b/qcom/opensource/datarmnet/core/rmnet_trace.h
index d7687cee4a..25933a55c9 100644
--- a/qcom/opensource/datarmnet/core/rmnet_trace.h
+++ b/qcom/opensource/datarmnet/core/rmnet_trace.h
@@ -9,11 +9,11 @@
 
 #ifndef RMNET_TRACE_INCLUDE_PATH
 #if defined(CONFIG_RMNET_LA_PLATFORM)
-#define RMNET_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #elif defined(__arch_um__)
 #define RMNET_TRACE_INCLUDE_PATH ../../datarmnet/core
 #else
-#define RMNET_TRACE_INCLUDE_PATH ../../../../../../../datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #endif /* defined(CONFIG_RMNET_LA_PLATFORM) */
 #endif /* RMNET_TRACE_INCLUDE_PATH */
 #define TRACE_INCLUDE_PATH RMNET_TRACE_INCLUDE_PATH
diff --git a/qcom/opensource/datarmnet/core/wda.h b/qcom/opensource/datarmnet/core/wda.h
index 126a72b801..aa66dcf9c5 100644
--- a/qcom/opensource/datarmnet/core/wda.h
+++ b/qcom/opensource/datarmnet/core/wda.h
@@ -10,14 +10,14 @@
 #ifndef RMNET_TRACE_INCLUDE_PATH
 #if defined(CONFIG_RMNET_LA_PLATFORM)
 #ifdef CONFIG_ARCH_KHAJE
-#define RMNET_TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #else
-#define RMNET_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #endif /* CONFIG_ARCH_KHAJE */
 #elif defined(__arch_um__)
 #define RMNET_TRACE_INCLUDE_PATH ../../datarmnet/core
 #else
-#define RMNET_TRACE_INCLUDE_PATH ../../../../../../../datarmnet/core
+#define RMNET_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/datarmnet/core
 #endif /* defined(CONFIG_RMNET_LA_PLATFORM) */
 #endif /* RMNET_TRACE_INCLUDE_PATH */
 #define TRACE_INCLUDE_PATH RMNET_TRACE_INCLUDE_PATH
diff --git a/qcom/opensource/display-drivers/msm/Kbuild b/qcom/opensource/display-drivers/msm/Kbuild
index 1733a70e22..55a340b50e 100644
--- a/qcom/opensource/display-drivers/msm/Kbuild
+++ b/qcom/opensource/display-drivers/msm/Kbuild
@@ -90,8 +90,8 @@ ifeq ($(call cc-option-yn, -Wmaybe-uninitialized),y)
 EXTRA_CFLAGS += -Wmaybe-uninitialized
 endif
 
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/display-drivers/hdcp/Module.symvers
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/display-drivers/msm/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/display-drivers/hdcp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/sm8650-modules/qcom/opensource/display-drivers/msm/Module.symvers
 
 ifeq ($(call cc-option-yn, -Wheader-guard),y)
 EXTRA_CFLAGS += -Wheader-guard
diff --git a/qcom/opensource/dsp-kernel/dsp/fastrpc_trace.h b/qcom/opensource/dsp-kernel/dsp/fastrpc_trace.h
index 16f0eb65e7..77efdc3d37 100644
--- a/qcom/opensource/dsp-kernel/dsp/fastrpc_trace.h
+++ b/qcom/opensource/dsp-kernel/dsp/fastrpc_trace.h
@@ -15,7 +15,7 @@
  * Define path if not defined in bazel file
  */
 #ifndef DSP_TRACE_INCLUDE_PATH
-#define DSP_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/dsp-kernel/dsp
+#define DSP_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/dsp-kernel/dsp
 #endif
 
 #undef TRACE_INCLUDE_PATH
diff --git a/qcom/opensource/mm-sys-kernel/ubwcp/ubwcp_trace.h b/qcom/opensource/mm-sys-kernel/ubwcp/ubwcp_trace.h
index 60d1a1329e..515c0839c1 100644
--- a/qcom/opensource/mm-sys-kernel/ubwcp/ubwcp_trace.h
+++ b/qcom/opensource/mm-sys-kernel/ubwcp/ubwcp_trace.h
@@ -11,7 +11,7 @@
 
 /* Path must be relative to location of 'define_trace.h' header in kernel */
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/mm-sys-kernel/ubwcp
+#define TRACE_INCLUDE_PATH ../../../../../sm8650-modules/qcom/opensource/mm-sys-kernel/ubwcp
 
 /* Name of trace header file */
 #undef TRACE_INCLUDE_FILE
diff --git a/qcom/opensource/securemsm-kernel/smcinvoke/trace_smcinvoke.h b/qcom/opensource/securemsm-kernel/smcinvoke/trace_smcinvoke.h
index 313fb81774..3a0023946c 100644
--- a/qcom/opensource/securemsm-kernel/smcinvoke/trace_smcinvoke.h
+++ b/qcom/opensource/securemsm-kernel/smcinvoke/trace_smcinvoke.h
@@ -490,7 +490,7 @@ TRACE_EVENT(smcinvoke_release,
 * Define path if not defined in bazel file
  */
 #ifndef SMCINVOKE_TRACE_INCLUDE_PATH
-#define SMCINVOKE_TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/securemsm-kernel/smcinvoke
+#define SMCINVOKE_TRACE_INCLUDE_PATH ../../../../sm8650-modules/qcom/opensource/securemsm-kernel/smcinvoke
 #endif
 
 #undef TRACE_INCLUDE_PATH
diff --git a/qcom/opensource/wlan/platform/Makefile b/qcom/opensource/wlan/platform/Makefile
index 6a166e5803..c6c467e74d 100644
--- a/qcom/opensource/wlan/platform/Makefile
+++ b/qcom/opensource/wlan/platform/Makefile
@@ -28,7 +28,7 @@ KBUILD_OPTIONS += CONFIG_CNSS_UTILS=m
 KBUILD_OPTIONS += CONFIG_CNSS_HW_SECURE_DISABLE=y
 KBUILD_OPTIONS += CONFIG_BUS_AUTO_SUSPEND=y
 
-KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(ANDROID_BUILD_TOP)/out/vendor/qcom/opensource/securemsm-kernel/Module.symvers
+KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(OUT_DIR)/../sm8650-modules/qcom/opensource/securemsm-kernel/Module.symvers
 endif
 
 all: modules
diff --git a/qcom/opensource/wlan/qcacld-3.0/Makefile b/qcom/opensource/wlan/qcacld-3.0/Makefile
index 2d23542aee..8d41ad47f9 100644
--- a/qcom/opensource/wlan/qcacld-3.0/Makefile
+++ b/qcom/opensource/wlan/qcacld-3.0/Makefile
@@ -13,7 +13,7 @@ M ?= $(shell pwd)
 
 ifeq ($(WLAN_ROOT),)
 KBUILD_OPTIONS += \
-    WLAN_ROOT=$(KERNEL_SRC)/$(M)/.kiwi_v2 \
+    WLAN_ROOT=$(KERNEL_SRC)/$(M) \
     WLAN_PLATFORM_ROOT=vendor/qcom/opensource/wlan/platform \
     WLAN_COMMON_ROOT=cmn \
     WLAN_COMMON_INC=$(KERNEL_SRC)/$(M)/cmn \