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'.
diff --git a/ChangeLog b/ChangeLog
index b0327cd..9c4ab5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-06-13  Werner Lemberg  <wl@gnu.org>
+
+	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  <david@freetype.org>
 
 	Make macros for header file names optional.
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index bba8424..2cb3046 100644
--- 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>
diff --git a/builds/wince/ftdebug.c b/builds/wince/ftdebug.c
index c6c8e66..734c4f0 100644
--- 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>
 
diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
index 81ca8b8..d589490 100644
--- 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>
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 93cc9ab..3966278 100644
--- 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>
diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h
index 8a43bdd..5050d3a 100644
--- 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
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index 2adb732..fda1ad9 100644
--- 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
diff --git a/include/freetype/ftbdf.h b/include/freetype/ftbdf.h
index 4732325..2e1daee 100644
--- 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
diff --git a/include/freetype/ftbitmap.h b/include/freetype/ftbitmap.h
index 8d43fd4..282c22e 100644
--- 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>
 
diff --git a/include/freetype/ftbzip2.h b/include/freetype/ftbzip2.h
index a1411ef..fe582ea 100644
--- 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
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 26f48fe..6047275 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -20,7 +20,6 @@
 #define FTCACHE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftglyph.h>
 
 
diff --git a/include/freetype/ftcid.h b/include/freetype/ftcid.h
index ab002de..a29fb33 100644
--- 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
diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
index 44bcb8a..ecc6485 100644
--- 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
diff --git a/include/freetype/ftdriver.h b/include/freetype/ftdriver.h
index f7ec6f3..34fcaad 100644
--- 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>
 
diff --git a/include/freetype/ftfntfmt.h b/include/freetype/ftfntfmt.h
index 5e235f3..f803349 100644
--- 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
diff --git a/include/freetype/ftgasp.h b/include/freetype/ftgasp.h
index 74eb904..6b76882 100644
--- 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
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 88e63fb..704619e 100644
--- 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
diff --git a/include/freetype/ftgxval.h b/include/freetype/ftgxval.h
index e617b81..354460a 100644
--- 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
diff --git a/include/freetype/ftgzip.h b/include/freetype/ftgzip.h
index 6148b3c..2aa8d75 100644
--- 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
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 185967c..9fecd1f 100644
--- 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
 
 
diff --git a/include/freetype/ftincrem.h b/include/freetype/ftincrem.h
index b1b3167..f67655e 100644
--- 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>
 
diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h
index 31cbbe2..b8c5c00 100644
--- 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>
 
diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h
index f6ce25f..4588922 100644
--- 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
diff --git a/include/freetype/ftlzw.h b/include/freetype/ftlzw.h
index aec431c..904e19b 100644
--- 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
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index c1a0aa3..c9de981 100644
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -29,7 +29,6 @@
 #define FTMAC_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 7392fe4..d8781a8 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -20,7 +20,6 @@
 #define FTMM_H_
 
 
-#include <ft2build.h>
 #include <freetype/t1tables.h>
 
 
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
index 09c3a23..4b5cdfb 100644
--- 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
diff --git a/include/freetype/ftotval.h b/include/freetype/ftotval.h
index e912712..9c00ad3 100644
--- 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
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 5039ee4..5069d18 100644
--- 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
diff --git a/include/freetype/ftparams.h b/include/freetype/ftparams.h
index 9b893a1..55ea2a3 100644
--- 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
diff --git a/include/freetype/ftpfr.h b/include/freetype/ftpfr.h
index bd7f0aa..9a5383f 100644
--- 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
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index c33763c..8007951 100644
--- 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>
 
diff --git a/include/freetype/ftsizes.h b/include/freetype/ftsizes.h
index a999042..a8682a3 100644
--- 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
diff --git a/include/freetype/ftsnames.h b/include/freetype/ftsnames.h
index 46b4dfd..729e6ab 100644
--- 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>
 
diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h
index 18aee42..1c5477c 100644
--- 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>
 
diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h
index 55b1a39..bdb4c57 100644
--- 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
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index f7fecb5..22aead7 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -20,7 +20,6 @@
 #define FTSYSTEM_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/ftwinfnt.h b/include/freetype/ftwinfnt.h
