17 files changed, 18 insertions, 18 deletions
diff --git a/freetype/include/internal/services/svbdf.h b/freetype/include/internal/services/svbdf.h
index 0974752a7..08575aaf4 100644
--- a/freetype/include/internal/services/svbdf.h
+++ b/freetype/include/internal/services/svbdf.h
@@ -20,7 +20,7 @@
 #define __SVBDF_H__
 
 #include FT_BDF_H
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svcid.h b/freetype/include/internal/services/svcid.h
index 6be3f9374..646ce1283 100644
--- a/freetype/include/internal/services/svcid.h
+++ b/freetype/include/internal/services/svcid.h
@@ -18,7 +18,7 @@
 #ifndef __SVCID_H__
 #define __SVCID_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svgldict.h b/freetype/include/internal/services/svgldict.h
index 1d1253472..4d3c58f8c 100644
--- a/freetype/include/internal/services/svgldict.h
+++ b/freetype/include/internal/services/svgldict.h
@@ -19,7 +19,7 @@
 #ifndef __SVGLDICT_H__
 #define __SVGLDICT_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svgxval.h b/freetype/include/internal/services/svgxval.h
index 2cdab5065..7707d0751 100644
--- a/freetype/include/internal/services/svgxval.h
+++ b/freetype/include/internal/services/svgxval.h
@@ -29,7 +29,7 @@
 #define __SVGXVAL_H__
 
 #include FT_GX_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
+#include <freetype/internal/ftvalid.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/include/internal/services/svkern.h b/freetype/include/internal/services/svkern.h
index 1488adf49..68f5a96e9 100644
--- a/freetype/include/internal/services/svkern.h
+++ b/freetype/include/internal/services/svkern.h
@@ -19,7 +19,7 @@
 #ifndef __SVKERN_H__
 #define __SVKERN_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_TRUETYPE_TABLES_H
 
 
diff --git a/freetype/include/internal/services/svmm.h b/freetype/include/internal/services/svmm.h
index b08a663d6..4c1b960b4 100644
--- a/freetype/include/internal/services/svmm.h
+++ b/freetype/include/internal/services/svmm.h
@@ -19,7 +19,7 @@
 #ifndef __SVMM_H__
 #define __SVMM_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svotval.h b/freetype/include/internal/services/svotval.h
index 970bbd575..141cddb46 100644
--- a/freetype/include/internal/services/svotval.h
+++ b/freetype/include/internal/services/svotval.h
@@ -20,7 +20,7 @@
 #define __SVOTVAL_H__
 
 #include FT_OPENTYPE_VALIDATE_H
-#include FT_INTERNAL_VALIDATE_H
+#include <freetype/internal/ftvalid.h>
 
 FT_BEGIN_HEADER
 
diff --git a/freetype/include/internal/services/svpfr.h b/freetype/include/internal/services/svpfr.h
index 462786f9c..65760c8a3 100644
--- a/freetype/include/internal/services/svpfr.h
+++ b/freetype/include/internal/services/svpfr.h
@@ -20,7 +20,7 @@
 #define __SVPFR_H__
 
 #include FT_PFR_H
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpostnm.h b/freetype/include/internal/services/svpostnm.h
index a76b4fe05..1476dea48 100644
--- a/freetype/include/internal/services/svpostnm.h
+++ b/freetype/include/internal/services/svpostnm.h
@@ -19,7 +19,7 @@
 #ifndef __SVPOSTNM_H__
 #define __SVPOSTNM_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpscmap.h b/freetype/include/internal/services/svpscmap.h
index 030948ea6..3cb15a2a6 100644
--- a/freetype/include/internal/services/svpscmap.h
+++ b/freetype/include/internal/services/svpscmap.h
@@ -19,7 +19,7 @@
 #ifndef __SVPSCMAP_H__
 #define __SVPSCMAP_H__
 
-#include FT_INTERNAL_OBJECTS_H
+#include <freetype/internal/ftobjs.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svpsinfo.h b/freetype/include/internal/services/svpsinfo.h
index 4bfb50671..ca3bbc114 100644
--- a/freetype/include/internal/services/svpsinfo.h
+++ b/freetype/include/internal/services/svpsinfo.h
@@ -19,8 +19,8 @@
 #ifndef __SVPSINFO_H__
 #define __SVPSINFO_H__
 
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_TYPE1_TYPES_H
+#include <freetype/internal/ftserv.h>
+#include <freetype/internal/t1types.h>
 
 
 FT_BEGIN_HEADER
diff --git a/freetype/include/internal/services/svsfnt.h b/freetype/include/internal/services/svsfnt.h
index d3835aa1c..9a328d0a4 100644
--- a/freetype/include/internal/services/svsfnt.h
+++ b/freetype/include/internal/services/svsfnt.h
@@ -19,7 +19,7 @@
 #ifndef __SVSFNT_H__
 #define __SVSFNT_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_TRUETYPE_TABLES_H
 
 
diff --git a/freetype/include/internal/services/svttcmap.h b/freetype/include/internal/services/svttcmap.h
index 4370f4c2d..af2e37926 100644
--- a/freetype/include/internal/services/svttcmap.h
+++ b/freetype/include/internal/services/svttcmap.h
@@ -24,7 +24,7 @@
 #ifndef __SVTTCMAP_H__
 #define __SVTTCMAP_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_TRUETYPE_TABLES_H
 
 
diff --git a/freetype/include/internal/services/svtteng.h b/freetype/include/internal/services/svtteng.h
index 58e02a6f9..4612884cb 100644
--- a/freetype/include/internal/services/svtteng.h
+++ b/freetype/include/internal/services/svtteng.h
@@ -19,7 +19,7 @@
 #ifndef __SVTTENG_H__
 #define __SVTTENG_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_MODULE_H
 
 
diff --git a/freetype/include/internal/services/svttglyf.h b/freetype/include/internal/services/svttglyf.h
index 369eb8421..3bb087445 100644
--- a/freetype/include/internal/services/svttglyf.h
+++ b/freetype/include/internal/services/svttglyf.h
@@ -17,7 +17,7 @@
 #ifndef __SVTTGLYF_H__
 #define __SVTTGLYF_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_TRUETYPE_TABLES_H
 
 
diff --git a/freetype/include/internal/services/svwinfnt.h b/freetype/include/internal/services/svwinfnt.h
index 57f7765d9..7ae69e2a4 100644
--- a/freetype/include/internal/services/svwinfnt.h
+++ b/freetype/include/internal/services/svwinfnt.h
@@ -19,7 +19,7 @@
 #ifndef __SVWINFNT_H__
 #define __SVWINFNT_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 #include FT_WINFONTS_H
 
 
diff --git a/freetype/include/internal/services/svxf86nm.h b/freetype/include/internal/services/svxf86nm.h
index ca5d884a8..b16cbbf7b 100644
--- a/freetype/include/internal/services/svxf86nm.h
+++ b/freetype/include/internal/services/svxf86nm.h
@@ -19,7 +19,7 @@
 #ifndef __SVXF86NM_H__
 #define __SVXF86NM_H__
 
-#include FT_INTERNAL_SERVICE_H
+#include <freetype/internal/ftserv.h>
 
 
 FT_BEGIN_HEADER