Cleanup: reorganize doxygen modules

- Nest compositor pages under the compositor module
- Nest GUI, DNA/RNA & externformats modules under Blender.
- Remove modules from intern which no longer exist.
- Add intern modules (atomic, eigen, glew-mx, libc_compat, locale,
  numaapi, rigidbody, sky, utfconv).
- Use 'intern_' prefix for intern modules since some of the modules
  use generic terms such as locale & atomic.

117 files changed, 296 insertions, 154 deletions

diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index b08b868a7e3..b6145e22a90 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -6,91 +6,90 @@
  *  as part of the normal development process.
  */
 
-/** \defgroup MEM Guarded memory (de)allocation
- *  \ingroup intern
+/* TODO: other modules.
+ * - `libmv`
+ * - `cycles`
+ * - `opencolorio`
+ * - `opensubdiv`
+ * - `openvdb`
+ * - `quadriflow`
  */
 
-/** \defgroup clog C-Logging (CLOG)
- *  \ingroup intern
- */
+/** \defgroup intern_atomic Atomic Operations
+ *  \ingroup intern */
 
-/** \defgroup ctr container
- *  \ingroup intern
- */
+/** \defgroup intern_clog C-Logging (CLOG)
+ *  \ingroup intern */
 
-/** \defgroup iksolver iksolver
- *  \ingroup intern
- */
+/** \defgroup intern_eigen Eigen
+ *  \ingroup intern */
 
-/** \defgroup itasc itasc
- *  \ingroup intern
- */
+/** \defgroup intern_glew-mx GLEW with Multiple Rendering Context's
+ *  \ingroup intern */
 
-/** \defgroup memutil memutil
- *  \ingroup intern
- */
+/** \defgroup intern_iksolver Inverse Kinematics (Solver)
+ *  \ingroup intern */
 
-/** \defgroup mikktspace mikktspace
- *  \ingroup intern
- */
+/** \defgroup intern_itasc Inverse Kinematics (ITASC)
+ *  \ingroup intern */
 
-/** \defgroup moto moto
- *  \ingroup intern
- */
+/** \defgroup intern_libc_compat libc Compatibility For Linux
+ *  \ingroup intern */
 
-/** \defgroup eigen eigen
- *  \ingroup intern
- */
+/** \defgroup intern_locale Locale
+ *  \ingroup intern */
 
-/** \defgroup smoke smoke
- *  \ingroup intern
- */
+/** \defgroup intern_mantaflow Manta-Flow Fluid Simulation
+ *  \ingroup intern */
 
-/** \defgroup string string
- *  \ingroup intern
- */
+/** \defgroup intern_mem Guarded Memory (de)allocation
+ *  \ingroup intern */
+
+/** \defgroup intern_memutil Memory Utilities (memutil)
+ *  \ingroup intern */
+
+/** \defgroup intern_mikktspace MikktSpace
+ *  \ingroup intern */
+
+/** \defgroup intern_numaapi NUMA (Non Uniform Memory Architecture)
+ *  \ingroup intern */
+
+/** \defgroup intern_rigidbody Rigid-Body C-API
+ *  \ingroup intern */
+
+/** \defgroup intern_sky_model Sky Model
+ *  \ingroup intern */
+
+/** \defgroup intern_utf_conv UTF-8/16 Conversion (utfconv)
+ *  \ingroup intern */
 
 /** \defgroup audaspace Audaspace
  *  \ingroup intern undoc
- *  \todo add to doxygen
- */
+ *  \todo add to doxygen */
 /** \defgroup audcoreaudio Audaspace CoreAudio
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audfx Audaspace FX
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audopenal Audaspace OpenAL
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audpulseaudio Audaspace PulseAudio
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audwasapi Audaspace WASAPI
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audpython Audaspace Python
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audsdl Audaspace SDL
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audsrc Audaspace SRC
- *
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audffmpeg Audaspace FFMpeg
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audfftw Audaspace FFTW
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audjack Audaspace Jack
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 /** \defgroup audsndfile Audaspace sndfile
- *  \ingroup audaspace
- */
+ *  \ingroup audaspace */
 
 /** \defgroup GHOST GHOST API
  * \ingroup intern GUI
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h
index 510f3fe8ffe..4e351c9cc04 100644
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -5,7 +5,8 @@
 /** \defgroup bmesh BMesh
  *  \ingroup blender
  */
-/** \defgroup compositor Compositing */
+/** \defgroup compositor Compositing
+ *  \ingroup blender */
 
 /** \defgroup python Python
  *  \ingroup blender
@@ -78,7 +79,8 @@
  *  \ingroup blender
  */
 
-/** \defgroup data DNA, RNA and .blend access*/
+/** \defgroup data DNA, RNA and .blend access
+ *  \ingroup blender */
 
 /** \defgroup gpu GPU
  *  \ingroup blender
@@ -101,11 +103,12 @@
  *   merged in docs.
  */
 
-/** \defgroup gui GUI */
+/**
+ * \defgroup gui GUI
+ * \ingroup blender */
 
 /** \defgroup wm Window Manager
- *  \ingroup blender gui
- */
+ *  \ingroup gui */
 
 /* ================================ */
 
@@ -279,7 +282,8 @@
  *  \ingroup gui
  */
 
