shithub: freetype+ttf2subf

Download patch

ref: 165868596783af1d296aa4fa30295b22cf7e79a2
parent: e13391333f501967db8823025ce8c63259b5d57e
author: Werner Lemberg <[email protected]>
date: Sat Jun 13 17:15:45 EDT 2020 

Remove redundant inclusion of `ft2build.h'.

* */*: Remove `#include <ft2build.h>' where possible.

* include/freetype/freetype.h: Remove cpp error about missing
inclusion of `ft2build.h'.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-06-13  Werner Lemberg  <[email protected]>
+
+	Remove redundant inclusion of `ft2build.h'.
+
+	* */*: Remove `#include <ft2build.h>' where possible.
+
+	* include/freetype/freetype.h: Remove cpp error about missing
+	inclusion of `ft2build.h'.
+
 2020-06-08  David Turner  <[email protected]>
 
 	Make macros for header file names optional.
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -62,7 +62,6 @@
   */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftstream.h>
--- a/builds/wince/ftdebug.c
+++ b/builds/wince/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -20,11 +20,6 @@
 #define FREETYPE_H_
 
 
-#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#endif
-
-
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
 #include <freetype/fttypes.h>
--- a/include/freetype/ftadvanc.h
+++ b/include/freetype/ftadvanc.h
@@ -20,7 +20,6 @@
 #define FTADVANC_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -31,7 +31,6 @@
 #define FTBBOX_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftbdf.h
+++ b/include/freetype/ftbdf.h
@@ -19,7 +19,6 @@
 #ifndef FTBDF_H_
 #define FTBDF_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftbitmap.h
+++ b/include/freetype/ftbitmap.h
@@ -20,7 +20,6 @@
 #define FTBITMAP_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftcolor.h>
 
--- a/include/freetype/ftbzip2.h
+++ b/include/freetype/ftbzip2.h
@@ -19,7 +19,6 @@
 #ifndef FTBZIP2_H_
 #define FTBZIP2_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -20,7 +20,6 @@
 #define FTCACHE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftglyph.h>
 
 
--- a/include/freetype/ftcid.h
+++ b/include/freetype/ftcid.h
@@ -19,7 +19,6 @@
 #ifndef FTCID_H_
 #define FTCID_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftcolor.h
+++ b/include/freetype/ftcolor.h
@@ -19,7 +19,6 @@
 #ifndef FTCOLOR_H_
 #define FTCOLOR_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftdriver.h
+++ b/include/freetype/ftdriver.h
@@ -19,7 +19,6 @@
 #ifndef FTDRIVER_H_
 #define FTDRIVER_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
--- a/include/freetype/ftfntfmt.h
+++ b/include/freetype/ftfntfmt.h
@@ -19,7 +19,6 @@
 #ifndef FTFNTFMT_H_
 #define FTFNTFMT_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftgasp.h
+++ b/include/freetype/ftgasp.h
@@ -19,7 +19,6 @@
 #ifndef FTGASP_H_
 #define FTGASP_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -33,7 +33,6 @@
 #define FTGLYPH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftgxval.h
+++ b/include/freetype/ftgxval.h
@@ -28,7 +28,6 @@
 #ifndef FTGXVAL_H_
 #define FTGXVAL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftgzip.h
+++ b/include/freetype/ftgzip.h
@@ -19,7 +19,6 @@
 #ifndef FTGZIP_H_
 #define FTGZIP_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -30,7 +30,6 @@
 
   /* STANDALONE_ is from ftgrays.c */
 #ifndef STANDALONE_
-#include <ft2build.h>
 #endif
 
 
--- a/include/freetype/ftincrem.h
+++ b/include/freetype/ftincrem.h
@@ -19,7 +19,6 @@
 #ifndef FTINCREM_H_
 #define FTINCREM_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
--- a/include/freetype/ftlcdfil.h
+++ b/include/freetype/ftlcdfil.h
@@ -20,7 +20,6 @@
 #ifndef FTLCDFIL_H_
 #define FTLCDFIL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@@ -28,7 +28,6 @@
 #define FTLIST_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftlzw.h
+++ b/include/freetype/ftlzw.h
@@ -19,7 +19,6 @@
 #ifndef FTLZW_H_
 #define FTLZW_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -29,7 +29,6 @@
 #define FTMAC_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -20,7 +20,6 @@
 #define FTMM_H_
 
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 
 