index 18341dc..786528c 100644
--- 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
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index f344ff1..d4220a2 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -70,7 +70,6 @@
    */
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/include/freetype/internal/cffotypes.h b/include/freetype/internal/cffotypes.h
index 360af53..a316fd1 100644
--- 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>
diff --git a/include/freetype/internal/cfftypes.h b/include/freetype/internal/cfftypes.h
index e48ff1b..f21167b 100644
--- 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>
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index d8236d2..6bc2791 100644
--- 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>
 
 
diff --git a/include/freetype/internal/ftdrv.h b/include/freetype/internal/ftdrv.h
index 36caa4f..a294516 100644
--- 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>
 
 
diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h
index f27dd2b..27b8659 100644
--- 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>
 
 
diff --git a/include/freetype/internal/fthash.h b/include/freetype/internal/fthash.h
index 5833bc9..622ec76 100644
--- 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>
 
 
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 7c667c1..c7ac1a7 100644
--- 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>
diff --git a/include/freetype/internal/ftpsprop.h b/include/freetype/internal/ftpsprop.h
index d52ca2c..81ec291 100644
--- 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>
 
 
diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h
index 071743f..1b7b25a 100644
--- 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>
 
 
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index a917b0a..8e0a262 100644
--- 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>
diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h
index 43bd79b..663e9d3 100644
--- 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>
 
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 283f0cb..b4c12db 100644
--- 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>
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index 9fe12db..6a0fe5e 100644
--- 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>
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 4a41485..c36342c 100644
--- 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>
diff --git a/include/freetype/internal/wofftypes.h b/include/freetype/internal/wofftypes.h
index a10fef9..1874a13 100644
--- 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>
 
diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h
index ed285fc..426e140 100644
--- 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
diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h
index 9a00913..2b2ed4c 100644
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -20,7 +20,6 @@
 #define TTNAMEID_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index 8cfd1d2..c8fa35e 100644
--- 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
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 8ed6dbf..3c9fbd5 100644
--- 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
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 3c207a2..ed7a065 100644
--- 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>
 
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 41e3e66..6e9f28c 100644
--- 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>
 
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index 1569c5d..902f398 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -21,7 +21,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/ftadvanc.h>
 
 
diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h
index 75013ef..74c4ff6 100644
--- 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>
 
diff --git a/src/autofit/afshaper.c b/src/autofit/afshaper.c
index 80143a9..bbf7b6b 100644
--- 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"
diff --git a/src/autofit/afshaper.h b/src/autofit/afshaper.h
index cc8693d..138c27b 100644
--- a/src/autofit/afshaper.h
+++ b/src/autofit/afshaper.h
@@ -20,7 +20,6 @@
 #define AFSHAPER_H_
 
 
-#include <ft2build.h>
 #include <freetype/freetype.h>
 
 
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 4bbe9a7..5f040c6 100644
--- 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>
diff --git a/src/autofit/autofit.c b/src/autofit/autofit.c
index 88be8bf..ef5e7f1 100644
--- 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"
diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c
index c19b5e3..c689e6a 100644
--- 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>
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index b8242bb..bfbaffd 100644
--- 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"
diff --git a/src/base/ftbase.h b/src/base/ftbase.h
index ab37052..b03922a 100644
--- 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>
 
 
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 3e6661e..30a4eba 100644
--- 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>
diff --git a/src/base/ftbdf.c b/src/base/ftbdf.c
index 26ffdf9..fc374c6 100644
--- 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>
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index efa25ed..d109ee4 100644
--- 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>
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index d8b7584..b5258c8 100644
--- 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>
diff --git a/src/base/ftcid.c b/src/base/ftcid.c
index d02213e..ce8a876 100644
--- 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>
diff --git a/src/base/ftcolor.c b/src/base/ftcolor.c
index 9e250ee..a50d680 100644
--- 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>
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 0135385..62cf680 100644
--- 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>
 
diff --git a/src/base/fterrors.c b/src/base/fterrors.c
index 0c18d24..eba9e76 100644
--- 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>
 
