9 files changed, 77 insertions, 0 deletions
diff --git a/cpukit/include/rtems/linkersets.h b/cpukit/include/rtems/linkersets.h
index c4b3e2b7dc..f81876d399 100644
--- a/cpukit/include/rtems/linkersets.h
+++ b/cpukit/include/rtems/linkersets.h
@@ -1,5 +1,14 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
+/**
+ * @file
+ *
+ * @ingroup RTEMSImplLinker
+ *
+ * @brief This header file provides interfaces of the
+ *   linker set support.
+ */
+
 /*
  * Copyright (c) 2015, 2020 embedded brains GmbH.  All rights reserved.
  *
@@ -25,6 +34,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @defgroup RTEMSImplLinker RTEMS linker control
+ *
+ * @ingroup RTEMSImpl
+ */
+
 #ifndef _RTEMS_LINKERSET_H
 #define _RTEMS_LINKERSET_H
 
diff --git a/cpukit/include/rtems/posix/posixapi.h b/cpukit/include/rtems/posix/posixapi.h
index 24c1dc51e0..bb966920dc 100644
--- a/cpukit/include/rtems/posix/posixapi.h
+++ b/cpukit/include/rtems/posix/posixapi.h
@@ -3,6 +3,8 @@
 /**
  * @file
  *
+ * @ingroup POSIXAPI
+ *
  * @brief POSIX API Implementation
  *
  * This include file defines the top level interface to the POSIX API
diff --git a/cpukit/include/rtems/posix/spinlockimpl.h b/cpukit/include/rtems/posix/spinlockimpl.h
index a5e5bb1850..599ed88ca3 100644
--- a/cpukit/include/rtems/posix/spinlockimpl.h
+++ b/cpukit/include/rtems/posix/spinlockimpl.h
@@ -2,6 +2,8 @@
 
 /**
  * @file
+ *
+ * @ingroup RTEMSPOSIXAPISpinlock
  * 
  * @brief Inlined Routines from the POSIX Spinlock Manager
  *
@@ -37,6 +39,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @defgroup RTEMSPOSIXAPISpinlock POSIX Spinlock Manager
+ *
+ * @ingroup POSIXAPI
+ */
+
 #ifndef _RTEMS_POSIX_SPINLOCKIMPL_H
 #define _RTEMS_POSIX_SPINLOCKIMPL_H
 
diff --git a/cpukit/include/rtems/rtems/mainpage.h b/cpukit/include/rtems/rtems/mainpage.h
index 78d5c6cc60..66c903f7e8 100644
--- a/cpukit/include/rtems/rtems/mainpage.h
+++ b/cpukit/include/rtems/rtems/mainpage.h
@@ -3,10 +3,18 @@
 /**
  * @file
  *
+ * @ingroup RTEMSImplDoxygen
+ *
  * @brief This file exists to provide a top level description of RTEMS for
  *   Doxygen.
  */
 
+/**
+ * @defgroup RTEMSImplDoxygen Doxygen document generator support
+ *
+ * @ingroup RTEMSImpl
+ */
+
 /*
  * Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
  *
diff --git a/cpukit/include/rtems/scheduler.h b/cpukit/include/rtems/scheduler.h
index a8004cb5e4..80e5d39f66 100644
--- a/cpukit/include/rtems/scheduler.h
+++ b/cpukit/include/rtems/scheduler.h
@@ -3,6 +3,8 @@
 /**
  * @file
  *
+ * @ingroup RTEMSApplConfigGeneralSchedulerConfiguration
+ *
  * @brief Scheduler Configuration API
  */
 
diff --git a/cpukit/include/rtems/sysinit.h b/cpukit/include/rtems/sysinit.h
index ad483684e7..f8395c3745 100644
--- a/cpukit/include/rtems/sysinit.h
+++ b/cpukit/include/rtems/sysinit.h
@@ -1,5 +1,14 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
+/**
+ * @file
+ *
+ * @ingroup RTEMSAPIClassicInit
+ *
+ * @brief This header file provides interfaces of the
+ *   system initialization handler.
+ */
+
 /*
  * Copyright (c) 2015, 2020 embedded brains GmbH.  All rights reserved.
  *
diff --git a/cpukit/include/rtems/test-info.h b/cpukit/include/rtems/test-info.h
index 3b839533c2..3f818eca49 100644
--- a/cpukit/include/rtems/test-info.h
+++ b/cpukit/include/rtems/test-info.h
@@ -1,5 +1,14 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
+/**
+ * @file
+ *
+ * @ingroup RTEMSTestFramework
+ *
+ * @brief This header file provides interfaces of the
+ *   RTEMS Test Framework.
+ */
+
 /*
  * Copyright (c) 2014, 2018 embedded brains GmbH.  All rights reserved.
  *
diff --git a/cpukit/include/rtems/test.h b/cpukit/include/rtems/test.h
index aa6b4f88b2..2e4bb1a8de 100644
--- a/cpukit/include/rtems/test.h
+++ b/cpukit/include/rtems/test.h
@@ -1,3 +1,12 @@
+/**
+ * @file
+ *
+ * @ingroup RTEMSTestFramework
+ *
+ * @brief This header file provides interfaces of the
+ *   RTEMS Test Framework.
+ */
+
 /*
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/cpukit/include/rtems/thread.h b/cpukit/include/rtems/thread.h
index f77b572e34..164f4b388a 100644
--- a/cpukit/include/rtems/thread.h
+++ b/cpukit/include/rtems/thread.h
@@ -1,5 +1,14 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 
+/**
+ * @file
+ *
+ * @ingroup RTEMSImplThread
+ *
+ * @brief This header file provides interfaces of the
+ *   Thread Handler.
+ */
+
 /*
  * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
  *
@@ -25,6 +34,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @defgroup RTEMSImplThread Thread Handler
+ *
+ * @ingroup RTEMSImpl
+ */
+
 #ifndef _RTEMS_THREAD_H
 #define _RTEMS_THREAD_H