summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2020-06-13 21:15:45 +0200
committerWerner Lemberg <wl@gnu.org>2020-06-13 21:15:45 +0200
commit165868596783af1d296aa4fa30295b22cf7e79a2 (patch)
tree6ab46a0ceefffa54452f56b3b8fcfb348fc636e2
parente13391333f501967db8823025ce8c63259b5d57e (diff)
downloadfreetype2-165868596783af1d296aa4fa30295b22cf7e79a2.tar.gz
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'.
-rw-r--r--ChangeLog9
-rw-r--r--builds/mac/ftmac.c1
-rw-r--r--builds/wince/ftdebug.c1
-rw-r--r--builds/windows/ftdebug.c1
-rw-r--r--include/freetype/freetype.h5
-rw-r--r--include/freetype/ftadvanc.h1
-rw-r--r--include/freetype/ftbbox.h1
-rw-r--r--include/freetype/ftbdf.h1
-rw-r--r--include/freetype/ftbitmap.h1
-rw-r--r--include/freetype/ftbzip2.h1
-rw-r--r--include/freetype/ftcache.h1
-rw-r--r--include/freetype/ftcid.h1
-rw-r--r--include/freetype/ftcolor.h1
-rw-r--r--include/freetype/ftdriver.h1
-rw-r--r--include/freetype/ftfntfmt.h1
-rw-r--r--include/freetype/ftgasp.h1
-rw-r--r--include/freetype/ftglyph.h1
-rw-r--r--include/freetype/ftgxval.h1
-rw-r--r--include/freetype/ftgzip.h1
-rw-r--r--include/freetype/ftimage.h1
-rw-r--r--include/freetype/ftincrem.h1
-rw-r--r--include/freetype/ftlcdfil.h1
-rw-r--r--include/freetype/ftlist.h1
-rw-r--r--include/freetype/ftlzw.h1
-rw-r--r--include/freetype/ftmac.h1
-rw-r--r--include/freetype/ftmm.h1
-rw-r--r--include/freetype/ftmodapi.h1
-rw-r--r--include/freetype/ftotval.h1
-rw-r--r--include/freetype/ftoutln.h1
-rw-r--r--include/freetype/ftparams.h1
-rw-r--r--include/freetype/ftpfr.h1
-rw-r--r--include/freetype/ftrender.h1
-rw-r--r--include/freetype/ftsizes.h1
-rw-r--r--include/freetype/ftsnames.h1
-rw-r--r--include/freetype/ftstroke.h1
-rw-r--r--include/freetype/ftsynth.h1
-rw-r--r--include/freetype/ftsystem.h1
-rw-r--r--include/freetype/ftwinfnt.h1
-rw-r--r--include/freetype/internal/autohint.h1
-rw-r--r--include/freetype/internal/cffotypes.h1
-rw-r--r--include/freetype/internal/cfftypes.h1
-rw-r--r--include/freetype/internal/ftcalc.h1
-rw-r--r--include/freetype/internal/ftdrv.h1
-rw-r--r--include/freetype/internal/ftgloadr.h1
-rw-r--r--include/freetype/internal/fthash.h1
-rw-r--r--include/freetype/internal/ftobjs.h1
-rw-r--r--include/freetype/internal/ftpsprop.h1
-rw-r--r--include/freetype/internal/ftrfork.h1
-rw-r--r--include/freetype/internal/psaux.h1
-rw-r--r--include/freetype/internal/pshints.h1
-rw-r--r--include/freetype/internal/sfnt.h1
-rw-r--r--include/freetype/internal/t1types.h1
-rw-r--r--include/freetype/internal/tttypes.h1
-rw-r--r--include/freetype/internal/wofftypes.h1
-rw-r--r--include/freetype/t1tables.h1
-rw-r--r--include/freetype/ttnameid.h1
-rw-r--r--include/freetype/tttables.h1
-rw-r--r--include/freetype/tttags.h1
-rw-r--r--src/autofit/afcjk.c1
-rw-r--r--src/autofit/aflatin.c1
-rw-r--r--src/autofit/aflatin2.c1
-rw-r--r--src/autofit/afmodule.h1
-rw-r--r--src/autofit/afshaper.c1
-rw-r--r--src/autofit/afshaper.h1
-rw-r--r--src/autofit/aftypes.h1
-rw-r--r--src/autofit/autofit.c1
-rw-r--r--src/base/ftadvanc.c1
-rw-r--r--src/base/ftbase.c1
-rw-r--r--src/base/ftbase.h1
-rw-r--r--src/base/ftbbox.c1
-rw-r--r--src/base/ftbdf.c1
-rw-r--r--src/base/ftbitmap.c1
-rw-r--r--src/base/ftcalc.c1
-rw-r--r--src/base/ftcid.c1
-rw-r--r--src/base/ftcolor.c1
-rw-r--r--src/base/ftdebug.c1
-rw-r--r--src/base/fterrors.c1
-rw-r--r--src/base/ftfntfmt.c1
-rw-r--r--src/base/ftfstype.c1
-rw-r--r--src/base/ftgasp.c1
-rw-r--r--src/base/ftgloadr.c1
-rw-r--r--src/base/ftglyph.c1
-rw-r--r--src/base/ftgxval.c1
-rw-r--r--src/base/fthash.c1
-rw-r--r--src/base/ftlcdfil.c1
-rw-r--r--src/base/ftmac.c1
-rw-r--r--src/base/ftmm.c1
-rw-r--r--src/base/ftobjs.c1
-rw-r--r--src/base/ftotval.c1
-rw-r--r--src/base/ftoutln.c1
-rw-r--r--src/base/ftpatent.c1
-rw-r--r--src/base/ftpfr.c1
-rw-r--r--src/base/ftpsprop.c1
-rw-r--r--src/base/ftrfork.c1
-rw-r--r--src/base/ftsnames.c1
-rw-r--r--src/base/ftstream.c1
-rw-r--r--src/base/ftstroke.c1
-rw-r--r--src/base/ftsynth.c1
-rw-r--r--src/base/fttrigon.c1
-rw-r--r--src/base/fttype1.c1
-rw-r--r--src/base/ftutil.c1
-rw-r--r--src/base/ftwinfnt.c1
-rw-r--r--src/bdf/bdf.c1
-rw-r--r--src/bdf/bdf.h1
-rw-r--r--src/bdf/bdfdrivr.c1
-rw-r--r--src/bdf/bdfdrivr.h1
-rw-r--r--src/bdf/bdflib.c1
-rw-r--r--src/bzip2/ftbzip2.c1
-rw-r--r--src/cache/ftcache.c1
-rw-r--r--src/cache/ftcbasic.c1
-rw-r--r--src/cache/ftccache.c1
-rw-r--r--src/cache/ftccback.h1
-rw-r--r--src/cache/ftccmap.c1
-rw-r--r--src/cache/ftcglyph.c1
-rw-r--r--src/cache/ftcglyph.h1
-rw-r--r--src/cache/ftcimage.c1
-rw-r--r--src/cache/ftcimage.h1
-rw-r--r--src/cache/ftcmanag.c1
-rw-r--r--src/cache/ftcmanag.h1
-rw-r--r--src/cache/ftcmru.c1
-rw-r--r--src/cache/ftcmru.h1
-rw-r--r--src/cache/ftcsbits.c1
-rw-r--r--src/cache/ftcsbits.h1
-rw-r--r--src/cff/cff.c1
-rw-r--r--src/cff/cffcmap.c1
-rw-r--r--src/cff/cffdrivr.c1
-rw-r--r--src/cff/cffdrivr.h1
-rw-r--r--src/cff/cffgload.c1
-rw-r--r--src/cff/cffgload.h1
-rw-r--r--src/cff/cffload.c1
-rw-r--r--src/cff/cffload.h1
-rw-r--r--src/cff/cffobjs.c1
-rw-r--r--src/cff/cffobjs.h1
-rw-r--r--src/cff/cffparse.c1
-rw-r--r--src/cff/cffparse.h1
-rw-r--r--src/cid/cidgload.c1
-rw-r--r--src/cid/cidgload.h1
-rw-r--r--src/cid/cidload.h1
-rw-r--r--src/cid/cidobjs.c1
-rw-r--r--src/cid/cidparse.c1
-rw-r--r--src/cid/cidparse.h1
-rw-r--r--src/cid/cidriver.c1
-rw-r--r--src/cid/cidriver.h1
-rw-r--r--src/cid/type1cid.c1
-rw-r--r--src/gxvalid/gxvalid.c1
-rw-r--r--src/gxvalid/gxvalid.h1
-rw-r--r--src/gxvalid/gxvcommn.h1
-rw-r--r--src/gxvalid/gxvmod.c1
-rw-r--r--src/gxvalid/gxvmod.h1
-rw-r--r--src/gzip/ftgzip.c1
-rw-r--r--src/lzw/ftlzw.c1
-rw-r--r--src/lzw/ftzopen.h1
-rw-r--r--src/otvalid/otvalid.c1
-rw-r--r--src/otvalid/otvalid.h1
-rw-r--r--src/otvalid/otvcommn.h1
-rw-r--r--src/otvalid/otvmod.c1
-rw-r--r--src/otvalid/otvmod.h1
-rw-r--r--src/pcf/pcf.c1
-rw-r--r--src/pcf/pcf.h1
-rw-r--r--src/pcf/pcfdrivr.c1
-rw-r--r--src/pcf/pcfdrivr.h1
-rw-r--r--src/pcf/pcfread.c1
-rw-r--r--src/pcf/pcfread.h1
-rw-r--r--src/pcf/pcfutil.c1
-rw-r--r--src/pfr/pfr.c1
-rw-r--r--src/pfr/pfrcmap.c1
-rw-r--r--src/pfr/pfrcmap.h1
-rw-r--r--src/pfr/pfrdrivr.c1
-rw-r--r--src/pfr/pfrdrivr.h1
-rw-r--r--src/pfr/pfrtypes.h1
-rw-r--r--src/psaux/afmparse.c1
-rw-r--r--src/psaux/afmparse.h1
-rw-r--r--src/psaux/cffdecode.c1
-rw-r--r--src/psaux/cffdecode.h1
-rw-r--r--src/psaux/psaux.c1
-rw-r--r--src/psaux/psauxmod.c1
-rw-r--r--src/psaux/psauxmod.h1
-rw-r--r--src/psaux/psconv.c1
-rw-r--r--src/psaux/psconv.h1
-rw-r--r--src/psaux/psfont.c1
-rw-r--r--src/psaux/psobjs.c1
-rw-r--r--src/psaux/psobjs.h1
-rw-r--r--src/psaux/pstypes.h1
-rw-r--r--src/psaux/t1cmap.h1
-rw-r--r--src/psaux/t1decode.c1
-rw-r--r--src/psaux/t1decode.h1
-rw-r--r--src/pshinter/pshalgo.c1
-rw-r--r--src/pshinter/pshglob.c1
-rw-r--r--src/pshinter/pshinter.c1
-rw-r--r--src/pshinter/pshmod.c1
-rw-r--r--src/pshinter/pshmod.h1
-rw-r--r--src/pshinter/pshrec.c1
-rw-r--r--src/pshinter/pshrec.h1
-rw-r--r--src/psnames/psmodule.c1
-rw-r--r--src/psnames/psmodule.h1
-rw-r--r--src/psnames/psnames.c1
-rw-r--r--src/raster/ftraster.c1
-rw-r--r--src/raster/ftrend1.c1
-rw-r--r--src/raster/ftrend1.h1
-rw-r--r--src/raster/raster.c1
-rw-r--r--src/sfnt/pngshim.c1
-rw-r--r--src/sfnt/pngshim.h1
-rw-r--r--src/sfnt/sfdriver.c1
-rw-r--r--src/sfnt/sfdriver.h1
-rw-r--r--src/sfnt/sfnt.c1
-rw-r--r--src/sfnt/sfobjs.c1
-rw-r--r--src/sfnt/sfobjs.h1
-rw-r--r--src/sfnt/sfwoff.c1
-rw-r--r--src/sfnt/sfwoff.h1
-rw-r--r--src/sfnt/sfwoff2.c1
-rw-r--r--src/sfnt/sfwoff2.h1
-rw-r--r--src/sfnt/ttbdf.c1
-rw-r--r--src/sfnt/ttbdf.h1
-rw-r--r--src/sfnt/ttcmap.c1
-rw-r--r--src/sfnt/ttcmap.h1
-rw-r--r--src/sfnt/ttcolr.c1
-rw-r--r--src/sfnt/ttcolr.h1
-rw-r--r--src/sfnt/ttcpal.c1
-rw-r--r--src/sfnt/ttcpal.h1
-rw-r--r--src/sfnt/ttkern.c1
-rw-r--r--src/sfnt/ttkern.h1
-rw-r--r--src/sfnt/ttload.c1
-rw-r--r--src/sfnt/ttload.h1
-rw-r--r--src/sfnt/ttmtx.c1
-rw-r--r--src/sfnt/ttmtx.h1
-rw-r--r--src/sfnt/ttpost.c1
-rw-r--r--src/sfnt/ttsbit.c1
-rw-r--r--src/sfnt/ttsbit.h1
-rw-r--r--src/sfnt/woff2tags.c1
-rw-r--r--src/sfnt/woff2tags.h1
-rw-r--r--src/smooth/ftgrays.c1
-rw-r--r--src/smooth/ftsmooth.c1
-rw-r--r--src/smooth/ftsmooth.h1
-rw-r--r--src/smooth/smooth.c1
-rw-r--r--src/tools/test_afm.c1
-rw-r--r--src/tools/test_bbox.c1
-rw-r--r--src/tools/test_trig.c1
-rw-r--r--src/truetype/truetype.c1
-rw-r--r--src/truetype/ttdriver.c1
-rw-r--r--src/truetype/ttdriver.h1
-rw-r--r--src/truetype/ttgload.h1
-rw-r--r--src/truetype/ttgxvar.h1
-rw-r--r--src/truetype/ttinterp.c1
-rw-r--r--src/truetype/ttinterp.h1
-rw-r--r--src/truetype/ttobjs.c1
-rw-r--r--src/truetype/ttobjs.h1
-rw-r--r--src/truetype/ttpload.c1
-rw-r--r--src/truetype/ttpload.h1
-rw-r--r--src/truetype/ttsubpix.c1
-rw-r--r--src/truetype/ttsubpix.h1
-rw-r--r--src/type1/t1afm.c1
-rw-r--r--src/type1/t1afm.h1
-rw-r--r--src/type1/t1driver.c1
-rw-r--r--src/type1/t1driver.h1
-rw-r--r--src/type1/t1gload.c1
-rw-r--r--src/type1/t1gload.h1
-rw-r--r--src/type1/t1load.h1
-rw-r--r--src/type1/t1objs.c1
-rw-r--r--src/type1/t1parse.c1
-rw-r--r--src/type1/t1parse.h1
-rw-r--r--src/type1/type1.c1
-rw-r--r--src/type42/t42drivr.h1
-rw-r--r--src/type42/t42objs.h1
-rw-r--r--src/type42/t42types.h1
-rw-r--r--src/type42/type42.c1
-rw-r--r--src/winfonts/winfnt.c1
-rw-r--r--src/winfonts/winfnt.h1
267 files changed, 9 insertions, 270 deletions
diff --git a/ChangeLog b/ChangeLog
index b0327cd96..9c4ab5fe4 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 bba842452..2cb30468c 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 c6c8e66a5..734c4f0a5 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 81ca8b8d6..d58949003 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 93cc9ab55..39662784d 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 8a43bdd42..5050d3ac5 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 2adb7326c..fda1ad94a 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 47323253d..2e1daeeaa 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 8d43fd4ed..282c22e1c 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 a1411eff8..fe582ead8 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 26f48fe5c..604727520 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 ab002deff..a29fb3330 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 44bcb8a48..ecc6485e5 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 f7ec6f339..34fcaad8d 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 5e235f3dd..f803349cd 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 74eb9048c..6b76882c7 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 88e63fbde..704619e3d 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 e617b81e3..354460a9a 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 6148b3cf3..2aa8d75d7 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 185967c1b..9fecd1fbc 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 b1b31670e..f67655eda 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 31cbbe299..b8c5c0036 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 f6ce25fef..458892270 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 aec431cd2..904e19b2f 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 c1a0aa373..c9de98184 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 7392fe4a8..d8781a829 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 09c3a231d..4b5cdfbaf 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 e9127124b..9c00ad30b 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 5039ee4e6..5069d187b 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 9b893a18b..55ea2a387 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 bd7f0aa2d..9a5383f91 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 c33763ca5..8007951b3 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 a99904212..a8682a30f 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 46b4dfd5f..729e6ab06 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 18aee4224..1c5477c5a 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 55b1a39b0..bdb4c5753 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 f7fecb53f..22aead714 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 18341dcf7..786528c6e 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 f344ff183..d4220a274 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 360af5332..a316fd1f3 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 e48ff1bf9..f21167b1e 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 d8236d24b..6bc2791f7 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 36caa4f3d..a2945164d 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 f27dd2b83..27b8659f7 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 5833bc9be..622ec76bb 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 7c667c13f..c7ac1a76a 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 d52ca2c3b..81ec29151 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 071743f20..1b7b25acb 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 a917b0ac4..8e0a262fd 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 43bd79b67..663e9d348 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 283f0cb82..b4c12dbb2 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 9fe12dbae..6a0fe5e97 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 4a41485cc..c36342c93 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 a10fef930..1874a138a 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 ed285fc13..426e14024 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 9a00913ee..2b2ed4c61 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 8cfd1d2d6..c8fa35ef8 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 8ed6dbfa1..3c9fbd59d 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 3c207a21e..ed7a06563 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 41e3e66ff..6e9f28c75 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 1569c5de5..902f3982e 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 75013ef84..74c4ff6e7 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 80143a958..bbf7b6b1f 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 cc8693d51..138c27b32 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 4bbe9a787..5f040c6b4 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 88be8bf2b..ef5e7f145 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 c19b5e336..c689e6a15 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 b8242bb96..bfbaffd64 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 ab37052e6..b03922ae6 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 3e6661ec9..30a4eba0b 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 26ffdf913..fc374c667 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 efa25ed8f..d109ee49b 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 d8b758475..b5258c85a 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 d02213e46..ce8a876ad 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 9e250ee18..a50d68009 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 0135385db..62cf680b0 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 0c18d2438..eba9e7656 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 06baf4cbd..a45317e79 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 67111c6b7..bca548fc5 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 c721af539..eed05a326 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 fd7c95097..faf7d85f8 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 2f85c6de1..78dff7ff2 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 9fc2ca889..f04df1452 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 2251373e4..449b03a5c 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 3a0268739..1e84dbc89 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 d71e22997..55a631fd7 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 ce746be35..9a702b993 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 d7b6424d6..532a06d15 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 198f05569..90a5dd617 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 7a6c7fd5a..9935e058b 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 5ec4e6f76..a02c636a6 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 28916c3be..c656fcd9b 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 644e697ca..8c29f50f6 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 fba122f78..ea7e31081 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 472c98168..8507f28d3 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 eaa210cc9..d940254d8 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 61571853e..56f98e1d9 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 d98e89dff..3c962721b 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 dedcee729..c6f027cf6 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 ce26e0002..be60ed6ec 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 0c18d8f64..d90cfbcd2 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 822954066..699dc3d70 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 e54df6649..249012e59 100644
--- a/src/bdf/bdf.c
+++ b/src/bdf/bdf.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
#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 005784671..5acbd5f2f 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 0859b3ba9..e338808ac 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -24,7 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
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 b638a889e..54aaa3353 100644
--- a/src/bdf/bdfdrivr.h
+++ b/src/bdf/bdfdrivr.h
@@ -28,7 +28,6 @@ THE SOFTWARE.
#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 5c0fa40b2..a4ddb9a1d 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 acd4eb45e..411c5d263 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 4137f6869..e90f4639c 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 899b92963..493fc0af7 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 c6cac6968..1c8e0f322 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 cbe539542..802fd4444 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 593cc55b6..468c008cf 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 5e17df6f7..7f5438aad 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 ef689f994..5629545f3 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 65cc2f615..58ebad8c9 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 a360f4859..a400788b3 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 18a02e327..436d41f37 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 1ea560f27..6c6ec6854 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 44c0a620a..8feed45f6 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 a27ea5f90..e7c2a8fad 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 2dd51f934..e0db930af 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 b1e09b225..46f797e72 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 755228bb6..0fa6c8787 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 b244461b4..6d16ed422 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 b513cc39a..af0ec7187 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 c1175c6ee..d198dd35c 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 1171acfc9..5381489ed 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 eaf2ab584..3b312f452 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 c98272a09..3a3df6b0f 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 6b1bb9777..fc998db2d 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 5e5831568..981bc7009 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 6f12b95db..845bd9094 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 17e4a8ed4..25c90d2f3 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 35cf2b641..6f3fbb37d 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 0eb2a1a7b..54aa62f81 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 251c93c9f..da36e37e0 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 bb162228d..06fb9ef47 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 67dae5e1a..2d284ca55 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 3b65e19f9..1fc098b44 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 ab274347e..0b49bebf4 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 7eaec068e..d08cea1d7 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 0895efb05..0fc8ed37b 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 ba9141075..082e8bfe5 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 cb655aeb9..683b8a697 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 ac9cae02b..ff2812da2 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 f36799f0e..59d149215 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 c4318161f..a467e8713 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 80c198fd3..f2982c96c 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 1495a9895..de7d0fdd5 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 1e2073b47..ddb81e6e9 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 6a7a73013..cb9206b3e 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 487d336a3..d640209f6 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 c4d26a643..8208ff011 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 0755c4442..f9926034a 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 5fe873722..0188b2701 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 6f2e750dc..efd6da035 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 8ffd6e280..6b30fb249 100644
--- a/src/pcf/pcf.c
+++ b/src/pcf/pcf.c
@@ -26,7 +26,6 @@ THE SOFTWARE.
#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 13380303b..3134cc355 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
#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 c3ab0a445..b0b5ee405 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -25,7 +25,6 @@ THE SOFTWARE.
*/
-#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 dac2f2238..d46539374 100644
--- a/src/pcf/pcfdrivr.h
+++ b/src/pcf/pcfdrivr.h
@@ -28,7 +28,6 @@ THE SOFTWARE.
#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 7cc33a36a..08878a2d7 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -25,7 +25,6 @@ THE SOFTWARE.
*/
-#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 bed30e503..a54648fbf 100644
--- a/src/pcf/pcfread.h
+++ b/src/pcf/pcfread.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
#define PCFREAD_H_
-#include <ft2build.h>
FT_BEGIN_HEADER
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index 045c42d60..5d3c00791 100644
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -32,7 +32,6 @@ in this Software without prior written authorization from The Open Group.
/* Modified for use with FreeType */
-#include <ft2build.h>
#include "pcfutil.h"
diff --git a/src/pfr/pfr.c b/src/pfr/pfr.c
index 5dea6fa34..9264c77df 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 b43fd7fa4..ebc7b8439 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 251d85bc3..a6d920c30 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 e0b315406..b14320875 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 1400e27ec..7646b4d1b 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 83bf5f29d..06fb82d51 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 9dbf9d590..2d6a0d9a1 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 8e8a5873b..16a3a3e90 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 7ed6c5bf2..3d2da1e03 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 e7f095b6a..77a496269 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 96d2484e9..f4282222a 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 bb520792e..bfc507c07 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 4582f9fd6..400d0ea93 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 ae6e55f9b..4cf5cd5d8 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 00f303b09..833e82736 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 ba584a52d..0db1f0c5b 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 9b1711be8..4b8f58cab 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 6bed57f97..fdad672b6 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 8d30481e0..435ef7e1f 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 5dc2c332f..031796510 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 b42b9c65d..5761c5308 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 0e0f6e3ad..b793504ac 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 7d68e4162..920b9a74b 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 6baaf8366..cdc1c3af0 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 6009db518..3cca0ad7c 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 405edbb9b..801bf926a 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 f5c8626f7..2a6eb1c46 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 df3873d1a..36debf1bd 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 e0a4cd144..b13c7be13 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 58e8df817..b38f9d3b1 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 d0628a82f..c85a9ecad 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 5ac3897d2..cff36851b 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 a633ae1a8..6a85f25f9 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 cdb2cfc3e..57fed9bc1 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 caeaa1873..3f6be5367 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 08431c850..cd37943bf 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 3acc1d551..7388837b3 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 d2c9e2b9b..2d6e83d69 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 d17b25a28..0f463a36d 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 ca7c517db..1ac270632 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 9db7935ae..471239ff0 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 7eb1d4c5a..22da06135 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 da9bac57c..e8e304208 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 7df353508..f0a32e1e0 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 13f67f7c9..d177ab116 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 2714d5c39..3f590444f 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 6b43f279a..798f66bd0 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 b3f28813c..a287d3afc 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 a1ed68887..e60c01cb8 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 0ac1a9653..e54baf9e9 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 afe9945bf..428ad21ef 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 082e1a7f9..7476c426a 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 8da6b3aa1..641216266 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 bded2e3f4..bdf7bfa30 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 f2e116ba2..b544be696 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 a6df22223..d4a70c785 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 5b0e36389..f44b5bdeb 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 c10ddcd4e..8e9591b68 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 ba1bece32..4e53d8b78 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 ab68f5091..021123336 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 6eb5eb303..dba65ca9b 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 db2a2b8b1..ffc90b665 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 3bd37adc2..293c6fd04 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 dfeb88683..b867e43a6 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 04713bdc6..977538519 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 cd0d38699..a3124835f 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 bbc29cefd..fd64548ec 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -278,7 +278,6 @@ typedef ptrdiff_t FT_PtrDist;
#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 3b42d4354..95e14d32a 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 420b3d622..22a88d54e 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 6ad9424f0..04b531c08 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 c322f0e5d..a4b226898 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 d17a3baae..d9fd93299 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 9213cc856..4f3410ab3 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 1f15b29bb..41b6808a8 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 ce14d7802..bf830b141 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 204d3533c..ee1438eb6 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 9a8c3e71d..8f72cd558 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 11664e997..26e89bcf7 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 6d7633956..6aecfb4f5 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 07e4ad689..2b6c7497e 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 c5a18875c..04d23737c 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 7e81d2a0b..d986deabc 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 42c946753..bf0f99f2d 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 eb5f5a4e5..bb669e027 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 c11008643..56667deaf 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 23adf7e8d..229a6cf05 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 69295beb3..b9cd66b04 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 97b41f3b8..edf919c79 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 87d463bc6..b786a8781 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 a96dce210..e7eae0b88 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 0026ae5bd..9d04bd213 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 59fae82b6..9947507c8 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 0712ad6aa..4396415c2 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 ff2786ba2..9defdfccc 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 0007d551e..74cf38bde 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 6aaccb892..1ea0110b5 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 95dbaeb50..cadee7899 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 49461ce3c..8bf2afc75 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 b3452fbb6..69f5cffd4 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 01af60526..ba0cc2142 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 4739b3c33..012559e2f 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 6931ef4a6..e83312d16 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 0ea85952d..3367c7715 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>