diff --git a/canutils/Make.defs b/canutils/Make.defs
index 92373732f..4a7be6e01 100644
--- a/canutils/Make.defs
+++ b/canutils/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard canutils/*/Make.defs)
+include $(wildcard $(APPDIR)/canutils/*/Make.defs)
diff --git a/examples/Make.defs b/examples/Make.defs
index f1cad890c..72a5bec55 100644
--- a/examples/Make.defs
+++ b/examples/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard examples/*/Make.defs)
+include $(wildcard $(APPDIR)/examples/*/Make.defs)
diff --git a/fsutils/Make.defs b/fsutils/Make.defs
index 4e5a68db5..b0ab5502a 100644
--- a/fsutils/Make.defs
+++ b/fsutils/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard fsutils/*/Make.defs)
+include $(wildcard $(APPDIR)/fsutils/*/Make.defs)
diff --git a/gpsutils/Make.defs b/gpsutils/Make.defs
index bdd232f1d..9102d844c 100644
--- a/gpsutils/Make.defs
+++ b/gpsutils/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard gpsutils/*/Make.defs)
+include $(wildcard $(APPDIR)/gpsutils/*/Make.defs)
diff --git a/graphics/Make.defs b/graphics/Make.defs
index 15499db75..2b64f7c83 100644
--- a/graphics/Make.defs
+++ b/graphics/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard graphics/*/Make.defs)
+include $(wildcard $(APPDIR)/graphics/*/Make.defs)
diff --git a/graphics/nxwidgets/UnitTests/Make.defs b/graphics/nxwidgets/UnitTests/Make.defs
index d73af406d..bef1776b4 100644
--- a/graphics/nxwidgets/UnitTests/Make.defs
+++ b/graphics/nxwidgets/UnitTests/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard graphics/nxwidget/UnitTests/*/Make.defs)
+include $(wildcard $(APPDIR)/graphics/nxwidget/UnitTests/*/Make.defs)
diff --git a/industry/Make.defs b/industry/Make.defs
index 6b9bf62d1..86d9aa0cb 100644
--- a/industry/Make.defs
+++ b/industry/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard industry/*/Make.defs)
+include $(wildcard $(APPDIR)/industry/*/Make.defs)
diff --git a/interpreters/Make.defs b/interpreters/Make.defs
index 7893b58e7..a37550ec0 100644
--- a/interpreters/Make.defs
+++ b/interpreters/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard interpreters/*/Make.defs)
+include $(wildcard $(APPDIR)/interpreters/*/Make.defs)
diff --git a/netutils/Make.defs b/netutils/Make.defs
index 58443df23..ee9e9f5a6 100644
--- a/netutils/Make.defs
+++ b/netutils/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard netutils/*/Make.defs)
+include $(wildcard $(APPDIR)/netutils/*/Make.defs)
diff --git a/system/Make.defs b/system/Make.defs
index a54e610a1..ec01fa4fd 100644
--- a/system/Make.defs
+++ b/system/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard system/*/Make.defs)
+include $(wildcard $(APPDIR)/system/*/Make.defs)
diff --git a/testing/Make.defs b/testing/Make.defs
index 089464aa9..bc174bc2c 100644
--- a/testing/Make.defs
+++ b/testing/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard testing/*/Make.defs)
+include $(wildcard $(APPDIR)/testing/*/Make.defs)
diff --git a/wireless/Make.defs b/wireless/Make.defs
index 6f5bcf9f7..76f5af10a 100644
--- a/wireless/Make.defs
+++ b/wireless/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard wireless/*/Make.defs)
+include $(wildcard $(APPDIR)/wireless/*/Make.defs)
diff --git a/wireless/bluetooth/Make.defs b/wireless/bluetooth/Make.defs
index 771c76087..dcdb85afe 100644
--- a/wireless/bluetooth/Make.defs
+++ b/wireless/bluetooth/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard wireless/bluetooth/*/Make.defs)
+include $(wildcard $(APPDIR)/wireless/bluetooth/*/Make.defs)
diff --git a/wireless/ieee802154/Make.defs b/wireless/ieee802154/Make.defs
index ecb59032c..9a6cf6f23 100644
--- a/wireless/ieee802154/Make.defs
+++ b/wireless/ieee802154/Make.defs
@@ -34,4 +34,4 @@
 #
 ############################################################################
 
-include $(wildcard wireless/ieee802154/*/Make.defs)
+include $(wildcard $(APPDIR)/wireless/ieee802154/*/Make.defs)