Index: include/freetype/internal/ftvalid.h
===================================================================
--- include/freetype/internal/ftvalid.h	(revision 1015)
+++ include/freetype/internal/ftvalid.h	(working copy)
@@ -20,9 +20,11 @@
 #define __FTVALID_H__
 
 #include <ft2build.h>
-#include FT_CONFIG_STANDARD_LIBRARY_H   /* for ft_setjmp and ft_longjmp */
 
+/* for ft_setjmp and ft_longjmp */
+#include FT_CONFIG_STANDARD_LIBRARY_H
 
+
 FT_BEGIN_HEADER
 
 
Index: src/base/ftobjs.c
===================================================================
--- src/base/ftobjs.c	(revision 1015)
+++ src/base/ftobjs.c	(working copy)
@@ -24,7 +24,10 @@
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_RFORK_H
 #include FT_INTERNAL_STREAM_H
-#include FT_INTERNAL_SFNT_H    /* for SFNT_Load_Table_Func */
+
+/* for SFNT_Load_Table_Func */
+#include FT_INTERNAL_SFNT_H
+
 #include FT_TRUETYPE_TABLES_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_IDS_H
Index: src/raster/ftraster.c
===================================================================
--- src/raster/ftraster.c	(revision 1015)
+++ src/raster/ftraster.c	(working copy)
@@ -60,8 +60,10 @@
 
 #include <ft2build.h>
 #include "ftraster.h"
-#include FT_INTERNAL_CALC_H   /* for FT_MulDiv only */
 
+/* for FT_MulDiv only */
+#include FT_INTERNAL_CALC_H
+
 #include "rastpic.h"
 
 #endif /* !_STANDALONE_ */
@@ -224,8 +226,10 @@
 
 
 #include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H        /* for FT_TRACE() and FT_ERROR() */
 
+/* for FT_TRACE() and FT_ERROR() */
+#include FT_INTERNAL_DEBUG_H
+
 #include "rasterrs.h"
 
 #define Raster_Err_None         Raster_Err_Ok