build: move from srctree to ZEPHYR_BASE for app include paths

$srctree for the application might not be set to be $ZEPHYR_BASE, use
$ZEPHYR_BASE instead to be more explicit in the build.

Change-Id: Iefa5ff59f246b584949329044f7a6531adc6ed62
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>

79 files changed, 149 insertions, 149 deletions

diff --git a/samples/bluetooth/ipsp/src/Makefile b/samples/bluetooth/ipsp/src/Makefile
index 548a228b1..617ff39f7 100644
--- a/samples/bluetooth/ipsp/src/Makefile
+++ b/samples/bluetooth/ipsp/src/Makefile
@@ -1,7 +1,7 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/ipss.o
diff --git a/samples/bluetooth/peripheral/src/Makefile b/samples/bluetooth/peripheral/src/Makefile
index e0bbf9f07..95263c805 100644
--- a/samples/bluetooth/peripheral/src/Makefile
+++ b/samples/bluetooth/peripheral/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o ../../gatt/hrs.o ../../gatt/dis.o \
 	../../gatt/bas.o ../../gatt/cts.o
diff --git a/samples/bluetooth/peripheral_csc/src/Makefile b/samples/bluetooth/peripheral_csc/src/Makefile
index 1f76bcbd1..1dec2c56d 100644
--- a/samples/bluetooth/peripheral_csc/src/Makefile
+++ b/samples/bluetooth/peripheral_csc/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o ../../gatt/dis.o ../../gatt/bas.o
diff --git a/samples/bluetooth/peripheral_dis/src/Makefile b/samples/bluetooth/peripheral_dis/src/Makefile
index fb0b81f5c..3adbf1b18 100644
--- a/samples/bluetooth/peripheral_dis/src/Makefile
+++ b/samples/bluetooth/peripheral_dis/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o ../../gatt/dis.o
diff --git a/samples/bluetooth/peripheral_esp/src/Makefile b/samples/bluetooth/peripheral_esp/src/Makefile
index 1f76bcbd1..1dec2c56d 100644
--- a/samples/bluetooth/peripheral_esp/src/Makefile
+++ b/samples/bluetooth/peripheral_esp/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o ../../gatt/dis.o ../../gatt/bas.o
diff --git a/samples/bluetooth/peripheral_hr/src/Makefile b/samples/bluetooth/peripheral_hr/src/Makefile
index 040c4c91b..47c6f4feb 100644
--- a/samples/bluetooth/peripheral_hr/src/Makefile
+++ b/samples/bluetooth/peripheral_hr/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o ../../gatt/hrs.o ../../gatt/dis.o \
 	../../gatt/bas.o
diff --git a/samples/bluetooth/peripheral_sc_only/src/Makefile b/samples/bluetooth/peripheral_sc_only/src/Makefile
index 7fd5a831b..54390d2a2 100644
--- a/samples/bluetooth/peripheral_sc_only/src/Makefile
+++ b/samples/bluetooth/peripheral_sc_only/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y +=-I${srctree}/samples/bluetooth
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth
 
 obj-y = main.o ../../gatt/gap.o
diff --git a/samples/environmental_sensing/arc/src/Makefile b/samples/environmental_sensing/arc/src/Makefile
index 681974321..ed1f8baf5 100644
--- a/samples/environmental_sensing/arc/src/Makefile
+++ b/samples/environmental_sensing/arc/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += ${PROJECTINCLUDE} \
-		-I$(srctree)/include/drivers \
-		-I$(srctree)/drivers -I$(srctree)/arch/arc
+		-I$(ZEPHYR_BASE)/include/drivers \
+		-I$(ZEPHYR_BASE)/drivers -I$(ZEPHYR_BASE)/arch/arc
 
 obj-y = main.o
diff --git a/samples/environmental_sensing/x86/src/Makefile b/samples/environmental_sensing/x86/src/Makefile
index 0fc75795e..853387065 100644
--- a/samples/environmental_sensing/x86/src/Makefile
+++ b/samples/environmental_sensing/x86/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += ${PROJECTINCLUDE}
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers -I$(srctree)/arch/x86
+ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers
+ccflags-y +=-I$(ZEPHYR_BASE)/drivers -I$(ZEPHYR_BASE)/arch/x86
 
 obj-y = main.o
