Solved freetype compilation problems

207 files changed, 418 insertions, 418 deletions

diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 853c9ca39..be19aacca 100755
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -141,14 +141,14 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">lib64\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">objs/debug_mt\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">objs64/debug_mt\</IntDir>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype2501MT_D</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype2501MT_D</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype2501MT</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype2501MT</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype2501_D</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype2501_D</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype2501</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype2501</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype253MT_D</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype253MT_D</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype253MT</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype253MT</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype253_D</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype253_D</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype253</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype253</TargetName>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

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!"
diff --git a/freetype/src/autofit/afcjk.c b/freetype/src/autofit/afcjk.c
index 7402b9b08..360ecd935 100644
--- a/freetype/src/autofit/afcjk.c
+++ b/freetype/src/autofit/afcjk.c
@@ -23,8 +23,8 @@
    */
 
 #include <ft2build.h>
-#include <freetype/ftadvanc.h>
-#include <freetype/internal/ftdebug.h>
+#include <ftadvanc.h>
+#include <internal/ftdebug.h>
 
 #include "afglobal.h"
 #include "afpic.h"
diff --git a/freetype/src/autofit/aferrors.h b/freetype/src/autofit/aferrors.h
index 824d0b3a3..b04ac2305 100644
--- a/freetype/src/autofit/aferrors.h
+++ b/freetype/src/autofit/aferrors.h
@@ -26,7 +26,7 @@
 #ifndef __AFERRORS_H__
 #define __AFERRORS_H__
 
-#include <freetype/ftmoderr.h>
+#include <ftmoderr.h>
 
 #undef __FTERRORS_H__
 
@@ -34,7 +34,7 @@
 #define FT_ERR_PREFIX  AF_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Autofit
 
-#include <freetype/fterrors.h>
+#include <fterrors.h>
 
 #endif /* __AFERRORS_H__ */
 
diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c
index c96c7ac3c..d9fb13364 100644
--- a/freetype/src/autofit/afhints.c
+++ b/freetype/src/autofit/afhints.c
@@ -18,8 +18,8 @@
 
 #include "afhints.h"
 #include "aferrors.h"
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftdebug.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/autofit/aflatin.c b/freetype/src/autofit/aflatin.c
index 2938f79c7..e6f4dfb05 100644
--- a/freetype/src/autofit/aflatin.c
+++ b/freetype/src/autofit/aflatin.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/ftadvanc.h>
-#include <freetype/internal/ftdebug.h>
+#include <ftadvanc.h>
+#include <internal/ftdebug.h>
 
 #include "afglobal.h"
 #include "afpic.h"
diff --git a/freetype/src/autofit/afmodule.c b/freetype/src/autofit/afmodule.c
index 55c8d596f..ba3b283ae 100644
--- a/freetype/src/autofit/afmodule.c
+++ b/freetype/src/autofit/afmodule.c
@@ -29,8 +29,8 @@
   void*  _af_debug_hints;
 #endif
 
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
 #include FT_AUTOHINTER_H
 #include FT_SERVICE_PROPERTIES_H
 
diff --git a/freetype/src/autofit/afmodule.h b/freetype/src/autofit/afmodule.h
index b347decc9..6c7a5d123 100644
--- a/freetype/src/autofit/afmodule.h
+++ b/freetype/src/autofit/afmodule.h
@@ -20,7 +20,7 @@
 #define __AFMODULE_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_MODULE_H
 
 #include "afloader.h"
diff --git a/freetype/src/autofit/afpic.h b/freetype/src/autofit/afpic.h
index e2b026751..3afd1fce1 100644
--- a/freetype/src/autofit/afpic.h
+++ b/freetype/src/autofit/afpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 
 #ifndef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/autofit/aftypes.h b/freetype/src/autofit/aftypes.h
index 9f2331eed..b4cc0f8af 100644
--- a/freetype/src/autofit/aftypes.h
+++ b/freetype/src/autofit/aftypes.h
@@ -34,10 +34,10 @@
 
 #include <ft2build.h>
 
-#include <freetype/freetype.h>
+#include <freetype.h>
 #include FT_OUTLINE_H
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
 
 #include "afblue.h"
 
diff --git a/freetype/src/base/basepic.c b/freetype/src/base/basepic.c
index fa7bf5142..5d317ddb3 100644
--- a/freetype/src/base/basepic.c
+++ b/freetype/src/base/basepic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "basepic.h"
 
 
diff --git a/freetype/src/base/basepic.h b/freetype/src/base/basepic.h
index 1910a60f9..ec7507cec 100644
--- a/freetype/src/base/basepic.h
+++ b/freetype/src/base/basepic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 #ifndef FT_CONFIG_OPTION_PIC
 
diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c
index 10ba02389..24da83dbb 100644
--- a/freetype/src/base/ftadvanc.c
+++ b/freetype/src/base/ftadvanc.c
@@ -20,7 +20,7 @@
 #include FT_INTERNAL_DEBUG_H
 
 #include FT_ADVANCES_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 
   static FT_Error
diff --git a/freetype/src/base/ftbase.h b/freetype/src/base/ftbase.h
index 9dcae7823..0ab0590d9 100644
--- a/freetype/src/base/ftbase.h
+++ b/freetype/src/base/ftbase.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/base/ftbbox.c b/freetype/src/base/ftbbox.c
index e04cbdaaf..36048c296 100644
--- a/freetype/src/base/ftbbox.c
+++ b/freetype/src/base/ftbbox.c
@@ -30,8 +30,8 @@
 #include FT_BBOX_H
 #include FT_IMAGE_H
 #include FT_OUTLINE_H
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftcalc.h>
+#include <internal/ftobjs.h>
 
 
   typedef struct  TBBox_Rec_
diff --git a/freetype/src/base/ftbdf.c b/freetype/src/base/ftbdf.c
index 48aaacb9e..fccbfedde 100644
--- a/freetype/src/base/ftbdf.c
+++ b/freetype/src/base/ftbdf.c
@@ -17,7 +17,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_SERVICE_BDF_H
 
 
diff --git a/freetype/src/base/ftbitmap.c b/freetype/src/base/ftbitmap.c
index 3425c368f..887722a93 100644
--- a/freetype/src/base/ftbitmap.c
+++ b/freetype/src/base/ftbitmap.c
@@ -21,7 +21,7 @@
 
 #include FT_BITMAP_H
 #include FT_IMAGE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 
   static
diff --git a/freetype/src/base/ftcalc.c b/freetype/src/base/ftcalc.c
index a1e76e192..fb0492721 100644
--- a/freetype/src/base/ftcalc.c
+++ b/freetype/src/base/ftcalc.c
@@ -34,10 +34,10 @@
 
 #include <ft2build.h>
 #include FT_GLYPH_H
-#include <freetype/fttrigon.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
+#include <fttrigon.h>
+#include <internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
 
 #ifdef FT_MULFIX_INLINED
 #undef FT_MulFix
diff --git a/freetype/src/base/ftdbgmem.c b/freetype/src/base/ftdbgmem.c
index f4b98effc..eaf090d33 100644
--- a/freetype/src/base/ftdbgmem.c
+++ b/freetype/src/base/ftdbgmem.c
@@ -18,8 +18,8 @@
 
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftmemory.h>
+#include <internal/ftdebug.h>
+#include <internal/ftmemory.h>
 #include FT_SYSTEM_H
 #include FT_ERRORS_H
 #include FT_TYPES_H
diff --git a/freetype/src/base/ftdebug.c b/freetype/src/base/ftdebug.c
index 95bde59bb..2e4e0e538 100644
--- a/freetype/src/base/ftdebug.c
+++ b/freetype/src/base/ftdebug.c
@@ -42,8 +42,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/internal/ftdebug.h>
+#include <freetype.h>
+#include <internal/ftdebug.h>
 
 
 #ifdef FT_DEBUG_LEVEL_ERROR
