diff --git a/Makefile.include b/Makefile.include
index 3bf19bd37..b1344c18f 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -165,9 +165,17 @@ endif
 MODULEDIRS = $(MODULES_REL) ${wildcard ${addprefix $(CONTIKI)/, $(MODULES)}}
 UNIQUEMODULES = $(call uniq,$(MODULEDIRS))
 MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}}
+CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
+
+# Include module-specific makefiles
 MODULES_INCLUDES = ${wildcard ${foreach d, $(MODULEDIRS), $(d)/Makefile.${notdir $(d)}}}
 include $(MODULES_INCLUDES)
-CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
+
+# C-include module-specific macros using -imacros
+MODULES_IMACROS = ${wildcard ${foreach d, $(MODULEDIRS), $(d)/module-macros.h}}
+ifneq ($(MODULES_IMACROS),)
+  CFLAGS += ${foreach d, $(MODULES_IMACROS), -imacros $(d)}
+endif
 
 ### Verbosity control. Use  make V=1  to get verbose builds.
 
diff --git a/examples/rpl-border-router/native/Makefile.native b/examples/rpl-border-router/native/Makefile.native
index ee0fae43f..62f7221a0 100644
--- a/examples/rpl-border-router/native/Makefile.native
+++ b/examples/rpl-border-router/native/Makefile.native
@@ -1,4 +1,3 @@
-CFLAGS += -imacros native/module-macros.h
 MODULES += os/services/slip-cmd
 
 MAKE_MAC = MAKE_MAC_OTHER
diff --git a/examples/rpl-border-router/sky/Makefile.sky b/examples/rpl-border-router/sky/Makefile.sky
deleted file mode 100644
index f4e066c2e..000000000
--- a/examples/rpl-border-router/sky/Makefile.sky
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -imacros sky/module-macros.h
diff --git a/examples/slip-radio/sky/Makefile.sky b/examples/slip-radio/sky/Makefile.sky
deleted file mode 100644
index f4e066c2e..000000000
--- a/examples/slip-radio/sky/Makefile.sky
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -imacros sky/module-macros.h