diff --git a/samples/ipm/ipm_demo_arc/src/Makefile b/samples/ipm/ipm_demo_arc/src/Makefile
index cff7ce39b..9b39aff0d 100644
--- a/samples/ipm/ipm_demo_arc/src/Makefile
+++ b/samples/ipm/ipm_demo_arc/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += ${PROJECTINCLUDE} \
-		-I$(srctree)/include/drivers \
-		-I$(srctree)/drivers -I$(srctree)/arch/arc
+		-I$(ZEPHYR_BASE)/include/drivers \
+		-I$(ZEPHYR_BASE)/drivers -I$(ZEPHYR_BASE)/arch/arc
 
 obj-y = hello.o
diff --git a/samples/ipm/ipm_demo_lmt/src/Makefile b/samples/ipm/ipm_demo_lmt/src/Makefile
index 211d8294e..d96be4573 100644
--- a/samples/ipm/ipm_demo_lmt/src/Makefile
+++ b/samples/ipm/ipm_demo_lmt/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += ${PROJECTINCLUDE}
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers -I$(srctree)/arch/x86
+ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers
+ccflags-y +=-I$(ZEPHYR_BASE)/drivers -I$(ZEPHYR_BASE)/arch/x86
 
 obj-y = hello.o
diff --git a/samples/net/coap_observe_client/src/Makefile b/samples/net/coap_observe_client/src/Makefile
index c232d6205..4f489743e 100644
--- a/samples/net/coap_observe_client/src/Makefile
+++ b/samples/net/coap_observe_client/src/Makefile
@@ -1,12 +1,12 @@
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os/sys
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip/tinydtls
-ccflags-y +=-I${srctree}/net/ip/er-coap
-ccflags-y +=-I${srctree}/net/ip/rest-engine
-ccflags-y +=-I${srctree}/samples/bluetooth/
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/sys
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/tinydtls
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/er-coap
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/rest-engine
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth/
 
 obj-y = coap-observe-client.o
 
@@ -15,6 +15,6 @@ ifeq ($(CONFIG_NETWORKING_WITH_BT), y)
 endif
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=0
 endif
diff --git a/samples/net/coap_server/src/Makefile b/samples/net/coap_server/src/Makefile
index 53a6bcab9..b2707850a 100644
--- a/samples/net/coap_server/src/Makefile
+++ b/samples/net/coap_server/src/Makefile
@@ -1,12 +1,12 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os/sys
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip/tinydtls
-ccflags-y +=-I${srctree}/net/ip/er-coap
-ccflags-y +=-I${srctree}/net/ip/rest-engine
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/samples/bluetooth/
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/sys
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/tinydtls
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/er-coap
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/rest-engine
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth/
 
 obj-y = coap-server.o
 
@@ -15,7 +15,7 @@ ifeq ($(CONFIG_NETWORKING_WITH_BT), y)
 endif
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=1
 endif
 
diff --git a/samples/net/dhcp_client/src/Makefile b/samples/net/dhcp_client/src/Makefile
index a6f327dd6..07e0ebef6 100644
--- a/samples/net/dhcp_client/src/Makefile
+++ b/samples/net/dhcp_client/src/Makefile
@@ -1,6 +1,6 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
 
 obj-y = dhcp-client.o
diff --git a/samples/net/dtls_client/src/Makefile b/samples/net/dtls_client/src/Makefile
index ea68c4367..f44668e06 100644
--- a/samples/net/dtls_client/src/Makefile
+++ b/samples/net/dtls_client/src/Makefile
@@ -1,11 +1,11 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip/contiki/os/sys
-ccflags-y +=-I${srctree}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/sys
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=0
 endif
 
diff --git a/samples/net/dtls_server/src/Makefile b/samples/net/dtls_server/src/Makefile
index 3522a3c8d..f3f5d16d6 100644
--- a/samples/net/dtls_server/src/Makefile
+++ b/samples/net/dtls_server/src/Makefile
@@ -1,12 +1,12 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip/contiki/os/sys
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/samples/bluetooth/
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/sys
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth/
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=1
 endif
 