-/** \defgroup externformats External Formats */
+/** \defgroup externformats External Formats
+ *  \ingroup blender */
 
 /** \defgroup collada COLLADA
  *  \ingroup externformats
@@ -308,4 +312,7 @@
 /* ================================ */
 
 /** \defgroup undoc Undocumented
- *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */
+ *
+ * \brief Modules and libraries that are still undocumented,
+ * or lacking proper integration into the doxygen system, are marked in this group.
+ */
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index ad404c756ce..6a4d6d263c0 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -45,7 +45,7 @@
  */
 
 /** \file
- * \ingroup Atomic
+ * \ingroup intern_atomic
  *
  * \brief Provides wrapper around system-specific atomic primitives,
  * and some extensions (faked-atomic operations over float numbers).
diff --git a/intern/atomic/intern/atomic_ops_ext.h b/intern/atomic/intern/atomic_ops_ext.h
index 4dbc1153506..aedf0985169 100644
--- a/intern/atomic/intern/atomic_ops_ext.h
+++ b/intern/atomic/intern/atomic_ops_ext.h
@@ -44,6 +44,10 @@
  * The Original Code is: adapted from jemalloc.
  */
 
+/** \file
+ * \ingroup intern_atomic
+ */
+
 #ifndef __ATOMIC_OPS_EXT_H__
 #define __ATOMIC_OPS_EXT_H__
 
diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h
index 9ed8f8e6295..ea5ae666db9 100644
--- a/intern/atomic/intern/atomic_ops_msvc.h
+++ b/intern/atomic/intern/atomic_ops_msvc.h
@@ -26,6 +26,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/** \file
+ * \ingroup intern_atomic
+ */
+
 #ifndef __ATOMIC_OPS_MSVC_H__
 #define __ATOMIC_OPS_MSVC_H__
 
diff --git a/intern/atomic/intern/atomic_ops_unix.h b/intern/atomic/intern/atomic_ops_unix.h
index dcafbc67949..2fcfe34d03c 100644
--- a/intern/atomic/intern/atomic_ops_unix.h
+++ b/intern/atomic/intern/atomic_ops_unix.h
@@ -44,6 +44,10 @@
  * The Original Code is: adapted from jemalloc.
  */
 
+/** \file
+ * \ingroup intern_atomic
+ */
+
 #ifndef __ATOMIC_OPS_UNIX_H__
 #define __ATOMIC_OPS_UNIX_H__
 
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h
index 01f4284284a..533cfbe9e1f 100644
--- a/intern/atomic/intern/atomic_ops_utils.h
+++ b/intern/atomic/intern/atomic_ops_utils.h
@@ -44,6 +44,10 @@
  * The Original Code is: adapted from jemalloc.
  */
 
+/** \file
+ * \ingroup intern_atomic
+ */
+
 #ifndef __ATOMIC_OPS_UTILS_H__
 #define __ATOMIC_OPS_UTILS_H__
 
diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 8a26eb035cf..3664ade2981 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -14,11 +14,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __CLG_LOG_H__
-#define __CLG_LOG_H__
-
 /** \file
- * \ingroup clog
+ * \ingroup intern_clog
  *
  * C Logging Library (clog)
  * ========================
@@ -68,6 +65,9 @@
  * - 4+: May be used for more details than 3, should be avoided but not prevented.
  */
 
+#ifndef __CLG_LOG_H__
+#define __CLG_LOG_H__
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 3501197511a..88cc0fbc4cb 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup clog
+ * \ingroup intern_clog
  */
 
 #include <assert.h>
diff --git a/intern/eigen/eigen_capi.h b/intern/eigen/eigen_capi.h
index 52ec489159f..4f8ecd03a42 100644
--- a/intern/eigen/eigen_capi.h
+++ b/intern/eigen/eigen_capi.h
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN_C_API_H__
 #define __EIGEN_C_API_H__
 
diff --git a/intern/eigen/intern/eigenvalues.h b/intern/eigen/intern/eigenvalues.h
index fabbdd87207..0f61d6ee3e8 100644
--- a/intern/eigen/intern/eigenvalues.h
+++ b/intern/eigen/intern/eigenvalues.h
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN3_EIGENVALUES_C_API_H__
 #define __EIGEN3_EIGENVALUES_C_API_H__
 
diff --git a/intern/eigen/intern/linear_solver.cc b/intern/eigen/intern/linear_solver.cc
index bce5937409c..4edc3426dca 100644
--- a/intern/eigen/intern/linear_solver.cc
+++ b/intern/eigen/intern/linear_solver.cc
@@ -22,6 +22,10 @@
  *  and the reason for such modification.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #include "linear_solver.h"
 
 #include <Eigen/Sparse>
diff --git a/intern/eigen/intern/linear_solver.h b/intern/eigen/intern/linear_solver.h
index 4da1ec05cd0..6b9f815ca88 100644
--- a/intern/eigen/intern/linear_solver.h
+++ b/intern/eigen/intern/linear_solver.h
@@ -22,6 +22,10 @@
  *  and the reason for such modification.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #pragma once
 
 #include <stdbool.h>
diff --git a/intern/eigen/intern/matrix.cc b/intern/eigen/intern/matrix.cc
index 2024a1ba59a..cff0e9cf264 100644
--- a/intern/eigen/intern/matrix.cc
+++ b/intern/eigen/intern/matrix.cc
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN3_MATRIX_C_API_CC__
 #define __EIGEN3_MATRIX_C_API_CC__
 
diff --git a/intern/eigen/intern/matrix.h b/intern/eigen/intern/matrix.h
index 91ef5e0713d..1f94e1cbe15 100644
--- a/intern/eigen/intern/matrix.h
+++ b/intern/eigen/intern/matrix.h
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN3_MATRIX_C_API_H__
 #define __EIGEN3_MATRIX_C_API_H__
 
diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc
index bfd7064353d..24aa44f4740 100644
--- a/intern/eigen/intern/svd.cc
+++ b/intern/eigen/intern/svd.cc
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN3_SVD_C_API_CC__
 #define __EIGEN3_SVD_C_API_CC__
 