diff --git a/freetype/src/base/ftgloadr.c b/freetype/src/base/ftgloadr.c
index 7defb29d8..61ab21b9c 100644
--- a/freetype/src/base/ftgloadr.c
+++ b/freetype/src/base/ftgloadr.c
@@ -17,10 +17,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftgloadr.h>
-#include <freetype/internal/ftmemory.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftgloadr.h>
+#include <internal/ftmemory.h>
+#include <internal/ftobjs.h>
 
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_gloader
diff --git a/freetype/src/base/ftglyph.c b/freetype/src/base/ftglyph.c
index 66b01ef29..76d8d6156 100644
--- a/freetype/src/base/ftglyph.c
+++ b/freetype/src/base/ftglyph.c
@@ -34,7 +34,7 @@
 #include FT_GLYPH_H
 #include FT_OUTLINE_H
 #include FT_BITMAP_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 #include "basepic.h"
 
diff --git a/freetype/src/base/ftinit.c b/freetype/src/base/ftinit.c
index c18877aed..224b7ce37 100644
--- a/freetype/src/base/ftinit.c
+++ b/freetype/src/base/ftinit.c
@@ -39,8 +39,8 @@
 
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
 #include FT_MODULE_H
 #include "basepic.h"
 
diff --git a/freetype/src/base/ftlcdfil.c b/freetype/src/base/ftlcdfil.c
index 17ef9c9bd..e6d7fca3b 100644
--- a/freetype/src/base/ftlcdfil.c
+++ b/freetype/src/base/ftlcdfil.c
@@ -21,7 +21,7 @@
 
 #include FT_LCD_FILTER_H
 #include FT_IMAGE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 
 #ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
diff --git a/freetype/src/base/ftmm.c b/freetype/src/base/ftmm.c
index 14ed98e47..178f97abf 100644
--- a/freetype/src/base/ftmm.c
+++ b/freetype/src/base/ftmm.c
@@ -20,7 +20,7 @@
 #include FT_INTERNAL_DEBUG_H
 
 #include FT_MULTIPLE_MASTERS_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_SERVICE_MULTIPLE_MASTERS_H
 
 
diff --git a/freetype/src/base/ftobjs.c b/freetype/src/base/ftobjs.c
index f01451ed5..4cbadfee6 100644
--- a/freetype/src/base/ftobjs.c
+++ b/freetype/src/base/ftobjs.c
@@ -19,12 +19,12 @@
 #include <ft2build.h>
 #include FT_LIST_H
 #include FT_OUTLINE_H
-#include <freetype/internal/ftvalid.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftrfork.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>    /* for SFNT_Load_Table_Func */
+#include <internal/ftvalid.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftrfork.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>    /* for SFNT_Load_Table_Func */
 #include FT_TRUETYPE_TABLES_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_IDS_H
diff --git a/freetype/src/base/ftoutln.c b/freetype/src/base/ftoutln.c
index ead7139b0..5f0e61c1c 100644
--- a/freetype/src/base/ftoutln.c
+++ b/freetype/src/base/ftoutln.c
@@ -25,10 +25,10 @@
 
 #include <ft2build.h>
 #include FT_OUTLINE_H
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/fttrigon.h>
+#include <internal/ftobjs.h>
+#include <internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <fttrigon.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/base/ftpic.c b/freetype/src/base/ftpic.c
index ce93f02ff..0d008d55f 100644
--- a/freetype/src/base/ftpic.c
+++ b/freetype/src/base/ftpic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "basepic.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/base/ftrfork.c b/freetype/src/base/ftrfork.c
index 84032d723..0e44d33a8 100644
--- a/freetype/src/base/ftrfork.c
+++ b/freetype/src/base/ftrfork.c
@@ -25,9 +25,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftrfork.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftrfork.h>
 #include "basepic.h"
 #include "ftbase.h"
 
diff --git a/freetype/src/base/ftsnames.c b/freetype/src/base/ftsnames.c
index 26fa35c5a..06551ea8c 100644
--- a/freetype/src/base/ftsnames.c
+++ b/freetype/src/base/ftsnames.c
@@ -21,8 +21,8 @@
 
 #include <ft2build.h>
 #include FT_SFNT_NAMES_H
-#include <freetype/internal/tttypes.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/tttypes.h>
+#include <internal/ftstream.h>
 
 
 #ifdef TT_CONFIG_OPTION_SFNT_NAMES
diff --git a/freetype/src/base/ftstream.c b/freetype/src/base/ftstream.c
index 39b5c1e7f..8cb1b88b2 100644
--- a/freetype/src/base/ftstream.c
+++ b/freetype/src/base/ftstream.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftdebug.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/base/ftsynth.c b/freetype/src/base/ftsynth.c
index fdb31982c..4fc8254c7 100644
--- a/freetype/src/base/ftsynth.c
+++ b/freetype/src/base/ftsynth.c
@@ -17,11 +17,11 @@
 
 
 #include <ft2build.h>
-#include <freetype/ftsynth.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ftbitmap.h>
+#include <ftsynth.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <ftoutln.h>
+#include <ftbitmap.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/base/ftsystem.c b/freetype/src/base/ftsystem.c
index 6d6cb7b2e..9af57c372 100644
--- a/freetype/src/base/ftsystem.c
+++ b/freetype/src/base/ftsystem.c
@@ -27,8 +27,8 @@
 
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_SYSTEM_H
 #include FT_ERRORS_H
 #include FT_TYPES_H
diff --git a/freetype/src/base/fttrigon.c b/freetype/src/base/fttrigon.c
index a5c7efc01..9e0af81b0 100644
--- a/freetype/src/base/fttrigon.c
+++ b/freetype/src/base/fttrigon.c
@@ -30,7 +30,7 @@
   /*************************************************************************/
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_INTERNAL_CALC_H
 #include FT_TRIGONOMETRY_H
 
diff --git a/freetype/src/base/fttype1.c b/freetype/src/base/fttype1.c
index db48b135e..54ccbbd30 100644
--- a/freetype/src/base/fttype1.c
+++ b/freetype/src/base/fttype1.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftserv.h>
-#include <freetype/internal/services/svpsinfo.h>
+#include <internal/ftobjs.h>
+#include <internal/ftserv.h>
+#include <internal/services/svpsinfo.h>
 
 
   /* documentation is in t1tables.h */
diff --git a/freetype/src/base/ftutil.c b/freetype/src/base/ftutil.c
index 042077f5a..317280b85 100644
--- a/freetype/src/base/ftutil.c
+++ b/freetype/src/base/ftutil.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftmemory.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftmemory.h>
+#include <internal/ftobjs.h>
 #include FT_LIST_H
 
 
diff --git a/freetype/src/base/ftxf86.c b/freetype/src/base/ftxf86.c
index 680f57637..db6407b32 100644
--- a/freetype/src/base/ftxf86.c
+++ b/freetype/src/base/ftxf86.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_XFREE86_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_SERVICE_XFREE86_NAME_H
 
 
diff --git a/freetype/src/bdf/bdf.h b/freetype/src/bdf/bdf.h
index 7aacb6ed2..0e516c383 100644
--- a/freetype/src/bdf/bdf.h
+++ b/freetype/src/bdf/bdf.h
@@ -31,8 +31,8 @@
  */
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftobjs.h>
+#include <internal/ftstream.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/bdf/bdfdrivr.c b/freetype/src/bdf/bdfdrivr.c
index 46b545f98..2893d7780 100644
--- a/freetype/src/bdf/bdfdrivr.c
+++ b/freetype/src/bdf/bdfdrivr.c
@@ -26,9 +26,9 @@ THE SOFTWARE.
 
 #include <ft2build.h>
 
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftobjs.h>
 #include FT_BDF_H
 #include FT_TRUETYPE_IDS_H
 
