diff --git a/Makefile.base b/Makefile.base
index 27b51d8497a80bf044a94bb26671b7ba9e75ddf6..a05d65d1c2e92fe4679a329f94090fadfb40cec1 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -18,8 +18,8 @@ $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
 
 # compile and generate dependency info
 $(BINDIR)%.o: %.c
-	@$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
-	@$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
+	@$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
 	@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
 
 $(BINDIR)%.o: %.s
diff --git a/Makefile.include b/Makefile.include
index 6f6b4171de342010e5f9f41db7420859a40c6759..939a4c849438d773bbceebeaa73a44ead94a9b8e 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -70,7 +70,7 @@ ${PROJBINDIR}/$(PROJECT).a:  $(OBJ)
 
 ${PROJBINDIR}/%.o: %.c
 	@echo; echo "Compiling.... $*.c"; echo
-	$(CC) $(CFLAGS) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o bin/$*.o
+	$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o bin/$*.o
 
 clean:
 	$(MAKE) -C $(RIOTBOARD) clean
diff --git a/cpu/lpc214x/Makefile b/cpu/lpc214x/Makefile
index fd9c47f8e65f65a8b9cf407521a1bbde4eae8ef4..a281d08a000586b79300fef3d5b18b499f356d21 100644
--- a/cpu/lpc214x/Makefile
+++ b/cpu/lpc214x/Makefile
@@ -19,8 +19,8 @@ endif
 
 # compile and generate dependency info
 ../bin/%.o: %.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o ../bin/$*.o
-	$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > ../bin/$*.d
+	$(CC) $(CFLAGS) $(INCLUDES) $(CPUINCLUDE) -c $*.c -o ../bin/$*.o
+	$(CC) $(CFLAGS) $(INCLUDES) $(CPUINCLUDE) -MM $*.c > ../bin/$*.d
 	@printf "../bin/"|cat - ../bin/$*.d > /tmp/fw_out && mv /tmp/fw_out ../bin/$*.d
 
 # remove compilation products
diff --git a/sys/shell/Makefile b/sys/shell/Makefile
index 3b88abc0d665efda120e0b0a3eb62e6939a8748c..9d889dbf402c84896fd83acc5280c1db69198fef 100644
--- a/sys/shell/Makefile
+++ b/sys/shell/Makefile
@@ -13,8 +13,8 @@ $(BINDIR)$(MODULE).a: $(OBJ)
 
 # compile and generate dependency info
 $(BINDIR)%.o: %.c
-	$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
-	$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
+	$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
 	@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
 
 # remove compilation products
diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index c14ee9bcef14b8542ded7d595c588304dd92316a..8fc4103d227ef4d2391bbc00dfb77f05d8ad5204 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -38,8 +38,8 @@ $(BINDIR)$(MODULE).a: $(OBJ)
 
 # compile and generate dependency info
 $(BINDIR)%.o: %.c
-	$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
-	$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
+	$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d
 	@printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
 
 # remove compilation products