--- a/include/freetype/ftmodapi.h
+++ b/include/freetype/ftmodapi.h
@@ -20,7 +20,6 @@
 #define FTMODAPI_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftotval.h
+++ b/include/freetype/ftotval.h
@@ -30,7 +30,6 @@
 #ifndef FTOTVAL_H_
 #define FTOTVAL_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -21,7 +21,6 @@
 #define FTOUTLN_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftparams.h
+++ b/include/freetype/ftparams.h
@@ -19,7 +19,6 @@
 #ifndef FTPARAMS_H_
 #define FTPARAMS_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftpfr.h
+++ b/include/freetype/ftpfr.h
@@ -19,7 +19,6 @@
 #ifndef FTPFR_H_
 #define FTPFR_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -20,7 +20,6 @@
 #define FTRENDER_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 #include <freetype/ftglyph.h>
 
--- a/include/freetype/ftsizes.h
+++ b/include/freetype/ftsizes.h
@@ -29,7 +29,6 @@
 #define FTSIZES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftsnames.h
+++ b/include/freetype/ftsnames.h
@@ -23,7 +23,6 @@
 #define FTSNAMES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftparams.h>
 
--- a/include/freetype/ftstroke.h
+++ b/include/freetype/ftstroke.h
@@ -19,7 +19,6 @@
 #ifndef FTSTROKE_H_
 #define FTSTROKE_H_
 
-#include <ft2build.h>
 #include <freetype/ftoutln.h>
 #include <freetype/ftglyph.h>
 
--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@@ -45,7 +45,6 @@
 #define FTSYNTH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -20,7 +20,6 @@
 #define FTSYSTEM_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
--- a/include/freetype/ftwinfnt.h
+++ b/include/freetype/ftwinfnt.h
@@ -19,7 +19,6 @@
 #ifndef FTWINFNT_H_
 #define FTWINFNT_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -70,7 +70,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/include/freetype/internal/cffotypes.h
+++ b/include/freetype/internal/cffotypes.h
@@ -19,7 +19,6 @@
 #ifndef CFFOTYPES_H_
 #define CFFOTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/cfftypes.h>
 #include <freetype/internal/tttypes.h>
--- a/include/freetype/internal/cfftypes.h
+++ b/include/freetype/internal/cfftypes.h
@@ -21,7 +21,6 @@
 #define CFFTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/ftserv.h>
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -20,7 +20,6 @@
 #define FTCALC_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/include/freetype/internal/ftdrv.h
+++ b/include/freetype/internal/ftdrv.h
@@ -20,7 +20,6 @@
 #define FTDRV_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/freetype/internal/ftgloadr.h
@@ -20,7 +20,6 @@
 #define FTGLOADR_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/include/freetype/internal/fthash.h
+++ b/include/freetype/internal/fthash.h
@@ -43,7 +43,6 @@
 #define FTHASH_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -26,7 +26,6 @@
 #ifndef FTOBJS_H_
 #define FTOBJS_H_
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 #include <freetype/ftsizes.h>
 #include <freetype/ftlcdfil.h>
--- a/include/freetype/internal/ftpsprop.h
+++ b/include/freetype/internal/ftpsprop.h
@@ -20,7 +20,6 @@
 #define FTPSPROP_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/include/freetype/internal/ftrfork.h
+++ b/include/freetype/internal/ftrfork.h
@@ -25,7 +25,6 @@
 #define FTRFORK_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -21,7 +21,6 @@
 #define PSAUX_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/fthash.h>
--- a/include/freetype/internal/pshints.h
+++ b/include/freetype/internal/pshints.h
@@ -22,7 +22,6 @@
 #define PSHINTS_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -20,7 +20,6 @@
 #define SFNT_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 #include <freetype/internal/tttypes.h>
 #include <freetype/internal/wofftypes.h>
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -21,7 +21,6 @@
 #define T1TYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/pshints.h>
 #include <freetype/internal/ftserv.h>
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -21,7 +21,6 @@
 #define TTTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcolor.h>