diff --git a/samples/net/echo_client/src/Makefile b/samples/net/echo_client/src/Makefile
index 0205673c3..72412d014 100644
--- a/samples/net/echo_client/src/Makefile
+++ b/samples/net/echo_client/src/Makefile
@@ -1,11 +1,11 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/samples/bluetooth/
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth/
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=0
 endif
 
diff --git a/samples/net/echo_server/src/Makefile b/samples/net/echo_server/src/Makefile
index aa867577a..faf24c437 100644
--- a/samples/net/echo_server/src/Makefile
+++ b/samples/net/echo_server/src/Makefile
@@ -1,11 +1,11 @@
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
-ccflags-y +=-I${srctree}/samples/bluetooth/
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth/
 
 ifeq ($(CONFIG_NET_TESTING), y)
-ccflags-y +=-I${srctree}/samples/net/common/
+ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/
 ccflags-y +=-DNET_TESTING_SERVER=1
 endif
 
diff --git a/samples/net/loopback_test/src/Makefile b/samples/net/loopback_test/src/Makefile
index e900d97b9..7d1e103e9 100644
--- a/samples/net/loopback_test/src/Makefile
+++ b/samples/net/loopback_test/src/Makefile
@@ -1,6 +1,6 @@
-ccflags-y += -I${srctree}/net/ip/contiki
-ccflags-y += -I${srctree}/net/ip/contiki/os/lib
-ccflags-y += -I${srctree}/net/ip/contiki/os
-ccflags-y += -I${srctree}/net/ip
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y += -I${ZEPHYR_BASE}/net/ip
 
 obj-y = network.o
diff --git a/samples/net/paho_mqtt_client/src/Makefile b/samples/net/paho_mqtt_client/src/Makefile
index 4afa1a818..9ef5bf77a 100644
--- a/samples/net/paho_mqtt_client/src/Makefile
+++ b/samples/net/paho_mqtt_client/src/Makefile
@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
 
 obj-y += tcp.o
 obj-y += mqtt.o
diff --git a/samples/net/paho_mqtt_shell/src/Makefile b/samples/net/paho_mqtt_shell/src/Makefile
index 5020e7d9e..cd250da6f 100644
--- a/samples/net/paho_mqtt_shell/src/Makefile
+++ b/samples/net/paho_mqtt_shell/src/Makefile
@@ -14,12 +14,12 @@
 # limitations under the License.
 #
 
-ccflags-y +=-I${srctree}/net/ip/contiki
-ccflags-y +=-I${srctree}/net/ip/contiki/os/lib
-ccflags-y +=-I${srctree}/net/ip/contiki/os
-ccflags-y +=-I${srctree}/net/ip
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y +=-I${ZEPHYR_BASE}/net/ip
 
-ccflags-y += -I${srctree}/samples/net/paho_mqtt_client/src
+ccflags-y += -I${ZEPHYR_BASE}/samples/net/paho_mqtt_client/src
 
 obj-y += main.o
 obj-y += mqtt_shell.o
diff --git a/samples/net/test_15_4/src/Makefile b/samples/net/test_15_4/src/Makefile
index f5a559651..ae7e84559 100644
--- a/samples/net/test_15_4/src/Makefile
+++ b/samples/net/test_15_4/src/Makefile
@@ -1,7 +1,7 @@
-ccflags-y += -I${srctree}/net/ip/contiki
-ccflags-y += -I${srctree}/net/ip/contiki/os/lib
-ccflags-y += -I${srctree}/net/ip/contiki/os
-ccflags-y += -I${srctree}/net/ip
-ccflags-$(CONFIG_NET_SANITY_TEST) += -I${srctree}/samples/include
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y += -I${ZEPHYR_BASE}/net/ip
+ccflags-$(CONFIG_NET_SANITY_TEST) += -I${ZEPHYR_BASE}/samples/include
 
 obj-y = network.o
diff --git a/samples/net/zperf/src/Makefile b/samples/net/zperf/src/Makefile
index f74515f60..96ad3ce56 100644
--- a/samples/net/zperf/src/Makefile
+++ b/samples/net/zperf/src/Makefile
@@ -3,10 +3,10 @@ ccflags-y += -DPROFILER
 endif
 
 