diff --git a/freetype/src/bdf/bdfdrivr.h b/freetype/src/bdf/bdfdrivr.h
index 41047e707..f053e947b 100644
--- a/freetype/src/bdf/bdfdrivr.h
+++ b/freetype/src/bdf/bdfdrivr.h
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __BDFDRIVR_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 #include "bdf.h"
 
diff --git a/freetype/src/bdf/bdflib.c b/freetype/src/bdf/bdflib.c
index 2c0e17917..7156020d4 100644
--- a/freetype/src/bdf/bdflib.c
+++ b/freetype/src/bdf/bdflib.c
@@ -34,9 +34,9 @@
 #include <ft2build.h>
 
 #include FT_FREETYPE_H
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftobjs.h>
 
 #include "bdf.h"
 #include "bdferror.h"
diff --git a/freetype/src/cff/cffdrivr.c b/freetype/src/cff/cffdrivr.c
index 39e3f7b2d..7f37e491b 100644
--- a/freetype/src/cff/cffdrivr.c
+++ b/freetype/src/cff/cffdrivr.c
@@ -17,12 +17,12 @@
 
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/services/svcid.h>
-#include <freetype/internal/services/svpsinfo.h>
+#include <freetype.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
+#include <internal/services/svcid.h>
+#include <internal/services/svpsinfo.h>
 #include FT_SERVICE_POSTSCRIPT_NAME_H
 #include FT_SERVICE_TT_CMAP_H
 
diff --git a/freetype/src/cff/cffdrivr.h b/freetype/src/cff/cffdrivr.h
index 3fefafc04..03e2e8b66 100644
--- a/freetype/src/cff/cffdrivr.h
+++ b/freetype/src/cff/cffdrivr.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cff/cffgload.c b/freetype/src/cff/cffgload.c
index 3cc7d8ff9..620d09486 100644
--- a/freetype/src/cff/cffgload.c
+++ b/freetype/src/cff/cffgload.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
 #include FT_OUTLINE_H
 #include FT_CFF_DRIVER_H
 
diff --git a/freetype/src/cff/cffgload.h b/freetype/src/cff/cffgload.h
index abeff9b92..83e4618e9 100644
--- a/freetype/src/cff/cffgload.h
+++ b/freetype/src/cff/cffgload.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
 #include "cffobjs.h"
 
 
diff --git a/freetype/src/cff/cffload.c b/freetype/src/cff/cffload.c
index 2e4da25d8..0017f2efb 100644
--- a/freetype/src/cff/cffload.c
+++ b/freetype/src/cff/cffload.c
@@ -17,11 +17,11 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/tttags.h>
-#include <freetype/t1tables.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftstream.h>
+#include <tttags.h>
+#include <t1tables.h>
 
 #include "cffload.h"
 #include "cffparse.h"
diff --git a/freetype/src/cff/cffobjs.c b/freetype/src/cff/cffobjs.c
index 96b4e4f06..4c5141f5a 100644
--- a/freetype/src/cff/cffobjs.c
+++ b/freetype/src/cff/cffobjs.c
@@ -17,14 +17,14 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/fterrors.h>
-#include <freetype/ttnameid.h>
-#include <freetype/tttags.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/ftcffdrv.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftstream.h>
+#include <fterrors.h>
+#include <ttnameid.h>
+#include <tttags.h>
+#include <internal/sfnt.h>
+#include <ftcffdrv.h>
 
 #include "cffobjs.h"
 #include "cffload.h"
diff --git a/freetype/src/cff/cffobjs.h b/freetype/src/cff/cffobjs.h
index 072c0d080..12d94a063 100644
--- a/freetype/src/cff/cffobjs.h
+++ b/freetype/src/cff/cffobjs.h
@@ -21,11 +21,11 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "cfftypes.h"
-#include <freetype/internal/tttypes.h>
-#include <freetype/internal/services/svpscmap.h>
-#include <freetype/internal/pshints.h>
+#include <internal/tttypes.h>
+#include <internal/services/svpscmap.h>
+#include <internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cff/cffparse.c b/freetype/src/cff/cffparse.c
index d922f584b..1f9768373 100644
--- a/freetype/src/cff/cffparse.c
+++ b/freetype/src/cff/cffparse.c
@@ -18,8 +18,8 @@
 
 #include <ft2build.h>
 #include "cffparse.h"
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftdebug.h>
 
 #include "cfferrs.h"
 #include "cffpic.h"
diff --git a/freetype/src/cff/cffparse.h b/freetype/src/cff/cffparse.h
index 80f27b726..7d727510f 100644
--- a/freetype/src/cff/cffparse.h
+++ b/freetype/src/cff/cffparse.h
@@ -22,7 +22,7 @@
 
 #include <ft2build.h>
 #include "cfftypes.h"
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cff/cffpic.c b/freetype/src/cff/cffpic.c
index 71c32747a..dacd22241 100644
--- a/freetype/src/cff/cffpic.c
+++ b/freetype/src/cff/cffpic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "cffcmap.h"
 #include "cffpic.h"
 #include "cfferrs.h"
diff --git a/freetype/src/cff/cffpic.h b/freetype/src/cff/cffpic.h
index b936e2ea5..f64a21c43 100644
--- a/freetype/src/cff/cffpic.h
+++ b/freetype/src/cff/cffpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 
 #ifndef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h
index f53837abe..af33ba5e5 100644
--- a/freetype/src/cff/cfftypes.h
+++ b/freetype/src/cff/cfftypes.h
@@ -22,11 +22,11 @@
 
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/ftserv.h>
-#include <freetype/internal/services/svpscmap.h>
-#include <freetype/internal/pshints.h>
+#include <freetype.h>
+#include <t1tables.h>
+#include <internal/ftserv.h>
+#include <internal/services/svpscmap.h>
+#include <internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cid/cidgload.c b/freetype/src/cid/cidgload.c
index 07d8fa915..c3db423fc 100644
--- a/freetype/src/cid/cidgload.c
+++ b/freetype/src/cid/cidgload.c
@@ -19,10 +19,10 @@
 #include <ft2build.h>
 #include "cidload.h"
 #include "cidgload.h"
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_OUTLINE_H
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftcalc.h>
 
 #include "ciderrs.h"
 
diff --git a/freetype/src/cid/cidload.c b/freetype/src/cid/cidload.c
index b39d6c3a6..c20ec6b42 100644
--- a/freetype/src/cid/cidload.c
+++ b/freetype/src/cid/cidload.c
@@ -17,10 +17,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 #include FT_CONFIG_CONFIG_H
 #include FT_MULTIPLE_MASTERS_H
-#include <freetype/internal/t1types.h>
+#include <internal/t1types.h>
 
 #include "cidload.h"
 
diff --git a/freetype/src/cid/cidload.h b/freetype/src/cid/cidload.h
index 8bada7f8c..dba1602d8 100644
--- a/freetype/src/cid/cidload.h
+++ b/freetype/src/cid/cidload.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftstream.h>
 #include "cidparse.h"
 
 
diff --git a/freetype/src/cid/cidobjs.c b/freetype/src/cid/cidobjs.c
index 41bd735f6..afb8e10a2 100644
--- a/freetype/src/cid/cidobjs.c
+++ b/freetype/src/cid/cidobjs.c
@@ -17,15 +17,15 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 
 #include "cidgload.h"
 #include "cidload.h"
 
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
-#include <freetype/internal/psaux.h>
-#include <freetype/internal/pshints.h>
+#include <internal/psaux.h>
+#include <internal/pshints.h>
 
 #include "ciderrs.h"
 