--- a/include/freetype/internal/wofftypes.h
+++ b/include/freetype/internal/wofftypes.h
@@ -21,7 +21,6 @@
 #define WOFFTYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@@ -21,7 +21,6 @@
 #define T1TABLES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -20,7 +20,6 @@
 #define TTNAMEID_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -21,7 +21,6 @@
 #define TTTABLES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -20,7 +20,6 @@
 #define TTAGS_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -22,7 +22,6 @@
    *
    */
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -21,7 +21,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 
 
--- a/src/autofit/afmodule.h
+++ b/src/autofit/afmodule.h
@@ -19,7 +19,6 @@
 #ifndef AFMODULE_H_
 #define AFMODULE_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftmodapi.h>
 
--- a/src/autofit/afshaper.c
+++ b/src/autofit/afshaper.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftadvanc.h>
 #include "afglobal.h"
--- a/src/autofit/afshaper.h
+++ b/src/autofit/afshaper.h
@@ -20,7 +20,6 @@
 #define AFSHAPER_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -32,7 +32,6 @@
 #ifndef AFTYPES_H_
 #define AFTYPES_H_
 
-#include <ft2build.h>
 
 #include <freetype/freetype.h>
 #include <freetype/ftoutln.h>
--- a/src/autofit/autofit.c
+++ b/src/autofit/autofit.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "afangles.c"
 #include "afblue.c"
--- a/src/base/ftadvanc.c
+++ b/src/base/ftadvanc.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftadvanc.h>
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #define  FT_MAKE_OPTION_SINGLE_OBJECT
 
 #include "ftadvanc.c"
--- a/src/base/ftbase.h
+++ b/src/base/ftbase.h
@@ -20,7 +20,6 @@
 #define FTBASE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -24,7 +24,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftbbox.h>
--- a/src/base/ftbdf.c
+++ b/src/base/ftbdf.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftbitmap.h>
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -32,7 +32,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/ftglyph.h>
 #include <freetype/fttrigon.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/base/ftcid.c
+++ b/src/base/ftcid.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcid.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svcid.h>
--- a/src/base/ftcolor.c
+++ b/src/base/ftcolor.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/tttypes.h>
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -41,7 +41,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/src/base/fterrors.c
+++ b/src/base/fterrors.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/fterrors.h>
 
--- a/src/base/ftfntfmt.c
+++ b/src/base/ftfntfmt.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftfntfmt.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svfntfmt.h>
--- a/src/base/ftfstype.c
+++ b/src/base/ftfstype.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 #include <freetype/tttables.h>
 #include <freetype/internal/ftserv.h>
--- a/src/base/ftgasp.c
+++ b/src/base/ftgasp.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftgasp.h>
 #include <freetype/internal/tttypes.h>
 
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftgloadr.h>
 #include <freetype/internal/ftmemory.h>
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -28,7 +28,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftglyph.h>
--- a/src/base/ftgxval.c
+++ b/src/base/ftgxval.c
@@ -25,7 +25,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
--- a/src/base/fthash.c
+++ b/src/base/fthash.c
@@ -39,7 +39,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/fthash.h>
 #include <freetype/internal/ftmemory.h>
 
--- a/src/base/ftlcdfil.c
+++ b/src/base/ftlcdfil.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftlcdfil.h>
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -65,7 +65,6 @@
   */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftstream.h>
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftmm.h>
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftlist.h>
 #include <freetype/ftoutln.h>
 #include <freetype/ftfntfmt.h>
--- a/src/base/ftotval.c
+++ b/src/base/ftotval.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftoutln.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/base/ftpatent.c
+++ b/src/base/ftpatent.c
@@ -16,7 +16,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/tttags.h>
 #include <freetype/internal/ftobjs.h>
--- a/src/base/ftpfr.c
+++ b/src/base/ftpfr.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/internal/ftobjs.h>
--- a/src/base/ftpsprop.c
+++ b/src/base/ftpsprop.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftdriver.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/psaux.h>
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -24,7 +24,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftrfork.h>
--- a/src/base/ftsnames.c
+++ b/src/base/ftsnames.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include <freetype/ftsnames.h>
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftstroke.h>
 #include <freetype/fttrigon.h>
 #include <freetype/ftoutln.h>
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftsynth.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
--- a/src/base/fttrigon.c
+++ b/src/base/fttrigon.c
@@ -29,7 +29,6 @@
    *
    */
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/fttrigon.h>
--- a/src/base/fttype1.c
+++ b/src/base/fttype1.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftserv.h>
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftobjs.h>
--- a/src/base/ftwinfnt.c
+++ b/src/base/ftwinfnt.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftobjs.h>
--- a/src/bdf/bdf.c
+++ b/src/bdf/bdf.c
@@ -26,7 +26,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "bdflib.c"
 #include "bdfdrivr.c"
