diff --git a/Makefile.include b/Makefile.include
index d6753ad6c..c8c9c4597 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -60,6 +60,8 @@ CONTIKI_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CONTIKI_SOURCEFI
 
 PROJECT_SOURCEFILES += ${foreach d, $(PROJECTDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}}
 PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFILES)}}
+PROJECT_INCLUDES = ${strip ${wildcard ${foreach d, $(PROJECTDIRS), $(d)/Makefile.${notdir $(d)}}}}
+-include $(PROJECT_INCLUDES)
 
 # Provide way to create $(OBJECTDIR) if it has been removed by make clean
 $(OBJECTDIR):
diff --git a/examples/rpl-border-router/Makefile b/examples/rpl-border-router/Makefile
index cb6179a1b..0870aacd9 100644
--- a/examples/rpl-border-router/Makefile
+++ b/examples/rpl-border-router/Makefile
@@ -5,14 +5,14 @@ CONTIKI = ../..
 include $(CONTIKI)/Makefile.identify-target
 
 ifeq ($(TARGET),native)
-  SOURCES_DIR = native
+  PROJECTDIRS += native
+	CFLAGS += -DPROJECT_CONF_PATH=\"native/project-conf.h\"
 else
-  SOURCES_DIR = embedded
+	PROJECTDIRS += embedded
+	# For embedded platforms, include platform-specific directory
+	PROJECTDIRS += embedded/$(TARGET)
+	CFLAGS += -DPROJECT_CONF_PATH=\"embedded/project-conf.h\"
 endif
-include $(SOURCES_DIR)/Makefile
-
 PROJECTDIRS += common
-PROJECTDIRS += $(SOURCES_DIR)
-CFLAGS += -DPROJECT_CONF_PATH=\"$(SOURCES_DIR)/project-conf.h\"
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/rpl-border-router/embedded/Makefile.embedded b/examples/rpl-border-router/embedded/Makefile.embedded
index 302c3fc31..c62f7df54 100644
--- a/examples/rpl-border-router/embedded/Makefile.embedded
+++ b/examples/rpl-border-router/embedded/Makefile.embedded
@@ -1,7 +1,3 @@
-### Optionally, the target can add its own Makefile, to do things like e.g.
-### add more source files to the build or define make variables.
--include $(SOURCES_DIR)/$(TARGET)/Makefile.$(TARGET)
-
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
diff --git a/examples/rpl-border-router/embedded/sky/Makefile.sky b/examples/rpl-border-router/embedded/sky/Makefile.sky
index c3d097481..17fefd5ee 100644
--- a/examples/rpl-border-router/embedded/sky/Makefile.sky
+++ b/examples/rpl-border-router/embedded/sky/Makefile.sky
@@ -1,3 +1 @@
-PROJECT_SOURCEFILES += slip-bridge-putchar.c
-
 CFLAGS += -DTARGET_CONF_PATH=\"target-conf.h\"
diff --git a/examples/sensniff/Makefile b/examples/sensniff/Makefile
index 1ec70a7c7..3c04da8e4 100644
--- a/examples/sensniff/Makefile
+++ b/examples/sensniff/Makefile
@@ -4,11 +4,7 @@ CONTIKI = ../..
 PROJECT_SOURCEFILES += sensniff-mac.c netstack.c
 PROJECTDIRS += pool $(TARGET)
 
-include $(CONTIKI)/Makefile.identify-target 
-
-### Optionally, the target can add its own Makefile, to do things like e.g.
-### add more source files to the build or define make variables.
--include $(TARGET)/Makefile.$(TARGET)
+include $(CONTIKI)/Makefile.identify-target
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/slip-radio/Makefile b/examples/slip-radio/Makefile
index 15c0ec1b0..85c9e35b1 100644
--- a/examples/slip-radio/Makefile
+++ b/examples/slip-radio/Makefile
@@ -5,10 +5,6 @@ MODULES += os/services/slip-cmd
 CONTIKI=../..
 include $(CONTIKI)/Makefile.identify-target
 
-### Optionally, the target can add its own Makefile, to do things like e.g.
-### add more source files to the build or define make variables.
--include $(TARGET)/Makefile.$(TARGET)
-
 PROJECTDIRS += $(TARGET)
 PROJECT_SOURCEFILES += slip-net.c