diff --git a/freetype/src/cid/cidobjs.h b/freetype/src/cid/cidobjs.h
index b297d6fb4..0b779a35c 100644
--- a/freetype/src/cid/cidobjs.h
+++ b/freetype/src/cid/cidobjs.h
@@ -21,9 +21,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/t1types.h>
+#include <internal/t1types.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cid/cidparse.c b/freetype/src/cid/cidparse.c
index c56e18b2d..e86adf62b 100644
--- a/freetype/src/cid/cidparse.c
+++ b/freetype/src/cid/cidparse.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftstream.h>
 
 #include "cidparse.h"
 
diff --git a/freetype/src/cid/cidparse.h b/freetype/src/cid/cidparse.h
index 40b3991e9..f0baff5c0 100644
--- a/freetype/src/cid/cidparse.h
+++ b/freetype/src/cid/cidparse.h
@@ -21,9 +21,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/t1types.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/cid/cidriver.c b/freetype/src/cid/cidriver.c
index 7f912cd94..217d06ee2 100644
--- a/freetype/src/cid/cidriver.c
+++ b/freetype/src/cid/cidriver.c
@@ -19,13 +19,13 @@
 #include <ft2build.h>
 #include "cidriver.h"
 #include "cidgload.h"
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 
 #include "ciderrs.h"
 
 #include FT_SERVICE_POSTSCRIPT_NAME_H
 #include FT_SERVICE_XFREE86_NAME_H
-#include <freetype/internal/services/svpsinfo.h>
+#include <internal/services/svpsinfo.h>
 #include FT_SERVICE_CID_H
 
 
diff --git a/freetype/src/cid/cidriver.h b/freetype/src/cid/cidriver.h
index ebc200e0a..049bfd658 100644
--- a/freetype/src/cid/cidriver.h
+++ b/freetype/src/cid/cidriver.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/gzip/ftgzip.c b/freetype/src/gzip/ftgzip.c
index 88f9af2a8..57925c09b 100644
--- a/freetype/src/gzip/ftgzip.c
+++ b/freetype/src/gzip/ftgzip.c
@@ -21,9 +21,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftmemory.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftmemory.h>
+#include <internal/ftstream.h>
+#include <internal/ftdebug.h>
 #include FT_GZIP_H
 #include FT_CONFIG_STANDARD_LIBRARY_H
 
diff --git a/freetype/src/lzw/ftlzw.c b/freetype/src/lzw/ftlzw.c
index d0c28f65d..8bdd0b4e8 100644
--- a/freetype/src/lzw/ftlzw.c
+++ b/freetype/src/lzw/ftlzw.c
@@ -23,9 +23,9 @@
 /***************************************************************************/
 
 #include <ft2build.h>
-#include <freetype/internal/ftmemory.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftmemory.h>
+#include <internal/ftstream.h>
+#include <internal/ftdebug.h>
 #include FT_LZW_H
 #include FT_CONFIG_STANDARD_LIBRARY_H
 
diff --git a/freetype/src/lzw/ftzopen.c b/freetype/src/lzw/ftzopen.c
index 15a70778e..fa1073dfb 100644
--- a/freetype/src/lzw/ftzopen.c
+++ b/freetype/src/lzw/ftzopen.c
@@ -19,9 +19,9 @@
 /***************************************************************************/
 
 #include "ftzopen.h"
-#include <freetype/internal/ftmemory.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftmemory.h>
+#include <internal/ftstream.h>
+#include <internal/ftdebug.h>
 
 
   static int
diff --git a/freetype/src/lzw/ftzopen.h b/freetype/src/lzw/ftzopen.h
index 34b37fd6b..47d65b74f 100644
--- a/freetype/src/lzw/ftzopen.h
+++ b/freetype/src/lzw/ftzopen.h
@@ -22,7 +22,7 @@
 #define __FT_ZOPEN_H__
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
 
 
   /*
diff --git a/freetype/src/pcf/pcf.h b/freetype/src/pcf/pcf.h
index 78549020b..7fcdf786a 100644
--- a/freetype/src/pcf/pcf.h
+++ b/freetype/src/pcf/pcf.h
@@ -30,8 +30,8 @@ THE SOFTWARE.
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdriver.h>
+#include <internal/ftstream.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/pcf/pcfdrivr.c b/freetype/src/pcf/pcfdrivr.c
index 44fb3789c..7752d918e 100644
--- a/freetype/src/pcf/pcfdrivr.c
+++ b/freetype/src/pcf/pcfdrivr.c
@@ -27,9 +27,9 @@ THE SOFTWARE.
 
 #include <ft2build.h>
 
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftobjs.h>
 #include FT_GZIP_H
 #include FT_LZW_H
 #include FT_BZIP2_H
diff --git a/freetype/src/pcf/pcfdrivr.h b/freetype/src/pcf/pcfdrivr.h
index 064fddffc..21115bc39 100644
--- a/freetype/src/pcf/pcfdrivr.h
+++ b/freetype/src/pcf/pcfdrivr.h
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __PCFDRIVR_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/src/pcf/pcfread.c b/freetype/src/pcf/pcfread.c
index e8ea4e4c5..e4d70eda1 100644
--- a/freetype/src/pcf/pcfread.c
+++ b/freetype/src/pcf/pcfread.c
@@ -27,9 +27,9 @@ THE SOFTWARE.
 
 #include <ft2build.h>
 
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftobjs.h>
 
 #include "pcf.h"
 #include "pcfread.h"
diff --git a/freetype/src/pfr/pfrcmap.h b/freetype/src/pfr/pfrcmap.h
index ee357d9f7..511cbcfcc 100644
--- a/freetype/src/pfr/pfrcmap.h
+++ b/freetype/src/pfr/pfrcmap.h
@@ -20,7 +20,7 @@
 #define __PFRCMAP_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "pfrtypes.h"
 
 
diff --git a/freetype/src/pfr/pfrdrivr.c b/freetype/src/pfr/pfrdrivr.c
index 8e2959e76..ae1f91917 100644
--- a/freetype/src/pfr/pfrdrivr.c
+++ b/freetype/src/pfr/pfrdrivr.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_SERVICE_PFR_H
 #include FT_SERVICE_XFREE86_NAME_H
 #include "pfrdrivr.h"
diff --git a/freetype/src/pfr/pfrdrivr.h b/freetype/src/pfr/pfrdrivr.h
index dece491b0..62e9dac86 100644
--- a/freetype/src/pfr/pfrdrivr.h
+++ b/freetype/src/pfr/pfrdrivr.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/pfr/pfrgload.c b/freetype/src/pfr/pfrgload.c
index 7b067ea16..df7fb0577 100644
--- a/freetype/src/pfr/pfrgload.c
+++ b/freetype/src/pfr/pfrgload.c
@@ -19,7 +19,7 @@
 #include "pfrgload.h"
 #include "pfrsbit.h"
 #include "pfrload.h"            /* for macro definitions */
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 
 #include "pfrerror.h"
 
diff --git a/freetype/src/pfr/pfrload.c b/freetype/src/pfr/pfrload.c
index f91fb077b..b91de9fcf 100644
--- a/freetype/src/pfr/pfrload.c
+++ b/freetype/src/pfr/pfrload.c
@@ -17,8 +17,8 @@
 
 
 #include "pfrload.h"
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 
 #include "pfrerror.h"
 
diff --git a/freetype/src/pfr/pfrload.h b/freetype/src/pfr/pfrload.h
index ee1ae5b32..6a6bc182a 100644
--- a/freetype/src/pfr/pfrload.h
+++ b/freetype/src/pfr/pfrload.h
@@ -20,7 +20,7 @@
 #define __PFRLOAD_H__
 
 #include "pfrobjs.h"
-#include <freetype/internal/ftstream.h>
+#include <internal/ftstream.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/pfr/pfrobjs.c b/freetype/src/pfr/pfrobjs.c
index 80e4b7e71..7953d812e 100644
--- a/freetype/src/pfr/pfrobjs.c
+++ b/freetype/src/pfr/pfrobjs.c
@@ -22,7 +22,7 @@
 #include "pfrcmap.h"
 #include "pfrsbit.h"
 #include FT_OUTLINE_H
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 #include FT_TRUETYPE_IDS_H
 
 #include "pfrerror.h"
