diff --git a/qcom/opensource/datarmnet-ext/aps/Makefile b/qcom/opensource/datarmnet-ext/aps/Makefile
index 3b150c8cd1..a61f88d157 100644
--- a/qcom/opensource/datarmnet-ext/aps/Makefile
+++ b/qcom/opensource/datarmnet-ext/aps/Makefile
@@ -1,7 +1,15 @@
 #By default build for CLD
 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)
+
 KBUILD_OPTIONS += $(RMNET_APS_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 
 M ?= $(shell pwd)
diff --git a/qcom/opensource/datarmnet-ext/offload/Makefile b/qcom/opensource/datarmnet-ext/offload/Makefile
index d9e9d42559..a3de75d638 100644
--- a/qcom/opensource/datarmnet-ext/offload/Makefile
+++ b/qcom/opensource/datarmnet-ext/offload/Makefile
@@ -1,7 +1,15 @@
 #By default build for CLD
 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)
+
 KBUILD_OPTIONS += $(RMNET_OFFLOAD_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 
 M ?= $(shell pwd)
diff --git a/qcom/opensource/datarmnet-ext/perf/Makefile b/qcom/opensource/datarmnet-ext/perf/Makefile
index 33b7f2caa5..3c29013a02 100644
--- a/qcom/opensource/datarmnet-ext/perf/Makefile
+++ b/qcom/opensource/datarmnet-ext/perf/Makefile
@@ -1,7 +1,21 @@
 #By default build for CLD
 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_SHS_PATH := $(KERNEL_SRC)/$(M)/../../$(DATARMNET_SHS_PATH)
+RMNET_SHS_INC_DIR := $(ANDROID_BUILD_TOP)/$(RMNET_SHS_PATH)
+
 KBUILD_OPTIONS += $(RMNET_PERF_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
+KBUILD_OPTIONS += RMNET_SHS_INC_DIR=$(RMNET_SHS_INC_DIR)
+KBUILD_OPTIONS += RMNET_SHS_PATH=$(RMNET_SHS_PATH)
+KBUILD_OPTIONS += DATARMNET_SHS_PATH=$(DATARMNET_SHS_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 KBUILD_EXTRA_SYMBOLS += $(M)/../../$(DATARMNET_SHS_PATH)/Module.symvers
 
diff --git a/qcom/opensource/datarmnet-ext/perf_tether/Makefile b/qcom/opensource/datarmnet-ext/perf_tether/Makefile
index 4a9ebcd981..d3bb61102e 100644
--- a/qcom/opensource/datarmnet-ext/perf_tether/Makefile
+++ b/qcom/opensource/datarmnet-ext/perf_tether/Makefile
@@ -1,7 +1,15 @@
 #By default build for CLD
 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)
+
 KBUILD_OPTIONS += $(RMNET_PERF_TETHER_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 
 M ?= $(shell pwd)
diff --git a/qcom/opensource/datarmnet-ext/sch/Makefile b/qcom/opensource/datarmnet-ext/sch/Makefile
index b8749ce735..41b9ff6b7d 100644
--- a/qcom/opensource/datarmnet-ext/sch/Makefile
+++ b/qcom/opensource/datarmnet-ext/sch/Makefile
@@ -1,6 +1,14 @@
 #By default build for CLD
 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)
+
 KBUILD_OPTIONS += $(RMNET_SCH_SELECT)
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
 
 M ?= $(shell pwd)
diff --git a/qcom/opensource/datarmnet-ext/shs/Makefile b/qcom/opensource/datarmnet-ext/shs/Makefile
index 37be585163..387a431e4e 100644
--- a/qcom/opensource/datarmnet-ext/shs/Makefile
+++ b/qcom/opensource/datarmnet-ext/shs/Makefile
@@ -1,7 +1,14 @@
 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)
+
 KBUILD_OPTIONS := RMNET_SHS_ROOT=$(PWD)
 KBUILD_OPTIONS += MODNAME?=rmnet_shs
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 M ?= $(shell pwd)
 
diff --git a/qcom/opensource/datarmnet-ext/wlan/Makefile b/qcom/opensource/datarmnet-ext/wlan/Makefile
index 16ab5a0f9b..2854398a8e 100644
--- a/qcom/opensource/datarmnet-ext/wlan/Makefile
+++ b/qcom/opensource/datarmnet-ext/wlan/Makefile
@@ -1,7 +1,15 @@
 #By default build for CLD
 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)
+
 KBUILD_OPTIONS += $(RMNET_WLAN_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_OPTIONS += RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
+KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
 
 M ?= $(shell pwd)