-ccflags-y += -I${srctree}/net/ip/contiki
-ccflags-y += -I${srctree}/net/ip/contiki/os/lib
-ccflags-y += -I${srctree}/net/ip/contiki/os
-ccflags-y += -I${srctree}/net/ip
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os/lib
+ccflags-y += -I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-y += -I${ZEPHYR_BASE}/net/ip
 ccflags-y += -I${ZEPHYR_BASE}/samples/task_profiler/profiler/src
 
 obj-y += zperf_shell.o
diff --git a/samples/sensor/bmi160/x86/src/Makefile b/samples/sensor/bmi160/x86/src/Makefile
index 6dc0ead83..7800c40ae 100644
--- a/samples/sensor/bmi160/x86/src/Makefile
+++ b/samples/sensor/bmi160/x86/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers -I$(srctree)/arch/x86
+ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers
+ccflags-y +=-I$(ZEPHYR_BASE)/drivers -I$(ZEPHYR_BASE)/arch/x86
 
 obj-y = x86_bmi160.o
diff --git a/tests/benchmark/app_kernel/src/Makefile b/tests/benchmark/app_kernel/src/Makefile
index 6dc2b5e4b..7635f3ae5 100644
--- a/tests/benchmark/app_kernel/src/Makefile
+++ b/tests/benchmark/app_kernel/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -I$(CURDIR)/misc/generated/sysgen
-ccflags-y += -I$(srctree)/tests/benchmark/latency_measure/microkernel/src
+ccflags-y += -I$(ZEPHYR_BASE)/tests/benchmark/latency_measure/microkernel/src
 
 obj-y := fifo_b.o mailbox_b.o master.o mempool_b.o \
 	nop_b.o  pipe_r.o sema_r.o event_b.o \
diff --git a/tests/benchmark/boot_time/microkernel/src/Makefile b/tests/benchmark/boot_time/microkernel/src/Makefile
index eb9681a26..eab469842 100644
--- a/tests/benchmark/boot_time/microkernel/src/Makefile
+++ b/tests/benchmark/boot_time/microkernel/src/Makefile
@@ -1,4 +1,4 @@
 ccflags-y += -I$(CURDIR)/misc/generated/sysgen
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y=boot_time.o
diff --git a/tests/benchmark/latency_measure/microkernel/src/Makefile b/tests/benchmark/latency_measure/microkernel/src/Makefile
index f004faeb2..bad4fe432 100644
--- a/tests/benchmark/latency_measure/microkernel/src/Makefile
+++ b/tests/benchmark/latency_measure/microkernel/src/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -I$(CURDIR)/misc/generated/sysgen
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 ccflags-$(CONFIG_SOC_QUARK_D2000) += -DSTACKSIZE=256
 
 obj-y = main.o \
diff --git a/tests/benchmark/sys_kernel/nanokernel/src/Makefile b/tests/benchmark/sys_kernel/nanokernel/src/Makefile
index c1f0c2af9..d03d0cb42 100644
--- a/tests/benchmark/sys_kernel/nanokernel/src/Makefile
+++ b/tests/benchmark/sys_kernel/nanokernel/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y = -I$(srctree)/tests/benchmark/latency_measure/microkernel/src -I${srctree}/tests/include
+ccflags-y = -I$(ZEPHYR_BASE)/tests/benchmark/latency_measure/microkernel/src -I${ZEPHYR_BASE}/tests/include
 ccflags-y += -I$(CURDIR)/misc/generated/sysgen
 
 obj-y = lifo.o \
diff --git a/tests/bluetooth/shell/src/Makefile b/tests/bluetooth/shell/src/Makefile
index 124abb430..367e98bee 100644
--- a/tests/bluetooth/shell/src/Makefile
+++ b/tests/bluetooth/shell/src/Makefile
@@ -1,5 +1,5 @@
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/samples/bluetooth
+ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers
+ccflags-y +=-I$(ZEPHYR_BASE)/samples/bluetooth
 
 obj-y = main.o ../../../../samples/bluetooth/gatt/gap.o \
 	../../../../samples/bluetooth/gatt/hrs.o