diff --git a/freetype/src/pfr/pfrsbit.c b/freetype/src/pfr/pfrsbit.c
index 6761bad9f..1bb878e1d 100644
--- a/freetype/src/pfr/pfrsbit.c
+++ b/freetype/src/pfr/pfrsbit.c
@@ -18,8 +18,8 @@
 
 #include "pfrsbit.h"
 #include "pfrload.h"
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 
 #include "pfrerror.h"
 
diff --git a/freetype/src/pfr/pfrtypes.h b/freetype/src/pfr/pfrtypes.h
index 49dc5c413..f2f1c3cc7 100644
--- a/freetype/src/pfr/pfrtypes.h
+++ b/freetype/src/pfr/pfrtypes.h
@@ -20,7 +20,7 @@
 #define __PFRTYPES_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/src/psaux/afmparse.c b/freetype/src/psaux/afmparse.c
index 0d63e39e5..f9e428e57 100644
--- a/freetype/src/psaux/afmparse.c
+++ b/freetype/src/psaux/afmparse.c
@@ -17,8 +17,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftdebug.h>
+#include <internal/psaux.h>
 
 #include "afmparse.h"
 #include "psconv.h"
diff --git a/freetype/src/psaux/afmparse.h b/freetype/src/psaux/afmparse.h
index 55e4f7c47..e767538f4 100644
--- a/freetype/src/psaux/afmparse.h
+++ b/freetype/src/psaux/afmparse.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/psaux/psconv.c b/freetype/src/psaux/psconv.c
index b73b724e8..9db8d67a6 100644
--- a/freetype/src/psaux/psconv.c
+++ b/freetype/src/psaux/psconv.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/psaux.h>
+#include <internal/ftdebug.h>
 
 #include "psconv.h"
 #include "psauxerr.h"
diff --git a/freetype/src/psaux/psconv.h b/freetype/src/psaux/psconv.h
index 913ff00f6..e9ce7c329 100644
--- a/freetype/src/psaux/psconv.h
+++ b/freetype/src/psaux/psconv.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/src/psaux/psobjs.c b/freetype/src/psaux/psobjs.c
index 5659220bb..524eb7771 100644
--- a/freetype/src/psaux/psobjs.c
+++ b/freetype/src/psaux/psobjs.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/psaux.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
 
 #include "psobjs.h"
 #include "psconv.h"
diff --git a/freetype/src/psaux/psobjs.h b/freetype/src/psaux/psobjs.h
index ab270ed6b..6b0ae0405 100644
--- a/freetype/src/psaux/psobjs.h
+++ b/freetype/src/psaux/psobjs.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/psaux/t1cmap.c b/freetype/src/psaux/t1cmap.c
index 6d8f232a9..63d3e979f 100644
--- a/freetype/src/psaux/t1cmap.c
+++ b/freetype/src/psaux/t1cmap.c
@@ -18,7 +18,7 @@
 
 #include "t1cmap.h"
 
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 
 #include "psauxerr.h"
 
diff --git a/freetype/src/psaux/t1cmap.h b/freetype/src/psaux/t1cmap.h
index 9f495f8b5..cc102ecba 100644
--- a/freetype/src/psaux/t1cmap.h
+++ b/freetype/src/psaux/t1cmap.h
@@ -20,8 +20,8 @@
 #define __T1CMAP_H__
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/t1types.h>
+#include <internal/ftobjs.h>
+#include <internal/t1types.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/src/psaux/t1decode.c b/freetype/src/psaux/t1decode.c
index 539258380..61746ae11 100644
--- a/freetype/src/psaux/t1decode.c
+++ b/freetype/src/psaux/t1decode.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/pshints.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/pshints.h>
+#include <internal/ftcalc.h>
 #include FT_OUTLINE_H
 
 #include "t1decode.h"
diff --git a/freetype/src/psaux/t1decode.h b/freetype/src/psaux/t1decode.h
index 64241136f..c15ba3880 100644
--- a/freetype/src/psaux/t1decode.h
+++ b/freetype/src/psaux/t1decode.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/psaux.h>
-#include <freetype/internal/t1types.h>
+#include <internal/psaux.h>
+#include <internal/t1types.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/pshinter/pshalgo.c b/freetype/src/pshinter/pshalgo.c
index 2a7497825..3d65831b5 100644
--- a/freetype/src/pshinter/pshalgo.c
+++ b/freetype/src/pshinter/pshalgo.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
 #include "pshalgo.h"
 
 #include "pshnterr.h"
diff --git a/freetype/src/pshinter/pshglob.c b/freetype/src/pshinter/pshglob.c
index ac1e37baf..ab2f82f8b 100644
--- a/freetype/src/pshinter/pshglob.c
+++ b/freetype/src/pshinter/pshglob.c
@@ -19,7 +19,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "pshglob.h"
 
 #ifdef DEBUG_HINTER
diff --git a/freetype/src/pshinter/pshglob.h b/freetype/src/pshinter/pshglob.h
index 34592049e..0baf09478 100644
--- a/freetype/src/pshinter/pshglob.h
+++ b/freetype/src/pshinter/pshglob.h
@@ -20,8 +20,8 @@
 #define __PSHGLOB_H__
 
 
-#include <freetype/freetype.h>
-#include <freetype/internal/pshints.h>
+#include <freetype.h>
+#include <internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/pshinter/pshmod.c b/freetype/src/pshinter/pshmod.c
index 762d4aa16..5415670d9 100644
--- a/freetype/src/pshinter/pshmod.c
+++ b/freetype/src/pshinter/pshmod.c
@@ -17,7 +17,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "pshrec.h"
 #include "pshalgo.h"
 #include "pshpic.h"
diff --git a/freetype/src/pshinter/pshpic.h b/freetype/src/pshinter/pshpic.h
index bc7501581..0be8841ee 100644
--- a/freetype/src/pshinter/pshpic.h
+++ b/freetype/src/pshinter/pshpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 
 #ifndef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/pshinter/pshrec.c b/freetype/src/pshinter/pshrec.c
index 107837cf8..ff3ac9c15 100644
--- a/freetype/src/pshinter/pshrec.c
+++ b/freetype/src/pshinter/pshrec.c
@@ -18,9 +18,9 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
 
 #include "pshrec.h"
 #include "pshalgo.h"
diff --git a/freetype/src/pshinter/pshrec.h b/freetype/src/pshinter/pshrec.h
index ed464eba0..0a71bdfd9 100644
--- a/freetype/src/pshinter/pshrec.h
+++ b/freetype/src/pshinter/pshrec.h
@@ -33,7 +33,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/pshints.h>
+#include <internal/pshints.h>
 #include "pshglob.h"
 
 
diff --git a/freetype/src/psnames/psmodule.c b/freetype/src/psnames/psmodule.c
index c05398b87..75c8b89cc 100644
--- a/freetype/src/psnames/psmodule.c
+++ b/freetype/src/psnames/psmodule.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/services/svpscmap.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/services/svpscmap.h>
 
 #include "psmodule.h"
 #include "pstables.h"
diff --git a/freetype/src/psnames/pspic.h b/freetype/src/psnames/pspic.h
index 3cbc93db1..578301f2a 100644
--- a/freetype/src/psnames/pspic.h
+++ b/freetype/src/psnames/pspic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 #ifndef FT_CONFIG_OPTION_PIC
 
diff --git a/freetype/src/raster/ftraster.c b/freetype/src/raster/ftraster.c
index 908352a59..f0073981b 100644
--- a/freetype/src/raster/ftraster.c
+++ b/freetype/src/raster/ftraster.c
@@ -60,7 +60,7 @@
 
 #include <ft2build.h>
 #include "ftraster.h"