--- a/src/bdf/bdf.h
+++ b/src/bdf/bdf.h
@@ -30,7 +30,6 @@
  * Based on bdf.h,v 1.16 2000/03/16 20:08:51 mleisher
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/fthash.h>
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -24,7 +24,6 @@
 THE SOFTWARE.
 */
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/bdf/bdfdrivr.h
+++ b/src/bdf/bdfdrivr.h
@@ -28,7 +28,6 @@
 #ifndef BDFDRIVR_H_
 #define BDFDRIVR_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 #include "bdf.h"
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -31,7 +31,6 @@
    */
 
 
-#include <ft2build.h>
 
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/bzip2/ftbzip2.c
+++ b/src/bzip2/ftbzip2.c
@@ -22,7 +22,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/cache/ftcache.c
+++ b/src/cache/ftcache.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftcbasic.c"
 #include "ftccache.c"
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftcache.h>
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "ftcmanag.h"
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/cache/ftccback.h
+++ b/src/cache/ftccback.h
@@ -18,7 +18,6 @@
 #ifndef FTCCBACK_H_
 #define FTCCBACK_H_
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include "ftcimage.h"
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftcache.h>
 #include "ftcmanag.h"
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
--- a/src/cache/ftcglyph.h
+++ b/src/cache/ftcglyph.h
@@ -117,7 +117,6 @@
 #define FTCGLYPH_H_
 
 
-#include <ft2build.h>
 #include "ftcmanag.h"
 
 
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcimage.h"
 #include <freetype/internal/ftmemory.h>
--- a/src/cache/ftcimage.h
+++ b/src/cache/ftcimage.h
@@ -36,7 +36,6 @@
 #define FTCIMAGE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
 
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmanag.h"
 #include <freetype/internal/ftobjs.h>
--- a/src/cache/ftcmanag.h
+++ b/src/cache/ftcmanag.h
@@ -63,7 +63,6 @@
 #define FTCMANAG_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include "ftccache.h"
--- a/src/cache/ftcmru.c
+++ b/src/cache/ftcmru.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcmru.h"
 #include <freetype/internal/ftobjs.h>
--- a/src/cache/ftcmru.h
+++ b/src/cache/ftcmru.h
@@ -44,7 +44,6 @@
 #define FTCMRU_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #ifdef FREETYPE_H
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcsbits.h"
 #include <freetype/internal/ftobjs.h>
--- a/src/cache/ftcsbits.h
+++ b/src/cache/ftcsbits.h
@@ -20,7 +20,6 @@
 #define FTCSBITS_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftcache.h>
 #include "ftcglyph.h"
 
--- a/src/cff/cff.c
+++ b/src/cff/cff.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "cffcmap.c"
 #include "cffdrivr.c"
--- a/src/cff/cffcmap.c
+++ b/src/cff/cffcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include "cffcmap.h"
 #include "cffload.h"
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/cff/cffdrivr.h
+++ b/src/cff/cffdrivr.h
@@ -20,7 +20,6 @@
 #define CFFDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/sfnt.h>
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -20,7 +20,6 @@
 #define CFFGLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/cffotypes.h>
 
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
--- a/src/cff/cffload.h
+++ b/src/cff/cffload.h
@@ -20,7 +20,6 @@
 #define CFFLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/cfftypes.h>
 #include "cffparse.h"
 #include <freetype/internal/cffotypes.h>  /* for CFF_Face */
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -20,7 +20,6 @@
 #define CFFOBJS_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cffparse.h"
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/cff/cffparse.h
+++ b/src/cff/cffparse.h
@@ -20,7 +20,6 @@
 #define CFFPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/cfftypes.h>
 #include <freetype/internal/ftobjs.h>
 
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cidload.h"
 #include "cidgload.h"
 #include <freetype/internal/ftdebug.h>
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -20,7 +20,6 @@
 #define CIDGLOAD_H_
 
 
