diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index fc1e5860c3..6c588ffd51 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -36,5 +36,5 @@ endif
 export FFLAGS += "prog $(HEXFILE)"
 
 export USEMODULE += msp430_common
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
+export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
 export OFLAGS = -O ihex
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index 0d92a859d0..ef33be275f 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -28,4 +28,4 @@ export HEXFILE = $(BINDIR)/$(PROJECT).hex
 export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
 export OFLAGS = -O binary --gap-fill=0xff
 
-export INCLUDES += -I $(RIOTCPU)/$(CPU)/include/
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index 61cec25f25..219cced126 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -22,5 +22,5 @@ endif
 export HEXFILE = $(BINDIR)$(PROJECT).hex
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
 
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
+export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
 export OFLAGS = -O ihex
diff --git a/dist/Makefile b/dist/Makefile
index 7d04576e46..1ff2c2e500 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -46,7 +46,7 @@ export QUIET ?= 1
 #USEMODULE += cc110x
 #USEMODULE += fat
 
-#export INCLUDES += -I application_include
+#export INCLUDES += -Iapplication_include
 
 # Specify custom dependencies for your application here ...
 # export PROJDEPS = proj_data.h
diff --git a/pkg/libcoap/Makefile.include b/pkg/libcoap/Makefile.include
index 9e4881dfbe..a6fb43a148 100644
--- a/pkg/libcoap/Makefile.include
+++ b/pkg/libcoap/Makefile.include
@@ -1,4 +1,4 @@
-INCLUDES += -I $(RIOTBASE)/pkg/libcoap/libcoap \
-			-I $(RIOTBASE)/sys/posix/include \
-			-I $(RIOTBASE)/sys/posix/pnet/include \
-			-I $(RIOTBASE)/sys/net/include
+INCLUDES += -I$(RIOTBASE)/pkg/libcoap/libcoap \
+			-I$(RIOTBASE)/sys/posix/include \
+			-I$(RIOTBASE)/sys/posix/pnet/include \
+			-I$(RIOTBASE)/sys/net/include