diff --git a/tests/bluetooth/test_bluetooth/src/Makefile b/tests/bluetooth/test_bluetooth/src/Makefile
index 8a7b33766..eea5ea771 100644
--- a/tests/bluetooth/test_bluetooth/src/Makefile
+++ b/tests/bluetooth/test_bluetooth/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = bluetooth.o
diff --git a/tests/bluetooth/tester/src/Makefile b/tests/bluetooth/tester/src/Makefile
index 92009e7c5..29a574bf5 100644
--- a/tests/bluetooth/tester/src/Makefile
+++ b/tests/bluetooth/tester/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y +=-I$(srctree)/include/drivers
+ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers
 
 obj-y = bttester.o gap.o gatt.o l2cap.o main.o
diff --git a/tests/crypto/test_aes/src/Makefile b/tests/crypto/test_aes/src/Makefile
index fc96cb403..3bec1b792 100644
--- a/tests/crypto/test_aes/src/Makefile
+++ b/tests/crypto/test_aes/src/Makefile
@@ -1,2 +1,2 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 obj-y = test_aes.o
diff --git a/tests/crypto/test_cbc/src/Makefile b/tests/crypto/test_cbc/src/Makefile
index abb41779c..a9dd60e7f 100644
--- a/tests/crypto/test_cbc/src/Makefile
+++ b/tests/crypto/test_cbc/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_cbc_mode.o
diff --git a/tests/crypto/test_ccm_mode/src/Makefile b/tests/crypto/test_ccm_mode/src/Makefile
index 29ce724db..c06404bef 100644
--- a/tests/crypto/test_ccm_mode/src/Makefile
+++ b/tests/crypto/test_ccm_mode/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_ccm_mode.o
diff --git a/tests/crypto/test_cmac_mode/src/Makefile b/tests/crypto/test_cmac_mode/src/Makefile
index 6705fbced..54d7d2ed3 100644
--- a/tests/crypto/test_cmac_mode/src/Makefile
+++ b/tests/crypto/test_cmac_mode/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_cmac_mode.o
diff --git a/tests/crypto/test_ctr/src/Makefile b/tests/crypto/test_ctr/src/Makefile
index cd6d3a646..b2f2f4604 100644
--- a/tests/crypto/test_ctr/src/Makefile
+++ b/tests/crypto/test_ctr/src/Makefile
@@ -1,2 +1,2 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 obj-y = test_ctr_mode.o
diff --git a/tests/crypto/test_hmac/src/Makefile b/tests/crypto/test_hmac/src/Makefile
index 59ae8f839..7784e7d76 100644
--- a/tests/crypto/test_hmac/src/Makefile
+++ b/tests/crypto/test_hmac/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_hmac.o
diff --git a/tests/crypto/test_prng/src/Makefile b/tests/crypto/test_prng/src/Makefile
index eccaf9d13..426d0eae7 100644
--- a/tests/crypto/test_prng/src/Makefile
+++ b/tests/crypto/test_prng/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_hmac_prng.o
 
diff --git a/tests/crypto/test_sha256/src/Makefile b/tests/crypto/test_sha256/src/Makefile
index 7947d9913..af75436fe 100644
--- a/tests/crypto/test_sha256/src/Makefile
+++ b/tests/crypto/test_sha256/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/tests/include
+ccflags-y += -I$(ZEPHYR_BASE)/tests/include
 
 obj-y = test_sha256.o
 