-#include <freetype/internal/ftcalc.h>   /* for FT_MulDiv and FT_MulDiv_No_Round */
+#include <internal/ftcalc.h>   /* for FT_MulDiv and FT_MulDiv_No_Round */
 
 #include "rastpic.h"
 
@@ -230,8 +230,8 @@
 #else /* !_STANDALONE_ */
 
 
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>        /* for FT_TRACE, FT_ERROR, and FT_THROW */
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>        /* for FT_TRACE, FT_ERROR, and FT_THROW */
 
 #include "rasterrs.h"
 
diff --git a/freetype/src/raster/ftrend1.c b/freetype/src/raster/ftrend1.c
index 4ce184348..6eb7bbbe8 100644
--- a/freetype/src/raster/ftrend1.c
+++ b/freetype/src/raster/ftrend1.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
 #include FT_OUTLINE_H
 #include "ftrend1.h"
 #include "ftraster.h"
diff --git a/freetype/src/raster/ftrend1.h b/freetype/src/raster/ftrend1.h
index f8c48f1f7..c55d22a91 100644
--- a/freetype/src/raster/ftrend1.h
+++ b/freetype/src/raster/ftrend1.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/ftrender.h>
+#include <ftrender.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/raster/rastpic.h b/freetype/src/raster/rastpic.h
index ff7df7367..592e0d3f1 100644
--- a/freetype/src/raster/rastpic.h
+++ b/freetype/src/raster/rastpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 
 #ifndef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c
index cea38be6b..2b7ffd556 100644
--- a/freetype/src/sfnt/sfdriver.c
+++ b/freetype/src/sfnt/sfdriver.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/sfnt.h>
+#include <internal/ftobjs.h>
 
 #include "sfdriver.h"
 #include "ttload.h"
diff --git a/freetype/src/sfnt/sfntpic.c b/freetype/src/sfnt/sfntpic.c
index 80d9547f9..d62d5bef2 100644
--- a/freetype/src/sfnt/sfntpic.c
+++ b/freetype/src/sfnt/sfntpic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "sfntpic.h"
 #include "sferrors.h"
 
diff --git a/freetype/src/sfnt/sfntpic.h b/freetype/src/sfnt/sfntpic.h
index e107b924b..948148899 100644
--- a/freetype/src/sfnt/sfntpic.h
+++ b/freetype/src/sfnt/sfntpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 
 #ifndef FT_CONFIG_OPTION_PIC
diff --git a/freetype/src/sfnt/sfobjs.c b/freetype/src/sfnt/sfobjs.c
index 93e4321b6..112753160 100644
--- a/freetype/src/sfnt/sfobjs.c
+++ b/freetype/src/sfnt/sfobjs.c
@@ -21,8 +21,8 @@
 #include "ttload.h"
 #include "ttcmap.h"
 #include "ttkern.h"
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/sfnt.h>
+#include <internal/ftdebug.h>
 #include FT_TRUETYPE_IDS_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
diff --git a/freetype/src/sfnt/sfobjs.h b/freetype/src/sfnt/sfobjs.h
index 97bd8efdb..e5cf16061 100644
--- a/freetype/src/sfnt/sfobjs.h
+++ b/freetype/src/sfnt/sfobjs.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/sfnt.h>
+#include <internal/ftobjs.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttbdf.c b/freetype/src/sfnt/ttbdf.c
index 9851fb1af..04f87a24e 100644
--- a/freetype/src/sfnt/ttbdf.c
+++ b/freetype/src/sfnt/ttbdf.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
 #include "ttbdf.h"
 
diff --git a/freetype/src/sfnt/ttcmap.c b/freetype/src/sfnt/ttcmap.c
index 1ef6d3ceb..580c43050 100644
--- a/freetype/src/sfnt/ttcmap.c
+++ b/freetype/src/sfnt/ttcmap.c
@@ -17,12 +17,12 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 
 #include "sferrors.h"           /* must come before <freetype/internal/ftvalid.h> */
 
-#include <freetype/internal/ftvalid.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftvalid.h>
+#include <internal/ftstream.h>
 #include "ttload.h"
 #include "ttcmap.h"
 #include "sfntpic.h"
diff --git a/freetype/src/sfnt/ttcmap.h b/freetype/src/sfnt/ttcmap.h
index 87aadc31c..352e58f6d 100644
--- a/freetype/src/sfnt/ttcmap.h
+++ b/freetype/src/sfnt/ttcmap.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/tttypes.h>
-#include <freetype/internal/ftvalid.h>
+#include <internal/tttypes.h>
+#include <internal/ftvalid.h>
 #include FT_SERVICE_TT_CMAP_H
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttkern.c b/freetype/src/sfnt/ttkern.c
index ac870b424..3bfd78891 100644
--- a/freetype/src/sfnt/ttkern.c
+++ b/freetype/src/sfnt/ttkern.c
@@ -18,8 +18,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
 #include "ttkern.h"
 
diff --git a/freetype/src/sfnt/ttkern.h b/freetype/src/sfnt/ttkern.h
index 39b51fc35..7d21309b0 100644
--- a/freetype/src/sfnt/ttkern.h
+++ b/freetype/src/sfnt/ttkern.h
@@ -22,8 +22,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttload.c b/freetype/src/sfnt/ttload.c
index f6a11c12f..1ca2dd5c2 100644
--- a/freetype/src/sfnt/ttload.c
+++ b/freetype/src/sfnt/ttload.c
@@ -18,8 +18,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
 #include "ttload.h"
 
diff --git a/freetype/src/sfnt/ttload.h b/freetype/src/sfnt/ttload.h
index 186e9ec90..12c036b99 100644
--- a/freetype/src/sfnt/ttload.h
+++ b/freetype/src/sfnt/ttload.h
@@ -22,8 +22,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttmtx.c b/freetype/src/sfnt/ttmtx.c
index bc95bf861..920b2b92a 100644
--- a/freetype/src/sfnt/ttmtx.c
+++ b/freetype/src/sfnt/ttmtx.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
 #include "ttmtx.h"
 
diff --git a/freetype/src/sfnt/ttmtx.h b/freetype/src/sfnt/ttmtx.h
index b045458ee..13b0775ce 100644
--- a/freetype/src/sfnt/ttmtx.h
+++ b/freetype/src/sfnt/ttmtx.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttpost.c b/freetype/src/sfnt/ttpost.c
index 73792aed4..164edd8ce 100644
--- a/freetype/src/sfnt/ttpost.c
+++ b/freetype/src/sfnt/ttpost.c
@@ -26,9 +26,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/tttags.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <tttags.h>
 #include "ttpost.h"
 
 #include "sferrors.h"
diff --git a/freetype/src/sfnt/ttpost.h b/freetype/src/sfnt/ttpost.h
index 965928cce..d552c3aa5 100644
--- a/freetype/src/sfnt/ttpost.h
+++ b/freetype/src/sfnt/ttpost.h
@@ -23,7 +23,7 @@
 
 #include <ft2build.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/tttypes.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttsbit.c b/freetype/src/sfnt/ttsbit.c
index cd7592dff..01dfac015 100644
--- a/freetype/src/sfnt/ttsbit.c
+++ b/freetype/src/sfnt/ttsbit.c
@@ -20,10 +20,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/tttags.h>
-#include <freetype/ftbitmap.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <tttags.h>
+#include <ftbitmap.h>
 #include "ttsbit.h"
 
 #include "sferrors.h"
diff --git a/freetype/src/smooth/ftgrays.c b/freetype/src/smooth/ftgrays.c
index 1c4e06288..b1611625d 100644
--- a/freetype/src/smooth/ftgrays.c
+++ b/freetype/src/smooth/ftgrays.c
@@ -236,8 +236,8 @@ typedef ptrdiff_t  FT_PtrDist;
 
 #include <ft2build.h>
 #include "ftgrays.h"
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
 #include FT_OUTLINE_H
 
 #include "ftsmerrs.h"
