diff --git a/ChangeLog b/ChangeLog
index ce3ec7664..8678ecb28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-19  Werner Lemberg  <wl@gnu.org>
+
+	More C++ compilation fixes.
+
+	* src/autofit/afhints.c (af_glyph_hints_dump_points,
+	af_glyph_hints_dump_segments, af_glyph_hints_dump_edges)
+	[__cplusplus]: Protect with `extern "C"'.
+
 2011-03-18  Werner Lemberg  <wl@gnu.org>
 
 	C++ compilation fixes.
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 75c2c3312..5d24b15ee 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -164,6 +164,9 @@
 #define AF_INDEX_NUM( ptr, base )  ( (ptr) ? ( (ptr) - (base) ) : -1 )
 
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
   void
   af_glyph_hints_dump_points( AF_GlyphHints  hints )
   {
@@ -196,6 +199,9 @@
     }
     printf( "\n" );
   }
+#ifdef __cplusplus
+  }
+#endif
 
 
   static const char*
@@ -228,6 +234,9 @@
 
   /* Dump the array of linked segments. */
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
   void
   af_glyph_hints_dump_segments( AF_GlyphHints  hints )
   {
@@ -263,10 +272,16 @@
       printf( "\n" );
     }
   }
+#ifdef __cplusplus
+  }
+#endif
 
 
   /* Dump the array of linked edges. */
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
   void
   af_glyph_hints_dump_edges( AF_GlyphHints  hints )
   {
@@ -307,12 +322,19 @@
       printf( "\n" );
     }
   }
+#ifdef __cplusplus
+  }
+#endif
 
 #else /* !AF_DEBUG */
 
   /* these empty stubs are only used to link the `ftgrid' test program */
   /* when debugging is disabled                                        */
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
   void
   af_glyph_hints_dump_points( AF_GlyphHints  hints )
   {
@@ -333,6 +355,10 @@
     FT_UNUSED( hints );
   }
 
+#ifdef __cplusplus
+  }
+#endif
+
 #endif /* !AF_DEBUG */