diff --git a/tests/kernel/test_arm_m3_irq_vector_table/src/Makefile b/tests/kernel/test_arm_m3_irq_vector_table/src/Makefile
index e04d7c6b6..2b3569663 100644
--- a/tests/kernel/test_arm_m3_irq_vector_table/src/Makefile
+++ b/tests/kernel/test_arm_m3_irq_vector_table/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o
diff --git a/tests/kernel/test_atomic/src/Makefile b/tests/kernel/test_atomic/src/Makefile
index 3f5f0d248..ec812af8b 100644
--- a/tests/kernel/test_atomic/src/Makefile
+++ b/tests/kernel/test_atomic/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = atomic.o
diff --git a/tests/kernel/test_bitfield/src/Makefile b/tests/kernel/test_bitfield/src/Makefile
index 52700a65b..717a67dea 100644
--- a/tests/kernel/test_bitfield/src/Makefile
+++ b/tests/kernel/test_bitfield/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = bitfield.o
diff --git a/tests/kernel/test_context/src/Makefile b/tests/kernel/test_context/src/Makefile
index febc6913a..10178c904 100644
--- a/tests/kernel/test_context/src/Makefile
+++ b/tests/kernel/test_context/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = context.o
diff --git a/tests/kernel/test_critical/src/Makefile b/tests/kernel/test_critical/src/Makefile
index 307adfb8c..152706f5c 100644
--- a/tests/kernel/test_critical/src/Makefile
+++ b/tests/kernel/test_critical/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = critical.o
diff --git a/tests/kernel/test_early_sleep/src/Makefile b/tests/kernel/test_early_sleep/src/Makefile
index d0592ae44..cd5249058 100644
--- a/tests/kernel/test_early_sleep/src/Makefile
+++ b/tests/kernel/test_early_sleep/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = early_sleep.o
diff --git a/tests/kernel/test_errno/src/Makefile b/tests/kernel/test_errno/src/Makefile
index e04d7c6b6..2b3569663 100644
--- a/tests/kernel/test_errno/src/Makefile
+++ b/tests/kernel/test_errno/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o
diff --git a/tests/kernel/test_events/src/Makefile b/tests/kernel/test_events/src/Makefile
index b3a553a48..f9d115889 100644
--- a/tests/kernel/test_events/src/Makefile
+++ b/tests/kernel/test_events/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = events.o test_fiber.o
diff --git a/tests/kernel/test_fifo/microkernel/src/Makefile b/tests/kernel/test_fifo/microkernel/src/Makefile
index 1c953d559..36c5a7863 100644
--- a/tests/kernel/test_fifo/microkernel/src/Makefile
+++ b/tests/kernel/test_fifo/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = fifo.o
diff --git a/tests/kernel/test_fifo/nanokernel/src/Makefile b/tests/kernel/test_fifo/nanokernel/src/Makefile
index 662ac71c5..332ffcd95 100644
--- a/tests/kernel/test_fifo/nanokernel/src/Makefile
+++ b/tests/kernel/test_fifo/nanokernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = fifo.o fifo_timeout.o
diff --git a/tests/kernel/test_fp_sharing/microkernel/src/Makefile b/tests/kernel/test_fp_sharing/microkernel/src/Makefile
index f30d66e20..477268f0b 100644
--- a/tests/kernel/test_fp_sharing/microkernel/src/Makefile
+++ b/tests/kernel/test_fp_sharing/microkernel/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y += main.o
 obj-y += pi.o
diff --git a/tests/kernel/test_intmath/src/Makefile b/tests/kernel/test_intmath/src/Makefile
index e04d7c6b6..2b3569663 100644
--- a/tests/kernel/test_intmath/src/Makefile
+++ b/tests/kernel/test_intmath/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o
diff --git a/tests/kernel/test_ipm/src/Makefile b/tests/kernel/test_ipm/src/Makefile
index d0a3d6269..7b4d09ea9 100644
--- a/tests/kernel/test_ipm/src/Makefile
+++ b/tests/kernel/test_ipm/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = ipm_dummy.o test_ipm.o
 
diff --git a/tests/kernel/test_irq_offload/src/Makefile b/tests/kernel/test_irq_offload/src/Makefile
index e04d7c6b6..2b3569663 100644
--- a/tests/kernel/test_irq_offload/src/Makefile
+++ b/tests/kernel/test_irq_offload/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o
diff --git a/tests/kernel/test_libs/src/Makefile b/tests/kernel/test_libs/src/Makefile
index 7a5b06af7..99ac74718 100644
--- a/tests/kernel/test_libs/src/Makefile
+++ b/tests/kernel/test_libs/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = libraries.o
 obj-y += main.o
