diff --git a/devel/ftoption.h b/devel/ftoption.h
index 801238ae6..c434ac1cf 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -50,8 +50,10 @@ FT_BEGIN_HEADER
    *   slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to
    *   locate this file during the build.  For example,
    *
+   *   {
    *     #define FT_CONFIG_OPTIONS_H  <myftoptions.h>
    *     #include <freetype/config/ftheader.h>
+   *   }
    *
    *   will use `$BUILD/myftoptions.h' instead of this file for macro
    *   definitions.
@@ -351,8 +353,7 @@ FT_BEGIN_HEADER
    *
    * Guessing methods to access embedded resource forks
    *
-   *   Enable extra Mac fonts support on non-Mac platforms (e.g.
-   *   GNU/Linux).
+   *   Enable extra Mac fonts support on non-Mac platforms (e.g., GNU/Linux).
    *
    *   Resource forks which include fonts data are stored sometimes in
    *   locations which users or developers don't expected.  In some cases,
@@ -429,22 +430,28 @@ FT_BEGIN_HEADER
    *   boolean variables (consequently, you should *never* enable this
    *   while compiling in `release' mode):
    *
+   *   {
    *     _af_debug_disable_horz_hints
    *     _af_debug_disable_vert_hints
    *     _af_debug_disable_blue_hints
+   *   }
    *
    *   Additionally, the following functions provide dumps of various
    *   internal autofit structures to stdout (using `printf'):
    *
+   *   {
    *     af_glyph_hints_dump_points
    *     af_glyph_hints_dump_segments
    *     af_glyph_hints_dump_edges
    *     af_glyph_hints_get_num_segments
    *     af_glyph_hints_get_segment_offset
+   *   }
    *
    *   As an argument, they use another global variable:
    *
+   *   {
    *     _af_debug_hints
+   *   }
    *
    *   Please have a look at the `ftgrid' demo program to see how those
    *   variables and macros should be used.
@@ -888,9 +895,11 @@ FT_BEGIN_HEADER
    * like Fedora that did not un-patch the following change (which was
    * present in FreeType between versions 2.4.6 and 2.7.1, inclusive).
    *
+   * {
    *   2011-07-16  Steven Chu  <steven.f.chu@gmail.com>
    *
    *     [truetype] Fix metrics on size request for scalable fonts.
+   * }
    *
    * This problematic commit is now reverted (more or less).
    */
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 3062e288a..18c7d13eb 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -50,8 +50,10 @@ FT_BEGIN_HEADER
    *   slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to
    *   locate this file during the build.  For example,
    *
+   *   {
    *     #define FT_CONFIG_OPTIONS_H  <myftoptions.h>
    *     #include <freetype/config/ftheader.h>
+   *   }
    *
    *   will use `$BUILD/myftoptions.h' instead of this file for macro
    *   definitions.
@@ -351,8 +353,7 @@ FT_BEGIN_HEADER
    *
    * Guessing methods to access embedded resource forks
    *
-   *   Enable extra Mac fonts support on non-Mac platforms (e.g.
-   *   GNU/Linux).
+   *   Enable extra Mac fonts support on non-Mac platforms (e.g., GNU/Linux).
    *
    *   Resource forks which include fonts data are stored sometimes in
    *   locations which users or developers don't expected.  In some cases,
@@ -429,22 +430,28 @@ FT_BEGIN_HEADER
    *   boolean variables (consequently, you should *never* enable this
    *   while compiling in `release' mode):
    *
+   *   {
    *     _af_debug_disable_horz_hints
    *     _af_debug_disable_vert_hints
    *     _af_debug_disable_blue_hints
+   *   }
    *
    *   Additionally, the following functions provide dumps of various
    *   internal autofit structures to stdout (using `printf'):
    *
+   *   {
    *     af_glyph_hints_dump_points
    *     af_glyph_hints_dump_segments
    *     af_glyph_hints_dump_edges
    *     af_glyph_hints_get_num_segments
    *     af_glyph_hints_get_segment_offset
+   *   }
    *
    *   As an argument, they use another global variable:
    *
+   *   {
    *     _af_debug_hints
+   *   }
    *
    *   Please have a look at the `ftgrid' demo program to see how those
    *   variables and macros should be used.
@@ -888,9 +895,11 @@ FT_BEGIN_HEADER
    * like Fedora that did not un-patch the following change (which was
    * present in FreeType between versions 2.4.6 and 2.7.1, inclusive).
    *
+   * {
    *   2011-07-16  Steven Chu  <steven.f.chu@gmail.com>
    *
    *     [truetype] Fix metrics on size request for scalable fonts.
+   * }
    *
    * This problematic commit is now reverted (more or less).
    */
diff --git a/include/ft2build.h b/include/ft2build.h
index 4c770b2ab..97dbd3c6a 100644
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -25,8 +25,10 @@
    *
    * A typical example is
    *
+   * {
    *   #include <ft2build.h>
    *   #include FT_FREETYPE_H
+   * }
    *
    */