diff --git a/doc/Doxyfile b/doc/Doxyfile
index 8bf8de71edcb4012d29554b92c777ac7019a70e0..83b5188ff41759e58a924adb9904b9168c17d430 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -626,7 +626,11 @@ INPUT                  = doxygen.main \
                          ../source/blender/blenloader \
                          ../source/blender/readblenfile \
                          ../source/blender/blenkernel \
-                         ../source/blender/blenlib
+                         ../source/blender/blenlib \
+                         ../source/blender/render \
+                         ../source/blender/nodes \
+                         ../source/blender/modifiers \
+                         ../source/blender/gpu
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
diff --git a/doc/doxygen.main b/doc/doxygen.main
index 201596c0e7ab0b2c20df84eb3857852daeccfbc1..e8927c8ffc1ddb32a10ee1390d6a90c0d3414638 100644
--- a/doc/doxygen.main
+++ b/doc/doxygen.main
@@ -8,31 +8,6 @@
  *
  * For more information on using Blender browse to http://www.blender.org
  *
- * \section sects Main sections of the blender code
- *
- *  The following sections are the broad categories into which the various modules
- *  belong.
- *
- *  - \ref render
- *  - \ref meshedit
- *  - \ref texture
- *  - \ref compositor
- *  - \ref scripts
- *  - \ref gameengine
- *  - \ref data
- *
- * \section GUI
- *  - \ref gui
- *
- * \section libraries Libraries and Wrappers
- *  - \ref GHOST
- *  - \ref imbuf
- *  - \ref audaspace
- *  - \ref DNA
- *  - \ref RNA
- *
- * \section Miscellaneous
- *  - \ref undoc
  */
 
 /** \defgroup intern Internal libraries
@@ -65,6 +40,10 @@
 
 /** \defgroup scripts Scripting */
 
+/** \defgroup python Python
+ *  \ingroup scripts
+ */
+
 /** \defgroup gameengine Game Engine */
 
 /** \defgroup audaspace Audaspace
@@ -82,10 +61,20 @@
  *  \ingroup core
  */
 
+/** \defgroup nodes nodes
+ *  \ingroup core
+ */
+
+/** \defgroup modifiers modifiers
+ *  \ingroup core
+ */
+
 /** \defgroup data DNA, RNA and .blend access*/
 
 /** \defgroup GHOST GHOST API */
 
+/** \defgroup gpu GPU */
+
 /** \defgroup DNA sDNA
  *  \ingroup data
  */
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 4c6e24cde62cf7f7fef8408606fd0e9917daaac9..7ce166d92bd9844572efcd23ab1782aa70c40d1b 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file GPU_buffers.h
+ *  \ingroup gpu
+ */
+
 #ifndef __GPU_BUFFERS_H__
 #define __GPU_BUFFERS_H__
 
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 1f1bbab9abf0a93364ea891e2c85f6cb50c2550d..18a6f1ba73dfd82737b80e0ce0361389fce7d60f 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file GPU_draw.h
+ *  \ingroup gpu
+ */
+
 #ifndef GPU_GAME_H
 #define GPU_GAME_H
 
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h
index 4256d49430253abe1f291a827898a91b6324f13e..90c9925708702764b2be9ed8e67544d2b1ef7034 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file GPU_extensions.h
+ *  \ingroup gpu
+ */
+
 #ifndef GPU_EXTENSIONS_H
 #define GPU_EXTENSIONS_H
 
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index bfc74683c9d3c5d9de34dc23991bd16cb3e7eed7..f563d8cbe92727c5c2d22084852a88830dc6dc3c 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file GPU_material.h
+ *  \ingroup gpu
+ */
+
 #ifndef __GPU_MATERIAL__
 #define __GPU_MATERIAL__
 
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index 6063acf47f4a8fca6eddc0a40174c05a411b6b7b..8486e2b5d29341709cffeaa6670f46f254d57481 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -25,6 +25,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file MOD_modifiertypes.h
+ *  \ingroup modifiers
+ */
+
 #ifndef MOD_MODIFIERTYPES_H
 #define MOD_MODIFIERTYPES_H
 
diff --git a/source/blender/nodes/CMP_node.h b/source/blender/nodes/CMP_node.h
index 4cbb5599797fa68a06a17b9dde34a6cc66ba242f..65c9236710f397b5e284769748ce56269ad42847 100644
--- a/source/blender/nodes/CMP_node.h
+++ b/source/blender/nodes/CMP_node.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file CMP_node.h
+ *  \ingroup nodes
+ */
+
 #ifndef CMP_NODE_H
 #define CMP_NODE_H
 
diff --git a/source/blender/nodes/SHD_node.h b/source/blender/nodes/SHD_node.h
index 20a7aa083eca489c945af0c255aa30a91e0ec258..80e5eec6893017c6ef501cbe143f75ce895b214f 100644
--- a/source/blender/nodes/SHD_node.h
+++ b/source/blender/nodes/SHD_node.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file SHD_node.h
+ *  \ingroup nodes
+ */
+
 #ifndef SHD_NODE_H
 #define SHD_NODE_H
 
diff --git a/source/blender/nodes/TEX_node.h b/source/blender/nodes/TEX_node.h
index b741c654b15eec6c08bd4c7683bd78a6ec25fc53..23a6b4427af91748589c76438e2a0fcf13e3ad05 100644
--- a/source/blender/nodes/TEX_node.h
+++ b/source/blender/nodes/TEX_node.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -30,6 +30,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file TEX_node.h
+ *  \ingroup nodes
+ */
+
 #ifndef TEX_NODE_H
 #define TEX_NODE_H
 
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index e559f0bf57b33845b7f3d07a373216cc2b49b3a7..2abe6044ca3a6402387c155bea986ce88908c348 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -27,6 +27,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file BPY_extern.h
+ *  \ingroup python
+ */
+
+
+
 #ifndef BPY_EXTERN_H
 #define BPY_EXTERN_H
 
diff --git a/source/blender/python/generic/blf_py_api.h b/source/blender/python/generic/blf_py_api.h
index db17f62337bf7fe51b17d4f7380a94f79d21565f..316bad3a4c9203f9b2f6b0b8d99fbee20df174b4 100644
--- a/source/blender/python/generic/blf_py_api.h
+++ b/source/blender/python/generic/blf_py_api.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index fa71101cbe8213f6e504fcae630a155859939c97..b64538cb45216b09c8485bc96c19f755ccaa9c66 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -27,6 +27,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file RE_pipeline.h
+ *  \ingroup render
+ */
+
 #ifndef RE_PIPELINE_H
 #define RE_PIPELINE_H
 
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index b04f7247e2a9ad742162665444f61782acdeb1c5..849640a5c1670b96576a47fcc03597bbf4647491 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -26,6 +26,10 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+/** \file RE_render_ext.h
+ *  \ingroup render
+ */
+
 
 #ifndef RE_RENDER_EXT_H
 #define RE_RENDER_EXT_H
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 7825d2e46475bc21ac061abbc765df67ed33cabc..ca04990efadf55ac7af573c86212d3345dd0e684 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -26,6 +26,10 @@
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+/** \file RE_shader_ext.h
+ *  \ingroup render
+ */
+
 
 #ifndef RE_SHADER_EXT_H
 #define RE_SHADER_EXT_H