diff --git a/tests/kernel/test_lifo/src/Makefile b/tests/kernel/test_lifo/src/Makefile
index 501e1e944..667033fdb 100644
--- a/tests/kernel/test_lifo/src/Makefile
+++ b/tests/kernel/test_lifo/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = lifo.o
diff --git a/tests/kernel/test_mail/src/Makefile b/tests/kernel/test_mail/src/Makefile
index c03c02824..cdf00f7f3 100644
--- a/tests/kernel/test_mail/src/Makefile
+++ b/tests/kernel/test_mail/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = mail.o main.o
diff --git a/tests/kernel/test_map/src/Makefile b/tests/kernel/test_map/src/Makefile
index eaf385089..c15eca53c 100644
--- a/tests/kernel/test_map/src/Makefile
+++ b/tests/kernel/test_map/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = map.o
diff --git a/tests/kernel/test_mem_safe/src/Makefile b/tests/kernel/test_mem_safe/src/Makefile
index e81c9358a..0b337fa8b 100644
--- a/tests/kernel/test_mem_safe/src/Makefile
+++ b/tests/kernel/test_mem_safe/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 DQUOTE = "
 BUILD_ARCH = $(strip $(subst $(DQUOTE),,$(CONFIG_ARCH)))
 
diff --git a/tests/kernel/test_mutex/src/Makefile b/tests/kernel/test_mutex/src/Makefile
index 97747e454..f48645a91 100644
--- a/tests/kernel/test_mutex/src/Makefile
+++ b/tests/kernel/test_mutex/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = mutex.o task50.o
diff --git a/tests/kernel/test_nano_work/src/Makefile b/tests/kernel/test_nano_work/src/Makefile
index e04d7c6b6..2b3569663 100644
--- a/tests/kernel/test_nano_work/src/Makefile
+++ b/tests/kernel/test_nano_work/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o
diff --git a/tests/kernel/test_obj_tracing/microkernel/src/Makefile b/tests/kernel/test_obj_tracing/microkernel/src/Makefile
index 7dfe9c128..724776497 100644
--- a/tests/kernel/test_obj_tracing/microkernel/src/Makefile
+++ b/tests/kernel/test_obj_tracing/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y =  phil_fiber.o phil_task.o object_monitor.o
diff --git a/tests/kernel/test_pend/src/Makefile b/tests/kernel/test_pend/src/Makefile
index dd4d6b80a..bc16ad5bc 100644
--- a/tests/kernel/test_pend/src/Makefile
+++ b/tests/kernel/test_pend/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = pend.o
diff --git a/tests/kernel/test_pipe/src/Makefile b/tests/kernel/test_pipe/src/Makefile
index 24ddcbd95..48e8bcce1 100644
--- a/tests/kernel/test_pipe/src/Makefile
+++ b/tests/kernel/test_pipe/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o pipe.o
diff --git a/tests/kernel/test_pool/src/Makefile b/tests/kernel/test_pool/src/Makefile
index c5a48c9b3..e65f73220 100644
--- a/tests/kernel/test_pool/src/Makefile
+++ b/tests/kernel/test_pool/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = pool.o
diff --git a/tests/kernel/test_rand32/src/Makefile b/tests/kernel/test_rand32/src/Makefile
index d94383705..1d9c88962 100644
--- a/tests/kernel/test_rand32/src/Makefile
+++ b/tests/kernel/test_rand32/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = test-rand32.o
diff --git a/tests/kernel/test_ring_buf/src/Makefile b/tests/kernel/test_ring_buf/src/Makefile
index 44464bbb6..d767b83e6 100644
--- a/tests/kernel/test_ring_buf/src/Makefile
+++ b/tests/kernel/test_ring_buf/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = test_ring_buf.o
 