diff --git a/src/base/ftfntfmt.c b/src/base/ftfntfmt.c
index 06baf4c..a45317e 100644
--- 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>
diff --git a/src/base/ftfstype.c b/src/base/ftfstype.c
index 67111c6..bca548f 100644
--- 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>
diff --git a/src/base/ftgasp.c b/src/base/ftgasp.c
index c721af5..eed05a3 100644
--- 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>
 
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c
index fd7c950..faf7d85 100644
--- 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>
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 2f85c6d..78dff7f 100644
--- 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>
diff --git a/src/base/ftgxval.c b/src/base/ftgxval.c
index 9fc2ca8..f04df14 100644
--- 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>
diff --git a/src/base/fthash.c b/src/base/fthash.c
index 2251373..449b03a 100644
--- 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>
 
diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
index 3a02687..1e84dbc 100644
--- 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>
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index d71e229..55a631f 100644
--- 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>
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index ce746be..9a702b9 100644
--- 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>
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index d7b6424..532a06d 100644
--- 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>
diff --git a/src/base/ftotval.c b/src/base/ftotval.c
index 198f055..90a5dd6 100644
--- 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>
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 7a6c7fd..9935e05 100644
--- 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>
diff --git a/src/base/ftpatent.c b/src/base/ftpatent.c
index 5ec4e6f..a02c636 100644
--- 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>
diff --git a/src/base/ftpfr.c b/src/base/ftpfr.c
index 28916c3..c656fcd 100644
--- 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>
diff --git a/src/base/ftpsprop.c b/src/base/ftpsprop.c
index 644e697..8c29f50 100644
--- 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>
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index fba122f..ea7e310 100644
--- 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>
diff --git a/src/base/ftsnames.c b/src/base/ftsnames.c
index 472c981..8507f28 100644
--- 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>
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index eaa210c..d940254 100644
--- 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>
 
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 6157185..56f98e1 100644
--- 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>
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index d98e89d..3c96272 100644
--- 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>
diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c
index dedcee7..c6f027c 100644
--- 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>
diff --git a/src/base/fttype1.c b/src/base/fttype1.c
index ce26e00..be60ed6 100644
--- 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>
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index 0c18d8f..d90cfbc 100644
--- 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>
diff --git a/src/base/ftwinfnt.c b/src/base/ftwinfnt.c
index 8229540..699dc3d 100644
--- 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>
diff --git a/src/bdf/bdf.c b/src/bdf/bdf.c
index e54df66..249012e 100644
--- 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"
diff --git a/src/bdf/bdf.h b/src/bdf/bdf.h
index 0057846..5acbd5f 100644
--- 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>
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 0859b3b..e338808 100644
--- 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>
diff --git a/src/bdf/bdfdrivr.h b/src/bdf/bdfdrivr.h
index b638a88..54aaa33 100644
--- 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"
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 5c0fa40..a4ddb9a 100644
--- 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>
diff --git a/src/bzip2/ftbzip2.c b/src/bzip2/ftbzip2.c
index acd4eb4..411c5d2 100644
--- 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>
diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c
index 4137f68..e90f463 100644
--- 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"
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index 899b929..493fc0a 100644
--- 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>
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index c6cac69..1c8e0f3 100644
--- 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>
diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h
index cbe5395..802fd44 100644
--- 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"
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index 593cc55..468c008 100644
--- 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"
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index 5e17df6..7f5438a 100644
--- 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"
diff --git a/src/cache/ftcglyph.h b/src/cache/ftcglyph.h
index ef689f9..5629545 100644
--- a/src/cache/ftcglyph.h
+++ b/src/cache/ftcglyph.h
@@ -117,7 +117,6 @@
 #define FTCGLYPH_H_
 
 
-#include <ft2build.h>
 #include "ftcmanag.h"
 
 
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 65cc2f6..58ebad8 100644
--- 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>
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
index a360f48..a400788 100644
--- 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"
 
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 18a02e3..436d41f 100644
--- 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>
diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h
index 1ea560f..6c6ec68 100644
--- 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"
diff --git a/src/cache/ftcmru.c b/src/cache/ftcmru.c
index 44c0a62..8feed45 100644
--- 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>
diff --git a/src/cache/ftcmru.h b/src/cache/ftcmru.h
index a27ea5f..e7c2a8f 100644
--- 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
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 2dd51f9..e0db930 100644
--- 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>
diff --git a/src/cache/ftcsbits.h b/src/cache/ftcsbits.h
index b1e09b2..46f797e 100644
--- 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"
 
