diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index f7a268001..bd7da8677 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -102,7 +102,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
-  /*    FT_Driver_ClassRec                                                    */
+  /*    FT_Driver_ClassRec                                                 */
   /*                                                                       */
   /* <Description>                                                         */
   /*    The font driver class.  This structure mostly contains pointers to */
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index 0a7bab52a..414e477d1 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -54,7 +54,7 @@ FT_BEGIN_HEADER
   } PCF_TocRec, *PCF_Toc;
 
 
-  typedef struct  PCF_ParseProperty_
+  typedef struct  PCF_ParsePropertyRec_
   {
     FT_Long  name;
     FT_Byte  isString;
@@ -63,7 +63,7 @@ FT_BEGIN_HEADER
   } PCF_ParsePropertyRec, *PCF_ParseProperty;
 
 
-  typedef struct  PCF_Property_
+  typedef struct  PCF_PropertyRec_
   {
     FT_String*  name;
     FT_Byte     isString;
@@ -79,7 +79,7 @@ FT_BEGIN_HEADER
   } PCF_PropertyRec, *PCF_Property;
 
 
-  typedef struct  PCF_Compressed_Metric_
+  typedef struct  PCF_Compressed_MetricRec_
   {
     FT_Byte  leftSideBearing;
     FT_Byte  rightSideBearing;
@@ -90,7 +90,7 @@ FT_BEGIN_HEADER
   } PCF_Compressed_MetricRec, *PCF_Compressed_Metric;
 
 
-  typedef struct  PCF_Metric_
+  typedef struct  PCF_MetricRec_
   {
     FT_Short  leftSideBearing;
     FT_Short  rightSideBearing;
@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
   } PCF_AccelRec, *PCF_Accel;
 
 
-  typedef struct  PCD_Encoding_
+  typedef struct  PCD_EncodingRec_
   {
     FT_Long   enc;
     FT_Short  glyph;