diff --git a/freetype/src/smooth/ftsmooth.c b/freetype/src/smooth/ftsmooth.c
index a42b85fdc..f2fcdede8 100644
--- a/freetype/src/smooth/ftsmooth.c
+++ b/freetype/src/smooth/ftsmooth.c
@@ -17,7 +17,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_OUTLINE_H
 #include "ftsmooth.h"
 #include "ftgrays.h"
diff --git a/freetype/src/smooth/ftsmooth.h b/freetype/src/smooth/ftsmooth.h
index 0b182efc3..248d08e9a 100644
--- a/freetype/src/smooth/ftsmooth.h
+++ b/freetype/src/smooth/ftsmooth.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/ftrender.h>
+#include <ftrender.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/smooth/ftspic.c b/freetype/src/smooth/ftspic.c
index c39bf72be..bd9f0320d 100644
--- a/freetype/src/smooth/ftspic.c
+++ b/freetype/src/smooth/ftspic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "ftspic.h"
 #include "ftsmerrs.h"
 
diff --git a/freetype/src/smooth/ftspic.h b/freetype/src/smooth/ftspic.h
index b31064751..e5cba1e8c 100644
--- a/freetype/src/smooth/ftspic.h
+++ b/freetype/src/smooth/ftspic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include <freetype/internal/ftpic.h>
+#include <internal/ftpic.h>
 
 #ifndef FT_CONFIG_OPTION_PIC
 
diff --git a/freetype/src/truetype/ttdriver.c b/freetype/src/truetype/ttdriver.c
index ff15ea070..ade2505c7 100644
--- a/freetype/src/truetype/ttdriver.c
+++ b/freetype/src/truetype/ttdriver.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
 #include FT_SERVICE_XFREE86_NAME_H
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
diff --git a/freetype/src/truetype/ttdriver.h b/freetype/src/truetype/ttdriver.h
index 59c100aa5..0f64f0652 100644
--- a/freetype/src/truetype/ttdriver.h
+++ b/freetype/src/truetype/ttdriver.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttgload.c b/freetype/src/truetype/ttgload.c
index 404ecf0df..3b4580cd7 100644
--- a/freetype/src/truetype/ttgload.c
+++ b/freetype/src/truetype/ttgload.c
@@ -17,10 +17,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
 #include FT_TRUETYPE_TAGS_H
 #include FT_OUTLINE_H
 #include FT_TRUETYPE_DRIVER_H
diff --git a/freetype/src/truetype/ttgxvar.c b/freetype/src/truetype/ttgxvar.c
index b05b199c3..50e5f02a7 100644
--- a/freetype/src/truetype/ttgxvar.c
+++ b/freetype/src/truetype/ttgxvar.c
@@ -44,10 +44,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
 #include FT_TRUETYPE_TAGS_H
 #include FT_MULTIPLE_MASTERS_H
 
diff --git a/freetype/src/truetype/ttinterp.c b/freetype/src/truetype/ttinterp.c
index 9b7ca9df5..828e295a5 100644
--- a/freetype/src/truetype/ttinterp.c
+++ b/freetype/src/truetype/ttinterp.c
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
 #include FT_TRIGONOMETRY_H
 #include FT_SYSTEM_H
 #include FT_TRUETYPE_DRIVER_H
diff --git a/freetype/src/truetype/ttobjs.c b/freetype/src/truetype/ttobjs.c
index af04873fa..ebbf1b058 100644
--- a/freetype/src/truetype/ttobjs.c
+++ b/freetype/src/truetype/ttobjs.c
@@ -17,10 +17,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
-#include <freetype/internal/sfnt.h>
+#include <internal/sfnt.h>
 #include FT_TRUETYPE_DRIVER_H
 
 #include "ttgload.h"
diff --git a/freetype/src/truetype/ttobjs.h b/freetype/src/truetype/ttobjs.h
index 9dd4ddb8d..bcd776532 100644
--- a/freetype/src/truetype/ttobjs.h
+++ b/freetype/src/truetype/ttobjs.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftobjs.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttpic.c b/freetype/src/truetype/ttpic.c
index 55e5ba4e2..99ae45cb9 100644
--- a/freetype/src/truetype/ttpic.c
+++ b/freetype/src/truetype/ttpic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include "ttpic.h"
 #include "tterrors.h"
 
diff --git a/freetype/src/truetype/ttpload.c b/freetype/src/truetype/ttpload.c
index 0c47253d8..2ee5d38b8 100644
--- a/freetype/src/truetype/ttpload.c
+++ b/freetype/src/truetype/ttpload.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftstream.h>
 #include FT_TRUETYPE_TAGS_H
 
 #include "ttpload.h"
diff --git a/freetype/src/truetype/ttpload.h b/freetype/src/truetype/ttpload.h
index 9be60eec3..ec93680f4 100644
--- a/freetype/src/truetype/ttpload.h
+++ b/freetype/src/truetype/ttpload.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/tttypes.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttsubpix.c b/freetype/src/truetype/ttsubpix.c
index b235eed6b..1f11d8d20 100644
--- a/freetype/src/truetype/ttsubpix.c
+++ b/freetype/src/truetype/ttsubpix.c
@@ -16,12 +16,12 @@
 /***************************************************************************/
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/tttags.h>
-#include <freetype/ftoutln.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
+#include <tttags.h>
+#include <ftoutln.h>
 #include FT_TRUETYPE_DRIVER_H
 
 #include "ttsubpix.h"
diff --git a/freetype/src/type1/t1afm.c b/freetype/src/type1/t1afm.c
index de0707184..92c167ecb 100644
--- a/freetype/src/type1/t1afm.c
+++ b/freetype/src/type1/t1afm.c
@@ -19,8 +19,8 @@
 #include <ft2build.h>
 #include "t1afm.h"
 #include FT_INTERNAL_DEBUG_H
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
 #include "t1errors.h"
 
 
diff --git a/freetype/src/type1/t1afm.h b/freetype/src/type1/t1afm.h
index befb3b10e..6f46d55c7 100644
--- a/freetype/src/type1/t1afm.h
+++ b/freetype/src/type1/t1afm.h
@@ -21,7 +21,7 @@
 
 #include <ft2build.h>
 #include "t1objs.h"
-#include <freetype/internal/t1types.h>
+#include <internal/t1types.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/src/type1/t1driver.c b/freetype/src/type1/t1driver.c
index 1f0e9ded4..1b175866c 100644
--- a/freetype/src/type1/t1driver.c
+++ b/freetype/src/type1/t1driver.c
@@ -27,15 +27,15 @@
 #include "t1afm.h"
 #endif
 
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 
 #include FT_SERVICE_MULTIPLE_MASTERS_H
 #include FT_SERVICE_GLYPH_DICT_H
 #include FT_SERVICE_XFREE86_NAME_H
 #include FT_SERVICE_POSTSCRIPT_NAME_H
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
-#include <freetype/internal/services/svpsinfo.h>
+#include <internal/services/svpsinfo.h>
 #include FT_SERVICE_KERNING_H
 
 
diff --git a/freetype/src/type1/t1driver.h b/freetype/src/type1/t1driver.h
index e23a140c7..cf1bca922 100644
--- a/freetype/src/type1/t1driver.h
+++ b/freetype/src/type1/t1driver.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type1/t1gload.c b/freetype/src/type1/t1gload.c
index 960a6d8cc..90644ac95 100644
--- a/freetype/src/type1/t1gload.c
+++ b/freetype/src/type1/t1gload.c
@@ -18,11 +18,11 @@
 
 #include <ft2build.h>
 #include "t1gload.h"
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
 #include FT_OUTLINE_H
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 #include "t1errors.h"
 