diff --git a/src/cff/cff.c b/src/cff/cff.c
index 755228b..0fa6c87 100644
--- 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"
diff --git a/src/cff/cffcmap.c b/src/cff/cffcmap.c
index b244461..6d16ed4 100644
--- 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"
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index b513cc3..af0ec71 100644
--- 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>
diff --git a/src/cff/cffdrivr.h b/src/cff/cffdrivr.h
index c1175c6..d198dd3 100644
--- 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>
 
 
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 1171acf..5381489 100644
--- 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>
diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h
index eaf2ab5..3b312f4 100644
--- 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>
 
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index c98272a..3a3df6b 100644
--- 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>
diff --git a/src/cff/cffload.h b/src/cff/cffload.h
index 6b1bb97..fc998db 100644
--- 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 */
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 5e58315..981bc70 100644
--- 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>
diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h
index 6f12b95..845bd90 100644
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -20,7 +20,6 @@
 #define CFFOBJS_H_
 
 
-#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 17e4a8e..25c90d2 100644
--- 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>
diff --git a/src/cff/cffparse.h b/src/cff/cffparse.h
index 35cf2b6..6f3fbb3 100644
--- 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>
 
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 0eb2a1a..54aa62f 100644
--- 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>
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index 251c93c..da36e37 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -20,7 +20,6 @@
 #define CIDGLOAD_H_
 
 
-#include <ft2build.h>
 #include "cidobjs.h"
 
 
diff --git a/src/cid/cidload.h b/src/cid/cidload.h
index bb16222..06fb9ef 100644
--- 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"
 
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 67dae5e..2d284ca 100644
--- 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>
 
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 3b65e19..1fc098b 100644
--- 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>
diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h
index ab27434..0b49beb 100644
--- 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>
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 7eaec06..d08cea1 100644
--- 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>
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 0895efb..0fc8ed3 100644
--- 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>
 
 
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index ba91410..082e8bf 100644
--- 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"
diff --git a/src/gxvalid/gxvalid.c b/src/gxvalid/gxvalid.c
index cb655ae..683b8a6 100644
--- 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"
diff --git a/src/gxvalid/gxvalid.h b/src/gxvalid/gxvalid.h
index ac9cae0..ff2812d 100644
--- 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' */
diff --git a/src/gxvalid/gxvcommn.h b/src/gxvalid/gxvcommn.h
index f36799f..59d1492 100644
--- 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>
diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c
index c431816..a467e87 100644
--- 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>
diff --git a/src/gxvalid/gxvmod.h b/src/gxvalid/gxvmod.h
index 80c198f..f2982c9 100644
--- 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>
 
 
diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c
index 1495a98..de7d0fd 100644
--- 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>
diff --git a/src/lzw/ftlzw.c b/src/lzw/ftlzw.c
index 1e2073b..ddb81e6 100644
--- 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>
diff --git a/src/lzw/ftzopen.h b/src/lzw/ftzopen.h
index 6a7a730..cb9206b 100644
--- 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>
 
 
diff --git a/src/otvalid/otvalid.c b/src/otvalid/otvalid.c
index 487d336..d640209 100644
--- 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"
diff --git a/src/otvalid/otvalid.h b/src/otvalid/otvalid.h
index c4d26a6..8208ff0 100644
--- 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' */
diff --git a/src/otvalid/otvcommn.h b/src/otvalid/otvcommn.h
index 0755c44..f992603 100644
--- 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>
 
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index 5fe8737..0188b27 100644
--- 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>
diff --git a/src/otvalid/otvmod.h b/src/otvalid/otvmod.h
index 6f2e750..efd6da0 100644
--- a/src/otvalid/otvmod.h
+++ b/src/otvalid/otvmod.h
@@ -21,7 +21,6 @@
 #define OTVMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c
index 8ffd6e2..6b30fb2 100644
--- 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"
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index 1338030..3134cc3 100644
--- 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>
 
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index c3ab0a4..b0b5ee4 100644
--- 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>
diff --git a/src/pcf/pcfdrivr.h b/src/pcf/pcfdrivr.h
index dac2f22..d465393 100644
--- 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>
 
 
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 7cc33a3..08878a2 100644
--- 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>
diff --git a/src/pcf/pcfread.h b/src/pcf/pcfread.h
index bed30e5..a54648f 100644
--- a/src/pcf/pcfread.h
+++ b/src/pcf/pcfread.h
@@ -29,7 +29,6 @@
 #define PCFREAD_H_
 
 