diff --git a/intern/eigen/intern/svd.h b/intern/eigen/intern/svd.h
index 80238621920..3d80137dc56 100644
--- a/intern/eigen/intern/svd.h
+++ b/intern/eigen/intern/svd.h
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_eigen
+ */
+
 #ifndef __EIGEN3_SVD_C_API_H__
 #define __EIGEN3_SVD_C_API_H__
 
diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h
index f9b3e55179f..5977fddb387 100644
--- a/intern/glew-mx/glew-mx.h
+++ b/intern/glew-mx/glew-mx.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup glew-mx
+ * \ingroup intern_glew-mx
  *
  * Support for GLEW Multiple rendering conteXts (MX)
  * Maintained as a Blender Library.
diff --git a/intern/glew-mx/intern/gl-deprecated.h b/intern/glew-mx/intern/gl-deprecated.h
index d101591fea3..b07c865993e 100644
--- a/intern/glew-mx/intern/gl-deprecated.h
+++ b/intern/glew-mx/intern/gl-deprecated.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup glew-mx
+ * \ingroup intern_glew-mx
  *  Utility used to check for use of deprecated functions.
  */
 
diff --git a/intern/glew-mx/intern/glew-mx.c b/intern/glew-mx/intern/glew-mx.c
index 541d3c5efbe..7e176ff2a76 100644
--- a/intern/glew-mx/intern/glew-mx.c
+++ b/intern/glew-mx/intern/glew-mx.c
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup glew-mx
+ * \ingroup intern_glew-mx
  */
 
 #include "glew-mx.h"
diff --git a/intern/glew-mx/intern/symbol-binding.h b/intern/glew-mx/intern/symbol-binding.h
index 0dc7d859fca..e65752efed4 100644
--- a/intern/glew-mx/intern/symbol-binding.h
+++ b/intern/glew-mx/intern/symbol-binding.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup glew-mx
+ * \ingroup intern_glew-mx
  *
  * This file is for any simple stuff that is missing from GLEW when
  * compiled with either the GLEW_ES_ONLY or the GLEW_NO_ES flag.
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 874abb88ff5..3c006b9a70c 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  *
  * \brief Read \ref MEMPage
  *
diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp
index 5bde16ddb42..dadaea12cfe 100644
--- a/intern/guardedalloc/cpp/mallocn.cpp
+++ b/intern/guardedalloc/cpp/mallocn.cpp
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  */
 
 #include "../MEM_guardedalloc.h"
diff --git a/intern/guardedalloc/intern/leak_detector.cc b/intern/guardedalloc/intern/leak_detector.cc
index d3a3449049d..072b68fcc9f 100644
--- a/intern/guardedalloc/intern/leak_detector.cc
+++ b/intern/guardedalloc/intern/leak_detector.cc
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  */
 
 #include <cstdio> /* Needed for `printf` on WIN32/APPLE. */
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 261a23a1196..c7b12ed3457 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  *
  * Guarded memory allocation, and boundary-write detection.
  */
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index bba72c907eb..2720a9762bb 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  *
  * Guarded memory allocation, and boundary-write detection.
  */
diff --git a/intern/guardedalloc/intern/mallocn_inline.h b/intern/guardedalloc/intern/mallocn_inline.h
index 4e73eb9bad6..65bd40de492 100644
--- a/intern/guardedalloc/intern/mallocn_inline.h
+++ b/intern/guardedalloc/intern/mallocn_inline.h
@@ -27,7 +27,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  */
 
 #ifndef __MALLOCN_INLINE_H__
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index e4bd3d533a3..b57e11d9a8f 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  */
 
 #ifndef __MALLOCN_INTERN_H__
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
index a843086a1f1..5d522f4da88 100644
--- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c
+++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup MEM
+ * \ingroup intern_mem
  *
  * Memory allocation which keeps track on allocated memory counters
  */
diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h
index 79c57b7f44b..8e7ea11bc18 100644
--- a/intern/iksolver/extern/IK_solver.h
+++ b/intern/iksolver/extern/IK_solver.h
@@ -19,7 +19,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 /**
diff --git a/intern/iksolver/intern/IK_Math.h b/intern/iksolver/intern/IK_Math.h
index f8f8b774787..be115364fb7 100644
--- a/intern/iksolver/intern/IK_Math.h
+++ b/intern/iksolver/intern/IK_Math.h
@@ -18,6 +18,10 @@
  * Original author: Laurence
  */
 
+/** \file
+ * \ingroup intern_iksolver
+ */
+
 #pragma once
 
 #include <Eigen/Core>
