diff --git a/boards/avsextrem/drivers/avsextrem-cc1100.c b/boards/avsextrem/drivers/avsextrem-cc1100.c
index ee83ebbd90..e898440755 100644
--- a/boards/avsextrem/drivers/avsextrem-cc1100.c
+++ b/boards/avsextrem/drivers/avsextrem-cc1100.c
@@ -48,8 +48,6 @@
 //#define DEBUG
 #ifdef DEBUG
 
-#include "stdio.h"
-
 static unsigned long time_value;
 
 static void set_time(void)
diff --git a/boards/avsextrem/drivers/avsextrem-smb380.c b/boards/avsextrem/drivers/avsextrem-smb380.c
index ea88e9495a..fb0343c52b 100644
--- a/boards/avsextrem/drivers/avsextrem-smb380.c
+++ b/boards/avsextrem/drivers/avsextrem-smb380.c
@@ -23,25 +23,23 @@
  */
 
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc.h>
+
 #include "lpc23xx.h"   /* LPC23XX/24xx Peripheral Registers */
 #include "cpu.h"
 #include "lpm.h"
-//#include "PatrecInit.h"
 #include "VIC.h"
 #include "kernel.h"
 #include "ssp0-board.h"
 #include "smb380-board.h"
 #include "hwtimer.h"
-#include <stdio.h>
-#include <malloc.h>
-// for fk_thread:
 #include "sched.h"
 #include "msg.h"
 #include "irq.h"
 
-//#include "hal-board.h"
 #include "gpioint.h"
-#include "stdlib.h"
 #include "math.h"
 #include "lpc2387.h"
 
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
index cd9d86cb45..e21b5e15ad 100644
--- a/boards/avsextrem/include/board.h
+++ b/boards/avsextrem/include/board.h
@@ -24,7 +24,7 @@
 
 #ifndef BOARDCONF_H_
 #define BOARDCONF_H_
-#include <bitarithm.h>
+#include "bitarithm.h"
 #include "msba2_common.h"
 
 #define FEUERWARE_CONF_BOARD_NAME	      "FU Berlin AVSEXTREM BOARD"
diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h
index 218f724f49..5c7241c4e3 100644
--- a/boards/avsextrem/include/smb380-board.h
+++ b/boards/avsextrem/include/smb380-board.h
@@ -24,7 +24,7 @@
 #ifndef SMB380_H_
 #define SMB380_H_
 #include <stdint.h>
-#include <bitarithm.h>
+#include "bitarithm.h"
 
 #define SMB380_DEBUG_MESSAGE "SMB380 Driver Error: "
 
