aboutsummaryrefslogtreecommitdiff
path: root/freetype/include/internal
diff options
context:
space:
mode:
Diffstat (limited to 'freetype/include/internal')
-rw-r--r--freetype/include/internal/autohint.h2
-rw-r--r--freetype/include/internal/ftcalc.h2
-rw-r--r--freetype/include/internal/ftdebug.h6
-rw-r--r--freetype/include/internal/ftgloadr.h2
-rw-r--r--freetype/include/internal/ftobjs.h18
-rw-r--r--freetype/include/internal/ftrfork.h2
-rw-r--r--freetype/include/internal/ftstream.h2
-rw-r--r--freetype/include/internal/psaux.h6
-rw-r--r--freetype/include/internal/pshints.h4
-rw-r--r--freetype/include/internal/services/svbdf.h2
-rw-r--r--freetype/include/internal/services/svcid.h2
-rw-r--r--freetype/include/internal/services/svgldict.h2
-rw-r--r--freetype/include/internal/services/svgxval.h2
-rw-r--r--freetype/include/internal/services/svkern.h2
-rw-r--r--freetype/include/internal/services/svmm.h2
-rw-r--r--freetype/include/internal/services/svotval.h2
-rw-r--r--freetype/include/internal/services/svpfr.h2
-rw-r--r--freetype/include/internal/services/svpostnm.h2
-rw-r--r--freetype/include/internal/services/svpscmap.h2
-rw-r--r--freetype/include/internal/services/svpsinfo.h4
-rw-r--r--freetype/include/internal/services/svsfnt.h2
-rw-r--r--freetype/include/internal/services/svttcmap.h2
-rw-r--r--freetype/include/internal/services/svtteng.h2
-rw-r--r--freetype/include/internal/services/svttglyf.h2
-rw-r--r--freetype/include/internal/services/svwinfnt.h2
-rw-r--r--freetype/include/internal/services/svxf86nm.h2
-rw-r--r--freetype/include/internal/sfnt.h4
-rw-r--r--freetype/include/internal/t1types.h8
-rw-r--r--freetype/include/internal/tttypes.h2
29 files changed, 47 insertions, 47 deletions
diff --git a/freetype/include/internal/autohint.h b/freetype/include/internal/autohint.h
index 545de938c..e1eaff509 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/freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftcalc.h b/freetype/include/internal/ftcalc.h
index 03bd68eb1..f864a18c3 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/freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftdebug.h b/freetype/include/internal/ftdebug.h
index 58a3916d7..cda7151fe 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 <freetype/config/ftconfig.h>
+#include <freetype/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..76987e8c5 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/freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftobjs.h b/freetype/include/internal/ftobjs.h
index 701c850eb..444e5d15c 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 <freetype/ftrender.h>
+#include <freetype/ftsizes.h>
+#include <freetype/ftlcdfil.h>
+#include <freetype/internal/ftmemory.h>
+#include <freetype/internal/ftgloadr.h>
+#include <freetype/internal/ftdriver.h>
+#include <freetype/internal/autohint.h>
+#include <freetype/internal/ftserv.h>
+#include <freetype/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..cf0ead8eb 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 <freetype/internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftstream.h b/freetype/include/internal/ftstream.h
index 266185832..4d3e88105 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 <freetype/internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/psaux.h b/freetype/include/internal/psaux.h
index e903114f8..ac7edacc2 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 <freetype/internal/ftobjs.h>
+#include <freetype/internal/t1types.h>
+#include <freetype/internal/services/svpscmap.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/pshints.h b/freetype/include/internal/pshints.h
index 3fb18dc2d..4e9294f90 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/freetype.h>
+#include <freetype/t1tables.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svbdf.h b/freetype/include/internal/services/svbdf.h
index 0974752a7..08575aaf4 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 <freetype/internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svcid.h b/freetype/include/internal/services/svcid.h
index 6be3f9374..646ce1283 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 <freetype/internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svgldict.h b/freetype/include/internal/services/svgldict.h
index 1d1253472..4d3c58f8c 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 <freetype/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..68f5a96e9 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 <freetype/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..4c1b960b4 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 <freetype/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..65760c8a3 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 <freetype/internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpostnm.h b/freetype/include/internal/services/svpostnm.h
index a76b4fe05..1476dea48 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 <freetype/internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpscmap.h b/freetype/include/internal/services/svpscmap.h
index 030948ea6..3cb15a2a6 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 <freetype/internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpsinfo.h b/freetype/include/internal/services/svpsinfo.h
index 4bfb50671..ca3bbc114 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 <freetype/internal/ftserv.h>
+#include <freetype/internal/t1types.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svsfnt.h b/freetype/include/internal/services/svsfnt.h
index d3835aa1c..9a328d0a4 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 <freetype/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..af2e37926 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 <freetype/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..4612884cb 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 <freetype/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..3bb087445 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 <freetype/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..7ae69e2a4 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 <freetype/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..b16cbbf7b 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 <freetype/internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/sfnt.h b/freetype/include/internal/sfnt.h
index 6b5e41f1a..b94b4dd3e 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 <freetype/internal/ftdriver.h>
+#include <freetype/internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/t1types.h b/freetype/include/internal/t1types.h
index e20237c14..ad8d27f8c 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 <freetype/t1tables.h>
+#include <freetype/internal/pshints.h>
+#include <freetype/internal/ftserv.h>
+#include <freetype/internal/services/svpscmap.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/tttypes.h b/freetype/include/internal/tttypes.h
index ad302b87c..3662943da 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 <freetype/internal/ftobjs.h>
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H