diff --git a/tests/kernel/test_sema/microkernel/src/Makefile b/tests/kernel/test_sema/microkernel/src/Makefile
index 6d8eae7b3..72df7a626 100644
--- a/tests/kernel/test_sema/microkernel/src/Makefile
+++ b/tests/kernel/test_sema/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = main.o sema.o test_fiber.o
diff --git a/tests/kernel/test_sema/nanokernel/src/Makefile b/tests/kernel/test_sema/nanokernel/src/Makefile
index 9ebfdfac5..f8b7635a2 100644
--- a/tests/kernel/test_sema/nanokernel/src/Makefile
+++ b/tests/kernel/test_sema/nanokernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = sema.o
diff --git a/tests/kernel/test_sleep/src/Makefile b/tests/kernel/test_sleep/src/Makefile
index 478c688c2..8dbd8198f 100644
--- a/tests/kernel/test_sleep/src/Makefile
+++ b/tests/kernel/test_sleep/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = sleep.o
diff --git a/tests/kernel/test_slist/src/Makefile b/tests/kernel/test_slist/src/Makefile
index adf7a3b9a..0a18e7c5e 100644
--- a/tests/kernel/test_slist/src/Makefile
+++ b/tests/kernel/test_slist/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = slist.o
diff --git a/tests/kernel/test_sprintf/microkernel/src/Makefile b/tests/kernel/test_sprintf/microkernel/src/Makefile
index d1a2325ed..06e7db214 100644
--- a/tests/kernel/test_sprintf/microkernel/src/Makefile
+++ b/tests/kernel/test_sprintf/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = test_sprintf.o
diff --git a/tests/kernel/test_stack/nanokernel/src/Makefile b/tests/kernel/test_stack/nanokernel/src/Makefile
index 563b3e8f2..3ee92059b 100644
--- a/tests/kernel/test_stack/nanokernel/src/Makefile
+++ b/tests/kernel/test_stack/nanokernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = stack.o
diff --git a/tests/kernel/test_stackprot/microkernel/src/Makefile b/tests/kernel/test_stackprot/microkernel/src/Makefile
index 878f4dc0e..fa67538f6 100644
--- a/tests/kernel/test_stackprot/microkernel/src/Makefile
+++ b/tests/kernel/test_stackprot/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = stackprot.o
diff --git a/tests/kernel/test_static_idt/microkernel/src/Makefile b/tests/kernel/test_static_idt/microkernel/src/Makefile
index dd29b7785..4610ea437 100644
--- a/tests/kernel/test_static_idt/microkernel/src/Makefile
+++ b/tests/kernel/test_static_idt/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = static_idt.o test_stubs.o
diff --git a/tests/kernel/test_task/src/Makefile b/tests/kernel/test_task/src/Makefile
index f2f2ad948..c8eb4e0c2 100644
--- a/tests/kernel/test_task/src/Makefile
+++ b/tests/kernel/test_task/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = task.o
diff --git a/tests/kernel/test_tickless/microkernel/src/Makefile b/tests/kernel/test_tickless/microkernel/src/Makefile
index 835dc2d26..6a7a2e3e2 100644
--- a/tests/kernel/test_tickless/microkernel/src/Makefile
+++ b/tests/kernel/test_tickless/microkernel/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y =  test_tickless.o 
 ifeq ($(ARCH),arm)
diff --git a/tests/kernel/test_timer/microkernel/src/Makefile b/tests/kernel/test_timer/microkernel/src/Makefile
index a5013015c..d7960e2de 100644
--- a/tests/kernel/test_timer/microkernel/src/Makefile
+++ b/tests/kernel/test_timer/microkernel/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include \
-    -I$(srctree)/tests/kernel/test_fifo/nanokernel/src/
+ccflags-y += -I${ZEPHYR_BASE}/tests/include \
+    -I$(ZEPHYR_BASE)/tests/kernel/test_fifo/nanokernel/src/
 
 obj-y = timer.o
diff --git a/tests/kernel/test_timer/nanokernel/src/Makefile b/tests/kernel/test_timer/nanokernel/src/Makefile
index 38a73ad38..73cfbad4f 100644
--- a/tests/kernel/test_timer/nanokernel/src/Makefile
+++ b/tests/kernel/test_timer/nanokernel/src/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 -DFIBER2_STACKSIZE=256
 
 obj-y=timer.o
diff --git a/tests/kernel/test_xip/microkernel/src/Makefile b/tests/kernel/test_xip/microkernel/src/Makefile
index c400d3f13..0dbc0c0ae 100644
--- a/tests/kernel/test_xip/microkernel/src/Makefile
+++ b/tests/kernel/test_xip/microkernel/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-y += -I${srctree}/tests/include
+ccflags-y += -I${ZEPHYR_BASE}/tests/include
 
 obj-y = test_xip.o test_xip_helper.o