-#include <ft2build.h>
 #include "cidobjs.h"
 
 
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -20,7 +20,6 @@
 #define CIDLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include "cidparse.h"
 
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -20,7 +20,6 @@
 #define CIDPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "cidriver.h"
 #include "cidgload.h"
 #include <freetype/internal/ftdebug.h>
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -20,7 +20,6 @@
 #define CIDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/cid/type1cid.c
+++ b/src/cid/type1cid.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "cidgload.c"
 #include "cidload.c"
--- a/src/gxvalid/gxvalid.c
+++ b/src/gxvalid/gxvalid.c
@@ -18,7 +18,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "gxvbsln.c"
 #include "gxvcommn.c"
--- a/src/gxvalid/gxvalid.h
+++ b/src/gxvalid/gxvalid.h
@@ -28,7 +28,6 @@
 #ifndef GXVALID_H_
 #define GXVALID_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #include "gxverror.h"                     /* must come before `ftvalid.h' */
--- a/src/gxvalid/gxvcommn.h
+++ b/src/gxvalid/gxvcommn.h
@@ -43,7 +43,6 @@
 #define GXVCOMMN_H_
 
 
-#include <ft2build.h>
 #include "gxvalid.h"
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftsnames.h>
--- a/src/gxvalid/gxvmod.c
+++ b/src/gxvalid/gxvmod.c
@@ -25,7 +25,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/tttags.h>
 #include <freetype/ftgxval.h>
--- a/src/gxvalid/gxvmod.h
+++ b/src/gxvalid/gxvmod.h
@@ -29,7 +29,6 @@
 #ifndef GXVMOD_H_
 #define GXVMOD_H_
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/src/gzip/ftgzip.c
+++ b/src/gzip/ftgzip.c
@@ -20,7 +20,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/lzw/ftlzw.c
+++ b/src/lzw/ftlzw.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftmemory.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/lzw/ftzopen.h
+++ b/src/lzw/ftzopen.h
@@ -22,7 +22,6 @@
 #ifndef FTZOPEN_H_
 #define FTZOPEN_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/src/otvalid/otvalid.c
+++ b/src/otvalid/otvalid.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "otvbase.c"
 #include "otvcommn.c"
--- a/src/otvalid/otvalid.h
+++ b/src/otvalid/otvalid.h
@@ -20,7 +20,6 @@
 #define OTVALID_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 #include "otverror.h"                      /* must come before `ftvalid.h' */
--- a/src/otvalid/otvcommn.h
+++ b/src/otvalid/otvcommn.h
@@ -20,7 +20,6 @@
 #define OTVCOMMN_H_
 
 
-#include <ft2build.h>
 #include "otvalid.h"
 #include <freetype/internal/ftdebug.h>
 
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttables.h>
 #include <freetype/tttags.h>
 #include <freetype/ftotval.h>
--- a/src/otvalid/otvmod.h
+++ b/src/otvalid/otvmod.h
@@ -21,7 +21,6 @@
 #define OTVMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/src/pcf/pcf.c
+++ b/src/pcf/pcf.c
@@ -26,7 +26,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pcfdrivr.c"
 #include "pcfread.c"
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -29,7 +29,6 @@
 #define PCF_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 #include <freetype/internal/ftstream.h>
 
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -25,7 +25,6 @@
 */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/pcf/pcfdrivr.h
+++ b/src/pcf/pcfdrivr.h
@@ -28,7 +28,6 @@
 #ifndef PCFDRIVR_H_
 #define PCFDRIVR_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -25,7 +25,6 @@
 */
 
 
-#include <ft2build.h>
 
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/pcf/pcfread.h
+++ b/src/pcf/pcfread.h
@@ -29,7 +29,6 @@
 #define PCFREAD_H_
 
 
-#include <ft2build.h>
 
 FT_BEGIN_HEADER
 
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -32,7 +32,6 @@
 /* Modified for use with FreeType */
 
 
-#include <ft2build.h>
 #include "pcfutil.h"
 
 
--- a/src/pfr/pfr.c
+++ b/src/pfr/pfr.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pfrcmap.c"
 #include "pfrdrivr.c"
