Solved freetype compilation problems

27 files changed, 44 insertions, 44 deletions

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