diff --git a/ChangeLog b/ChangeLog
index 937b2ec6f..04d3e9f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
 2000-12-01  David Turner  <david.turner@freetype.org>
 
 	* builds/unix/configure.in, builds/unix/configure,
-	builds/cygwin/configure.in, builds/cygwin/configure: setting 
-	"version_info" to 6:1:0 for the 2.0.1 release
+	builds/cygwin/configure.in, builds/cygwin/configure: Setting
+	"version_info" to 6:1:0 for the 2.0.1 release.
 
-	* CHANGES: added a summary of changes between 2.0.1 and 2.0
+	* CHANGES: Added a summary of changes between 2.0.1 and 2.0.
 
-	* builds/unix/ftconfig.in, builds/cygwin/ftconfig.in: changes
+	* builds/unix/ftconfig.in, builds/cygwin/ftconfig.in: Changes
 	to allow compilation under Unix with the Unix-specific config
-	files..
+	files.
 
 2000-12-01  Werner Lemberg  <wl@gnu.org>
 
diff --git a/builds/cygwin/ftconfig.in b/builds/cygwin/ftconfig.in
index 5071eefaa..e3a0d3808 100644
--- a/builds/cygwin/ftconfig.in
+++ b/builds/cygwin/ftconfig.in
@@ -126,7 +126,6 @@ FT_BEGIN_HEADER
 
 #else
 
-
   /*************************************************************************/
   /*                                                                       */
   /* Many compilers provide the non-ANSI `long long' 64-bit type.  You can */
@@ -240,15 +239,15 @@ FT_BEGIN_HEADER
   /*                                                                 */
 #ifdef __cplusplus
 
-#define FT_CALLBACK_DEF             extern "C"
-#define FT_CALLBACK_TABLE           extern "C"
-#define FT_CALLBACK_TABLE_DEF       extern "C"
+#define FT_CALLBACK_DEF        extern "C"
+#define FT_CALLBACK_TABLE      extern "C"
+#define FT_CALLBACK_TABLE_DEF  extern "C"
 
 #else
 
-#define FT_CALLBACK_DEF             static
-#define FT_CALLBACK_TABLE           extern
-#define FT_CALLBACK_TABLE_DEF
+#define FT_CALLBACK_DEF        static
+#define FT_CALLBACK_TABLE      extern
+#define FT_CALLBACK_TABLE_DEF  /* nothing */
 
 #endif /* __cplusplus */
 
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index 5071eefaa..e3a0d3808 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -126,7 +126,6 @@ FT_BEGIN_HEADER
 
 #else
 
-
   /*************************************************************************/
   /*                                                                       */
   /* Many compilers provide the non-ANSI `long long' 64-bit type.  You can */
@@ -240,15 +239,15 @@ FT_BEGIN_HEADER
   /*                                                                 */
 #ifdef __cplusplus
 
-#define FT_CALLBACK_DEF             extern "C"
-#define FT_CALLBACK_TABLE           extern "C"
-#define FT_CALLBACK_TABLE_DEF       extern "C"
+#define FT_CALLBACK_DEF        extern "C"
+#define FT_CALLBACK_TABLE      extern "C"
+#define FT_CALLBACK_TABLE_DEF  extern "C"
 
 #else
 
-#define FT_CALLBACK_DEF             static
-#define FT_CALLBACK_TABLE           extern
-#define FT_CALLBACK_TABLE_DEF
+#define FT_CALLBACK_DEF        static
+#define FT_CALLBACK_TABLE      extern
+#define FT_CALLBACK_TABLE_DEF  /* nothing */
 
 #endif /* __cplusplus */