diff --git a/freetype/src/type1/t1load.c b/freetype/src/type1/t1load.c
index e5b4b06fa..346812b08 100644
--- a/freetype/src/type1/t1load.c
+++ b/freetype/src/type1/t1load.c
@@ -61,11 +61,11 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 #include FT_CONFIG_CONFIG_H
 #include FT_MULTIPLE_MASTERS_H
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/t1types.h>
+#include <internal/ftcalc.h>
 
 #include "t1load.h"
 #include "t1errors.h"
diff --git a/freetype/src/type1/t1load.h b/freetype/src/type1/t1load.h
index ed0cf3894..2fd918790 100644
--- a/freetype/src/type1/t1load.h
+++ b/freetype/src/type1/t1load.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
 #include FT_MULTIPLE_MASTERS_H
 
 #include "t1parse.h"
diff --git a/freetype/src/type1/t1objs.c b/freetype/src/type1/t1objs.c
index 8289f31b5..f99dd6efe 100644
--- a/freetype/src/type1/t1objs.c
+++ b/freetype/src/type1/t1objs.c
@@ -17,9 +17,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftcalc.h>
 #include FT_TRUETYPE_IDS_H
 
 #include "t1gload.h"
@@ -32,7 +32,7 @@
 #endif
 
 #include FT_SERVICE_POSTSCRIPT_CMAPS_H
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/type1/t1objs.h b/freetype/src/type1/t1objs.h
index abba30d58..1dd5467da 100644
--- a/freetype/src/type1/t1objs.h
+++ b/freetype/src/type1/t1objs.h
@@ -21,9 +21,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
 #include FT_CONFIG_CONFIG_H
-#include <freetype/internal/t1types.h>
+#include <internal/t1types.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type1/t1parse.c b/freetype/src/type1/t1parse.c
index 9cb45eff8..093a1bd3b 100644
--- a/freetype/src/type1/t1parse.c
+++ b/freetype/src/type1/t1parse.c
@@ -34,9 +34,9 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
 
 #include "t1parse.h"
 
diff --git a/freetype/src/type1/t1parse.h b/freetype/src/type1/t1parse.h
index 151f3953f..8c35ce898 100644
--- a/freetype/src/type1/t1parse.h
+++ b/freetype/src/type1/t1parse.h
@@ -21,8 +21,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/t1types.h>
+#include <internal/ftstream.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42drivr.c b/freetype/src/type42/t42drivr.c
index 7782b1da0..e3a52d772 100644
--- a/freetype/src/type42/t42drivr.c
+++ b/freetype/src/type42/t42drivr.c
@@ -39,12 +39,12 @@
 #include "t42drivr.h"
 #include "t42objs.h"
 #include "t42error.h"
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 
 #include FT_SERVICE_XFREE86_NAME_H
 #include FT_SERVICE_GLYPH_DICT_H
 #include FT_SERVICE_POSTSCRIPT_NAME_H
-#include <freetype/internal/services/svpsinfo.h>
+#include <internal/services/svpsinfo.h>
 
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_t42
diff --git a/freetype/src/type42/t42drivr.h b/freetype/src/type42/t42drivr.h
index 1defca7ff..fca34d03f 100644
--- a/freetype/src/type42/t42drivr.h
+++ b/freetype/src/type42/t42drivr.h
@@ -20,7 +20,7 @@
 
 
 #include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42objs.c b/freetype/src/type42/t42objs.c
index 85d10a36f..2595ecc25 100644
--- a/freetype/src/type42/t42objs.c
+++ b/freetype/src/type42/t42objs.c
@@ -19,7 +19,7 @@
 #include "t42objs.h"
 #include "t42parse.h"
 #include "t42error.h"
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
 #include FT_LIST_H
 #include FT_TRUETYPE_IDS_H
 
diff --git a/freetype/src/type42/t42objs.h b/freetype/src/type42/t42objs.h
index 4db189948..0fad19adb 100644
--- a/freetype/src/type42/t42objs.h
+++ b/freetype/src/type42/t42objs.h
@@ -19,14 +19,14 @@
 #define __T42OBJS_H__
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/t1types.h>
+#include <freetype.h>
+#include <t1tables.h>
+#include <internal/t1types.h>
 #include "t42types.h"
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdriver.h>
-#include <freetype/internal/services/svpscmap.h>
-#include <freetype/internal/pshints.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdriver.h>
+#include <internal/services/svpscmap.h>
+#include <internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42parse.c b/freetype/src/type42/t42parse.c
index 5fdecb291..d103f94e9 100644
--- a/freetype/src/type42/t42parse.c
+++ b/freetype/src/type42/t42parse.c
@@ -18,9 +18,9 @@
 
 #include "t42parse.h"
 #include "t42error.h"
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/type42/t42parse.h b/freetype/src/type42/t42parse.h
index 28c22d0c3..f1ae1fcad 100644
--- a/freetype/src/type42/t42parse.h
+++ b/freetype/src/type42/t42parse.h
@@ -20,7 +20,7 @@
 
 
 #include "t42objs.h"
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42types.h b/freetype/src/type42/t42types.h
index 2d930d0b3..cfe1cb192 100644
--- a/freetype/src/type42/t42types.h
+++ b/freetype/src/type42/t42types.h
@@ -20,10 +20,10 @@
 
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/pshints.h>
+#include <freetype.h>
+#include <t1tables.h>
+#include <internal/t1types.h>
+#include <internal/pshints.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/src/winfonts/winfnt.c b/freetype/src/winfonts/winfnt.c
index 55ff04fba..1a56bc47b 100644
--- a/freetype/src/winfonts/winfnt.c
+++ b/freetype/src/winfonts/winfnt.c
@@ -20,9 +20,9 @@
 
 #include <ft2build.h>
 #include FT_WINFONTS_H
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/ftobjs.h>
 #include FT_TRUETYPE_IDS_H
 
 #include "winfnt.h"
diff --git a/freetype/src/winfonts/winfnt.h b/freetype/src/winfonts/winfnt.h
index c6fec3d50..fc0cd10ae 100644
--- a/freetype/src/winfonts/winfnt.h
+++ b/freetype/src/winfonts/winfnt.h
@@ -22,8 +22,8 @@
 
 
 #include <ft2build.h>
-#include <freetype/ftwinfnt.h>
-#include <freetype/internal/ftdriver.h>
+#include <ftwinfnt.h>
+#include <internal/ftdriver.h>
 
 
 FT_BEGIN_HEADER
diff --git a/makefile.before b/makefile.before
index d6537e6c7..6c0663008 100644
--- a/makefile.before
+++ b/makefile.before
@@ -94,11 +94,11 @@ all: $(OBJDIR)
 

 ifeq ($(DEBUG),1)

 PTHREADLIB:=$(MHMAKECONF)\pthreads\pthreadVC2d$(OBJDIREXTRA).lib

-FREETYPELIB:=$(MHMAKECONF)\freetype\lib$(OBJDIREXTRA)\freetype2501MT_D.lib

+FREETYPELIB:=$(MHMAKECONF)\freetype\lib$(OBJDIREXTRA)\freetype253MT_D.lib

 OPENSSLLIB:=$(MHMAKECONF)\openssl\out$(SSLSUFFIX)_d\libeay32.lib

 else

 PTHREADLIB:=$(MHMAKECONF)\pthreads\pthreadVC2$(OBJDIREXTRA).lib

-FREETYPELIB:=$(MHMAKECONF)\freetype\lib$(OBJDIREXTRA)\freetype2501MT.lib

+FREETYPELIB:=$(MHMAKECONF)\freetype\lib$(OBJDIREXTRA)\freetype253MT.lib

 OPENSSLLIB:=$(MHMAKECONF)\openssl\out$(SSLSUFFIX)\libeay32.lib

 endif

 LIBXMLLIB:=$(MHMAKECONF)\libxml2\lib$(OBJDIREXTRA)\libxml2-2.lib