diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index c4cfa42bc..c1c525315 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType high-level API and common types (specification only).       */
 /*                                                                         */
-/*  Copyright 1996-1999 by                                                 */
+/*  Copyright 1996-2000 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index a9eb278c0..71138caac 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs..                    */
 /*                                                                         */
-/*  Copyright 1996-1999 by                                                 */
+/*  Copyright 1996-2000 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
diff --git a/include/freetype/ftgrays.h b/include/freetype/ftgrays.h
index 3ab0c68a5..c5bdb5af3 100644
--- a/include/freetype/ftgrays.h
+++ b/include/freetype/ftgrays.h
@@ -1,6 +1,27 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgrays.h                                                              */
+/*                                                                         */
+/*    FreeType smooth renderer declaration                                 */
+/*                                                                         */
+/*  Copyright 1996-2000 by                                                 */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used        */
+/*  modified and distributed under the terms of the FreeType project       */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
 #ifndef FTGRAYS_H
 #define FTGRAYS_H
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
 #include <freetype/ftimage.h>
 
   /*************************************************************************/
@@ -17,4 +38,8 @@
 
   EXPORT_VAR(FT_Raster_Funcs)  ft_grays_raster;
 
+  #ifdef __cplusplus
+  }
+  #endif
+
 #endif
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 584ec4694..c4443dfa2 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -5,7 +5,7 @@
 /*  This file defines the glyph image formats recognized by FreeType, as   */
 /*  well as the default raster interface.                                  */
 /*                                                                         */
-/*  Copyright 1996-1999 by                                                 */
+/*  Copyright 1996-2000 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
diff --git a/include/freetype/ftraster.h b/include/freetype/ftraster.h
index c65d4ee19..bda759785 100644
--- a/include/freetype/ftraster.h
+++ b/include/freetype/ftraster.h
@@ -23,6 +23,7 @@
   extern "C" {
 #endif
 
+#include <freetype/ftimage.h>
 
   /*************************************************************************/
   /*                                                                       */
@@ -31,13 +32,11 @@
   /*                                                                       */
 /* #define _STANDALONE_ */
 
-#include <freetype/freetype.h>
-
 #ifndef EXPORT_VAR
-#define EXPORT_VAR(x)  x
+#define EXPORT_VAR(x)  extern x
 #endif
 
-  EXPORT_VAR(FT_Raster_Funcs)  ft_raster_funcs;
+  EXPORT_VAR(FT_Raster_Funcs)  ft_standard_raster;
 
 #ifdef __cplusplus
   }
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index 62c446b71..7e1059b33 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -8,7 +8,7 @@
  *    used by FreeType.
  *
  *
- *  Copyright 1996-1999 by
+ *  Copyright 1996-2000 by
  *  David Turner, Robert Wilhelm, and Werner Lemberg
  *
  *  This file is part of the FreeType project, and may only be used