diff --git a/intern/iksolver/intern/IK_QJacobian.cpp b/intern/iksolver/intern/IK_QJacobian.cpp
index 82aaaf7bb9a..19d711f3fe1 100644
--- a/intern/iksolver/intern/IK_QJacobian.cpp
+++ b/intern/iksolver/intern/IK_QJacobian.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #include "IK_QJacobian.h"
diff --git a/intern/iksolver/intern/IK_QJacobian.h b/intern/iksolver/intern/IK_QJacobian.h
index 8d4a8a7ba65..ed2d41368ad 100644
--- a/intern/iksolver/intern/IK_QJacobian.h
+++ b/intern/iksolver/intern/IK_QJacobian.h
@@ -19,7 +19,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #pragma once
diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp
index b8ad0b2c09c..efbf271c4b2 100644
--- a/intern/iksolver/intern/IK_QJacobianSolver.cpp
+++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #include <stdio.h>
diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h
index cef13625dc4..0c8ef661129 100644
--- a/intern/iksolver/intern/IK_QJacobianSolver.h
+++ b/intern/iksolver/intern/IK_QJacobianSolver.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #pragma once
diff --git a/intern/iksolver/intern/IK_QSegment.cpp b/intern/iksolver/intern/IK_QSegment.cpp
index dbbec621acd..544d68e99ca 100644
--- a/intern/iksolver/intern/IK_QSegment.cpp
+++ b/intern/iksolver/intern/IK_QSegment.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #include "IK_QSegment.h"
diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h
index 3c8c5033d28..17b56b1cfb3 100644
--- a/intern/iksolver/intern/IK_QSegment.h
+++ b/intern/iksolver/intern/IK_QSegment.h
@@ -19,7 +19,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #pragma once
diff --git a/intern/iksolver/intern/IK_QTask.cpp b/intern/iksolver/intern/IK_QTask.cpp
index f3fe24bef18..30fef1ff670 100644
--- a/intern/iksolver/intern/IK_QTask.cpp
+++ b/intern/iksolver/intern/IK_QTask.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #include "IK_QTask.h"
diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h
index 595d1454872..faca6e2a036 100644
--- a/intern/iksolver/intern/IK_QTask.h
+++ b/intern/iksolver/intern/IK_QTask.h
@@ -19,7 +19,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #pragma once
diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp
index b274e005990..368546d7cef 100644
--- a/intern/iksolver/intern/IK_Solver.cpp
+++ b/intern/iksolver/intern/IK_Solver.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup iksolver
+ * \ingroup intern_iksolver
  */
 
 #include "../extern/IK_solver.h"
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp
index abbfc851eae..f365d40e9f1 100644
--- a/intern/itasc/Armature.cpp
+++ b/intern/itasc/Armature.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/Armature.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * Armature.cpp
diff --git a/intern/itasc/Cache.cpp b/intern/itasc/Cache.cpp
index eeae070dc3e..28e6fbd22b1 100644
--- a/intern/itasc/Cache.cpp
+++ b/intern/itasc/Cache.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/Cache.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * Cache.cpp
diff --git a/intern/itasc/ConstraintSet.cpp b/intern/itasc/ConstraintSet.cpp
index 2df5cb13df8..fda1ee9d70d 100644
--- a/intern/itasc/ConstraintSet.cpp
+++ b/intern/itasc/ConstraintSet.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/ConstraintSet.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * ConstraintSet.cpp
diff --git a/intern/itasc/ControlledObject.cpp b/intern/itasc/ControlledObject.cpp
index 3c3e87ee09e..bb2e4117361 100644
--- a/intern/itasc/ControlledObject.cpp
+++ b/intern/itasc/ControlledObject.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/ControlledObject.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * ControlledObject.cpp
diff --git a/intern/itasc/CopyPose.cpp b/intern/itasc/CopyPose.cpp
index 8b177bb102d..a9b6d3cd680 100644
--- a/intern/itasc/CopyPose.cpp
+++ b/intern/itasc/CopyPose.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/CopyPose.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * CopyPose.cpp
diff --git a/intern/itasc/Distance.cpp b/intern/itasc/Distance.cpp
index eebe9bab4c6..6a368944ed3 100644
--- a/intern/itasc/Distance.cpp
+++ b/intern/itasc/Distance.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/Distance.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * Distance.cpp
diff --git a/intern/itasc/FixedObject.cpp b/intern/itasc/FixedObject.cpp
index ff30ffac946..8a547ac2b05 100644
--- a/intern/itasc/FixedObject.cpp
+++ b/intern/itasc/FixedObject.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/FixedObject.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * FixedObject.cpp
diff --git a/intern/itasc/MovingFrame.cpp b/intern/itasc/MovingFrame.cpp
index 1b3062765a9..e3f4d612155 100644
--- a/intern/itasc/MovingFrame.cpp
+++ b/intern/itasc/MovingFrame.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/MovingFrame.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * MovingFrame.cpp
diff --git a/intern/itasc/Scene.cpp b/intern/itasc/Scene.cpp
index 0d2486ceac7..b5f8e4df386 100644
--- a/intern/itasc/Scene.cpp
+++ b/intern/itasc/Scene.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/Scene.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * Scene.cpp
diff --git a/intern/itasc/UncontrolledObject.cpp b/intern/itasc/UncontrolledObject.cpp
index 9f638107c99..3083b711217 100644
--- a/intern/itasc/UncontrolledObject.cpp
+++ b/intern/itasc/UncontrolledObject.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/UncontrolledObject.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * UncontrolledObject.cpp
diff --git a/intern/itasc/WDLSSolver.cpp b/intern/itasc/WDLSSolver.cpp
index 0a5a0afd0d8..c5221fc2767 100644
--- a/intern/itasc/WDLSSolver.cpp
+++ b/intern/itasc/WDLSSolver.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/WDLSSolver.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * WDLSSolver.hpp.cpp
diff --git a/intern/itasc/WSDLSSolver.cpp b/intern/itasc/WSDLSSolver.cpp
index cc009d7ae46..32273828acc 100644
--- a/intern/itasc/WSDLSSolver.cpp
+++ b/intern/itasc/WSDLSSolver.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/WSDLSSolver.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * WDLSSolver.hpp.cpp
diff --git a/intern/itasc/WorldObject.cpp b/intern/itasc/WorldObject.cpp
index 998b180b73b..34641478ea0 100644
--- a/intern/itasc/WorldObject.cpp
+++ b/intern/itasc/WorldObject.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/WorldObject.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * WorldObject.cpp
diff --git a/intern/itasc/eigen_types.cpp b/intern/itasc/eigen_types.cpp
index e8ae3d878ab..a1c0525766e 100644
--- a/intern/itasc/eigen_types.cpp
+++ b/intern/itasc/eigen_types.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/eigen_types.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * eigen_types.cpp
diff --git a/intern/itasc/kdl/chain.cpp b/intern/itasc/kdl/chain.cpp
index 1ab8ee3e648..8137ade1847 100644
--- a/intern/itasc/kdl/chain.cpp
+++ b/intern/itasc/kdl/chain.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/chain.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/chainfksolverpos_recursive.cpp b/intern/itasc/kdl/chainfksolverpos_recursive.cpp
index a0d7262f427..d5149256c0d 100644
--- a/intern/itasc/kdl/chainfksolverpos_recursive.cpp
+++ b/intern/itasc/kdl/chainfksolverpos_recursive.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/chainfksolverpos_recursive.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Francois Cauwe <francois at cauwe dot org>
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
diff --git a/intern/itasc/kdl/chainjnttojacsolver.cpp b/intern/itasc/kdl/chainjnttojacsolver.cpp
index eb84a5d863e..ea183fac4fb 100644
--- a/intern/itasc/kdl/chainjnttojacsolver.cpp
+++ b/intern/itasc/kdl/chainjnttojacsolver.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/chainjnttojacsolver.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/frameacc.cpp b/intern/itasc/kdl/frameacc.cpp
index f145d4de074..7c294aeb268 100644
--- a/intern/itasc/kdl/frameacc.cpp
+++ b/intern/itasc/kdl/frameacc.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/frameacc.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*****************************************************************************
  *  	Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven
