diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 8f3f07e21..607c96fe9 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -67,27 +67,27 @@
 
 #include "chconf.h"
 #include "chtypes.h"
-#include "lists.h"
+#include "chlists.h"
 #include "chcore.h"
-#include "sys.h"
-#include "vt.h"
-#include "scheduler.h"
-#include "semaphores.h"
-#include "mutexes.h"
-#include "condvars.h"
-#include "events.h"
-#include "messages.h"
-#include "mailboxes.h"
-#include "memcore.h"
-#include "heap.h"
-#include "mempools.h"
-#include "threads.h"
-#include "registry.h"
+#include "chsys.h"
+#include "chvt.h"
+#include "chschd.h"
+#include "chsem.h"
+#include "chmtx.h"
+#include "chcond.h"
+#include "chevents.h"
+#include "chmsg.h"
+#include "chmboxes.h"
+#include "chmemcore.h"
+#include "chheap.h"
+#include "chmempools.h"
+#include "chthreads.h"
+#include "chregistry.h"
 #include "inline.h"
-#include "queues.h"
-#include "streams.h"
-#include "channels.h"
-#include "debug.h"
+#include "chqueues.h"
+#include "chstreams.h"
+#include "chioch.h"
+#include "chdebug.h"
 
 #endif /* _CH_H_ */
 
diff --git a/os/kernel/include/condvars.h b/os/kernel/include/chcond.h
similarity index 100%
rename from os/kernel/include/condvars.h
rename to os/kernel/include/chcond.h
diff --git a/os/kernel/include/debug.h b/os/kernel/include/chdebug.h
similarity index 100%
rename from os/kernel/include/debug.h
rename to os/kernel/include/chdebug.h
diff --git a/os/kernel/include/events.h b/os/kernel/include/chevents.h
similarity index 100%
rename from os/kernel/include/events.h
rename to os/kernel/include/chevents.h
diff --git a/os/kernel/include/heap.h b/os/kernel/include/chheap.h
similarity index 100%
rename from os/kernel/include/heap.h
rename to os/kernel/include/chheap.h
diff --git a/os/kernel/include/channels.h b/os/kernel/include/chioch.h
similarity index 100%
rename from os/kernel/include/channels.h
rename to os/kernel/include/chioch.h
diff --git a/os/kernel/include/lists.h b/os/kernel/include/chlists.h
similarity index 100%
rename from os/kernel/include/lists.h
rename to os/kernel/include/chlists.h
diff --git a/os/kernel/include/mailboxes.h b/os/kernel/include/chmboxes.h
similarity index 100%
rename from os/kernel/include/mailboxes.h
rename to os/kernel/include/chmboxes.h
diff --git a/os/kernel/include/memcore.h b/os/kernel/include/chmemcore.h
similarity index 100%
rename from os/kernel/include/memcore.h
rename to os/kernel/include/chmemcore.h
diff --git a/os/kernel/include/mempools.h b/os/kernel/include/chmempools.h
similarity index 100%
rename from os/kernel/include/mempools.h
rename to os/kernel/include/chmempools.h
diff --git a/os/kernel/include/messages.h b/os/kernel/include/chmsg.h
similarity index 100%
rename from os/kernel/include/messages.h
rename to os/kernel/include/chmsg.h
diff --git a/os/kernel/include/mutexes.h b/os/kernel/include/chmtx.h
similarity index 100%
rename from os/kernel/include/mutexes.h
rename to os/kernel/include/chmtx.h
diff --git a/os/kernel/include/queues.h b/os/kernel/include/chqueues.h
similarity index 100%
rename from os/kernel/include/queues.h
rename to os/kernel/include/chqueues.h
diff --git a/os/kernel/include/registry.h b/os/kernel/include/chregistry.h
similarity index 100%
rename from os/kernel/include/registry.h
rename to os/kernel/include/chregistry.h
diff --git a/os/kernel/include/scheduler.h b/os/kernel/include/chschd.h
similarity index 100%
rename from os/kernel/include/scheduler.h
rename to os/kernel/include/chschd.h
diff --git a/os/kernel/include/semaphores.h b/os/kernel/include/chsem.h
similarity index 100%
rename from os/kernel/include/semaphores.h
rename to os/kernel/include/chsem.h
diff --git a/os/kernel/include/streams.h b/os/kernel/include/chstreams.h
similarity index 100%
rename from os/kernel/include/streams.h
rename to os/kernel/include/chstreams.h
diff --git a/os/kernel/include/sys.h b/os/kernel/include/chsys.h
similarity index 100%
rename from os/kernel/include/sys.h
rename to os/kernel/include/chsys.h
diff --git a/os/kernel/include/threads.h b/os/kernel/include/chthreads.h
similarity index 100%
rename from os/kernel/include/threads.h
rename to os/kernel/include/chthreads.h
diff --git a/os/kernel/include/vt.h b/os/kernel/include/chvt.h
similarity index 100%
rename from os/kernel/include/vt.h
rename to os/kernel/include/chvt.h
diff --git a/readme.txt b/readme.txt
index b2d0a354b..56c95c3ba 100644
--- a/readme.txt
+++ b/readme.txt
@@ -78,6 +78,9 @@
   been renamed to Posix simulator in order to include this change in a
   single project.
 - NEW: New articles, sections and various improvements to the documentation.
+- CHANGE: Renamed the kernel header files to match the names of their source
+  files. The change was also required in order to make the names less
+  "generic" and less likely to match names in external libraries.
 
 *** 1.5.1 ***
 - FIX: Fixed insufficient stack space for the idle thread in the ARMCM3 port