-#include <ft2build.h>
 
 FT_BEGIN_HEADER
 
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index 045c42d..5d3c007 100644
--- 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"
 
 
diff --git a/src/pfr/pfr.c b/src/pfr/pfr.c
index 5dea6fa..9264c77 100644
--- 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"
diff --git a/src/pfr/pfrcmap.c b/src/pfr/pfrcmap.c
index b43fd7f..ebc7b84 100644
--- 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"
diff --git a/src/pfr/pfrcmap.h b/src/pfr/pfrcmap.h
index 251d85b..a6d920c 100644
--- 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"
 
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index e0b3154..b143208 100644
--- 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>
diff --git a/src/pfr/pfrdrivr.h b/src/pfr/pfrdrivr.h
index 1400e27..7646b4d 100644
--- 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>
 
 
diff --git a/src/pfr/pfrtypes.h b/src/pfr/pfrtypes.h
index 83bf5f2..06fb82d 100644
--- 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
diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c
index 9dbf9d5..2d6a0d9 100644
--- 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>
diff --git a/src/psaux/afmparse.h b/src/psaux/afmparse.h
index 8e8a587..16a3a3e 100644
--- 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>
 
 
diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c
index 7ed6c5b..3d2da1e 100644
--- 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>
diff --git a/src/psaux/cffdecode.h b/src/psaux/cffdecode.h
index e7f095b..77a4962 100644
--- 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>
 
 
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index 96d2484..f428222 100644
--- 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"
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index bb52079..bfc507c 100644
--- 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"
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
index 4582f9f..400d0ea 100644
--- 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>
diff --git a/src/psaux/psconv.c b/src/psaux/psconv.c
index ae6e55f..4cf5cd5 100644
--- 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>
 
diff --git a/src/psaux/psconv.h b/src/psaux/psconv.h
index 00f303b..833e827 100644
--- 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
diff --git a/src/psaux/psfont.c b/src/psaux/psfont.c
index ba584a5..0db1f0c 100644
--- 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"
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 9b1711b..4b8f58c 100644
--- 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>
diff --git a/src/psaux/psobjs.h b/src/psaux/psobjs.h
index 6bed57f..fdad672 100644
--- 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>
 
diff --git a/src/psaux/pstypes.h b/src/psaux/pstypes.h
index 8d30481..435ef7e 100644
--- 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>
 
 
diff --git a/src/psaux/t1cmap.h b/src/psaux/t1cmap.h
index 5dc2c33..0317965 100644
--- 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>
 
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index b42b9c6..5761c53 100644
--- 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>
diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h
index 0e0f6e3..b793504 100644
--- 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>
 
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 7d68e41..920b9a7 100644
--- 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>
diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c
index 6baaf83..cdc1c3a 100644
--- 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>
diff --git a/src/pshinter/pshinter.c b/src/pshinter/pshinter.c
index 6009db5..3cca0ad 100644
--- 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"
diff --git a/src/pshinter/pshmod.c b/src/pshinter/pshmod.c
index 405edbb..801bf92 100644
--- 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"
diff --git a/src/pshinter/pshmod.h b/src/pshinter/pshmod.h
index f5c8626..2a6eb1c 100644
--- a/src/pshinter/pshmod.h
+++ b/src/pshinter/pshmod.h
@@ -20,7 +20,6 @@
 #define PSHMOD_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c
index df3873d..36debf1 100644
--- 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>
diff --git a/src/pshinter/pshrec.h b/src/pshinter/pshrec.h
index e0a4cd1..b13c7be 100644
--- 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"
 
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 58e8df8..b38f9d3 100644
--- 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>
diff --git a/src/psnames/psmodule.h b/src/psnames/psmodule.h
index d0628a8..c85a9ec 100644
--- a/src/psnames/psmodule.h
+++ b/src/psnames/psmodule.h
@@ -20,7 +20,6 @@
 #define PSMODULE_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index 5ac3897..cff3685 100644
