diff --git a/os/kernel/include/chcond.h b/os/kernel/include/chcond.h
index a84fa3bdb..8c2fc863d 100644
--- a/os/kernel/include/chcond.h
+++ b/os/kernel/include/chcond.h
@@ -22,15 +22,15 @@
  */
 
 /**
- * @file    condvars.h
+ * @file    chcond.h
  * @brief   Condition Variables macros and structures.
  *
  * @addtogroup condvars
  * @{
  */
 
-#ifndef _CONDVARS_H_
-#define _CONDVARS_H_
+#ifndef _CHCOND_H_
+#define _CHCOND_H_
 
 #if CH_USE_CONDVARS
 
@@ -86,6 +86,6 @@ extern "C" {
 
 #endif /* CH_USE_CONDVARS */
 
-#endif /* _CONDVARS_H_ */
+#endif /* _CHCOND_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chdebug.h b/os/kernel/include/chdebug.h
index 5cd056a81..316d9e633 100644
--- a/os/kernel/include/chdebug.h
+++ b/os/kernel/include/chdebug.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    debug.h
+ * @file    chdebug.h
  * @brief   Debug macros and structures.
  *
  * @addtogroup debug
  * @{
  */
 
-#ifndef _DEBUG_H_
-#define _DEBUG_H_
+#ifndef _CHDEBUG_H_
+#define _CHDEBUG_H_
 
 /**
  * @brief Trace buffer entries.
@@ -158,6 +158,6 @@ extern "C" {
 #endif
 #endif /* !defined(__DOXYGEN__) */
 
-#endif /* _DEBUG_H_ */
+#endif /* _CHDEBUG_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chevents.h b/os/kernel/include/chevents.h
index e81d3ee3b..c423c34ef 100644
--- a/os/kernel/include/chevents.h
+++ b/os/kernel/include/chevents.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    events.h
+ * @file    chevents.h
  * @brief   Events macros and structures.
  *
  * @addtogroup events
  * @{
  */
 
-#ifndef _EVENTS_H_
-#define _EVENTS_H_
+#ifndef _CHEVENTS_H_
+#define _CHEVENTS_H_
 
 #if CH_USE_EVENTS
 
@@ -152,6 +152,6 @@ extern "C" {
 
 #endif /* CH_USE_EVENTS */
 
-#endif /* _EVENTS_H_ */
+#endif /* _CHEVENTS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index 8be48961a..1cfaf2c5f 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    heap.h
+ * @file    chheap.h
  * @brief   Heaps macros and structures.
  *
  * @addtogroup heaps
  * @{
  */
 
-#ifndef _HEAP_H_
-#define _HEAP_H_
+#ifndef _CHHEAP_H_
+#define _CHHEAP_H_
 
 #if CH_USE_HEAP
 
@@ -85,6 +85,6 @@ extern "C" {
 
 #endif /* CH_USE_HEAP */
 
-#endif /* _HEAP_H_ */
+#endif /* _CHHEAP_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chioch.h b/os/kernel/include/chioch.h
index 06c7cf88a..c63dadc0e 100644
--- a/os/kernel/include/chioch.h
+++ b/os/kernel/include/chioch.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file    channels.h
+ * @file    chioch.h
  * @brief   I/O channels.
  * @details This header defines abstract interfaces useful to access generic
  *          I/O resources in a standardized way.
@@ -27,8 +27,8 @@
  * @{
  */
 
-#ifndef _CHANNELS_H_
-#define _CHANNELS_H_
+#ifndef _CHIOCH_H_
+#define _CHIOCH_H_
 
 /**
  * @brief   @p BaseChannel specific methods.
@@ -264,6 +264,6 @@ typedef struct {
 
 #endif /* CH_USE_EVENTS */
 
-#endif /* _CHANNELS_H_ */
+#endif /* _CHIOCH_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chlists.h b/os/kernel/include/chlists.h
index 48841c687..d3eef5417 100644
--- a/os/kernel/include/chlists.h
+++ b/os/kernel/include/chlists.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file    lists.h
+ * @file    chlists.h
  * @brief   Thread queues/lists macros and structures.
  * @note    All the macros present in this module, while public, are not
  *          an OS API and should not be directly used in the user applications
@@ -28,8 +28,8 @@
  * @{
  */
 
-#ifndef _LISTS_H_
-#define _LISTS_H_
+#ifndef _CHLISTS_H_
+#define _CHLISTS_H_
 
 typedef struct Thread Thread;
 
@@ -113,6 +113,6 @@ extern "C" {
 
 #endif /* !CH_OPTIMIZE_SPEED */
 
-#endif /* _LISTS_H_ */
+#endif /* _CHLISTS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chmboxes.h b/os/kernel/include/chmboxes.h
index d2c71b6d8..a5088b2c5 100644
--- a/os/kernel/include/chmboxes.h
+++ b/os/kernel/include/chmboxes.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    mailboxes.h
+ * @file    chmboxes.h
  * @brief   Mailboxes macros and structures.
  *
  * @addtogroup mailboxes
  * @{
  */
 
-#ifndef _MAILBOXES_H_
-#define _MAILBOXES_H_
+#ifndef _CHMBOXES_H_
+#define _CHMBOXES_H_
 
 #if CH_USE_MAILBOXES
 
@@ -138,6 +138,6 @@ extern "C" {
 
 #endif /* CH_USE_MAILBOXES */
 
-#endif /* _MAILBOXES_H_ */
+#endif /* _CHMBOXES_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chmemcore.h b/os/kernel/include/chmemcore.h
index 381339938..7888222b3 100644
--- a/os/kernel/include/chmemcore.h
+++ b/os/kernel/include/chmemcore.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    memcore.h
+ * @file    chmemcore.h
  * @brief   Core memory manager macros and structures.
  *
  * @addtogroup memcore
  * @{
  */
 
-#ifndef _MEMCORE_H_
-#define _MEMCORE_H_
+#ifndef _CHMEMCORE_H_
+#define _CHMEMCORE_H_
 
 /**
  * @brief   Memory get function.
@@ -66,6 +66,6 @@ extern "C" {
 
 #endif /* CH_USE_MEMCORE */
 
-#endif /* _MEMCORE_H_ */
+#endif /* _CHMEMCORE_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chmempools.h b/os/kernel/include/chmempools.h
index 056ceaae8..2408d1c7f 100644
--- a/os/kernel/include/chmempools.h
+++ b/os/kernel/include/chmempools.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    mempools.h
+ * @file    chmempools.h
  * @brief   Memory Pools macros and structures.
  *
  * @addtogroup pools
  * @{
  */
 
-#ifndef _MEMPOOLS_H_
-#define _MEMPOOLS_H_
+#ifndef _CHMEMPOOLS_H_
+#define _CHMEMPOOLS_H_
 
 #if CH_USE_MEMPOOLS
 
@@ -88,6 +88,6 @@ extern "C" {
 
 #endif /* CH_USE_MEMPOOLS */
 
-#endif /* _MEMPOOLS_H_ */
+#endif /* _CHMEMPOOLS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chmsg.h b/os/kernel/include/chmsg.h
index d5e7cb32e..1947c02f7 100644
--- a/os/kernel/include/chmsg.h
+++ b/os/kernel/include/chmsg.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    messages.h
+ * @file    chmsg.h
  * @brief   Messages macros and structures.
  *
  * @addtogroup messages
  * @{
  */
 
-#ifndef _MESSAGES_H_
-#define _MESSAGES_H_
+#ifndef _CHMSG_H_
+#define _CHMSG_H_
 
 #if CH_USE_MESSAGES
 
@@ -55,6 +55,6 @@ extern "C" {
 
 #endif /* CH_USE_MESSAGES */
 
-#endif /* _MESSAGES_H_ */
+#endif /* _CHMSG_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chmtx.h b/os/kernel/include/chmtx.h
index a57e8386a..73a507079 100644
--- a/os/kernel/include/chmtx.h
+++ b/os/kernel/include/chmtx.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    mutexes.h
+ * @file    chmtx.h
  * @brief   Mutexes macros and structures.
  *
  * @addtogroup mutexes
  * @{
  */
 
-#ifndef _MUTEXES_H_
-#define _MUTEXES_H_
+#ifndef _CHMTX_H_
+#define _CHMTX_H_
 
 #if CH_USE_MUTEXES
 
@@ -83,6 +83,6 @@ extern "C" {
 
 #endif /* CH_USE_MUTEXES */
 
-#endif /* _MUTEXES_H_ */
+#endif /* _CHMTX_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chqueues.h b/os/kernel/include/chqueues.h
index fb2f13194..fed1248b5 100644
--- a/os/kernel/include/chqueues.h
+++ b/os/kernel/include/chqueues.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    queues.h I/O
+ * @file    chqueues.h I/O
  * @brief   Queues macros and structures.
  *
  * @addtogroup io_queues
  * @{
  */
 
-#ifndef _QUEUES_H_
-#define _QUEUES_H_
+#ifndef _CHQUEUES_H_
+#define _CHQUEUES_H_
 
 #if CH_USE_QUEUES
 
@@ -237,6 +237,6 @@ extern "C" {
 #endif
 #endif /* CH_USE_QUEUES */
 
-#endif /* _QUEUES_H_ */
+#endif /* _CHQUEUES_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chregistry.h b/os/kernel/include/chregistry.h
index 2bff903e8..0c4ba8eb9 100644
--- a/os/kernel/include/chregistry.h
+++ b/os/kernel/include/chregistry.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    registry.h
+ * @file    chregistry.h
  * @brief   Threads registry macros and structures.
  *
  * @addtogroup registry
  * @{
  */
 
-#ifndef _REGISTRY_H_
-#define _REGISTRY_H_
+#ifndef _CHREGISTRY_H_
+#define _CHREGISTRY_H_
 
 #if CH_USE_REGISTRY
 
@@ -64,6 +64,6 @@ extern "C" {
 
 #endif /* CH_USE_REGISTRY */
 
-#endif /* _REGISTRY_H_ */
+#endif /* _CHREGISTRY_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chschd.h b/os/kernel/include/chschd.h
index ddb7df979..c06ed8100 100644
--- a/os/kernel/include/chschd.h
+++ b/os/kernel/include/chschd.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    scheduler.h
+ * @file    chschd.h
  * @brief   Scheduler macros and structures.
  *
  * @addtogroup scheduler
  * @{
  */
 
-#ifndef _SCHEDULER_H_
-#define _SCHEDULER_H_
+#ifndef _CHSCHD_H_
+#define _CHSCHD_H_
 
 /** @brief Default thread wakeup low level message.*/
 #define RDY_OK          0
@@ -129,6 +129,6 @@ extern "C" {
  */
 #define chSchIsRescRequiredI() (firstprio(&rlist.r_queue) > currp->p_prio)
 
-#endif /* _SCHEDULER_H_ */
+#endif /* _CHSCHD_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chsem.h b/os/kernel/include/chsem.h
index cced49601..02ad3a79f 100644
--- a/os/kernel/include/chsem.h
+++ b/os/kernel/include/chsem.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    semaphores.h
+ * @file    chsem.h
  * @brief   Semaphores macros and structures.
  *
  * @addtogroup semaphores
  * @{
  */
 
-#ifndef _SEMAPHORES_H_
-#define _SEMAPHORES_H_
+#ifndef _CHSEM_H_
+#define _CHSEM_H_
 
 #if CH_USE_SEMAPHORES
 
@@ -99,6 +99,6 @@ extern "C" {
 
 #endif /* CH_USE_SEMAPHORES */
 
-#endif /* _SEMAPHORES_H_ */
+#endif /* _CHSEM_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chstreams.h b/os/kernel/include/chstreams.h
index fa376546c..7b55ca539 100644
--- a/os/kernel/include/chstreams.h
+++ b/os/kernel/include/chstreams.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file    streams.h
+ * @file    chstreams.h
  * @brief   Data streams.
  * @details This header defines abstract interfaces useful to access generic
  *          data streams in a standardized way.
@@ -27,8 +27,8 @@
  * @{
  */
 
-#ifndef _STREAMS_H_
-#define _STREAMS_H_
+#ifndef _CHSTREAMS_H_
+#define _CHSTREAMS_H_
 
 /**
  * @brief   BaseSequentialStream specific methods.
@@ -91,6 +91,6 @@ typedef struct {
  */
 #define chSequentialStreamRead(ip, bp, n) ((ip)->vmt->read(ip, bp, n))
 
-#endif /* _STREAMS_H_ */
+#endif /* _CHSTREAMS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chsys.h b/os/kernel/include/chsys.h
index 5d0b6d875..52fa7331b 100644
--- a/os/kernel/include/chsys.h
+++ b/os/kernel/include/chsys.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    sys.h
+ * @file    chsys.h
  * @brief   System related macros and structures.
  *
  * @addtogroup system
  * @{
  */
 
-#ifndef _SYS_H_
-#define _SYS_H_
+#ifndef _CHSYS_H_
+#define _CHSYS_H_
 
 /**
  * @brief   Halts the system.
@@ -173,6 +173,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _SYS_H_ */
+#endif /* _CHSYS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chthreads.h b/os/kernel/include/chthreads.h
index 9f519fea0..9eeff8666 100644
--- a/os/kernel/include/chthreads.h
+++ b/os/kernel/include/chthreads.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    threads.h
+ * @file    chthreads.h
  * @brief   Threads macros and structures.
  *
  * @addtogroup threads
  * @{
  */
 
-#ifndef _THREADS_H_
-#define _THREADS_H_
+#ifndef _CHTHREADS_H_
+#define _CHTHREADS_H_
 
 /*
  * Module dependencies check.
@@ -325,6 +325,6 @@ extern "C" {
  */
 #define chThdSleepMicroseconds(usec) chThdSleep(US2ST(usec))
 
-#endif /* _THREADS_H_ */
+#endif /* _CHTHREADS_H_ */
 
 /** @} */
diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h
index 445650332..2c39ccde7 100644
--- a/os/kernel/include/chvt.h
+++ b/os/kernel/include/chvt.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    vt.h
+ * @file    chvt.h
  * @brief   Time macros and structures.
  *
  * @addtogroup time
  * @{
  */
 
-#ifndef _VT_H_
-#define _VT_H_
+#ifndef _CHVT_H_
+#define _CHVT_H_
 
 /**
  * @brief   Time conversion utility.
@@ -142,6 +142,6 @@ extern "C" {
  */
 #define chTimeNow() (vtlist.vt_systime)
 
-#endif /* _VT_H_ */
+#endif /* _CHVT_H_ */
 
 /** @} */
diff --git a/todo.txt b/todo.txt
index 47e162704..d6038ebe6 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,7 +9,7 @@ Before 1.6.0:
 * Reference counter for threads, concept of detached threads, threads
   management.
 * Active threads registry in the kernel.
-- Rename all the kernel headers by putting "ch" in front of the name, this is
+* Rename all the kernel headers by putting "ch" in front of the name, this is
   required in order to avoid potential conflicts with external libraries, the
   current names are a bit too generic.
 - Debug-related features and tools.