summaryrefslogtreecommitdiff
path: root/src/type1
diff options
context:
space:
mode:
Diffstat (limited to 'src/type1')
-rw-r--r--src/type1/t1afm.c6
-rw-r--r--src/type1/t1afm.h2
-rw-r--r--src/type1/t1driver.c6
-rw-r--r--src/type1/t1gload.c4
-rw-r--r--src/type1/t1hinter.c2
-rw-r--r--src/type1/t1load.c6
-rw-r--r--src/type1/t1load.h2
-rw-r--r--src/type1/t1objs.c6
-rw-r--r--src/type1/t1objs.h6
-rw-r--r--src/type1/t1parse.c4
-rw-r--r--src/type1/t1parse.h2
-rw-r--r--src/type1/t1tokens.c4
12 files changed, 25 insertions, 25 deletions
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index f619e28e5..2b904af83 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -5,10 +5,10 @@
*
***************************************************************************/
-#include <t1afm.h>
-#include <ftstream.h>
-#include <t1types.h>
+#include <freetype/internal/ftstream.h>
+#include <freetype/internal/t1types.h>
#include <stdlib.h> /* for qsort */
+#include <t1afm.h>
LOCAL_FUNC
void T1_Done_AFM( FT_Memory memory, T1_AFM* afm )
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index 567ed6325..61e18b82c 100644
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -8,7 +8,7 @@
#ifndef T1AFM_H
#define T1AFM_H
-#include <ftobjs.h>
+#include <freetype/internal/ftobjs.h>
/* In this version, we only read the kerning table from the */
/* AFM file. We may add support for ligatures a bit later.. */
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index ed5920118..78fe415bc 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -19,9 +19,9 @@
#include <t1gload.h>
#include <t1afm.h>
-#include <ftdebug.h>
-#include <ftstream.h>
-#include <psnames.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftstream.h>
+#include <freetype/internal/psnames.h>
#undef FT_COMPONENT
#define FT_COMPONENT trace_t1driver
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index d644267aa..e9cd8a3e5 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -16,8 +16,8 @@
******************************************************************/
#include <t1gload.h>
-#include <ftdebug.h>
-#include <ftstream.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftstream.h>
#ifndef T1_CONFIG_OPTION_DISABLE_HINTER
#include <t1hinter.h>
diff --git a/src/type1/t1hinter.c b/src/type1/t1hinter.c
index 3a09ed7a5..f9d5db9b5 100644
--- a/src/type1/t1hinter.c
+++ b/src/type1/t1hinter.c
@@ -20,7 +20,7 @@
*
******************************************************************/
-#include <ftdebug.h>
+#include <freetype/internal/ftdebug.h>
#include <t1objs.h>
#include <t1hinter.h>
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 87c2d1fee..e4802da9c 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1,7 +1,7 @@
-#include <ftconfig.h>
-#include <ftdebug.h>
+#include <freetype/config/ftconfig.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/t1types.h>
-#include <t1types.h>
#include <t1tokens.h>
#include <t1parse.h>
diff --git a/src/type1/t1load.h b/src/type1/t1load.h
index 9e0ee4736..673316a03 100644
--- a/src/type1/t1load.h
+++ b/src/type1/t1load.h
@@ -18,7 +18,7 @@
#ifndef T1LOAD_H
#define T1LOAD_H
-#include <ftstream.h>
+#include <freetype/internal/ftstream.h>
#include <t1parse.h>
#ifdef __cplusplus
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 79d26db9b..23b6a900c 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -15,8 +15,8 @@
*
******************************************************************/
-#include <ftdebug.h>
-#include <ftstream.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftstream.h>
#include <t1gload.h>
#include <t1load.h>
@@ -26,7 +26,7 @@
#include <t1hinter.h>
#endif
-#include <psnames.h>
+#include <freetype/internal/psnames.h>
/* Required by tracing mode */
#undef FT_COMPONENT
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h
index e11a3a1c3..51c71861a 100644
--- a/src/type1/t1objs.h
+++ b/src/type1/t1objs.h
@@ -18,11 +18,11 @@
#ifndef T1OBJS_H
#define T1OBJS_H
-#include <ftobjs.h>
-#include <ftconfig.h>
+#include <freetype/config/ftconfig.h>
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/t1types.h>
#include <t1errors.h>
-#include <t1types.h>
#ifdef __cplusplus
extern "C" {
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index e3710b07f..d897d7446 100644
--- a/src/type1/t1parse.c
+++ b/src/type1/t1parse.c
@@ -1,5 +1,5 @@
-#include <ftdebug.h>
-#include <t1types.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/t1types.h>
#include <t1parse.h>
#include <stdio.h> /* for sscanf */
diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h
index b124c08e9..99666807a 100644
--- a/src/type1/t1parse.h
+++ b/src/type1/t1parse.h
@@ -25,7 +25,7 @@
#ifndef T1PARSE_H
#define T1PARSE_H
-#include <ftstream.h>
+#include <freetype/internal/ftstream.h>
#include <t1tokens.h>
#ifdef __cplusplus
diff --git a/src/type1/t1tokens.c b/src/type1/t1tokens.c
index 92a16d7e1..f4aca2831 100644
--- a/src/type1/t1tokens.c
+++ b/src/type1/t1tokens.c
@@ -23,8 +23,8 @@
*
******************************************************************/
-#include <ftstream.h>
-#include <ftdebug.h>
+#include <freetype/internal/ftstream.h>
+#include <freetype/internal/ftdebug.h>
#include <t1tokens.h>
#include <t1load.h>