diff --git a/intern/itasc/kdl/frames.cpp b/intern/itasc/kdl/frames.cpp
index 517176babb2..747a54909e9 100644
--- a/intern/itasc/kdl/frames.cpp
+++ b/intern/itasc/kdl/frames.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/frames.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /***************************************************************************
                         frames.cxx -  description
diff --git a/intern/itasc/kdl/frames_io.cpp b/intern/itasc/kdl/frames_io.cpp
index a35de29da18..782524ce77c 100644
--- a/intern/itasc/kdl/frames_io.cpp
+++ b/intern/itasc/kdl/frames_io.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/frames_io.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 
 /***************************************************************************
diff --git a/intern/itasc/kdl/framevel.cpp b/intern/itasc/kdl/framevel.cpp
index 8ccefee999e..d86d9ad2ef6 100644
--- a/intern/itasc/kdl/framevel.cpp
+++ b/intern/itasc/kdl/framevel.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/framevel.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*****************************************************************************
  *  	Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven
diff --git a/intern/itasc/kdl/inertia.cpp b/intern/itasc/kdl/inertia.cpp
index 1a1dc4629ed..651666cf7b9 100644
--- a/intern/itasc/kdl/inertia.cpp
+++ b/intern/itasc/kdl/inertia.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/inertia.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/jacobian.cpp b/intern/itasc/kdl/jacobian.cpp
index e02ab8cbb8b..e15eeac286c 100644
--- a/intern/itasc/kdl/jacobian.cpp
+++ b/intern/itasc/kdl/jacobian.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/jacobian.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/jntarray.cpp b/intern/itasc/kdl/jntarray.cpp
index e427239e69a..40a1a8449aa 100644
--- a/intern/itasc/kdl/jntarray.cpp
+++ b/intern/itasc/kdl/jntarray.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/jntarray.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/jntarrayacc.cpp b/intern/itasc/kdl/jntarrayacc.cpp
index b6bbd541c1d..51e14e56f6f 100644
--- a/intern/itasc/kdl/jntarrayacc.cpp
+++ b/intern/itasc/kdl/jntarrayacc.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/jntarrayacc.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/jntarrayvel.cpp b/intern/itasc/kdl/jntarrayvel.cpp
index 5e00aabc413..9f9328e88c4 100644
--- a/intern/itasc/kdl/jntarrayvel.cpp
+++ b/intern/itasc/kdl/jntarrayvel.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/jntarrayvel.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/joint.cpp b/intern/itasc/kdl/joint.cpp
index 388539ecb02..2ec71066c66 100644
--- a/intern/itasc/kdl/joint.cpp
+++ b/intern/itasc/kdl/joint.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/joint.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/kinfam_io.cpp b/intern/itasc/kdl/kinfam_io.cpp
index 006c3c797f0..5ae62648c2b 100644
--- a/intern/itasc/kdl/kinfam_io.cpp
+++ b/intern/itasc/kdl/kinfam_io.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/kinfam_io.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/segment.cpp b/intern/itasc/kdl/segment.cpp
index dfdcad5df2d..b116095c8b2 100644
--- a/intern/itasc/kdl/segment.cpp
+++ b/intern/itasc/kdl/segment.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/segment.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Version: 1.0
 // Author: Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
diff --git a/intern/itasc/kdl/tree.cpp b/intern/itasc/kdl/tree.cpp
index e266c4d2d50..39c7f58d433 100644
--- a/intern/itasc/kdl/tree.cpp
+++ b/intern/itasc/kdl/tree.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/tree.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 
diff --git a/intern/itasc/kdl/treefksolverpos_recursive.cpp b/intern/itasc/kdl/treefksolverpos_recursive.cpp
index e084296648c..f465e13a84c 100644
--- a/intern/itasc/kdl/treefksolverpos_recursive.cpp
+++ b/intern/itasc/kdl/treefksolverpos_recursive.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/treefksolverpos_recursive.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 // Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
 // Copyright  (C)  2008 Julia Jesse
diff --git a/intern/itasc/kdl/treejnttojacsolver.cpp b/intern/itasc/kdl/treejnttojacsolver.cpp
index 0db14541bb6..94ecad7aec5 100644
--- a/intern/itasc/kdl/treejnttojacsolver.cpp
+++ b/intern/itasc/kdl/treejnttojacsolver.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/treejnttojacsolver.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*
  * TreeJntToJacSolver.cpp
diff --git a/intern/itasc/kdl/utilities/error_stack.cpp b/intern/itasc/kdl/utilities/error_stack.cpp
index a8585681266..a409effb193 100644
--- a/intern/itasc/kdl/utilities/error_stack.cpp
+++ b/intern/itasc/kdl/utilities/error_stack.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/utilities/error_stack.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*****************************************************************************
  *  	Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven
diff --git a/intern/itasc/kdl/utilities/kdl-config.h b/intern/itasc/kdl/utilities/kdl-config.h
index ecdf73612d7..b49ddf91058 100644
--- a/intern/itasc/kdl/utilities/kdl-config.h
+++ b/intern/itasc/kdl/utilities/kdl-config.h
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/utilities/kdl-config.h
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /* Copyright  (C)  2007  Ruben Smits <ruben dot smits at mech dot kuleuven dot be> */
 
