aboutsummaryrefslogtreecommitdiff
path: root/freetype/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-26 10:37:02 +0200
committermarha <marha@users.sourceforge.net>2014-06-26 10:37:02 +0200
commit095ea6e18c55df550fda14f72c2d174af9b239ba (patch)
tree7dd06ce2fbb82397123186136c92e14aa158e7d3 /freetype/include
parent90137f4c5e30b1c6f9a262e8c853494540dad2d7 (diff)
downloadvcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.gz
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.bz2
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.zip
Solved freetype compilation problems
Diffstat (limited to 'freetype/include')
-rw-r--r--freetype/include/config/ftconfig.h4
-rw-r--r--freetype/include/ftadvanc.h2
-rw-r--r--freetype/include/ftbbox.h2
-rw-r--r--freetype/include/ftbdf.h2
-rw-r--r--freetype/include/ftbitmap.h2
-rw-r--r--freetype/include/fterrors.h4
-rw-r--r--freetype/include/ftglyph.h2
-rw-r--r--freetype/include/ftgzip.h2
-rw-r--r--freetype/include/ftincrem.h2
-rw-r--r--freetype/include/ftlcdfil.h2
-rw-r--r--freetype/include/ftlist.h2
-rw-r--r--freetype/include/ftlzw.h2
-rw-r--r--freetype/include/ftmodapi.h2
-rw-r--r--freetype/include/ftoutln.h2
-rw-r--r--freetype/include/ftpfr.h2
-rw-r--r--freetype/include/ftsizes.h2
-rw-r--r--freetype/include/ftsnames.h2
-rw-r--r--freetype/include/ftsynth.h2
-rw-r--r--freetype/include/fttrigon.h2
-rw-r--r--freetype/include/fttypes.h6
-rw-r--r--freetype/include/ftwinfnt.h2
-rw-r--r--freetype/include/ftxf86.h2
-rw-r--r--freetype/include/internal/autohint.h2
-rw-r--r--freetype/include/internal/ftcalc.h2
-rw-r--r--freetype/include/internal/ftdebug.h4
-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/svkern.h2
-rw-r--r--freetype/include/internal/services/svmm.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
-rw-r--r--freetype/include/t1tables.h2
-rw-r--r--freetype/include/tttables.h2
-rw-r--r--freetype/include/tttags.h2
52 files changed, 73 insertions, 73 deletions
diff --git a/freetype/include/config/ftconfig.h b/freetype/include/config/ftconfig.h
index 48bd0b4bd..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 <freetype/config/ftoption.h>
-#include <freetype/config/ftstdlib.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 80be2c9fc..ce02175dd 100644
--- a/freetype/include/ftadvanc.h
+++ b/freetype/include/ftadvanc.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/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 d0fd22ba0..d3f12f9de 100644
--- a/freetype/include/ftbbox.h
+++ b/freetype/include/ftbbox.h
@@ -32,7 +32,7 @@
#include <ft2build.h>
-#include <freetype/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 732562dd0..2bd005593 100644
--- a/freetype/include/ftbdf.h
+++ b/freetype/include/ftbdf.h
@@ -20,7 +20,7 @@
#define __FTBDF_H__
#include <ft2build.h>
-#include <freetype/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 c57f42bcc..e4b91925b 100644
--- a/freetype/include/ftbitmap.h
+++ b/freetype/include/ftbitmap.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <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 dfde72027..e98e080cf 100644
--- a/freetype/include/fterrors.h
+++ b/freetype/include/fterrors.h
@@ -86,7 +86,7 @@
/* include module base error codes */
-#include <freetype/ftmoderr.h>
+#include <ftmoderr.h>
/*******************************************************************/
@@ -157,7 +157,7 @@
/* now include the error codes */
-#include <freetype/fterrdef.h>
+#include <fterrdef.h>
#ifdef FT_ERROR_END_LIST
diff --git a/freetype/include/ftglyph.h b/freetype/include/ftglyph.h
index 3d15d1f63..af25d710a 100644
--- a/freetype/include/ftglyph.h
+++ b/freetype/include/ftglyph.h
@@ -34,7 +34,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <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 af114761d..383d9116c 100644
--- a/freetype/include/ftgzip.h
+++ b/freetype/include/ftgzip.h
@@ -20,7 +20,7 @@
#define __FTGZIP_H__
#include <ft2build.h>
-#include <freetype/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 209cd060c..5cbca43ef 100644
--- a/freetype/include/ftincrem.h
+++ b/freetype/include/ftincrem.h
@@ -20,7 +20,7 @@
#define __FTINCREM_H__
#include <ft2build.h>
-#include <freetype/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 214393139..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 <freetype/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 abe872540..44b570fc4 100644
--- a/freetype/include/ftlist.h
+++ b/freetype/include/ftlist.h
@@ -29,7 +29,7 @@
#include <ft2build.h>
-#include <freetype/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 6446bb0ea..e1c9c746d 100644
--- a/freetype/include/ftlzw.h
+++ b/freetype/include/ftlzw.h
@@ -20,7 +20,7 @@
#define __FTLZW_H__
#include <ft2build.h>
-#include <freetype/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 53ed37d10..6c4a396de 100644
--- a/freetype/include/ftmodapi.h
+++ b/freetype/include/ftmodapi.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <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 e922cb218..e40763b1c 100644
--- a/freetype/include/ftoutln.h
+++ b/freetype/include/ftoutln.h
@@ -22,7 +22,7 @@
#include <ft2build.h>
-#include <freetype/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 ae98d2520..1eb9b45ec 100644
--- a/freetype/include/ftpfr.h
+++ b/freetype/include/ftpfr.h
@@ -20,7 +20,7 @@
#define __FTPFR_H__
#include <ft2build.h>
-#include <freetype/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 0a2e219d8..46d1cdfd8 100644
--- a/freetype/include/ftsizes.h
+++ b/freetype/include/ftsizes.h
@@ -30,7 +30,7 @@
#include <ft2build.h>
-#include <freetype/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 07ba52706..9b9bdbf02 100644
--- a/freetype/include/ftsnames.h
+++ b/freetype/include/ftsnames.h
@@ -24,7 +24,7 @@
#include <ft2build.h>
-#include <freetype/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 f3542dc0e..1a5ed96a1 100644
--- a/freetype/include/ftsynth.h
+++ b/freetype/include/ftsynth.h
@@ -46,7 +46,7 @@
#include <ft2build.h>
-#include <freetype/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 3dc77cbe6..9637fced0 100644
--- a/freetype/include/fttrigon.h
+++ b/freetype/include/fttrigon.h
@@ -19,7 +19,7 @@
#ifndef __FTTRIGON_H__
#define __FTTRIGON_H__
-#include <freetype/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 570c482a4..b5064629d 100644
--- a/freetype/include/fttypes.h
+++ b/freetype/include/fttypes.h
@@ -21,9 +21,9 @@
#include <ft2build.h>
-#include <freetype/config/ftconfig.h>
-#include <freetype/ftsystem.h>
-#include <freetype/ftimage.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 e78892507..26ea6abe4 100644
--- a/freetype/include/ftwinfnt.h
+++ b/freetype/include/ftwinfnt.h
@@ -20,7 +20,7 @@
#define __FTWINFNT_H__
#include <ft2build.h>
-#include <freetype/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 3c78e1700..6702890bc 100644
--- a/freetype/include/ftxf86.h
+++ b/freetype/include/ftxf86.h
@@ -20,7 +20,7 @@
#define __FTXF86_H__
#include <ft2build.h>
-#include <freetype/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 e1eaff509..a393f18ac 100644
--- a/freetype/include/internal/autohint.h
+++ b/freetype/include/internal/autohint.h
@@ -71,7 +71,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftcalc.h b/freetype/include/internal/ftcalc.h
index f864a18c3..82c4ac5fb 100644
--- a/freetype/include/internal/ftcalc.h
+++ b/freetype/include/internal/ftcalc.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftdebug.h b/freetype/include/internal/ftdebug.h
index cda7151fe..ca26ab63b 100644
--- a/freetype/include/internal/ftdebug.h
+++ b/freetype/include/internal/ftdebug.h
@@ -26,8 +26,8 @@
#include <ft2build.h>
-#include <freetype/config/ftconfig.h>
-#include <freetype/freetype.h>
+#include <config/ftconfig.h>
+#include <freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftgloadr.h b/freetype/include/internal/ftgloadr.h
index 76987e8c5..e2d9a710c 100644
--- a/freetype/include/internal/ftgloadr.h
+++ b/freetype/include/internal/ftgloadr.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftobjs.h b/freetype/include/internal/ftobjs.h
index 444e5d15c..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 <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>
+#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 cf0ead8eb..1e3ca137e 100644
--- a/freetype/include/internal/ftrfork.h
+++ b/freetype/include/internal/ftrfork.h
@@ -26,7 +26,7 @@
#include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/ftstream.h b/freetype/include/internal/ftstream.h
index 4d3e88105..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 <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/psaux.h b/freetype/include/internal/psaux.h
index ac7edacc2..7c38c3f84 100644
--- a/freetype/include/internal/psaux.h
+++ b/freetype/include/internal/psaux.h
@@ -22,9 +22,9 @@
#include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/services/svpscmap.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 4e9294f90..0976bd34f 100644
--- a/freetype/include/internal/pshints.h
+++ b/freetype/include/internal/pshints.h
@@ -23,8 +23,8 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.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 08575aaf4..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 <freetype/internal/ftserv.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 646ce1283..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 <freetype/internal/ftserv.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 4d3c58f8c..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 <freetype/internal/ftserv.h>
+#include <internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svkern.h b/freetype/include/internal/services/svkern.h
index 68f5a96e9..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 <freetype/internal/ftserv.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 4c1b960b4..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 <freetype/internal/ftserv.h>
+#include <internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpfr.h b/freetype/include/internal/services/svpfr.h
index 65760c8a3..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 <freetype/internal/ftserv.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 1476dea48..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 <freetype/internal/ftserv.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 3cb15a2a6..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 <freetype/internal/ftobjs.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 ca3bbc114..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 <freetype/internal/ftserv.h>
-#include <freetype/internal/t1types.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 9a328d0a4..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 <freetype/internal/ftserv.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 af2e37926..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 <freetype/internal/ftserv.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 4612884cb..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 <freetype/internal/ftserv.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 3bb087445..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 <freetype/internal/ftserv.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 7ae69e2a4..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 <freetype/internal/ftserv.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 b16cbbf7b..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 <freetype/internal/ftserv.h>
+#include <internal/ftserv.h>
FT_BEGIN_HEADER
diff --git a/freetype/include/internal/sfnt.h b/freetype/include/internal/sfnt.h
index b94b4dd3e..3355804b7 100644
--- a/freetype/include/internal/sfnt.h
+++ b/freetype/include/internal/sfnt.h
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
-#include <freetype/internal/tttypes.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 ad8d27f8c..e3dacadfe 100644
--- a/freetype/include/internal/t1types.h
+++ b/freetype/include/internal/t1types.h
@@ -22,10 +22,10 @@
#include <ft2build.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/pshints.h>
-#include <freetype/internal/ftserv.h>
-#include <freetype/internal/services/svpscmap.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 3662943da..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 <freetype/internal/ftobjs.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 4045bbd34..eab407ca2 100644
--- a/freetype/include/t1tables.h
+++ b/freetype/include/t1tables.h
@@ -22,7 +22,7 @@
#include <ft2build.h>
-#include <freetype/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 bf87fec14..0e0032a6d 100644
--- a/freetype/include/tttables.h
+++ b/freetype/include/tttables.h
@@ -22,7 +22,7 @@
#include <ft2build.h>
-#include <freetype/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 9b25aac4d..6734c3eb6 100644
--- a/freetype/include/tttags.h
+++ b/freetype/include/tttags.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
#ifdef FREETYPE_H
#error "freetype.h of FreeType 1 has been loaded!"