--- a/src/pfr/pfrcmap.c
+++ b/src/pfr/pfrcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include "pfrcmap.h"
 #include "pfrobjs.h"
--- a/src/pfr/pfrcmap.h
+++ b/src/pfr/pfrcmap.h
@@ -19,7 +19,6 @@
 #ifndef PFRCMAP_H_
 #define PFRCMAP_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include "pfrtypes.h"
 
--- a/src/pfr/pfrdrivr.c
+++ b/src/pfr/pfrdrivr.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/services/svpfr.h>
--- a/src/pfr/pfrdrivr.h
+++ b/src/pfr/pfrdrivr.h
@@ -20,7 +20,6 @@
 #define PFRDRIVR_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/pfr/pfrtypes.h
+++ b/src/pfr/pfrtypes.h
@@ -19,7 +19,6 @@
 #ifndef PFRTYPES_H_
 #define PFRTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 FT_BEGIN_HEADER
--- a/src/psaux/afmparse.c
+++ b/src/psaux/afmparse.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/psaux.h>
--- a/src/psaux/afmparse.h
+++ b/src/psaux/afmparse.h
@@ -20,7 +20,6 @@
 #define AFMPARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftserv.h>
--- a/src/psaux/cffdecode.h
+++ b/src/psaux/cffdecode.h
@@ -20,7 +20,6 @@
 #define CFFDECODE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "afmparse.c"
 #include "psauxmod.c"
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "psauxmod.h"
 #include "psobjs.h"
 #include "t1decode.h"
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -20,7 +20,6 @@
 #define PSAUXMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 #include <freetype/internal/psaux.h>
--- a/src/psaux/psconv.c
+++ b/src/psaux/psconv.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/ftdebug.h>
 
--- a/src/psaux/psconv.h
+++ b/src/psaux/psconv.h
@@ -20,7 +20,6 @@
 #define PSCONV_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 
 FT_BEGIN_HEADER
--- a/src/psaux/psfont.c
+++ b/src/psaux/psfont.c
@@ -36,7 +36,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 
 #include "psft.h"
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/psaux/psobjs.h
+++ b/src/psaux/psobjs.h
@@ -20,7 +20,6 @@
 #define PSOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/cffotypes.h>
 
--- a/src/psaux/pstypes.h
+++ b/src/psaux/pstypes.h
@@ -39,7 +39,6 @@
 #ifndef PSTYPES_H_
 #define PSTYPES_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
--- a/src/psaux/t1cmap.h
+++ b/src/psaux/t1cmap.h
@@ -19,7 +19,6 @@
 #ifndef T1CMAP_H_
 #define T1CMAP_H_
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/t1types.h>
 
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/pshints.h>
--- a/src/psaux/t1decode.h
+++ b/src/psaux/t1decode.h
@@ -20,7 +20,6 @@
 #define T1DECODE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/t1types.h>
 
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/pshinter/pshglob.c
+++ b/src/pshinter/pshglob.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftcalc.h>
--- a/src/pshinter/pshinter.c
+++ b/src/pshinter/pshinter.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pshalgo.c"
 #include "pshglob.c"
--- a/src/pshinter/pshmod.c
+++ b/src/pshinter/pshmod.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include "pshrec.h"
 #include "pshalgo.h"
--- a/src/pshinter/pshmod.h
+++ b/src/pshinter/pshmod.h
@@ -20,7 +20,6 @@
 #define PSHMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/src/pshinter/pshrec.c
+++ b/src/pshinter/pshrec.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/pshinter/pshrec.h
+++ b/src/pshinter/pshrec.h
@@ -32,7 +32,6 @@
 #define PSHREC_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/pshints.h>
 #include "pshglob.h"
 
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/services/svpscmap.h>
--- a/src/psnames/psmodule.h
+++ b/src/psnames/psmodule.h
@@ -20,7 +20,6 @@
 #define PSMODULE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "psmodule.c"
 
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -62,7 +62,6 @@
 
 #else /* !STANDALONE_ */
 
-#include <ft2build.h>
 #include "ftraster.h"
 #include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */
 #include <freetype/ftoutln.h>         /* for FT_Outline_Get_CBox              */
--- a/src/raster/ftrend1.c
+++ b/src/raster/ftrend1.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftoutln.h>
--- a/src/raster/ftrend1.h
+++ b/src/raster/ftrend1.h
@@ -20,7 +20,6 @@
 #define FTREND1_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