diff --git a/intern/itasc/kdl/utilities/traits.h b/intern/itasc/kdl/utilities/traits.h
index 7b0b5f1b30f..32cc2eaa2e3 100644
--- a/intern/itasc/kdl/utilities/traits.h
+++ b/intern/itasc/kdl/utilities/traits.h
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/utilities/traits.h
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 #ifndef KDLPV_TRAITS_H 
 #define KDLPV_TRAITS_H 
diff --git a/intern/itasc/kdl/utilities/utility.cpp b/intern/itasc/kdl/utilities/utility.cpp
index 5fc8403bdb7..fa8f89fde63 100644
--- a/intern/itasc/kdl/utilities/utility.cpp
+++ b/intern/itasc/kdl/utilities/utility.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/utilities/utility.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /** @file   utility.cpp
  *  @author Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven
diff --git a/intern/itasc/kdl/utilities/utility_io.cpp b/intern/itasc/kdl/utilities/utility_io.cpp
index 8d289dbfa50..de9511b9efb 100644
--- a/intern/itasc/kdl/utilities/utility_io.cpp
+++ b/intern/itasc/kdl/utilities/utility_io.cpp
@@ -1,5 +1,5 @@
 /** \file itasc/kdl/utilities/utility_io.cpp
- * \ingroup itasc
+ * \ingroup intern_itasc
  */
 /*****************************************************************************
  *  	Erwin Aertbelien, Div. PMA, Dep. of Mech. Eng., K.U.Leuven
diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c
index 78e387e3117..0bf22879422 100644
--- a/intern/libc_compat/libc_compat.c
+++ b/intern/libc_compat/libc_compat.c
@@ -21,6 +21,10 @@
  * incompatible with the system libraries that Blender is built on. To solve
  * this we add a few -ffast-math symbols that can be missing. */
 
+/** \file
+ * \ingroup intern_libc_compat
+ */
+
 #ifdef __linux__
 #  include <features.h>
 #  include <math.h>
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index 444b51b5e04..873ebca6873 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_locale
+ */
+
 #include <boost/locale.hpp>
 #include <stdio.h>
 
diff --git a/intern/locale/boost_locale_wrapper.h b/intern/locale/boost_locale_wrapper.h
index deb552e4871..8eb51735fe5 100644
--- a/intern/locale/boost_locale_wrapper.h
+++ b/intern/locale/boost_locale_wrapper.h
@@ -18,8 +18,8 @@
  */
 
 /** \file
- * \ingroup locale
- *  A thin C wrapper around boost::locale...
+ * \ingroup intern_locale
+ *  A thin C wrapper around `boost::locale`.
  */
 
 #ifndef __BOOST_LOCALE_WRAPPER_H__
diff --git a/intern/locale/osx_user_locale.mm b/intern/locale/osx_user_locale.mm
index ce694b5fc1e..8776c658b52 100644
--- a/intern/locale/osx_user_locale.mm
+++ b/intern/locale/osx_user_locale.mm
@@ -1,5 +1,9 @@
 #include "boost_locale_wrapper.h"
 
+/** \file
+ * \ingroup intern_locale
+ */
+
 #import <Cocoa/Cocoa.h>
 
 #include <cstdlib>
diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h
index e4ad4c66d8a..d59a7bde426 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #ifndef MANTA_API_H
diff --git a/intern/mantaflow/extern/manta_python_API.h b/intern/mantaflow/extern/manta_python_API.h
index 02d96d2e5f2..1d66725946b 100644
--- a/intern/mantaflow/extern/manta_python_API.h
+++ b/intern/mantaflow/extern/manta_python_API.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #ifndef MANTA_PYTHON_API_H
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 6c8e45ceeb4..858e17443d3 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include <fstream>
diff --git a/intern/mantaflow/intern/MANTA_main.h b/intern/mantaflow/intern/MANTA_main.h
index 7129a545243..5514b1c651a 100644
--- a/intern/mantaflow/intern/MANTA_main.h
+++ b/intern/mantaflow/intern/MANTA_main.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #ifndef MANTA_A_H
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp
index 5b27bd91d91..4a096afa9c8 100644
--- a/intern/mantaflow/intern/manta_fluid_API.cpp
+++ b/intern/mantaflow/intern/manta_fluid_API.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include <cmath>
diff --git a/intern/mantaflow/intern/manta_python_API.cpp b/intern/mantaflow/intern/manta_python_API.cpp
index a905e045fd3..977a5b6b7c4 100644
--- a/intern/mantaflow/intern/manta_python_API.cpp
+++ b/intern/mantaflow/intern/manta_python_API.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include "manta_python_API.h"
diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h
index 3bf8e66c110..f3a72e69cd3 100644
--- a/intern/mantaflow/intern/strings/fluid_script.h
+++ b/intern/mantaflow/intern/strings/fluid_script.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include <string>
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index c44727bd47e..94450653703 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include <string>
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 157cfff1a27..9a6f6c0a0e0 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup mantaflow
+ * \ingroup intern_mantaflow
  */
 
 #include <string>
diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h
index 1dbb2d5a9f7..2afe66023ac 100644
--- a/intern/memutil/MEM_Allocator.h
+++ b/intern/memutil/MEM_Allocator.h
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  */
 
 #ifndef __MEM_ALLOCATOR_H__
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h
index a8706454de8..d0e52f8540c 100644
--- a/intern/memutil/MEM_CacheLimiter.h
+++ b/intern/memutil/MEM_CacheLimiter.h
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  */
 
 #ifndef __MEM_CACHELIMITER_H__
diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h
index 2bbbfb75555..9a2e404d9da 100644
--- a/intern/memutil/MEM_CacheLimiterC-Api.h
+++ b/intern/memutil/MEM_CacheLimiterC-Api.h
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  */
 
 #ifndef __MEM_CACHELIMITERC_API_H__
diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h
index 06828fc32c3..319effdebaf 100644
--- a/intern/memutil/MEM_RefCounted.h
+++ b/intern/memutil/MEM_RefCounted.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  *
  * Declaration of MEM_RefCounted class.
  */
diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h
index 2a132f3c173..0e5dd5e0ae3 100644
--- a/intern/memutil/MEM_RefCountedC-Api.h
+++ b/intern/memutil/MEM_RefCountedC-Api.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  *
  * Interface for C access to functionality relating to shared objects in the foundation library.
  */
diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
index 9f583c948ee..099c89f2dfe 100644
--- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
+++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  */
 
 #include <cstddef>
diff --git a/intern/memutil/intern/MEM_RefCountedC-Api.cpp b/intern/memutil/intern/MEM_RefCountedC-Api.cpp
index c319d6321f4..8a0eebcd5e4 100644
--- a/intern/memutil/intern/MEM_RefCountedC-Api.cpp
+++ b/intern/memutil/intern/MEM_RefCountedC-Api.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup memutil
+ * \ingroup intern_memutil
  */
 
 #include "MEM_RefCountedC-Api.h"
diff --git a/intern/numaapi/include/numaapi.h b/intern/numaapi/include/numaapi.h
index ce7139a9cfb..11e916019ef 100644
--- a/intern/numaapi/include/numaapi.h
+++ b/intern/numaapi/include/numaapi.h
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #ifndef __LIBNUMAAPI_H__
 #define __LIBNUMAAPI_H__
 
diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h
index 49d82aa3e87..e7c332483b5 100644
--- a/intern/numaapi/source/build_config.h
+++ b/intern/numaapi/source/build_config.h
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #ifndef __BUILD_CONFIG_H__
 #define __BUILD_CONFIG_H__
 
diff --git a/intern/numaapi/source/numaapi.c b/intern/numaapi/source/numaapi.c
index c482fc556bb..ef3f5b19dac 100644
--- a/intern/numaapi/source/numaapi.c
+++ b/intern/numaapi/source/numaapi.c
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #include "numaapi.h"
 
 #include <assert.h>
diff --git a/intern/numaapi/source/numaapi_linux.c b/intern/numaapi/source/numaapi_linux.c
index 853aeeb34ba..ed5ae1bd35d 100644
--- a/intern/numaapi/source/numaapi_linux.c
+++ b/intern/numaapi/source/numaapi_linux.c
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #include "build_config.h"
 
 #if OS_LINUX
diff --git a/intern/numaapi/source/numaapi_stub.c b/intern/numaapi/source/numaapi_stub.c
index a364eb9135a..85a4fab0a86 100644
--- a/intern/numaapi/source/numaapi_stub.c
+++ b/intern/numaapi/source/numaapi_stub.c
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #include "numaapi.h"
 
 #include "build_config.h"
diff --git a/intern/numaapi/source/numaapi_win32.c b/intern/numaapi/source/numaapi_win32.c
index 93064ff48b7..1a3634539ce 100644
--- a/intern/numaapi/source/numaapi_win32.c
+++ b/intern/numaapi/source/numaapi_win32.c
@@ -20,6 +20,10 @@
 //
 // Author: Sergey Sharybin <sergey.vfx@gmail.com>
 
+/** \file
+ * \ingroup intern_numaapi
+ */
+
 #include "build_config.h"
 
 #if OS_WIN
diff --git a/intern/rigidbody/RBI_api.h b/intern/rigidbody/RBI_api.h
index f13f321a2c6..c37d4bc6619 100644
--- a/intern/rigidbody/RBI_api.h
+++ b/intern/rigidbody/RBI_api.h
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup RigidBody
+ * \ingroup intern_rigidbody
  * \brief Rigid Body API for interfacing with external Physics Engines
  */
 
diff --git a/intern/rigidbody/RBI_hull_api.h b/intern/rigidbody/RBI_hull_api.h
index 3bd216b92cb..01c98f4772e 100644
--- a/intern/rigidbody/RBI_hull_api.h
+++ b/intern/rigidbody/RBI_hull_api.h
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_rigidbody
+ */
+
 #ifndef __RB_HULL_API_H__
 #define __RB_HULL_API_H__
 
diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
index daa377a7b55..57d55939218 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -18,7 +18,7 @@
  */
 
 /** \file
- * \ingroup RigidBody
+ * \ingroup intern_rigidbody
  * \brief Rigid Body API implementation for Bullet
  */
 