--- 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"
 
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index a633ae1..6a85f25 100644
--- 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              */
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c
index cdb2cfc..57fed9b 100644
--- 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>
diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h
index caeaa18..3f6be53 100644
--- a/src/raster/ftrend1.h
+++ b/src/raster/ftrend1.h
@@ -20,7 +20,6 @@
 #define FTREND1_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
diff --git a/src/raster/raster.c b/src/raster/raster.c
index 08431c8..cd37943 100644
--- 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"
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 3acc1d5..7388837 100644
--- 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>
diff --git a/src/sfnt/pngshim.h b/src/sfnt/pngshim.h
index d2c9e2b..2d6e83d 100644
--- a/src/sfnt/pngshim.h
+++ b/src/sfnt/pngshim.h
@@ -21,7 +21,6 @@
 #define PNGSHIM_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index d17b25a..0f463a3 100644
--- 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>
diff --git a/src/sfnt/sfdriver.h b/src/sfnt/sfdriver.h
index ca7c517..1ac2706 100644
--- a/src/sfnt/sfdriver.h
+++ b/src/sfnt/sfdriver.h
@@ -20,7 +20,6 @@
 #define SFDRIVER_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftmodapi.h>
 
 
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index 9db7935..471239f 100644
--- 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"
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 7eb1d4c..22da061 100644
--- 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"
diff --git a/src/sfnt/sfobjs.h b/src/sfnt/sfobjs.h
index da9bac5..e8e3042 100644
--- 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>
 
diff --git a/src/sfnt/sfwoff.c b/src/sfnt/sfwoff.c
index 7df3535..f0a32e1 100644
--- 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>
diff --git a/src/sfnt/sfwoff.h b/src/sfnt/sfwoff.h
index 13f67f7..d177ab1 100644
--- 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>
 
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 2714d5c..3f59044 100644
--- 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>
diff --git a/src/sfnt/sfwoff2.h b/src/sfnt/sfwoff2.h
index 6b43f27..798f66b 100644
--- 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>
 
diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c
index b3f2881..a287d3a 100644
--- 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>
diff --git a/src/sfnt/ttbdf.h b/src/sfnt/ttbdf.h
index a1ed688..e60c01c 100644
--- 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>
 
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 0ac1a96..e54baf9 100644
--- 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' */
diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h
index afe9945..428ad21 100644
--- 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>
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 082e1a7..7476c42 100644
--- 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>
diff --git a/src/sfnt/ttcolr.h b/src/sfnt/ttcolr.h
index 8da6b3a..6412162 100644
--- a/src/sfnt/ttcolr.h
+++ b/src/sfnt/ttcolr.h
@@ -22,7 +22,6 @@
 #define __TTCOLR_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/ttcpal.c b/src/sfnt/ttcpal.c
index bded2e3..bdf7bfa 100644
--- 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>
diff --git a/src/sfnt/ttcpal.h b/src/sfnt/ttcpal.h
index f2e116b..b544be6 100644
--- a/src/sfnt/ttcpal.h
+++ b/src/sfnt/ttcpal.h
@@ -22,7 +22,6 @@
 #define __TTCPAL_H__
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index a6df222..d4a70c7 100644
--- 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>
diff --git a/src/sfnt/ttkern.h b/src/sfnt/ttkern.h
index 5b0e363..f44b5bd 100644
--- 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>
 
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index c10ddcd..8e9591b 100644
--- 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>
diff --git a/src/sfnt/ttload.h b/src/sfnt/ttload.h
index ba1bece..4e53d8b 100644
--- 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>
 
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index ab68f50..0211233 100644
--- 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>
diff --git a/src/sfnt/ttmtx.h b/src/sfnt/ttmtx.h
index 6eb5eb3..dba65ca 100644
--- 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>
 
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index db2a2b8..ffc90b6 100644
--- 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>
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 3bd37ad..293c6fd 100644
--- 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>
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index dfeb886..b867e43 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -20,7 +20,6 @@
 #define TTSBIT_H_
 
 
-#include <ft2build.h>
 #include "ttload.h"
 
 
diff --git a/src/sfnt/woff2tags.c b/src/sfnt/woff2tags.c
index 04713bd..9775385 100644
--- a/src/sfnt/woff2tags.c
+++ b/src/sfnt/woff2tags.c
@@ -16,7 +16,6 @@
  */
 
 