--- a/src/raster/raster.c
+++ b/src/raster/raster.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftraster.c"
 #include "ftrend1.c"
--- a/src/sfnt/pngshim.c
+++ b/src/sfnt/pngshim.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/pngshim.h
+++ b/src/sfnt/pngshim.h
@@ -21,7 +21,6 @@
 #define PNGSHIM_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
--- a/src/sfnt/sfdriver.h
+++ b/src/sfnt/sfdriver.h
@@ -20,7 +20,6 @@
 #define SFDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "pngshim.c"
 #include "sfdriver.c"
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "sfobjs.h"
 #include "ttload.h"
 #include "ttcmap.h"
--- a/src/sfnt/sfobjs.h
+++ b/src/sfnt/sfobjs.h
@@ -20,7 +20,6 @@
 #define SFOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
--- a/src/sfnt/sfwoff.c
+++ b/src/sfnt/sfwoff.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "sfwoff.h"
 #include <freetype/tttags.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/sfnt/sfwoff.h
+++ b/src/sfnt/sfwoff.h
@@ -20,7 +20,6 @@
 #define SFWOFF_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include "sfwoff2.h"
 #include "woff2tags.h"
 #include <freetype/tttags.h>
--- a/src/sfnt/sfwoff2.h
+++ b/src/sfnt/sfwoff2.h
@@ -20,7 +20,6 @@
 #define SFWOFF2_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
 
--- a/src/sfnt/ttbdf.c
+++ b/src/sfnt/ttbdf.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttbdf.h
+++ b/src/sfnt/ttbdf.h
@@ -20,7 +20,6 @@
 #define TTBDF_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 #include <freetype/ftbdf.h>
 
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 
 #include "sferrors.h"                      /* must come before `ftvalid.h' */
--- a/src/sfnt/ttcmap.h
+++ b/src/sfnt/ttcmap.h
@@ -20,7 +20,6 @@
 #define TTCMAP_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/tttypes.h>
 #include <freetype/internal/ftvalid.h>
 #include <freetype/internal/services/svttcmap.h>
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -27,7 +27,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttcolr.h
+++ b/src/sfnt/ttcolr.h
@@ -22,7 +22,6 @@
 #define __TTCOLR_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
--- a/src/sfnt/ttcpal.c
+++ b/src/sfnt/ttcpal.c
@@ -27,7 +27,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttcpal.h
+++ b/src/sfnt/ttcpal.h
@@ -22,7 +22,6 @@
 #define __TTCPAL_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttkern.h
+++ b/src/sfnt/ttkern.h
@@ -21,7 +21,6 @@
 #define TTKERN_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -17,7 +17,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttload.h
+++ b/src/sfnt/ttload.h
@@ -21,7 +21,6 @@
 #define TTLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttmtx.h
+++ b/src/sfnt/ttmtx.h
@@ -20,7 +20,6 @@
 #define TTMTX_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/tttypes.h>
 
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -25,7 +25,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -20,7 +20,6 @@
 #define TTSBIT_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
--- a/src/sfnt/woff2tags.c
+++ b/src/sfnt/woff2tags.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttags.h>
 
 
--- a/src/sfnt/woff2tags.h
+++ b/src/sfnt/woff2tags.h
@@ -20,7 +20,6 @@
 #define WOFF2TAGS_H
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 
 
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -278,7 +278,6 @@
 #else /* !STANDALONE_ */
 
 
-#include <ft2build.h>
 #include "ftgrays.h"
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftoutln.h>
--- a/src/smooth/ftsmooth.h
+++ b/src/smooth/ftsmooth.h
@@ -20,7 +20,6 @@
 #define FTSMOOTH_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
--- a/src/smooth/smooth.c
+++ b/src/smooth/smooth.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ftgrays.c"
 #include "ftsmooth.c"
--- a/src/tools/test_afm.c
+++ b/src/tools/test_afm.c
@@ -2,7 +2,6 @@
  * gcc -DFT2_BUILD_LIBRARY -I../../include -o test_afm test_afm.c \
  *     -L../../objs/.libs -lfreetype -lz -static
  */
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
--- a/src/tools/test_bbox.c
+++ b/src/tools/test_bbox.c
@@ -1,4 +1,3 @@
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/ftbbox.h>
 
