diff --git a/kernel/microkernel/channel/InitChan.c b/kernel/microkernel/channel/InitChan.c
index 7e514f1b3fd..25f0ff6a6be 100644
--- a/kernel/microkernel/channel/InitChan.c
+++ b/kernel/microkernel/channel/InitChan.c
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 
 /****************************************************************************/
 
diff --git a/kernel/microkernel/channel/KS_ChGet.c b/kernel/microkernel/channel/KS_ChGet.c
index 3f718ba543d..cc321ebaa51 100644
--- a/kernel/microkernel/channel/KS_ChGet.c
+++ b/kernel/microkernel/channel/KS_ChGet.c
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "minik.h"
-#include "toolchain.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <minik.h>
+#include <toolchain.h>
 
 /*****************************************************************************/
 int _task_pipe_get(kpipe_t Id,
diff --git a/kernel/microkernel/channel/KS_ChPtA.c b/kernel/microkernel/channel/KS_ChPtA.c
index ca0a33fe1e3..5d137b1579d 100644
--- a/kernel/microkernel/channel/KS_ChPtA.c
+++ b/kernel/microkernel/channel/KS_ChPtA.c
@@ -32,10 +32,10 @@
 
 /* includes */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "minik.h"
-#include "toolchain.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <minik.h>
+#include <toolchain.h>
 
 /*******************************************************************************
 *
diff --git a/kernel/microkernel/channel/KS_ChPut.c b/kernel/microkernel/channel/KS_ChPut.c
index 3f5a08ef7eb..808d7ca6561 100644
--- a/kernel/microkernel/channel/KS_ChPut.c
+++ b/kernel/microkernel/channel/KS_ChPut.c
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "minik.h"
-#include "toolchain.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <minik.h>
+#include <toolchain.h>
 
 /*****************************************************************************/
 
diff --git a/kernel/microkernel/channel/K_ChGAck.c b/kernel/microkernel/channel/K_ChGAck.c
index c0175b7cbed..d01480389f5 100644
--- a/kernel/microkernel/channel/K_ChGAck.c
+++ b/kernel/microkernel/channel/K_ChGAck.c
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/kernel/microkernel/channel/K_ChGReq.c b/kernel/microkernel/channel/K_ChGReq.c
index 75fdda628c8..30d71822393 100644
--- a/kernel/microkernel/channel/K_ChGReq.c
+++ b/kernel/microkernel/channel/K_ChGReq.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChGRpl.c b/kernel/microkernel/channel/K_ChGRpl.c
index 10374c503ed..4da731a4877 100644
--- a/kernel/microkernel/channel/K_ChGRpl.c
+++ b/kernel/microkernel/channel/K_ChGRpl.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
-#include "kchan.h"
+#include <microkernel/k_struct.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
+#include <kchan.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChGTmo.c b/kernel/microkernel/channel/K_ChGTmo.c
index 36ef5cbbdfd..a558b4e70fc 100644
--- a/kernel/microkernel/channel/K_ChGTmo.c
+++ b/kernel/microkernel/channel/K_ChGTmo.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChPAck.c b/kernel/microkernel/channel/K_ChPAck.c
index ae2eb4bbedc..23fe17487f1 100644
--- a/kernel/microkernel/channel/K_ChPAck.c
+++ b/kernel/microkernel/channel/K_ChPAck.c
@@ -30,13 +30,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "minik.h"
-#include "kticks.h"
-#include "kmemcpy.h"
-#include "ksema.h"
-#include "kmemp.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <minik.h>
+#include <kticks.h>
+#include <kmemcpy.h>
+#include <ksema.h>
+#include <kmemp.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChPReq.c b/kernel/microkernel/channel/K_ChPReq.c
index 6f4fb8eaf63..cc25097c37f 100644
--- a/kernel/microkernel/channel/K_ChPReq.c
+++ b/kernel/microkernel/channel/K_ChPReq.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChPRpl.c b/kernel/microkernel/channel/K_ChPRpl.c
index e08f3291be4..7a76c448d2e 100644
--- a/kernel/microkernel/channel/K_ChPRpl.c
+++ b/kernel/microkernel/channel/K_ChPRpl.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChPTmo.c b/kernel/microkernel/channel/K_ChPTmo.c
index fe1c888267a..4d1fdaf5c5f 100644
--- a/kernel/microkernel/channel/K_ChPTmo.c
+++ b/kernel/microkernel/channel/K_ChPTmo.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_ChProc.c b/kernel/microkernel/channel/K_ChProc.c
index 264898da3e8..00d9cdf1c83 100644
--- a/kernel/microkernel/channel/K_ChProc.c
+++ b/kernel/microkernel/channel/K_ChProc.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/K_Ch_Mvd.c b/kernel/microkernel/channel/K_Ch_Mvd.c
index 240670c6847..27e7765f66b 100644
--- a/kernel/microkernel/channel/K_Ch_Mvd.c
+++ b/kernel/microkernel/channel/K_Ch_Mvd.c
@@ -32,11 +32,11 @@
 
 /* includes */
 
-#include "microkernel/k_struct.h"
-#include "kchan.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kchan.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kticks.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/ch_addit.c b/kernel/microkernel/channel/ch_addit.c
index 51717110d59..2688eff820a 100644
--- a/kernel/microkernel/channel/ch_addit.c
+++ b/kernel/microkernel/channel/ch_addit.c
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "microkernel/k_struct.h"
-#include "kmemcpy.h"
-#include "minik.h"
-#include "kchan.h"
-#include "kticks.h"
+#include <microkernel/k_struct.h>
+#include <kmemcpy.h>
+#include <minik.h>
+#include <kchan.h>
+#include <kticks.h>
 #include <string_s.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/kernel/microkernel/channel/ch_buff.c b/kernel/microkernel/channel/ch_buff.c
index e3499022d2a..4d5368ee47e 100644
--- a/kernel/microkernel/channel/ch_buff.c
+++ b/kernel/microkernel/channel/ch_buff.c
@@ -42,9 +42,9 @@
 extern "C" {
 #endif
 
-#include "microkernel/k_types.h"
-#include "ch_buff.h"
-#include "ch_buffm.h"
+#include <microkernel/k_types.h>
+#include <ch_buff.h>
+#include <ch_buffm.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/channel/ch_buffm.c b/kernel/microkernel/channel/ch_buffm.c
index c2f37bd63ff..4d545f4c8e2 100644
--- a/kernel/microkernel/channel/ch_buffm.c
+++ b/kernel/microkernel/channel/ch_buffm.c
@@ -38,10 +38,10 @@ extern "C" {
 /******************************************************************/
 
 #include <stddef.h>
-#include "microkernel/k_types.h"
-#include "microkernel/k_chstr.h" /* definition of all channel related data \
+#include <microkernel/k_types.h>
+#include <microkernel/k_chstr.h> /* definition of all channel related data \
 				    structures */
-#include "ch_buffm.h"
+#include <ch_buffm.h>
 #include <string.h>
 #include <toolchain.h>
 #include <sections.h>