diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index e84441eb8..32191bb0d 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1149,9 +1149,11 @@
 
     void*             other;
 
-    /*@private begin*/
+    /*@private begin */
+
     FT_GlyphLoader*   loader;
-    /*@private end*/
+
+    /*@private end */
 
   } FT_GlyphSlotRec;
 
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 950bb7a65..036899b66 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -172,7 +172,7 @@
                "negative height while rastering" )
 
   /* cache errors */
-  
+
   FT_ERRORDEF( FT_Err_Too_Many_Caches,              0x0070, \
                "too many registered caches" )
 
diff --git a/include/freetype/ftnames.h b/include/freetype/ftnames.h
index ce3bf4923..c29f9d8d7 100644
--- a/include/freetype/ftnames.h
+++ b/include/freetype/ftnames.h
@@ -65,10 +65,10 @@
     FT_UShort  encoding_id;
     FT_UShort  language_id;
     FT_UShort  name_id;
-  
+
     FT_Byte*   string;      /* this string is *not* null-terminated! */
     FT_UInt    string_len;  /* in bytes */
-  
+
   } FT_SfntName;
 
 
@@ -119,7 +119,7 @@
   FT_EXPORT_DEF( FT_Error )  FT_Get_Sfnt_Name( FT_Face       face,
                                                FT_UInt       index,
                                                FT_SfntName*  aname );
-                                               
+
 
 #ifdef __cplusplus
   }
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index b5a4abeba..5b56b8ccb 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -66,7 +66,7 @@
 
 static
 const FT_Module_Class*  const ft_default_modules[] =
-const {
+  {
 #include <freetype/config/ftmodule.h>
     0
   };
@@ -87,8 +87,8 @@ const {
   /*                                                                       */
   FT_EXPORT_FUNC( void )  FT_Add_Default_Modules( FT_Library  library )
   {
-    FT_Error                 error;
-    const FT_Module_Class**  cur;
+    FT_Error                       error;
+    const FT_Module_Class* const*  cur;
 
 
     /* test for valid `library' delayed to FT_Add_Module() */
diff --git a/src/raster1/ftraster.c b/src/raster1/ftraster.c
index 3db811b65..0be0f379d 100644
--- a/src/raster1/ftraster.c
+++ b/src/raster1/ftraster.c
@@ -2971,8 +2971,6 @@
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
-  /* XXX Fixme: ftraster's error codes don't harmonize with FT2's ones!    */
-  /*                                                                       */
   LOCAL_FUNC
   FT_Error  Render_Glyph( RAS_ARG )
   {