diff --git a/boards/chronos/board_init.c b/boards/chronos/board_init.c
index db2326701f..c762e2e9da 100644
--- a/boards/chronos/board_init.c
+++ b/boards/chronos/board_init.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <board.h>
-#include <cpu.h>
-#include <irq.h>
+#include "board.h"
+#include "cpu.h"
+#include "irq.h"
 
 void cc430_cpu_init(void)
 {
diff --git a/boards/chronos/drivers/battery.c b/boards/chronos/drivers/battery.c
index 13e50dc102..30f788d9fb 100644
--- a/boards/chronos/drivers/battery.c
+++ b/boards/chronos/drivers/battery.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <cc430f6137.h>
-#include <cc430-adc.h>
+#include "cc430-adc.h"
 
 uint32_t battery_get_voltage(void)
 {
diff --git a/boards/chronos/drivers/buzzer.c b/boards/chronos/drivers/buzzer.c
index 3d4d15061d..edde080f4c 100644
--- a/boards/chronos/drivers/buzzer.c
+++ b/boards/chronos/drivers/buzzer.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include <buzzer.h>
-#include <hwtimer.h>
 #include <cc430f6137.h>
+#include "buzzer.h"
+#include "hwtimer.h"
 
 void buzzer_beep(uint8_t pitch, uint16_t duration)
 {
diff --git a/boards/chronos/drivers/cc430-cc110x.c b/boards/chronos/drivers/cc430-cc110x.c
index d606d5bfd5..d61c19efac 100644
--- a/boards/chronos/drivers/cc430-cc110x.c
+++ b/boards/chronos/drivers/cc430-cc110x.c
@@ -1,13 +1,11 @@
 #include <stdint.h>
-
-#include <cpu.h>
-#include <irq.h>
-#include <cc110x_ng.h>
-#include <cc110x-arch.h>
-
-//#include <cc430_.h>
 #include <cc430f6137.h>
-//#include <msp430/rf1a.h>
+
+#include "cpu.h"
+#include "irq.h"
+#include "cc110x_ng.h"
+#include "cc110x-arch.h"
+
 
 #define CC1100_GDO0     (RF1AIN & BIT0)
 #define CC1100_GDO1     (RF1AIN & BIT1)
diff --git a/boards/chronos/drivers/display.c b/boards/chronos/drivers/display.c
index b93c820e1e..87705d1206 100644
--- a/boards/chronos/drivers/display.c
+++ b/boards/chronos/drivers/display.c
@@ -44,7 +44,7 @@
 
 /* driver */
 #include <cc430f6137.h>
-#include <display.h>
+#include "display.h"
 
 
 /**************************************************************************************************
diff --git a/boards/chronos/drivers/display1.c b/boards/chronos/drivers/display1.c
index 461c0c0097..1c4ee35b21 100644
--- a/boards/chronos/drivers/display1.c
+++ b/boards/chronos/drivers/display1.c
@@ -40,7 +40,7 @@
 /* Include section */
 #include <stdint.h>
 #include <cc430f6137.h>
-#include <display.h>
+#include "display.h"
 
 /* ************************************************************************************************* */
 /* Global Variable section */
diff --git a/boards/chronos/drivers/display_putchar.c b/boards/chronos/drivers/display_putchar.c
index 95498ea8e0..db48d72284 100644
--- a/boards/chronos/drivers/display_putchar.c
+++ b/boards/chronos/drivers/display_putchar.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <display.h>
 #include <string.h>
+#include "display.h"
 
 extern int toupper(int c);
 extern void (*_putchar)(int c);
diff --git a/boards/msb-430-common/board_config.c b/boards/msb-430-common/board_config.c
index 14b8d00e31..ca475075d4 100644
--- a/boards/msb-430-common/board_config.c
+++ b/boards/msb-430-common/board_config.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
 #include <string.h>
-#include <board-conf.h>
-#include <config.h>
-#include <flashrom.h>
+#include "board-conf.h"
+#include "config.h"
+#include "flashrom.h"
 
 void config_load(void)
 {
diff --git a/boards/msb-430-common/drivers/include/sht11-board.h b/boards/msb-430-common/drivers/include/sht11-board.h
index 641b246c8e..ebf02fdc8e 100644
--- a/boards/msb-430-common/drivers/include/sht11-board.h
+++ b/boards/msb-430-common/drivers/include/sht11-board.h
@@ -39,7 +39,7 @@ and the mailinglist (subscription via web site)
  * @author      Freie Universität Berlin, Computer Systems & Telematics, RIOT
  *
  */
-#include "msp430x16x.h"
+#include <msp430x16x.h>
 #include "bitarithm.h"
 
 /* SCK  = P3B5
diff --git a/boards/msb-430-common/uart1.c b/boards/msb-430-common/uart1.c
index 025d09dc6e..28808332af 100644
--- a/boards/msb-430-common/uart1.c
+++ b/boards/msb-430-common/uart1.c
@@ -1,12 +1,12 @@
+#include <stdio.h>
 #include "board.h"
+#include "kernel.h"
+
+#include "board_uart0.h"
 
 #define UART1_TX                        TXBUF1
 #define UART1_WAIT_TXDONE()       while( (UTCTL1 & TXEPT) == 0 ) { _NOP(); }
 
-#include <stdio.h>
-#include <kernel.h>
-
-#include <board_uart0.h>
 
 int putchar(int c)
 {
diff --git a/boards/msb-430h/driver_cc110x.c b/boards/msb-430h/driver_cc110x.c
index 857bfcf1d4..798bc13da2 100644
--- a/boards/msb-430h/driver_cc110x.c
+++ b/boards/msb-430h/driver_cc110x.c
@@ -19,12 +19,12 @@ Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 
-#include <board.h>
-#include <cpu.h>
-#include <irq.h>
+#include "board.h"
+#include "cpu.h"
+#include "irq.h"
 
-#include <cc110x_ng.h>
-#include <cc110x-arch.h>
+#include "cc110x_ng.h"
+#include "cc110x-arch.h"
 
 #define CC1100_GDO0         (P2IN & 0x02)   // read serial I/O (GDO0)
 #define CC1100_GDO1         (P3IN & 0x04)   // read serial I/O (GDO1)
diff --git a/boards/msba2-common/board_common_init.c b/boards/msba2-common/board_common_init.c
index fe2e34c968..8806112fa9 100644
--- a/boards/msba2-common/board_common_init.c
+++ b/boards/msba2-common/board_common_init.c
@@ -40,13 +40,13 @@ and the mailinglist (subscription via web site)
  * @author 		Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  * @note        $Id$
  */
-#include <board.h>
-#include <lpc23xx.h>
-#include <VIC.h>
-#include <cpu.h>
-#include <config.h>
 #include <string.h>
-#include <flashrom.h>
+#include "board.h"
+#include "lpc23xx.h"
+#include "VIC.h"
+#include "cpu.h"
+#include "config.h"
+#include "flashrom.h"
 
 #define PCRTC         BIT9
 #define CL_CPU_DIV    4
diff --git a/boards/msba2-common/board_config.c b/boards/msba2-common/board_config.c
index 496a077961..4be92c886b 100644
--- a/boards/msba2-common/board_config.c
+++ b/boards/msba2-common/board_config.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <string.h>
-#include <config.h>
-#include <flashrom.h>
+#include "config.h"
+#include "flashrom.h"
 
 void config_load(void) {
     extern char configmem[];
diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h
index c35fb00788..966efb8958 100644
--- a/boards/msba2-common/drivers/include/sht11-board.h
+++ b/boards/msba2-common/drivers/include/sht11-board.h
@@ -42,8 +42,8 @@ and the mailinglist (subscription via web site)
  * @note		$Id$
  */
 
-#include <lpc23xx.h>
-#include <board.h>
+#include "lpc23xx.h"
+#include "board.h"
 
 #define SHT11_SCK_LOW	FIO1CLR = BIT25;	// serial clock line low
 #define SHT11_SCK_HIGH	FIO1SET = BIT25;    // serial clock line high
diff --git a/boards/msba2-common/drivers/msba2-cc110x.c b/boards/msba2-common/drivers/msba2-cc110x.c
index b5bde7cbfc..e41e751576 100644
--- a/boards/msba2-common/drivers/msba2-cc110x.c
+++ b/boards/msba2-common/drivers/msba2-cc110x.c
@@ -40,13 +40,13 @@ and the mailinglist (subscription via web site)
 #include <stdio.h>
 #include <stddef.h>
 // core
-#include <cpu.h>
-#include <irq.h>
+#include "cpu.h"
+#include "irq.h"
 // sys
-#include <cc110x_ng.h>
-#include <cc110x-arch.h>
-#include <cc110x_spi.h>
-#include <gpioint.h>
+#include "cc110x_ng.h"
+#include "cc110x-arch.h"
+#include "cc110x_spi.h"
+#include "gpioint.h"
 
 #define CC1100_GDO0         (FIO0PIN & BIT27)	// read serial I/O (GDO0)
 #define CC1100_GDO1         (FIO1PIN & BIT23)	// read serial I/O (GDO1)
@@ -63,8 +63,6 @@ and the mailinglist (subscription via web site)
 //#define DEBUG
 #ifdef DEBUG
 
-#include "stdio.h"
-
 static unsigned long time_value;
 
 static void set_time(void)
diff --git a/boards/msba2-common/drivers/msba2-uart0.c b/boards/msba2-common/drivers/msba2-uart0.c
index 5db2ca0da9..44c6c7741c 100644
--- a/boards/msba2-common/drivers/msba2-uart0.c
+++ b/boards/msba2-common/drivers/msba2-uart0.c
@@ -35,9 +35,9 @@ and the mailinglist (subscription via web site)
 #include <stdio.h>
 #include "lpc23xx.h"
 #include "VIC.h"
-#include <kernel.h>
+#include "kernel.h"
 
-#include <board_uart0.h>
+#include "board_uart0.h"
 
 /**
  * @file
diff --git a/boards/msba2/board_init.c b/boards/msba2/board_init.c
index 427d563e1b..ba2b64ddff 100644
--- a/boards/msba2/board_init.c
+++ b/boards/msba2/board_init.c
@@ -24,9 +24,8 @@
  * @note        $Id$
  */
 
-
-#include <board.h>
-#include <cpu.h>
+#include "board.h"
+#include "cpu.h"
 
 void loop_delay(void)
 {
diff --git a/boards/native/board_config.c b/boards/native/board_config.c
index 9dc376cdee..4247fcb689 100644
--- a/boards/native/board_config.c
+++ b/boards/native/board_config.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <config.h>
+#include "config.h"
 
 /**
  * XXX: loading not implemented
diff --git a/boards/pttu/board_init.c b/boards/pttu/board_init.c
index 18ba75d850..0bbe6e3de7 100644
--- a/boards/pttu/board_init.c
+++ b/boards/pttu/board_init.c
@@ -38,9 +38,9 @@ and the mailinglist (subscription via web site)
  * @author		Kaspar Schleiser
  *
  */
-#include <board.h>
-#include <VIC.h>
-#include <cpu.h>
+#include "board.h"
+#include "VIC.h"
+#include "cpu.h"
 
 #define PCRTC         BIT9
 #define CL_CPU_DIV    4
diff --git a/boards/pttu/include/board.h b/boards/pttu/include/board.h
index 2ee3308f99..aed1ae15ad 100644
--- a/boards/pttu/include/board.h
+++ b/boards/pttu/include/board.h
@@ -40,8 +40,8 @@ and the mailinglist (subscription via web site)
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#include <lpc2387.h>
-#include <cpu-conf.h>
+#include "lpc2387.h"
+#include "cpu-conf.h"
 
 #define VICIntEnClear VICIntEnClr
 
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index d0cf653731..1f16d2e7b7 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -22,5 +22,5 @@ endif
 export HEXFILE = bin/$(PROJECT).hex
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
 
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include/
+export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I $(RIOTBOARD)/$(BOARD)/include/
 export OFLAGS = -O ihex
diff --git a/boards/telosb/driver_cc2420.c b/boards/telosb/driver_cc2420.c
index 4ee7ce9d1d..4f3ee9a1c5 100644
--- a/boards/telosb/driver_cc2420.c
+++ b/boards/telosb/driver_cc2420.c
@@ -9,12 +9,12 @@
 
 #include <stdio.h>
 
-#include <board.h>
-#include <cpu.h>
-#include <irq.h>
-#include <hwtimer.h>
+#include "board.h"
+#include "cpu.h"
+#include "irq.h"
+#include "hwtimer.h"
 
-#include <cc2420.h>
+#include "cc2420.h"
 
 #define ENABLE_DEBUG    (1)
 #include "debug.h"
diff --git a/boards/wsn430-common/board_config.c b/boards/wsn430-common/board_config.c
index 4e9bc0b69c..a48589d408 100644
--- a/boards/wsn430-common/board_config.c
+++ b/boards/wsn430-common/board_config.c
@@ -7,9 +7,9 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <board-conf.h>
-#include <config.h>
-#include <flashrom.h>
+#include "board-conf.h"
+#include "config.h"
+#include "flashrom.h"
 
 void config_load(void) {
    if (*((uint16_t*) INFOMEM) ==  CONFIG_KEY) {
diff --git a/boards/wsn430-common/uart0.c b/boards/wsn430-common/uart0.c
index f743335ec4..ec4811ae93 100644
--- a/boards/wsn430-common/uart0.c
+++ b/boards/wsn430-common/uart0.c
@@ -6,15 +6,15 @@
    * Version 3.  See the file LICENSE for more details.
    */
 
+#include <stdio.h>
 #include "board.h"
 
 #define   UART0_TX                        U0TXBUF
 #define   UART0_WAIT_TXDONE()       while( (U0TCTL & TXEPT) == 0 ) { _NOP(); }
 
-#include <stdio.h>
-#include <kernel.h>
+#include "kernel.h"
 
-#include <board_uart0.h>
+#include "board_uart0.h"
 
 int putchar(int c)
 {
diff --git a/boards/wsn430-v1_3b/driver_cc110x.c b/boards/wsn430-v1_3b/driver_cc110x.c
index 89669e64f7..a9b9cde390 100644
--- a/boards/wsn430-v1_3b/driver_cc110x.c
+++ b/boards/wsn430-v1_3b/driver_cc110x.c
@@ -9,12 +9,12 @@
 
 #include <stdio.h>
 
-#include <board.h>
-#include <cpu.h>
-#include <irq.h>
+#include "board.h"
+#include "cpu.h"
+#include "irq.h"
 
-#include <cc110x_ng.h>
-#include <cc110x-arch.h>
+#include "cc110x_ng.h"
+#include "cc110x-arch.h"
 
 #define CC1100_GDO0         (P1IN & 0x08)   // read serial I/O (GDO0)
 #define CC1100_GDO1         (P5IN & 0x04)   // read serial I/O (GDO1)
diff --git a/boards/wsn430-v1_4/driver_cc2420.c b/boards/wsn430-v1_4/driver_cc2420.c
index c653c9ba3a..2d7249b85d 100644
--- a/boards/wsn430-v1_4/driver_cc2420.c
+++ b/boards/wsn430-v1_4/driver_cc2420.c
@@ -9,12 +9,12 @@
 
 #include <stdio.h>
 
-#include <board.h>
-#include <cpu.h>
-#include <irq.h>
-#include <hwtimer.h>
+#include "board.h"
+#include "cpu.h"
+#include "irq.h"
+#include "hwtimer.h"
 
-#include <cc2420.h>
+#include "cc2420.h"
 
 #define CC2420_RESETn_PIN   0x80
 #define CC2420_VREGEN_PIN   0x01
diff --git a/core/cib.c b/core/cib.c
index e58bfda06a..11c115d659 100644
--- a/core/cib.c
+++ b/core/cib.c
@@ -16,7 +16,7 @@
  * @}
  */
 
-#include <cib.h>
+#include "cib.h"
 
 void cib_init(cib_t *cib, unsigned int size)
 {
diff --git a/core/include/hwtimer.h b/core/include/hwtimer.h
index c916dc63cf..8b588e5525 100644
--- a/core/include/hwtimer.h
+++ b/core/include/hwtimer.h
@@ -35,7 +35,7 @@
 #define __HWTIMER_H
 
 #include <stdint.h>
-#include <hwtimer_cpu.h>
+#include "hwtimer_cpu.h"
 
 /**
  * @def    HWTIMER_SPEED
diff --git a/core/include/sched.h b/core/include/sched.h
index 8d97bf16cb..66f086d855 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -23,7 +23,7 @@
 #define _SCHEDULER_H
 
 #include <stddef.h>
-#include <bitarithm.h>
+#include "bitarithm.h"
 #include "tcb.h"
 
 #define MAXTHREADS 32
diff --git a/core/include/tcb.h b/core/include/tcb.h
index 7655b56d7b..6b186f5159 100644
--- a/core/include/tcb.h
+++ b/core/include/tcb.h
@@ -22,10 +22,10 @@
 #define TCB_H_
 
 #include <stdint.h>
-#include <queue.h>
-#include <clist.h>
-#include <cib.h>
-#include <msg.h>
+#include "queue.h"
+#include "clist.h"
+#include "cib.h"
+#include "msg.h"
 
 /* uneven means has to be on runqueue */
 #define STATUS_NOT_FOUND        (0x0000)
diff --git a/core/include/thread.h b/core/include/thread.h
index 8ab8fba171..39c973703a 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -23,8 +23,8 @@
 #define __THREAD_H
 
 
-#include <kernel.h>
-#include <tcb.h>
+#include "kernel.h"
+#include "tcb.h"
 
 /** Minimum stack size */
 #ifndef MINIMUM_STACK_SIZE
diff --git a/core/kernel_init.c b/core/kernel_init.c
index 3ee1381ebc..b33b500f56 100644
--- a/core/kernel_init.c
+++ b/core/kernel_init.c
@@ -22,14 +22,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <tcb.h>
-#include <kernel.h>
-#include <kernel_internal.h>
-#include <sched.h>
-#include <flags.h>
-#include <cpu.h>
-#include <lpm.h>
-#include <thread.h>
+#include "tcb.h"
+#include "kernel.h"
+#include "kernel_internal.h"
+#include "sched.h"
+#include "flags.h"
+#include "cpu.h"
+#include "lpm.h"
+#include "thread.h"
 
 #ifdef MODULE_AUTO_INIT
 #include <auto_init.h>
diff --git a/core/lifo.c b/core/lifo.c
index 33b7e71bf0..cb4d5f7f09 100644
--- a/core/lifo.c
+++ b/core/lifo.c
@@ -19,7 +19,7 @@
  * @}
  */
 
-#include <lifo.h>
+#include "lifo.h"
 
 int lifo_empty(int *array)
 {
diff --git a/core/msg.c b/core/msg.c
index f73bdec5f6..9938be85d8 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -20,15 +20,15 @@
  * @}
  */
 
+#include <stddef.h>
+#include <inttypes.h>
 #include "kernel.h"
 #include "sched.h"
 #include "msg.h"
 #include "queue.h"
 #include "tcb.h"
-#include <stddef.h>
-#include <irq.h>
-#include <cib.h>
-#include <inttypes.h>
+#include "irq.h"
+#include "cib.h"
 
 #include "flags.h"
 
diff --git a/core/oneway_malloc.c b/core/oneway_malloc.c
index e8bb8092c6..1b09c8b629 100644
--- a/core/oneway_malloc.c
+++ b/core/oneway_malloc.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #define ENABLE_DEBUG    (0)
-#include <debug.h>
+#include "debug.h"
 
 extern void *sbrk(int incr);
 
diff --git a/core/sched.c b/core/sched.c
index 27cf60163f..71cd706f08 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -22,11 +22,11 @@
  */
 
 #include <stdint.h>
-#include <sched.h>
-#include <kernel.h>
-#include <kernel_internal.h>
-#include <clist.h>
-#include <bitarithm.h>
+#include "sched.h"
+#include "kernel.h"
+#include "kernel_internal.h"
+#include "clist.h"
+#include "bitarithm.h"
 #include "thread.h"
 
 #if SCHEDSTATISTICS
@@ -34,7 +34,7 @@
 #endif
 
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 volatile int num_tasks = 0;
 
diff --git a/cpu/arm_common/bootloader.c b/cpu/arm_common/bootloader.c
index 13101daa26..0234cbbbbb 100644
--- a/cpu/arm_common/bootloader.c
+++ b/cpu/arm_common/bootloader.c
@@ -32,8 +32,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <kernel.h>
-#include <thread.h>
+#include "kernel.h"
+#include "thread.h"
 
 void FIQ_Routine(void)   __attribute__((interrupt("FIQ")));
 //void SWI_Routine (void)   __attribute__((interrupt("SWI")));
diff --git a/cpu/cc430/cc110x_cc430.c b/cpu/cc430/cc110x_cc430.c
index 4e1effe16a..d344fb51ee 100644
--- a/cpu/cc430/cc110x_cc430.c
+++ b/cpu/cc430/cc110x_cc430.c
@@ -1,9 +1,9 @@
-#include <irq.h>
-#include <cc110x-defaultSettings.h>
-#include <cc110x-reg.h>
 #include <stdint.h>
-#include <board.h>
-#include <hwtimer.h>
+#include "irq.h"
+#include "cc110x-defaultSettings.h"
+#include "cc110x-reg.h"
+#include "board.h"
+#include "hwtimer.h"
 
 /**************************************************************************************************
  * @fn          Strobe
diff --git a/cpu/cc430/cc430-adc.c b/cpu/cc430/cc430-adc.c
index 0fda2d812a..cdd2ed2f4d 100644
--- a/cpu/cc430/cc430-adc.c
+++ b/cpu/cc430/cc430-adc.c
@@ -37,9 +37,9 @@
 
 
 #include <legacymsp430.h>
-#include <cpu.h>
-#include <cc430-adc.h>
-#include <hwtimer.h>
+#include "cpu.h"
+#include "cc430-adc.h"
+#include "hwtimer.h"
 
 uint16_t adc12_result;
 uint8_t  adc12_data_ready;
diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c
index d9266b9868..35d866401d 100644
--- a/cpu/cc430/cc430-gpioint.c
+++ b/cpu/cc430/cc430-gpioint.c
@@ -20,11 +20,11 @@ See the file LICENSE in the top level directory for more details.
 
 #include <stdlib.h>
 #include <legacymsp430.h>
-#include <gpioint.h>
-#include <bitarithm.h>
-#include <cpu.h>
-#include <irq.h>
-#include <hwtimer.h>
+#include "gpioint.h"
+#include "bitarithm.h"
+#include "cpu.h"
+#include "irq.h"
+#include "hwtimer.h"
 
 /** min and max portnumber to generate interrupts */
 #define PORTINT_MIN     (1)
diff --git a/cpu/cc430/cc430-rtc.c b/cpu/cc430/cc430-rtc.c
index a62fa78ff1..8c9519c6d6 100644
--- a/cpu/cc430/cc430-rtc.c
+++ b/cpu/cc430/cc430-rtc.c
@@ -20,9 +20,9 @@ See the file LICENSE in the top level directory for more details.
 
 #include <string.h>
 #include <legacymsp430.h>
-#include <irq.h>
-#include <cpu.h>
-#include <cc430-rtc.h>
+#include "irq.h"
+#include "cpu.h"
+#include "cc430-rtc.h"
 
 //static volatile time_t epoch;
 static struct tm time_to_set;
diff --git a/cpu/cc430/hwtimer_cc430.c b/cpu/cc430/hwtimer_cc430.c
index 8a42180c21..6c4fc58369 100644
--- a/cpu/cc430/hwtimer_cc430.c
+++ b/cpu/cc430/hwtimer_cc430.c
@@ -1,11 +1,11 @@
 #include <legacymsp430.h>
-#include <board.h>
-#include <hwtimer.h>
-#include <hwtimer_arch.h>
-#include <cpu.h>
+#include "board.h"
+#include "hwtimer.h"
+#include "hwtimer_arch.h"
+#include "cpu.h"
 
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 static uint32_t ticks = 0;
 
diff --git a/cpu/cc430/include/cc430-rtc.h b/cpu/cc430/include/cc430-rtc.h
index ae9c6e9c8d..ea284850a0 100644
--- a/cpu/cc430/include/cc430-rtc.h
+++ b/cpu/cc430/include/cc430-rtc.h
@@ -12,8 +12,8 @@ See the file LICENSE in the top level directory for more details.
 
 #ifndef CC430_RTC_H
 #define CC430_RTC_H
-#include <rtc.h>
-#include <time.h>
+#include "rtc.h"
+#include "time.h"
 
 /**
  * @defgroup    cc430_rtc   CC430 Real Time Clock
diff --git a/cpu/lpc2387/gpioint/lpc2387-gpioint.c b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
index 836f50e708..76513cc943 100644
--- a/cpu/lpc2387/gpioint/lpc2387-gpioint.c
+++ b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
@@ -31,7 +31,7 @@ See the file LICENSE in the top level directory for more details.
 #include "lpc2387.h"
 #include "gpioint.h"
 #include "cpu.h"
-#include <irq.h>
+#include "irq.h"
 
 struct irq_callback_t {
     fp_irqcb    callback;
diff --git a/cpu/lpc2387/include/lpc2387-rtc.h b/cpu/lpc2387/include/lpc2387-rtc.h
index 6629cfe0b5..384fbf11af 100644
--- a/cpu/lpc2387/include/lpc2387-rtc.h
+++ b/cpu/lpc2387/include/lpc2387-rtc.h
@@ -34,9 +34,9 @@ See the file LICENSE in the top level directory for more details.
  * @note    	$Id: lpc2387-rtc.h 1998 2010-03-16 13:05:41Z baar $
  */
 
-#include <rtc.h>
 #include <time.h>
 #include <sys/time.h>
+#include "rtc.h"
 #include "lpc2387.h"
 
 /* ------------------------------------------------------------------------- */
diff --git a/cpu/lpc2387/include/lpc2387.h b/cpu/lpc2387/include/lpc2387.h
index 27bcb69b4b..43ab5e47d0 100644
--- a/cpu/lpc2387/include/lpc2387.h
+++ b/cpu/lpc2387/include/lpc2387.h
@@ -9,8 +9,8 @@
 #ifndef __LPC2387_H
 #define __LPC2387_H
 
-#include <lpc23xx.h>
-#include <bitarithm.h>
+#include "lpc23xx.h"
+#include "bitarithm.h"
 
 #define F_CCO					288000000
 #define CL_CPU_DIV				4									///< CPU clock divider
diff --git a/cpu/lpc2387/lpc2387-lpm.c b/cpu/lpc2387/lpc2387-lpm.c
index a0fc2217bb..dd8e74ba04 100644
--- a/cpu/lpc2387/lpc2387-lpm.c
+++ b/cpu/lpc2387/lpc2387-lpm.c
@@ -42,7 +42,7 @@ extern void init_clks1(void);
 extern void init_clks2(void);
 
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 void lpm_init(void)
 {
diff --git a/cpu/lpc2387/lpc23xx-iap.c b/cpu/lpc2387/lpc23xx-iap.c
index a16c50f73f..c2343d6aef 100644
--- a/cpu/lpc2387/lpc23xx-iap.c
+++ b/cpu/lpc2387/lpc23xx-iap.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
-#include <flashrom.h>
-#include <iap.h>
+#include "flashrom.h"
+#include "iap.h"
 
 uint8_t iap_get_sector(uint32_t addr)
 {
diff --git a/cpu/lpc2387/rtc/lpc2387-rtc.c b/cpu/lpc2387/rtc/lpc2387-rtc.c
index 91aa83b899..50ba9ccccd 100644
--- a/cpu/lpc2387/rtc/lpc2387-rtc.c
+++ b/cpu/lpc2387/rtc/lpc2387-rtc.c
@@ -36,7 +36,7 @@ See the file LICENSE in the top level directory for more details.
 #define PREFRAC_RTC	0x000061C0  /* Prescaler value, fraction portion, PCLK = 15Mhz */
 
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 /**
  * @brief	epoch time in hour granularity
diff --git a/cpu/lpc_common/iap.c b/cpu/lpc_common/iap.c
index 56dee0e693..df21d564f8 100644
--- a/cpu/lpc_common/iap.c
+++ b/cpu/lpc_common/iap.c
@@ -4,14 +4,14 @@
  *
  */
 
-#include <irq.h>
-#include <flashrom.h>
-#include <iap.h>
+#include "irq.h"
+#include "flashrom.h"
+#include "iap.h"
 /* TODO: replace by a lpc generic header */
-#include <lpc2387.h>
+#include "lpc2387.h"
 
 #define ENABLE_DEBUG    (0)
-#include <debug.h>
+#include "debug.h"
 
 /* pointer to reserved flash rom section for configuration data */
 __attribute((aligned(256))) char configmem[256] __attribute__((section(".configmem")));
diff --git a/cpu/mc1322x/include/gpio.h b/cpu/mc1322x/include/gpio.h
index 78cef03508..2e42d41ee9 100644
--- a/cpu/mc1322x/include/gpio.h
+++ b/cpu/mc1322x/include/gpio.h
@@ -12,7 +12,7 @@
 #define GPIO_H
 
 // TODO: why do we need to include this for macro expansion?
-#include "stdint.h"
+#include <stdint.h>
 
 /* Structure-based GPIO access
    Example usage:
diff --git a/cpu/msp430-common/atomic.c b/cpu/msp430-common/atomic.c
index 61aa1b7db2..1d094b9235 100644
--- a/cpu/msp430-common/atomic.c
+++ b/cpu/msp430-common/atomic.c
@@ -1,5 +1,5 @@
-#include <atomic.h>
-#include <cpu.h>
+#include "atomic.h"
+#include "cpu.h"
 
 unsigned int atomic_set_return(unsigned int *val, unsigned int set)
 {
diff --git a/cpu/msp430-common/hwtimer_cpu.c b/cpu/msp430-common/hwtimer_cpu.c
index bb75785d22..39f6b48096 100644
--- a/cpu/msp430-common/hwtimer_cpu.c
+++ b/cpu/msp430-common/hwtimer_cpu.c
@@ -12,12 +12,12 @@ See the file LICENSE in the top level directory for more details.
 
 #include <stdint.h>
 
-#include <cpu.h>
-#include <hwtimer.h>
-#include <hwtimer_arch.h>
+#include "cpu.h"
+#include "hwtimer.h"
+#include "hwtimer_arch.h"
 
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 
 void (*int_handler)(int);
diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h
index a8835f71b2..d95ae5c6c5 100644
--- a/cpu/msp430-common/include/cpu.h
+++ b/cpu/msp430-common/include/cpu.h
@@ -27,8 +27,8 @@ See the file LICENSE in the top level directory for more details.
 #include <stdio.h>
 #include <legacymsp430.h>
 
-#include "board.h"
 #include <msp430.h>
+#include "board.h"
 
 #include "sched.h"
 #include "msp430_types.h"
diff --git a/cpu/msp430-common/startup.c b/cpu/msp430-common/startup.c
index a8e13829a6..6251d2e21b 100644
--- a/cpu/msp430-common/startup.c
+++ b/cpu/msp430-common/startup.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kernel_internal.h>
+#include "kernel_internal.h"
 
 extern void board_init(void);
 
diff --git a/cpu/native/atomic_cpu.c b/cpu/native/atomic_cpu.c
index 99645cbdff..bb78dc596e 100644
--- a/cpu/native/atomic_cpu.c
+++ b/cpu/native/atomic_cpu.c
@@ -14,9 +14,9 @@
  * @}
  */
 
-#include <atomic.h>
-#include <irq.h>
-#include <debug.h>
+#include "atomic.h"
+#include "irq.h"
+#include "debug.h"
 
 unsigned int atomic_set_return(unsigned int *val, unsigned int set)
 {
diff --git a/drivers/at86rf231/at86rf231.c b/drivers/at86rf231/at86rf231.c
index 02b8c979dd..8812086672 100644
--- a/drivers/at86rf231/at86rf231.c
+++ b/drivers/at86rf231/at86rf231.c
@@ -6,10 +6,10 @@
   * Version 2.  See the file LICENSE for more details.
   */
 
-#include <at86rf231.h>
+#include "at86rf231.h"
 
-//#define ENABLE_DEBUG
-#include <debug.h>
+#define ENABLE_DEBUG (0)
+#include "debug.h"
 
 static uint16_t radio_pan;
 static uint8_t  radio_channel;
diff --git a/drivers/at86rf231/at86rf231_rx.c b/drivers/at86rf231/at86rf231_rx.c
index 05663fe969..d2ba93d128 100644
--- a/drivers/at86rf231/at86rf231_rx.c
+++ b/drivers/at86rf231/at86rf231_rx.c
@@ -1,12 +1,12 @@
 
-#include <at86rf231.h>
-#include <at86rf231_arch.h>
+#include "at86rf231.h"
+#include "at86rf231_arch.h"
 
-#include <transceiver.h>
-#include <msg.h>
+#include "transceiver.h"
+#include "msg.h"
 
-//#define ENABLE_DEBUG
-#include <debug.h>
+#define ENABLE_DEBUG (0)
+#include "debug.h"
 
 at86rf231_packet_t at86rf231_rx_buffer[AT86RF231_RX_BUF_SIZE];
 uint8_t buffer[AT86RF231_RX_BUF_SIZE][AT86RF231_MAX_PKT_LENGTH];
diff --git a/drivers/at86rf231/at86rf231_spi.c b/drivers/at86rf231/at86rf231_spi.c
index a459df7663..166bd9ee52 100644
--- a/drivers/at86rf231/at86rf231_spi.c
+++ b/drivers/at86rf231/at86rf231_spi.c
@@ -1,6 +1,6 @@
-#include <at86rf231_spi.h>
-#include <at86rf231_arch.h>
-#include <at86rf231_settings.h>
+#include "at86rf231_spi.h"
+#include "at86rf231_arch.h"
+#include "at86rf231_settings.h"
 
 void at86rf231_reg_write(uint8_t addr, uint8_t value)
 {
diff --git a/drivers/at86rf231/at86rf231_tx.c b/drivers/at86rf231/at86rf231_tx.c
index 1bb2231468..3907f83c93 100644
--- a/drivers/at86rf231/at86rf231_tx.c
+++ b/drivers/at86rf231/at86rf231_tx.c
@@ -1,5 +1,5 @@
-#include <at86rf231.h>
-#include <at86rf231_arch.h>
+#include "at86rf231.h"
+#include "at86rf231_arch.h"
 
 static void at86rf231_xmit(uint8_t *data, uint8_t length);
 static void at86rf231_gen_pkt(uint8_t *buf, at86rf231_packet_t *packet);
diff --git a/drivers/at86rf231/include/at86rf231.h b/drivers/at86rf231/include/at86rf231.h
index ad066b434d..19d6ee8ede 100644
--- a/drivers/at86rf231/include/at86rf231.h
+++ b/drivers/at86rf231/include/at86rf231.h
@@ -6,7 +6,7 @@
 
 #include "ieee802154_frame.h"
 
-#include <at86rf231_settings.h>
+#include "at86rf231_settings.h"
 
 #define AT86RF231_MAX_PKT_LENGTH 127
 #define AT86RF231_MAX_DATA_LENGTH 118
diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c
index 5e5bf5c085..4d9dd17d6e 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.c
+++ b/drivers/cc110x/cc1100-csmaca-mac.c
@@ -29,13 +29,13 @@ and Telematics group (http://cst.mi.fu-berlin.de).
 #include <stdlib.h>
 #include <string.h>
 
-#include <cc1100.h>
-#include <cc1100_phy.h>
-#include <cc1100-csmaca-mac.h>
+#include "cc1100.h"
+#include "cc1100_phy.h"
+#include "cc1100-csmaca-mac.h"
 #include "protocol-multiplex.h"
 
 #include "hwtimer.h"
-#include <vtimer.h>
+#include "vtimer.h"
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c
index 920a97aa27..5deec580d2 100644
--- a/drivers/cc110x/cc1100_phy.c
+++ b/drivers/cc110x/cc1100_phy.c
@@ -34,7 +34,7 @@ and Telematics group (http://cst.mi.fu-berlin.de).
 #include <string.h>
 
 #include "hwtimer.h"
-#include <vtimer.h>
+#include "vtimer.h"
 
 #include "cc1100.h"
 #include "cc1100_spi.h"
diff --git a/drivers/cc110x_ng/cc110x-rx.c b/drivers/cc110x_ng/cc110x-rx.c
index ed00c10f50..a71232a3a0 100644
--- a/drivers/cc110x_ng/cc110x-rx.c
+++ b/drivers/cc110x_ng/cc110x-rx.c
@@ -17,18 +17,18 @@
  * @}
  */
 
-#include <cc110x_ng.h>
-#include <cc110x-internal.h>
-#include <cc110x-config.h>
-#include <cc110x-defaultSettings.h>
-#include <cc110x_spi.h>
-#include <cc110x-reg.h>
+#include "cc110x_ng.h"
+#include "cc110x-internal.h"
+#include "cc110x-config.h"
+#include "cc110x-defaultSettings.h"
+#include "cc110x_spi.h"
+#include "cc110x-reg.h"
 
-#include <hwtimer.h>
-#include <msg.h>
-#include <transceiver.h>
+#include "hwtimer.h"
+#include "msg.h"
+#include "transceiver.h"
 
-#include <cpu-conf.h>
+#include "cpu-conf.h"
 #include "cpu.h"
 
 #ifdef DBG_IGNORE
diff --git a/drivers/cc110x_ng/cc110x-tx.c b/drivers/cc110x_ng/cc110x-tx.c
index cb11581711..f6f7abb642 100644
--- a/drivers/cc110x_ng/cc110x-tx.c
+++ b/drivers/cc110x_ng/cc110x-tx.c
@@ -18,16 +18,14 @@
  */
 #include <stdio.h>
 
-#include <cc110x_ng.h>
-#include <cc110x-defaultSettings.h>
-#include <cc110x-internal.h>
-#include <cc110x-arch.h>
-#include <cc110x_spi.h>
-#include <cc110x-reg.h>
+#include "cc110x_ng.h"
+#include "cc110x-defaultSettings.h"
+#include "cc110x-internal.h"
+#include "cc110x-arch.h"
+#include "cc110x_spi.h"
+#include "cc110x-reg.h"
 
-#include <irq.h>
-
-//#include <board.h>
+#include "irq.h"
 
 int8_t cc110x_send(cc110x_packet_t *packet)
 {
diff --git a/drivers/cc110x_ng/cc110x.c b/drivers/cc110x_ng/cc110x.c
index 717e1c9a59..47b867b952 100644
--- a/drivers/cc110x_ng/cc110x.c
+++ b/drivers/cc110x_ng/cc110x.c
@@ -16,20 +16,20 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @}
  */
-#include <cc110x_ng.h>
-#include <cc110x-arch.h>
-#include <cc110x-config.h>
-#include <cc110x-defaultSettings.h>
-#include <cc110x-internal.h>
-#include <cc110x_spi.h>
-#include <cc110x-reg.h>
+#include "cc110x_ng.h"
+#include "cc110x-arch.h"
+#include "cc110x-config.h"
+#include "cc110x-defaultSettings.h"
+#include "cc110x-internal.h"
+#include "cc110x_spi.h"
+#include "cc110x-reg.h"
 
-#include <hwtimer.h>
-#include <config.h>
+#include "hwtimer.h"
+#include "config.h"
 #include "cpu.h"
 
 #define ENABLE_DEBUG    (0)
-#include <debug.h>
+#include "debug.h"
 
 /* some externals */
 extern uint8_t pa_table[];              ///< PATABLE with available output powers
diff --git a/drivers/cc110x_ng/include/cc110x-config.h b/drivers/cc110x_ng/include/cc110x-config.h
index a054f1c3c6..6568cf117a 100644
--- a/drivers/cc110x_ng/include/cc110x-config.h
+++ b/drivers/cc110x_ng/include/cc110x-config.h
@@ -19,8 +19,8 @@
 #ifndef CC1100_CONFIG_H
 #define CC1100_CONFIG_H
 
-#include <timex.h>
 #include <stdint.h>
+#include "timex.h"
 
 /** CC1100 register configuration */
 typedef struct {
diff --git a/drivers/cc110x_ng/include/cc110x_ng.h b/drivers/cc110x_ng/include/cc110x_ng.h
index 32da92dde2..8003c314e5 100644
--- a/drivers/cc110x_ng/include/cc110x_ng.h
+++ b/drivers/cc110x_ng/include/cc110x_ng.h
@@ -22,10 +22,10 @@
 #ifndef CC1100_H
 #define CC1100_H
 
-#include <radio/radio.h>
-#include <radio/types.h>
 #include <stdint.h>
-#include <cc110x-config.h>
+#include "radio/radio.h"
+#include "radio/types.h"
+#include "cc110x-config.h"
 
 #define CC1100_MAX_DATA_LENGTH (58)
 
diff --git a/drivers/cc2420/cc2420.c b/drivers/cc2420/cc2420.c
index ccef0e4d6c..9b0a67bbd7 100644
--- a/drivers/cc2420/cc2420.c
+++ b/drivers/cc2420/cc2420.c
@@ -6,14 +6,14 @@
   * Version 2.  See the file LICENSE for more details.
   */
 
-#include <cc2420.h>
-#include <cc2420_spi.h>
-#include <cc2420_settings.h>
-#include <cc2420_arch.h>
-#include <hwtimer.h>
+#include "cc2420.h"
+#include "cc2420_spi.h"
+#include "cc2420_settings.h"
+#include "cc2420_arch.h"
+#include "hwtimer.h"
 
 #define ENABLE_DEBUG    (0)
-#include <debug.h>
+#include "debug.h"
 
 static uint16_t radio_channel;
 static uint16_t radio_address;
diff --git a/drivers/cc2420/cc2420_rx.c b/drivers/cc2420/cc2420_rx.c
index 59e8a420e4..cb5391b78b 100644
--- a/drivers/cc2420/cc2420_rx.c
+++ b/drivers/cc2420/cc2420_rx.c
@@ -8,15 +8,15 @@
 
 #include <stdio.h>
 
-#include <cc2420.h>
-#include <cc2420_settings.h>
-#include <cc2420_arch.h>
-#include <cc2420_spi.h>
-#include <ieee802154_frame.h>
+#include "cc2420.h"
+#include "cc2420_settings.h"
+#include "cc2420_arch.h"
+#include "cc2420_spi.h"
+#include "ieee802154_frame.h"
 
-#include <transceiver.h>
-#include <msg.h>
-#include <debug.h>
+#include "transceiver.h"
+#include "msg.h"
+#include "debug.h"
 
 cc2420_packet_t cc2420_rx_buffer[CC2420_RX_BUF_SIZE];
 volatile uint8_t rx_buffer_next;
diff --git a/drivers/cc2420/cc2420_spi.c b/drivers/cc2420/cc2420_spi.c
index 653955a9ca..3f06b74467 100644
--- a/drivers/cc2420/cc2420_spi.c
+++ b/drivers/cc2420/cc2420_spi.c
@@ -6,11 +6,11 @@
   * Version 2.  See the file LICENSE for more details.
   */
 
-#include <cc2420_spi.h>
-#include <cc2420_arch.h>
+#include "cc2420_spi.h"
+#include "cc2420_arch.h"
 
-#include <cc2420_settings.h>
-#include <irq.h>
+#include "cc2420_settings.h"
+#include "irq.h"
 
 /* reg */
 void cc2420_write_reg(uint8_t addr, uint16_t value) {
diff --git a/drivers/cc2420/cc2420_tx.c b/drivers/cc2420/cc2420_tx.c
index 8594710e37..56130e9a26 100644
--- a/drivers/cc2420/cc2420_tx.c
+++ b/drivers/cc2420/cc2420_tx.c
@@ -8,13 +8,13 @@
 
 #include <stdio.h>
 
-#include <cc2420.h>
-#include <cc2420_spi.h>
-#include <cc2420_settings.h>
-#include <cc2420_arch.h>
-#include <ieee802154_frame.h>
+#include "cc2420.h"
+#include "cc2420_spi.h"
+#include "cc2420_settings.h"
+#include "cc2420_arch.h"
+#include "ieee802154_frame.h"
 
-#include <irq.h>
+#include "irq.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/drivers/cc2420/include/cc2420.h b/drivers/cc2420/include/cc2420.h
index e6c69140cb..4f239a3b39 100644
--- a/drivers/cc2420/include/cc2420.h
+++ b/drivers/cc2420/include/cc2420.h
@@ -76,8 +76,8 @@ Frame type value:
 #ifndef CC2420_H
 #define CC2420_H
 
-#include <ieee802154_frame.h>
-#include <cc2420_settings.h>
+#include "ieee802154_frame.h"
+#include "cc2420_settings.h"
 
 #define CC2420_MAX_PKT_LENGTH 127
 #define CC2420_MAX_DATA_LENGTH (118)
diff --git a/drivers/include/ltc4150.h b/drivers/include/ltc4150.h
index 38fc47d2b8..6b694261bd 100644
--- a/drivers/include/ltc4150.h
+++ b/drivers/include/ltc4150.h
@@ -1,7 +1,7 @@
 #ifndef __LTC4150_H
 #define __LTC4150_H
 
-#include <ltc4150_arch.h>
+#include "ltc4150_arch.h"
 
 void ltc4150_init(void);
 void ltc4150_start(void);
diff --git a/drivers/lm75a/lm75a-temp-sensor.c b/drivers/lm75a/lm75a-temp-sensor.c
index cfc9a283e4..557ee845b3 100644
--- a/drivers/lm75a/lm75a-temp-sensor.c
+++ b/drivers/lm75a/lm75a-temp-sensor.c
@@ -29,10 +29,10 @@
 #include <stdbool.h>
 #include <string.h>
 #include <math.h>
-#include <msg.h>
-#include <thread.h>
-#include <vtimer.h>
-#include <timex.h>
+#include "msg.h"
+#include "thread.h"
+#include "vtimer.h"
+#include "timex.h"
 #include "lpc2387.h"
 #include "gpioint.h"
 #include "i2c.h"
diff --git a/drivers/srf02/srf02-ultrasonic-sensor.c b/drivers/srf02/srf02-ultrasonic-sensor.c
index a2aecd0252..adb9cfc83f 100644
--- a/drivers/srf02/srf02-ultrasonic-sensor.c
+++ b/drivers/srf02/srf02-ultrasonic-sensor.c
@@ -25,10 +25,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <msg.h>
-#include <vtimer.h>
-#include <timex.h>
-#include <thread.h>
+#include "msg.h"
+#include "vtimer.h"
+#include "timex.h"
+#include "thread.h"
 #include "hwtimer.h"
 #include "srf02-ultrasonic-sensor.h"
 #include "i2c.h"
diff --git a/sys/include/auto_init.h b/sys/include/auto_init.h
index b154deb1ef..66d7b60a31 100644
--- a/sys/include/auto_init.h
+++ b/sys/include/auto_init.h
@@ -23,23 +23,23 @@
 #define AUTO_INIT_H
 
 #ifdef MODULE_HWTIMER
-#include <hwtimer.h>
+#include "hwtimer.h"
 #endif
 
 #ifdef MODULE_SHT11
-#include <sht11.h>
+#include "sht11.h"
 #endif
 
 #ifdef MODULE_GPIOINT
-#include <gpioint.h>
+#include "gpioint.h"
 #endif
 
 #ifdef MODULE_CC110X
-#include <cc1100-interface.h>
+#include "cc1100-interface.h"
 #endif
 
 #ifdef MODULE_LTC4150
-#include <ltc4150.h>
+#include "ltc4150.h"
 #endif
 
 void auto_init(void);
diff --git a/sys/include/chardev_thread.h b/sys/include/chardev_thread.h
index 439354b81d..3dde560003 100644
--- a/sys/include/chardev_thread.h
+++ b/sys/include/chardev_thread.h
@@ -8,7 +8,7 @@
 #ifndef __CHARDEV_THREAD_H
 #define __CHARDEV_THREAD_H
 
-#include <ringbuffer.h>
+#include "ringbuffer.h"
 
 void chardev_loop(ringbuffer_t *rb);
 
diff --git a/sys/include/shell_commands.h b/sys/include/shell_commands.h
index 563968e8e2..7e11ffce11 100644
--- a/sys/include/shell_commands.h
+++ b/sys/include/shell_commands.h
@@ -1,7 +1,7 @@
 #ifndef __SHELL_COMMANDS_H
 #define __SHELL_COMMANDS_H
 
-#include <shell.h>
+#include "shell.h"
 
 #define DISK_GET_SECTOR_SIZE    "dget_ssize"
 #define DISK_GET_SECTOR_COUNT   "dget_scount"
diff --git a/sys/include/transceiver.h b/sys/include/transceiver.h
index 73159f4770..4959bb6965 100644
--- a/sys/include/transceiver.h
+++ b/sys/include/transceiver.h
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef MODULE_AT86RF231
-#include <at86rf231.h>
+#include "at86rf231.h"
 #endif
 
 /* Stack size for transceiver thread */
diff --git a/sys/net/destiny/destiny.c b/sys/net/destiny/destiny.c
index 9ac5c9b6ad..cfd58a676b 100644
--- a/sys/net/destiny/destiny.c
+++ b/sys/net/destiny/destiny.c
@@ -15,11 +15,12 @@
  * @}
  */
 
-#include <thread.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include "thread.h"
+
 #include "destiny.h"
 #include "vtimer.h"
 
diff --git a/sys/net/destiny/msg_help.c b/sys/net/destiny/msg_help.c
index 74888b83f2..bb01001f1e 100644
--- a/sys/net/destiny/msg_help.c
+++ b/sys/net/destiny/msg_help.c
@@ -5,7 +5,6 @@
  *      Author: Oliver
  */
 
-#include <thread.h>
 #include <stdio.h>
 
 #include "thread.h"
diff --git a/sys/net/net_help/net_help.c b/sys/net/net_help/net_help.c
index c0952b563a..541090408c 100644
--- a/sys/net/net_help/net_help.c
+++ b/sys/net/net_help/net_help.c
@@ -6,8 +6,8 @@
  */
 
 #include <stdio.h>
-#include <thread.h>
 #include <string.h>
+#include "thread.h"
 
 #include "net_help.h"
 
diff --git a/sys/net/rpl/etx_beaconing.h b/sys/net/rpl/etx_beaconing.h
index 4bfc7bd386..44c93bbda2 100644
--- a/sys/net/rpl/etx_beaconing.h
+++ b/sys/net/rpl/etx_beaconing.h
@@ -13,7 +13,7 @@
 
 //For debugging purposes
 #define ENABLE_DEBUG (0)
-#include <debug.h>
+#include "debug.h"
 
 #if ENABLE_DEBUG
 #define ETX_BEACON_STACKSIZE    (4500)
diff --git a/sys/net/rpl/rpl.c b/sys/net/rpl/rpl.c
index 13a310fc30..f27cfc4f95 100644
--- a/sys/net/rpl/rpl.c
+++ b/sys/net/rpl/rpl.c
@@ -17,9 +17,9 @@
  */
 
 #include <string.h>
-#include <vtimer.h>
-#include <thread.h>
-#include <mutex.h>
+#include "vtimer.h"
+#include "thread.h"
+#include "mutex.h"
 
 #include "msg.h"
 #include "rpl.h"
diff --git a/sys/net/rpl/trickle.h b/sys/net/rpl/trickle.h
index 5d8726253f..5a813c6f9d 100644
--- a/sys/net/rpl/trickle.h
+++ b/sys/net/rpl/trickle.h
@@ -15,8 +15,8 @@
  * @}
  */
 
-#include <vtimer.h>
-#include <thread.h>
+#include "vtimer.h"
+#include "thread.h"
 
 #define TRICKLE_TIMER_STACKSIZE (KERNEL_CONF_STACKSIZE_DEFAULT)
 #define TRICKLE_INTERVAL_STACKSIZE (KERNEL_CONF_STACKSIZE_MAIN)
diff --git a/sys/ping/ping.c b/sys/ping/ping.c
index 9114cb9792..cb501f0822 100644
--- a/sys/ping/ping.c
+++ b/sys/ping/ping.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <thread.h>
-#include <msg.h>
+#include "thread.h"
+#include "msg.h"
 
 #include "cc110x/cc1100.h"
 #include "lpc2387.h"
@@ -9,7 +9,7 @@
 #include "vtimer.h"
 #include "timex.h"
 #include "gpioint.h"
-#include <ping.h>
+#include "ping.h"
 
 ping_payload *pipa;
 protocol_t protocol_id = 0;
diff --git a/sys/posix/posix_io.c b/sys/posix/posix_io.c
index 4e78f54c5d..3ed4273812 100644
--- a/sys/posix/posix_io.c
+++ b/sys/posix/posix_io.c
@@ -15,10 +15,10 @@
  * @}
  */
 
-#include <thread.h>
-#include <msg.h>
+#include "thread.h"
+#include "msg.h"
 
-#include <posix_io.h>
+#include "posix_io.h"
 
 
 static int _posix_fileop(int pid, int op, int flags)
diff --git a/sys/shell/commands/sc_cc1100.c b/sys/shell/commands/sc_cc1100.c
index b1a6a47425..f6a30f33ee 100644
--- a/sys/shell/commands/sc_cc1100.c
+++ b/sys/shell/commands/sc_cc1100.c
@@ -18,11 +18,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <cc1100-interface.h>
+#include "cc1100-interface.h"
 
 #ifdef MODULE_CC110X
-#include <msg.h>
-#include <transceiver.h>
+#include "msg.h"
+#include "transceiver.h"
 
 #ifdef MODULE_TRANSCEIVER
 #define TEXT_SIZE           CC1100_MAX_DATA_LENGTH
diff --git a/sys/shell/commands/sc_cc110x_ng.c b/sys/shell/commands/sc_cc110x_ng.c
index 6435f454fb..26ad8aedc0 100644
--- a/sys/shell/commands/sc_cc110x_ng.c
+++ b/sys/shell/commands/sc_cc110x_ng.c
@@ -18,10 +18,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <transceiver.h>
-#include <cc110x_ng.h>
-#include <msg.h>
 #include <inttypes.h>
+#include "transceiver.h"
+#include "cc110x_ng.h"
+#include "msg.h"
 
 #define TEXT_SIZE           CC1100_MAX_DATA_LENGTH
 
diff --git a/sys/shell/commands/sc_cc2420.c b/sys/shell/commands/sc_cc2420.c
index 7da2dd7176..92a576797f 100644
--- a/sys/shell/commands/sc_cc2420.c
+++ b/sys/shell/commands/sc_cc2420.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <transceiver.h>
-#include <cc2420.h>
-#include <msg.h>
+#include "transceiver.h"
+#include "cc2420.h"
+#include "msg.h"
 
 #define TEXT_SIZE           CC2420_MAX_DATA_LENGTH
 
diff --git a/sys/shell/commands/sc_id.c b/sys/shell/commands/sc_id.c
index b5f0eabe61..765e190647 100644
--- a/sys/shell/commands/sc_id.c
+++ b/sys/shell/commands/sc_id.c
@@ -17,8 +17,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <config.h>
 #include <stdlib.h>
+#include "config.h"
 
 void _id_handler(char *id)
 {
diff --git a/sys/shell/commands/sc_ltc4150.c b/sys/shell/commands/sc_ltc4150.c
index 9a0587b132..0ae7ad9ff1 100644
--- a/sys/shell/commands/sc_ltc4150.c
+++ b/sys/shell/commands/sc_ltc4150.c
@@ -16,7 +16,7 @@
  */
 
 #include <stdio.h>
-#include <ltc4150.h>
+#include "ltc4150.h"
 
 void _get_current_handler(char *unused)
 {
diff --git a/sys/shell/commands/sc_rtc.c b/sys/shell/commands/sc_rtc.c
index be8b530d6b..2b7d1bb315 100644
--- a/sys/shell/commands/sc_rtc.c
+++ b/sys/shell/commands/sc_rtc.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #ifdef MODULE_RTC
-#include <rtc.h>
+#include "rtc.h"
 
 void _gettime_handler(void)
 {
diff --git a/sys/shell/commands/sc_sht11.c b/sys/shell/commands/sc_sht11.c
index 2fd687785c..80c196ebfe 100644
--- a/sys/shell/commands/sc_sht11.c
+++ b/sys/shell/commands/sc_sht11.c
@@ -18,8 +18,8 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sht11.h>
 #include <string.h>
+#include "sht11.h"
 
 #ifdef MODULE_SHT11
 
diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c
index 114f481865..45a8e4a3e0 100644
--- a/sys/shell/commands/shell_commands.c
+++ b/sys/shell/commands/shell_commands.c
@@ -19,8 +19,8 @@
  * @}
  */
 
-#include <shell_commands.h>
 #include <stdlib.h>
+#include "shell_commands.h"
 
 extern void _id_handler(char *id);
 extern void _heap_handler(char *unused);
diff --git a/sys/shell/shell.c b/sys/shell/shell.c
index f6dca46a8d..2878208c69 100644
--- a/sys/shell/shell.c
+++ b/sys/shell/shell.c
@@ -28,10 +28,10 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <shell.h>
-#include <shell_commands.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include "shell.h"
+#include "shell_commands.h"
 
 static void(*find_handler(const shell_command_t *command_list, char *command))(char *)
 {
diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c
index e0d71dd601..c09f4c7488 100644
--- a/sys/transceiver/transceiver.c
+++ b/sys/transceiver/transceiver.c
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef MODULE_AT86RF231
-#include <at86rf231.h>
+#include "at86rf231.h"
 #endif
 
 #define ENABLE_DEBUG (0)
diff --git a/sys/vtimer/vtimer.c b/sys/vtimer/vtimer.c
index 4e7761bc9e..7fe4867d09 100644
--- a/sys/vtimer/vtimer.c
+++ b/sys/vtimer/vtimer.c
@@ -21,18 +21,18 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <irq.h>
-#include <queue.h>
-#include <timex.h>
-#include <hwtimer.h>
-#include <msg.h>
-#include <thread.h>
-#include <queue.h>
+#include "irq.h"
+#include "queue.h"
+#include "timex.h"
+#include "hwtimer.h"
+#include "msg.h"
+#include "thread.h"
+#include "queue.h"
 
-#include <vtimer.h>
+#include "vtimer.h"
 
 #define ENABLE_DEBUG    (0)
-#include <debug.h>
+#include "debug.h"
 
 #define VTIMER_THRESHOLD 20UL
 #define VTIMER_BACKOFF 10UL