--- a/src/tools/test_trig.c
+++ b/src/tools/test_trig.c
@@ -1,4 +1,3 @@
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/fttrigon.h>
 
--- a/src/truetype/truetype.c
+++ b/src/truetype/truetype.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "ttdriver.c"   /* driver interface    */
 #include "ttgload.c"    /* glyph loader        */
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/sfnt.h>
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -20,7 +20,6 @@
 #define TTDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/truetype/ttgload.h
+++ b/src/truetype/ttgload.h
@@ -20,7 +20,6 @@
 #define TTGLOAD_H_
 
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 #ifdef TT_USE_BYTECODE_INTERPRETER
--- a/src/truetype/ttgxvar.h
+++ b/src/truetype/ttgxvar.h
@@ -20,7 +20,6 @@
 #define TTGXVAR_H_
 
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -20,7 +20,6 @@
 /* issues; many thanks!                                                */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/fttrigon.h>
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -19,7 +19,6 @@
 #ifndef TTINTERP_H_
 #define TTINTERP_H_
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/tttags.h>
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -20,7 +20,6 @@
 #define TTOBJS_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/tttypes.h>
 
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/internal/ftstream.h>
--- a/src/truetype/ttpload.h
+++ b/src/truetype/ttpload.h
@@ -20,7 +20,6 @@
 #define TTPLOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/tttypes.h>
 
 
--- a/src/truetype/ttsubpix.c
+++ b/src/truetype/ttsubpix.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftstream.h>
--- a/src/truetype/ttsubpix.h
+++ b/src/truetype/ttsubpix.h
@@ -19,7 +19,6 @@
 #ifndef TTSUBPIX_H_
 #define TTSUBPIX_H_
 
-#include <ft2build.h>
 #include "ttobjs.h"
 #include "ttinterp.h"
 
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1afm.h"
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -19,7 +19,6 @@
 #ifndef T1AFM_H_
 #define T1AFM_H_
 
-#include <ft2build.h>
 #include "t1objs.h"
 #include <freetype/internal/t1types.h>
 
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1driver.h"
 #include "t1gload.h"
 #include "t1load.h"
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -20,7 +20,6 @@
 #define T1DRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include "t1gload.h"
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
--- a/src/type1/t1gload.h
+++ b/src/type1/t1gload.h
@@ -20,7 +20,6 @@
 #define T1GLOAD_H_
 
 
-#include <ft2build.h>
 #include "t1objs.h"
 
 
--- a/src/type1/t1load.h
+++ b/src/type1/t1load.h
@@ -20,7 +20,6 @@
 #define T1LOAD_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
 #include <freetype/ftmm.h>
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/type1/t1parse.c
+++ b/src/type1/t1parse.c
@@ -33,7 +33,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/internal/psaux.h>
--- a/src/type1/t1parse.h
+++ b/src/type1/t1parse.h
@@ -20,7 +20,6 @@
 #define T1PARSE_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/t1types.h>
 #include <freetype/internal/ftstream.h>
 
--- a/src/type1/type1.c
+++ b/src/type1/type1.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "t1afm.c"
 #include "t1driver.c"
--- a/src/type42/t42drivr.h
+++ b/src/type42/t42drivr.h
@@ -20,7 +20,6 @@
 #define T42DRIVR_H_
 
 
-#include <ft2build.h>
 #include <freetype/internal/ftdrv.h>
 
 
--- a/src/type42/t42objs.h
+++ b/src/type42/t42objs.h
@@ -19,7 +19,6 @@
 #ifndef T42OBJS_H_
 #define T42OBJS_H_
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/t1types.h>
--- a/src/type42/t42types.h
+++ b/src/type42/t42types.h
@@ -20,7 +20,6 @@
 #define T42TYPES_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 #include <freetype/t1tables.h>
 #include <freetype/internal/t1types.h>
--- a/src/type42/type42.c
+++ b/src/type42/type42.c
@@ -17,7 +17,6 @@
 
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
 
 #include "t42drivr.c"
 #include "t42objs.c"
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -18,7 +18,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -21,7 +21,6 @@
 #define WINFNT_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftwinfnt.h>
 #include <freetype/internal/ftdrv.h>