diff --git a/pkg/ccn-lite/Makefile.include b/pkg/ccn-lite/Makefile.include
index 4751bbd926..40c18ee967 100644
--- a/pkg/ccn-lite/Makefile.include
+++ b/pkg/ccn-lite/Makefile.include
@@ -1,2 +1,2 @@
-INCLUDES += -I$(RIOTBASE)/pkg/ccn-lite -I$(RIOTBASE)/pkg/ccn-lite/ccn-lite/src
+INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(RIOTPKG)/ccn-lite/ccn-lite/src
 INCLUDES += -I$(RIOTBASE)/sys/posix/include
diff --git a/pkg/cmsis-dsp/Makefile.include b/pkg/cmsis-dsp/Makefile.include
index 8840a328af..835c7b44b7 100644
--- a/pkg/cmsis-dsp/Makefile.include
+++ b/pkg/cmsis-dsp/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTBASE)/pkg/cmsis-dsp/cmsis-dsp/include
+INCLUDES += -I$(RIOTPKG)/cmsis-dsp/cmsis-dsp/include
diff --git a/pkg/doc.txt b/pkg/doc.txt
index 8ee8f21c31..158dbe785d 100644
--- a/pkg/doc.txt
+++ b/pkg/doc.txt
@@ -11,7 +11,7 @@
  *
  * ~~~~~~~~ {.mk}
  * USEPKG += <pkg_name>
- * INCLUDE += $(RIOTBASE)/pkg/<pkg_name>/...
+ * INCLUDE += $(RIOTPKG)/<pkg_name>/...
  * ~~~~~~~~
  *
  * Porting an external library
diff --git a/pkg/libcoap/Makefile.include b/pkg/libcoap/Makefile.include
index dab6b7a26a..1370285f4d 100644
--- a/pkg/libcoap/Makefile.include
+++ b/pkg/libcoap/Makefile.include
@@ -1,3 +1,3 @@
-INCLUDES += -I$(RIOTBASE)/pkg/libcoap/libcoap \
+INCLUDES += -I$(RIOTPKG)/libcoap/libcoap \
 			-I$(RIOTBASE)/sys/posix/include \
 			-I$(RIOTBASE)/sys/net/include
diff --git a/pkg/micro-ecc/Makefile.include b/pkg/micro-ecc/Makefile.include
index 4fc603e350..2bdc475905 100644
--- a/pkg/micro-ecc/Makefile.include
+++ b/pkg/micro-ecc/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I $(RIOTBASE)/pkg/micro-ecc/micro-ecc
+INCLUDES += -I$(RIOTPKG)/micro-ecc/micro-ecc
diff --git a/pkg/microcoap/Makefile.include b/pkg/microcoap/Makefile.include
index 53b1fa4e47..e1998cb617 100644
--- a/pkg/microcoap/Makefile.include
+++ b/pkg/microcoap/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTBASE)/pkg/microcoap/microcoap
+INCLUDES += -I$(RIOTPKG)/microcoap/microcoap
diff --git a/pkg/oonf_api/Makefile.include b/pkg/oonf_api/Makefile.include
index 3cf84c68c4..041a62ad77 100644
--- a/pkg/oonf_api/Makefile.include
+++ b/pkg/oonf_api/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I $(RIOTBASE)/pkg/oonf_api/oonf_api/src-api
+INCLUDES += -I$(RIOTPKG)/oonf_api/oonf_api/src-api
diff --git a/pkg/relic/Makefile.include b/pkg/relic/Makefile.include
index fa0985b127..c9c20ba248 100644
--- a/pkg/relic/Makefile.include
+++ b/pkg/relic/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTBASE)/pkg/relic/relic/include
+INCLUDES += -I$(RIOTPKG)/relic/relic/include
diff --git a/pkg/tlsf/Makefile.include b/pkg/tlsf/Makefile.include
index 7ce51bc734..15ce4f1252 100644
--- a/pkg/tlsf/Makefile.include
+++ b/pkg/tlsf/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTBASE)/pkg/tlsf/tlsf
+INCLUDES += -I$(RIOTPKG)/tlsf/tlsf
diff --git a/pkg/wakaama/Makefile.include b/pkg/wakaama/Makefile.include
index 017dae1841..1bfb90a655 100644
--- a/pkg/wakaama/Makefile.include
+++ b/pkg/wakaama/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTBASE)/pkg/wakaama/wakaama
+INCLUDES += -I$(RIOTPKG)/wakaama/wakaama