diff options
Diffstat (limited to 'freetype/include')
59 files changed, 81 insertions, 81 deletions
diff --git a/freetype/include/config/ftconfig.h b/freetype/include/config/ftconfig.h index d98a3116b..1f0e39289 100644 --- a/freetype/include/config/ftconfig.h +++ b/freetype/include/config/ftconfig.h @@ -39,8 +39,8 @@ #define __FTCONFIG_H__ #include <ft2build.h> -#include FT_CONFIG_OPTIONS_H -#include FT_CONFIG_STANDARD_LIBRARY_H +#include <config/ftoption.h> +#include <config/ftstdlib.h> FT_BEGIN_HEADER diff --git a/freetype/include/ftadvanc.h b/freetype/include/ftadvanc.h index 8f7e2fce5..ce02175dd 100644 --- a/freetype/include/ftadvanc.h +++ b/freetype/include/ftadvanc.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftbbox.h b/freetype/include/ftbbox.h index 8938841a6..d3f12f9de 100644 --- a/freetype/include/ftbbox.h +++ b/freetype/include/ftbbox.h @@ -32,7 +32,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftbdf.h b/freetype/include/ftbdf.h index 8b3c41115..2bd005593 100644 --- a/freetype/include/ftbdf.h +++ b/freetype/include/ftbdf.h @@ -20,7 +20,7 @@ #define __FTBDF_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftbitmap.h b/freetype/include/ftbitmap.h index 7dbf5ba3f..e4b91925b 100644 --- a/freetype/include/ftbitmap.h +++ b/freetype/include/ftbitmap.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftcid.h b/freetype/include/ftcid.h index 203a30caf..5771441cf 100644 --- a/freetype/include/ftcid.h +++ b/freetype/include/ftcid.h @@ -19,7 +19,7 @@ #define __FTCID_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/fterrors.h b/freetype/include/fterrors.h index 0fa3e4dce..e98e080cf 100644 --- a/freetype/include/fterrors.h +++ b/freetype/include/fterrors.h @@ -86,7 +86,7 @@ /* include module base error codes */ -#include FT_MODULE_ERRORS_H +#include <ftmoderr.h> /*******************************************************************/ @@ -157,7 +157,7 @@ /* now include the error codes */ -#include FT_ERROR_DEFINITIONS_H +#include <fterrdef.h> #ifdef FT_ERROR_END_LIST diff --git a/freetype/include/ftgasp.h b/freetype/include/ftgasp.h index 453d4fa42..4b7f73542 100644 --- a/freetype/include/ftgasp.h +++ b/freetype/include/ftgasp.h @@ -20,7 +20,7 @@ #define _FT_GASP_H_ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftglyph.h b/freetype/include/ftglyph.h index 2d30ed9de..af25d710a 100644 --- a/freetype/include/ftglyph.h +++ b/freetype/include/ftglyph.h @@ -34,7 +34,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftgxval.h b/freetype/include/ftgxval.h index 6d38e327a..e00d4834e 100644 --- a/freetype/include/ftgxval.h +++ b/freetype/include/ftgxval.h @@ -29,7 +29,7 @@ #define __FTGXVAL_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftgzip.h b/freetype/include/ftgzip.h index 78e726999..383d9116c 100644 --- a/freetype/include/ftgzip.h +++ b/freetype/include/ftgzip.h @@ -20,7 +20,7 @@ #define __FTGZIP_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftincrem.h b/freetype/include/ftincrem.h index aaf689ff1..5cbca43ef 100644 --- a/freetype/include/ftincrem.h +++ b/freetype/include/ftincrem.h @@ -20,7 +20,7 @@ #define __FTINCREM_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftlcdfil.h b/freetype/include/ftlcdfil.h index 39206f019..dda9b1e4c 100644 --- a/freetype/include/ftlcdfil.h +++ b/freetype/include/ftlcdfil.h @@ -21,7 +21,7 @@ #define __FT_LCD_FILTER_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftlist.h b/freetype/include/ftlist.h index 241e21e55..44b570fc4 100644 --- a/freetype/include/ftlist.h +++ b/freetype/include/ftlist.h @@ -29,7 +29,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftlzw.h b/freetype/include/ftlzw.h index 00d40169a..e1c9c746d 100644 --- a/freetype/include/ftlzw.h +++ b/freetype/include/ftlzw.h @@ -20,7 +20,7 @@ #define __FTLZW_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftmodapi.h b/freetype/include/ftmodapi.h index 22878f8c6..6c4a396de 100644 --- a/freetype/include/ftmodapi.h +++ b/freetype/include/ftmodapi.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftotval.h b/freetype/include/ftotval.h index bb52dc4a0..3d1d6f4ed 100644 --- a/freetype/include/ftotval.h +++ b/freetype/include/ftotval.h @@ -31,7 +31,7 @@ #define __FTOTVAL_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftoutln.h b/freetype/include/ftoutln.h index 6c6d3f94b..e40763b1c 100644 --- a/freetype/include/ftoutln.h +++ b/freetype/include/ftoutln.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftpfr.h b/freetype/include/ftpfr.h index 0b7b7d427..1eb9b45ec 100644 --- a/freetype/include/ftpfr.h +++ b/freetype/include/ftpfr.h @@ -20,7 +20,7 @@ #define __FTPFR_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftsizes.h b/freetype/include/ftsizes.h index 416704570..46d1cdfd8 100644 --- a/freetype/include/ftsizes.h +++ b/freetype/include/ftsizes.h @@ -30,7 +30,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftsnames.h b/freetype/include/ftsnames.h index 88af44035..9b9bdbf02 100644 --- a/freetype/include/ftsnames.h +++ b/freetype/include/ftsnames.h @@ -24,7 +24,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftsynth.h b/freetype/include/ftsynth.h index 839ab5e40..1a5ed96a1 100644 --- a/freetype/include/ftsynth.h +++ b/freetype/include/ftsynth.h @@ -46,7 +46,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/fttrigon.h b/freetype/include/fttrigon.h index 65143cb8c..9637fced0 100644 --- a/freetype/include/fttrigon.h +++ b/freetype/include/fttrigon.h @@ -19,7 +19,7 @@ #ifndef __FTTRIGON_H__ #define __FTTRIGON_H__ -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/fttypes.h b/freetype/include/fttypes.h index bd944a493..b5064629d 100644 --- a/freetype/include/fttypes.h +++ b/freetype/include/fttypes.h @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_CONFIG_CONFIG_H -#include FT_SYSTEM_H -#include FT_IMAGE_H +#include <config/ftconfig.h> +#include <ftsystem.h> +#include <ftimage.h> #include <stddef.h> diff --git a/freetype/include/ftwinfnt.h b/freetype/include/ftwinfnt.h index 0b6735179..26ea6abe4 100644 --- a/freetype/include/ftwinfnt.h +++ b/freetype/include/ftwinfnt.h @@ -20,7 +20,7 @@ #define __FTWINFNT_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ftxf86.h b/freetype/include/ftxf86.h index 493cccdd0..6702890bc 100644 --- a/freetype/include/ftxf86.h +++ b/freetype/include/ftxf86.h @@ -20,7 +20,7 @@ #define __FTXF86_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/internal/autohint.h b/freetype/include/internal/autohint.h index 545de938c..a393f18ac 100644 --- a/freetype/include/internal/autohint.h +++ b/freetype/include/internal/autohint.h @@ -71,7 +71,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/ftcalc.h b/freetype/include/internal/ftcalc.h index 03bd68eb1..82c4ac5fb 100644 --- a/freetype/include/internal/ftcalc.h +++ b/freetype/include/internal/ftcalc.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/ftdebug.h b/freetype/include/internal/ftdebug.h index 58a3916d7..ca26ab63b 100644 --- a/freetype/include/internal/ftdebug.h +++ b/freetype/include/internal/ftdebug.h @@ -26,8 +26,8 @@ #include <ft2build.h> -#include FT_CONFIG_CONFIG_H -#include FT_FREETYPE_H +#include <config/ftconfig.h> +#include <freetype.h> FT_BEGIN_HEADER @@ -56,7 +56,7 @@ FT_BEGIN_HEADER /* defining the enumeration */ typedef enum FT_Trace_ { -#include FT_INTERNAL_TRACE_H +#include <freetype/internal/fttrace.h> trace_count } FT_Trace; diff --git a/freetype/include/internal/ftgloadr.h b/freetype/include/internal/ftgloadr.h index ce4dc6c9c..e2d9a710c 100644 --- a/freetype/include/internal/ftgloadr.h +++ b/freetype/include/internal/ftgloadr.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/ftobjs.h b/freetype/include/internal/ftobjs.h index 701c850eb..92d2cb1cc 100644 --- a/freetype/include/internal/ftobjs.h +++ b/freetype/include/internal/ftobjs.h @@ -27,15 +27,15 @@ #define __FTOBJS_H__ #include <ft2build.h> -#include FT_RENDER_H -#include FT_SIZES_H -#include FT_LCD_FILTER_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_GLYPH_LOADER_H -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_AUTOHINT_H -#include FT_INTERNAL_SERVICE_H -#include FT_INTERNAL_PIC_H +#include <ftrender.h> +#include <ftsizes.h> +#include <ftlcdfil.h> +#include <internal/ftmemory.h> +#include <internal/ftgloadr.h> +#include <internal/ftdriver.h> +#include <internal/autohint.h> +#include <internal/ftserv.h> +#include <internal/ftpic.h> #ifdef FT_CONFIG_OPTION_INCREMENTAL #include FT_INCREMENTAL_H diff --git a/freetype/include/internal/ftrfork.h b/freetype/include/internal/ftrfork.h index d750cbefd..1e3ca137e 100644 --- a/freetype/include/internal/ftrfork.h +++ b/freetype/include/internal/ftrfork.h @@ -26,7 +26,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/ftstream.h b/freetype/include/internal/ftstream.h index 266185832..7fe1758cc 100644 --- a/freetype/include/internal/ftstream.h +++ b/freetype/include/internal/ftstream.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include FT_SYSTEM_H -#include FT_INTERNAL_OBJECTS_H +#include <internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/psaux.h b/freetype/include/internal/psaux.h index e903114f8..7c38c3f84 100644 --- a/freetype/include/internal/psaux.h +++ b/freetype/include/internal/psaux.h @@ -22,9 +22,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_TYPE1_TYPES_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <internal/ftobjs.h> +#include <internal/t1types.h> +#include <internal/services/svpscmap.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/pshints.h b/freetype/include/internal/pshints.h index 3fb18dc2d..0976bd34f 100644 --- a/freetype/include/internal/pshints.h +++ b/freetype/include/internal/pshints.h @@ -23,8 +23,8 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H +#include <freetype.h> +#include <t1tables.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svbdf.h b/freetype/include/internal/services/svbdf.h index 0974752a7..cacae4455 100644 --- a/freetype/include/internal/services/svbdf.h +++ b/freetype/include/internal/services/svbdf.h @@ -20,7 +20,7 @@ #define __SVBDF_H__ #include FT_BDF_H -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svcid.h b/freetype/include/internal/services/svcid.h index 6be3f9374..2cfd50965 100644 --- a/freetype/include/internal/services/svcid.h +++ b/freetype/include/internal/services/svcid.h @@ -18,7 +18,7 @@ #ifndef __SVCID_H__ #define __SVCID_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svgldict.h b/freetype/include/internal/services/svgldict.h index 1d1253472..2eff7902c 100644 --- a/freetype/include/internal/services/svgldict.h +++ b/freetype/include/internal/services/svgldict.h @@ -19,7 +19,7 @@ #ifndef __SVGLDICT_H__ #define __SVGLDICT_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svgxval.h b/freetype/include/internal/services/svgxval.h index 2cdab5065..7707d0751 100644 --- a/freetype/include/internal/services/svgxval.h +++ b/freetype/include/internal/services/svgxval.h @@ -29,7 +29,7 @@ #define __SVGXVAL_H__ #include FT_GX_VALIDATE_H -#include FT_INTERNAL_VALIDATE_H +#include <freetype/internal/ftvalid.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svkern.h b/freetype/include/internal/services/svkern.h index 1488adf49..b7166a09f 100644 --- a/freetype/include/internal/services/svkern.h +++ b/freetype/include/internal/services/svkern.h @@ -19,7 +19,7 @@ #ifndef __SVKERN_H__ #define __SVKERN_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/internal/services/svmm.h b/freetype/include/internal/services/svmm.h index b08a663d6..f6e2eb74c 100644 --- a/freetype/include/internal/services/svmm.h +++ b/freetype/include/internal/services/svmm.h @@ -19,7 +19,7 @@ #ifndef __SVMM_H__ #define __SVMM_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svotval.h b/freetype/include/internal/services/svotval.h index 970bbd575..141cddb46 100644 --- a/freetype/include/internal/services/svotval.h +++ b/freetype/include/internal/services/svotval.h @@ -20,7 +20,7 @@ #define __SVOTVAL_H__ #include FT_OPENTYPE_VALIDATE_H -#include FT_INTERNAL_VALIDATE_H +#include <freetype/internal/ftvalid.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svpfr.h b/freetype/include/internal/services/svpfr.h index 462786f9c..01be58d01 100644 --- a/freetype/include/internal/services/svpfr.h +++ b/freetype/include/internal/services/svpfr.h @@ -20,7 +20,7 @@ #define __SVPFR_H__ #include FT_PFR_H -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svpostnm.h b/freetype/include/internal/services/svpostnm.h index a76b4fe05..c20d811c9 100644 --- a/freetype/include/internal/services/svpostnm.h +++ b/freetype/include/internal/services/svpostnm.h @@ -19,7 +19,7 @@ #ifndef __SVPOSTNM_H__ #define __SVPOSTNM_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svpscmap.h b/freetype/include/internal/services/svpscmap.h index 030948ea6..aa2804529 100644 --- a/freetype/include/internal/services/svpscmap.h +++ b/freetype/include/internal/services/svpscmap.h @@ -19,7 +19,7 @@ #ifndef __SVPSCMAP_H__ #define __SVPSCMAP_H__ -#include FT_INTERNAL_OBJECTS_H +#include <internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svpsinfo.h b/freetype/include/internal/services/svpsinfo.h index 4bfb50671..718ddeb4d 100644 --- a/freetype/include/internal/services/svpsinfo.h +++ b/freetype/include/internal/services/svpsinfo.h @@ -19,8 +19,8 @@ #ifndef __SVPSINFO_H__ #define __SVPSINFO_H__ -#include FT_INTERNAL_SERVICE_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <internal/ftserv.h> +#include <internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/services/svsfnt.h b/freetype/include/internal/services/svsfnt.h index d3835aa1c..a6747ca4c 100644 --- a/freetype/include/internal/services/svsfnt.h +++ b/freetype/include/internal/services/svsfnt.h @@ -19,7 +19,7 @@ #ifndef __SVSFNT_H__ #define __SVSFNT_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/internal/services/svttcmap.h b/freetype/include/internal/services/svttcmap.h index 4370f4c2d..cc3330d60 100644 --- a/freetype/include/internal/services/svttcmap.h +++ b/freetype/include/internal/services/svttcmap.h @@ -24,7 +24,7 @@ #ifndef __SVTTCMAP_H__ #define __SVTTCMAP_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/internal/services/svtteng.h b/freetype/include/internal/services/svtteng.h index 58e02a6f9..e945f37d2 100644 --- a/freetype/include/internal/services/svtteng.h +++ b/freetype/include/internal/services/svtteng.h @@ -19,7 +19,7 @@ #ifndef __SVTTENG_H__ #define __SVTTENG_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_MODULE_H diff --git a/freetype/include/internal/services/svttglyf.h b/freetype/include/internal/services/svttglyf.h index 369eb8421..4166c6abe 100644 --- a/freetype/include/internal/services/svttglyf.h +++ b/freetype/include/internal/services/svttglyf.h @@ -17,7 +17,7 @@ #ifndef __SVTTGLYF_H__ #define __SVTTGLYF_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/internal/services/svwinfnt.h b/freetype/include/internal/services/svwinfnt.h index 57f7765d9..6663e0ae4 100644 --- a/freetype/include/internal/services/svwinfnt.h +++ b/freetype/include/internal/services/svwinfnt.h @@ -19,7 +19,7 @@ #ifndef __SVWINFNT_H__ #define __SVWINFNT_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> #include FT_WINFONTS_H diff --git a/freetype/include/internal/services/svxf86nm.h b/freetype/include/internal/services/svxf86nm.h index ca5d884a8..d439d1022 100644 --- a/freetype/include/internal/services/svxf86nm.h +++ b/freetype/include/internal/services/svxf86nm.h @@ -19,7 +19,7 @@ #ifndef __SVXF86NM_H__ #define __SVXF86NM_H__ -#include FT_INTERNAL_SERVICE_H +#include <internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/sfnt.h b/freetype/include/internal/sfnt.h index 6b5e41f1a..3355804b7 100644 --- a/freetype/include/internal/sfnt.h +++ b/freetype/include/internal/sfnt.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <internal/ftdriver.h> +#include <internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/t1types.h b/freetype/include/internal/t1types.h index e20237c14..e3dacadfe 100644 --- a/freetype/include/internal/t1types.h +++ b/freetype/include/internal/t1types.h @@ -22,10 +22,10 @@ #include <ft2build.h> -#include FT_TYPE1_TABLES_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H -#include FT_INTERNAL_SERVICE_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <t1tables.h> +#include <internal/pshints.h> +#include <internal/ftserv.h> +#include <internal/services/svpscmap.h> FT_BEGIN_HEADER diff --git a/freetype/include/internal/tttypes.h b/freetype/include/internal/tttypes.h index ad302b87c..01f0c1cfa 100644 --- a/freetype/include/internal/tttypes.h +++ b/freetype/include/internal/tttypes.h @@ -23,7 +23,7 @@ #include <ft2build.h> #include FT_TRUETYPE_TABLES_H -#include FT_INTERNAL_OBJECTS_H +#include <internal/ftobjs.h> #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT #include FT_MULTIPLE_MASTERS_H diff --git a/freetype/include/t1tables.h b/freetype/include/t1tables.h index a14255e5f..eab407ca2 100644 --- a/freetype/include/t1tables.h +++ b/freetype/include/t1tables.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/tttables.h b/freetype/include/tttables.h index bb49dc0da..0e0032a6d 100644 --- a/freetype/include/tttables.h +++ b/freetype/include/tttables.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/tttags.h b/freetype/include/tttags.h index d59aa19a3..6734c3eb6 100644 --- a/freetype/include/tttags.h +++ b/freetype/include/tttags.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/ttunpat.h b/freetype/include/ttunpat.h index a0162759b..53e62eab0 100644 --- a/freetype/include/ttunpat.h +++ b/freetype/include/ttunpat.h @@ -23,7 +23,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" |