diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 7db906c9491..c745cbf3be9 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -116,6 +116,9 @@
 /** Number of texture units - GL_ARB_multitexture */
 #define MAX_TEXTURE_UNITS 8
 
+/*@}*/
+
+
 /**
  * \name Separate numbers of texture coordinates and texture image units.
  *
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index c29c27efe6a..e314fd8fa12 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -703,9 +703,6 @@ struct dd_function_table {
    /*@}*/
 
 
-   /*@}*/
-
-
    /** 
     * \name State-query functions
     *
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 67e4de9239a..1999758dfba 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -102,6 +102,8 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define CLAMPED_FLOAT_TO_USHORT(us, f)  \
         us = ( (GLushort) IROUND( (f) * 65535.0F) )
 
+/*@}*/
+
 
 /** Stepping a GLfloat pointer by a byte stride */
 #define STRIDE_F(p, i)  (p = (GLfloat *)((GLubyte *)p + i))
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 32696c8b668..13dee255100 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -36,7 +36,7 @@
 
 
 /** \name API functions */
-/*@*/
+/*@{*/
 
 extern void GLAPIENTRY
 _mesa_GetPixelMapfv( GLenum map, GLfloat *values );