-#include <ft2build.h>
 #include <freetype/tttags.h>
 
 
diff --git a/src/sfnt/woff2tags.h b/src/sfnt/woff2tags.h
index cd0d386..a312483 100644
--- 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>
 
 
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index bbc29ce..fd64548 100644
--- 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>
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 3b42d43..95e14d3 100644
--- 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>
diff --git a/src/smooth/ftsmooth.h b/src/smooth/ftsmooth.h
index 420b3d6..22a88d5 100644
--- a/src/smooth/ftsmooth.h
+++ b/src/smooth/ftsmooth.h
@@ -20,7 +20,6 @@
 #define FTSMOOTH_H_
 
 
-#include <ft2build.h>
 #include <freetype/ftrender.h>
 
 
diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c
index 6ad9424..04b531c 100644
--- 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"
diff --git a/src/tools/test_afm.c b/src/tools/test_afm.c
index c322f0e..a4b2268 100644
--- 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>
diff --git a/src/tools/test_bbox.c b/src/tools/test_bbox.c
index d17a3ba..d9fd932 100644
--- 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>
 
diff --git a/src/tools/test_trig.c b/src/tools/test_trig.c
index 9213cc8..4f3410a 100644
--- 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>
 
diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c
index 1f15b29..41b6808 100644
--- 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        */
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index ce14d78..bf830b1 100644
--- 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>
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 204d353..ee1438e 100644
--- 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>
 
 
diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h
index 9a8c3e7..8f72cd5 100644
--- 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
diff --git a/src/truetype/ttgxvar.h b/src/truetype/ttgxvar.h
index 11664e9..26e89bc 100644
--- a/src/truetype/ttgxvar.h
+++ b/src/truetype/ttgxvar.h
@@ -20,7 +20,6 @@
 #define TTGXVAR_H_
 
 
-#include <ft2build.h>
 #include "ttobjs.h"
 
 
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 6d76339..6aecfb4 100644
--- 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>
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index 07e4ad6..2b6c749 100644
--- 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"
 
 
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index c5a1887..04d2373 100644
--- 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>
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 7e81d2a..d986dea 100644
--- 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>
 
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index 42c9467..bf0f99f 100644
--- 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>
diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h
index eb5f5a4..bb669e0 100644
--- 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>
 
 
diff --git a/src/truetype/ttsubpix.c b/src/truetype/ttsubpix.c
index c110086..56667de 100644
--- 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>
diff --git a/src/truetype/ttsubpix.h b/src/truetype/ttsubpix.h
index 23adf7e..229a6cf 100644
--- 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"
 
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 69295be..b9cd66b 100644
--- 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>
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index 97b41f3..edf919c 100644
--- 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>
 
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 87d463b..b786a87 100644
--- 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"
diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h
index a96dce2..e7eae0b 100644
--- 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>
 
 
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index 0026ae5..9d04bd2 100644
--- 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>
diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h
index 59fae82..9947507 100644
--- a/src/type1/t1gload.h
+++ b/src/type1/t1gload.h
@@ -20,7 +20,6 @@
 #define T1GLOAD_H_
 
 
-#include <ft2build.h>
 #include "t1objs.h"
 
 
diff --git a/src/type1/t1load.h b/src/type1/t1load.h
index 0712ad6..4396415 100644
--- 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>
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index ff2786b..9defdfc 100644
--- 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>
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index 0007d55..74cf38b 100644
--- 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>
diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h
index 6aaccb8..1ea0110 100644
--- 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>
 
diff --git a/src/type1/type1.c b/src/type1/type1.c
index 95dbaeb..cadee78 100644
--- 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"
diff --git a/src/type42/t42drivr.h b/src/type42/t42drivr.h
index 49461ce..8bf2afc 100644
--- 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>
 
 
diff --git a/src/type42/t42objs.h b/src/type42/t42objs.h
index b3452fb..69f5cff 100644
--- 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>
diff --git a/src/type42/t42types.h b/src/type42/t42types.h
index 01af605..ba0cc21 100644
--- 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>
diff --git a/src/type42/type42.c b/src/type42/type42.c
index 4739b3c..012559e 100644
--- 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"
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 6931ef4..e83312d 100644
--- 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>
diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h
index 0ea8595..3367c77 100644
--- 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>