diff --git a/docs/ch.txt b/docs/ch.txt
index ad7421f3b..71ef8140e 100644
--- a/docs/ch.txt
+++ b/docs/ch.txt
@@ -435,6 +435,25 @@
  * Non portable code.
  * @ingroup Kernel
  * @file chcore.c Non portable code.
+ * @file chcore.h Non portable macros and structures.
+ */
+/** @} */
+
+/**
+ * @defgroup Types Types
+ * @{
+ * System types and macros.
+ * @ingroup Kernel
+ * @file chtypes.h System types and code modifiers.
+ */
+/** @} */
+
+/**
+ * @defgroup Inline Inline
+ * @{
+ * System inline-able code.
+ * @ingroup Kernel
+ * @file inline.h Inline versions of some critical system routines.
  */
 /** @} */
 
diff --git a/src/include/inline.h b/src/include/inline.h
index 9cc18974d..379a1f216 100644
--- a/src/include/inline.h
+++ b/src/include/inline.h
@@ -17,6 +17,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/**
+ * @addtogroup Inline
+ * @{
+ */
+
 #ifndef _INLINE_H_
 #define _INLINE_H_
 
@@ -78,3 +83,5 @@ static INLINE Thread *list_remove(ThreadsList *tlp) {
 #endif /* CH_OPTIMIZE_SPEED */
 
 #endif  /* _INLINE_H_ */
+
+/** @} */
diff --git a/src/templates/chtypes.h b/src/templates/chtypes.h
index 92b5dc443..547b0fb7e 100644
--- a/src/templates/chtypes.h
+++ b/src/templates/chtypes.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @addtogroup Core
+ * @addtogroup Types
  * @{
  */