diff --git a/intern/rigidbody/rb_convex_hull_api.cpp b/intern/rigidbody/rb_convex_hull_api.cpp
index 03e7580a12b..3b80dfdeae9 100644
--- a/intern/rigidbody/rb_convex_hull_api.cpp
+++ b/intern/rigidbody/rb_convex_hull_api.cpp
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_rigidbody
+ */
+
 #include "LinearMath/btConvexHullComputer.h"
 #include "RBI_hull_api.h"
 
diff --git a/intern/sky/include/sky_model.h b/intern/sky/include/sky_model.h
index 752b5c13785..38a479ade0f 100644
--- a/intern/sky/include/sky_model.h
+++ b/intern/sky/include/sky_model.h
@@ -298,6 +298,10 @@ HINT #1:   if you want to model the sky of an earth-like planet that orbits
            previous paragraph.
 */
 
+/** \file
+ * \ingroup intern_sky_modal
+ */
+
 #ifndef __SKY_MODEL_H__
 #define __SKY_MODEL_H__
 
diff --git a/intern/sky/source/sky_float3.h b/intern/sky/source/sky_float3.h
index 2a9b9c89623..8370d8127ed 100644
--- a/intern/sky/source/sky_float3.h
+++ b/intern/sky/source/sky_float3.h
@@ -14,6 +14,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/** \file
+ * \ingroup intern_sky_modal
+ */
+
 #ifndef __SKY_FLOAT3_H__
 #define __SKY_FLOAT3_H__
 
diff --git a/intern/sky/source/sky_model.cpp b/intern/sky/source/sky_model.cpp
index 165444003d3..b5bf415da26 100644
--- a/intern/sky/source/sky_model.cpp
+++ b/intern/sky/source/sky_model.cpp
@@ -97,6 +97,10 @@ All instructions on how to use this code are in the accompanying header file.
 
 */
 
+/** \file
+ * \ingroup intern_sky_modal
+ */
+
 #include "sky_model.h"
 #include "sky_model_data.h"
 
diff --git a/intern/sky/source/sky_model_data.h b/intern/sky/source/sky_model_data.h
index 8d98f84cdae..4f7bcb7cc48 100644
--- a/intern/sky/source/sky_model_data.h
+++ b/intern/sky/source/sky_model_data.h
@@ -98,6 +98,10 @@ the model.
 
 */
 
+/** \file
+ * \ingroup intern_sky_modal
+ */
+
 // Uses Sep 9 pattern / Aug 23 mean dataset
 
 static const double datasetXYZ1[] = {
diff --git a/intern/sky/source/sky_nishita.cpp b/intern/sky/source/sky_nishita.cpp
index 24cce6cd46f..615755390c7 100644
--- a/intern/sky/source/sky_nishita.cpp
+++ b/intern/sky/source/sky_nishita.cpp
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+/** \file
+ * \ingroup intern_sky_modal
+ */
+
 #include "sky_float3.h"
 #include "sky_model.h"
 
diff --git a/intern/utfconv/utf_winfunc.c b/intern/utfconv/utf_winfunc.c
index 615379d454a..9de2bcab3fc 100644
--- a/intern/utfconv/utf_winfunc.c
+++ b/intern/utfconv/utf_winfunc.c
@@ -17,6 +17,10 @@
  * All rights reserved.
  */
 
+/** \file
+ * \ingroup intern_utf_conv
+ */
+
 #ifndef _WIN32_IE
 #  define _WIN32_IE 0x0501
 #endif
diff --git a/intern/utfconv/utf_winfunc.h b/intern/utfconv/utf_winfunc.h
index 596109cac0e..b6f2ccad219 100644
--- a/intern/utfconv/utf_winfunc.h
+++ b/intern/utfconv/utf_winfunc.h
@@ -15,7 +15,10 @@
  *
  * The Original Code is Copyright (C) 2012 Blender Foundation.
  * All rights reserved.
- *
+ */
+
+/** \file
+ * \ingroup intern_utf_conv
  */
 
 #ifndef __UTF_WINFUNC_H__
diff --git a/intern/utfconv/utfconv.c b/intern/utfconv/utfconv.c
index 26fb1d44d28..00094b84042 100644
--- a/intern/utfconv/utfconv.c
+++ b/intern/utfconv/utfconv.c
@@ -15,7 +15,10 @@
  *
  * The Original Code is Copyright (C) 2012 Blender Foundation.
  * All rights reserved.
- *
+ */
+
+/** \file
+ * \ingroup intern_utf_conv
  */
 
 #include "utfconv.h"
diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h
index b4addd72c75..d3f62dfc1a4 100644
--- a/intern/utfconv/utfconv.h
+++ b/intern/utfconv/utfconv.h
@@ -15,7 +15,10 @@
  *
  * The Original Code is Copyright (C) 2012 Blender Foundation.
  * All rights reserved.
- *
+ */
+
+/** \file
+ * \ingroup intern_utf_conv
  */
 
 #ifndef __UTFCONV_H__
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index 4eb3b763f09..67d189fe5f8 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -28,12 +28,19 @@ extern "C" {
 /* Keep ascii art. */
 /* clang-format off */
 /**
+ *
  * \defgroup Model The data model of the compositor
+ * \ingroup compositor
  * \defgroup Memory The memory management stuff
+ * \ingroup compositor
  * \defgroup Execution The execution logic
+ * \ingroup compositor
  * \defgroup Conversion Conversion logic
+ * \ingroup compositor
  * \defgroup Node All nodes of the compositor
+ * \ingroup compositor
  * \defgroup Operation All operations of the compositor
+ * \ingroup compositor
  *
  * \page Introduction of the Blender Compositor
  *