diff --git a/Makefile.include b/Makefile.include
index aac107abd..ea5dfcb50 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -37,7 +37,7 @@ savedefines:
 
 OBJECTDIR = obj_$(TARGET)
 ifeq (${wildcard $(OBJECTDIR)},)
-DUMMY := ${shell mkdir $(OBJECTDIR)}
+  DUMMY := ${shell mkdir $(OBJECTDIR)}
 endif
 
 LOWERCASE = abcdefghijklmnopqrstuvwxyz
@@ -53,24 +53,24 @@ LIBS    = memb.c timer.c list.c etimer.c energest.c rtimer.c stimer.c \
           print-stats.c ifft.c crc16.c random.c
 
 ifdef UIP_CONF_IPV6
-CFLAGS+=-DUIP_CONF_IPV6=1
-UIP     = uip6.c tcpip.c psock.c uip-udp-packet.c uip-split.c \
+CFLAGS += -DUIP_CONF_IPV6
+  UIP   = uip6.c tcpip.c psock.c uip-udp-packet.c uip-split.c \
           uip-over-mesh.c resolv.c hc.c tcpdump.c uiplib.c
-NET     = $(UIP) uip-icmp6.c uip-nd6.c uip-nd6-io.c uip-netif.c sicslowpan.c
+  NET   = $(UIP) uip-icmp6.c uip-nd6.c uip-nd6-io.c uip-netif.c sicslowpan.c
 else # UIP_CONF_IPV6
-UIP     = uip.c uiplib.c resolv.c tcpip.c psock.c hc.c uip-split.c uip-fw.c \
+  UIP   = uip.c uiplib.c resolv.c tcpip.c psock.c hc.c uip-split.c uip-fw.c \
           uip-fw-drv.c uip_arp.c tcpdump.c uip-neighbor.c uip-udp-packet.c \
           uip-over-mesh.c #rawpacket-udp.c
-NET     = $(UIP) uaodv.c uaodv-rt.c
+  NET   = $(UIP) uaodv.c uaodv-rt.c
 endif # UIP_CONF_IPV6
 
 CTK     = ctk.c
 CTKVNC  = $(CTK) ctk-vncserver.c libconio.c vnc-server.c vnc-out.c ctk-vncfont.c
 
 ifndef CONTIKI_NO_NET
-CONTIKIFILES = $(SYSTEM) $(LIBS) $(NET) $(THREADS) $(DHCP)
+  CONTIKIFILES = $(SYSTEM) $(LIBS) $(NET) $(THREADS) $(DHCP)
 else
-CONTIKIFILES = $(SYSTEM) $(LIBS) $(THREADS) sicslowpan.c fakeuip.c
+  CONTIKIFILES = $(SYSTEM) $(LIBS) $(THREADS) sicslowpan.c fakeuip.c
 endif
 
 CONTIKI_SOURCEFILES += $(CONTIKIFILES)