9 files changed, 16 insertions, 16 deletions
diff --git a/freetype/src/autofit/afcjk.c b/freetype/src/autofit/afcjk.c
index 048e0e7d0..8f2bd00ee 100644
--- a/freetype/src/autofit/afcjk.c
+++ b/freetype/src/autofit/afcjk.c
@@ -23,8 +23,8 @@
    */
 
 #include <ft2build.h>
-#include FT_ADVANCES_H
-#include FT_INTERNAL_DEBUG_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 50e1a22dd..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 FT_MODULE_ERRORS_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 FT_ERRORS_H
+#include <fterrors.h>
 
 #endif /* __AFERRORS_H__ */
 
diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c
index f3cc50f20..4aa64bb4b 100644
--- a/freetype/src/autofit/afhints.c
+++ b/freetype/src/autofit/afhints.c
@@ -18,8 +18,8 @@
 
 #include "afhints.h"
 #include "aferrors.h"
-#include FT_INTERNAL_CALC_H
-#include FT_INTERNAL_DEBUG_H
+#include <internal/ftcalc.h>
+#include <internal/ftdebug.h>
 
 
   /*************************************************************************/
diff --git a/freetype/src/autofit/aflatin.c b/freetype/src/autofit/aflatin.c
index 36a36896f..40ec20faa 100644
--- a/freetype/src/autofit/aflatin.c
+++ b/freetype/src/autofit/aflatin.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include FT_ADVANCES_H
-#include FT_INTERNAL_DEBUG_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 641e03ea2..d411f44e7 100644
--- a/freetype/src/autofit/afmodule.c
+++ b/freetype/src/autofit/afmodule.c
@@ -29,8 +29,8 @@
   void*  _af_debug_hints;
 #endif
 
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_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 20b7b9f66..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 FT_INTERNAL_OBJECTS_H
+#include <internal/ftobjs.h>
 #include FT_MODULE_H
 
 #include "afloader.h"
diff --git a/freetype/src/autofit/afpic.c b/freetype/src/autofit/afpic.c
index cb29fd79f..90f8beb52 100644
--- a/freetype/src/autofit/afpic.c
+++ b/freetype/src/autofit/afpic.c
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
+#include <freetype/internal/ftobjs.h>
 #include "afpic.h"
 #include "afglobal.h"
 #include "aferrors.h"
diff --git a/freetype/src/autofit/afpic.h b/freetype/src/autofit/afpic.h
index 9a68b4a5a..3afd1fce1 100644
--- a/freetype/src/autofit/afpic.h
+++ b/freetype/src/autofit/afpic.h
@@ -22,7 +22,7 @@
 
 FT_BEGIN_HEADER
 
-#include FT_INTERNAL_PIC_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 61badd1b8..b4cc0f8af 100644
--- a/freetype/src/autofit/aftypes.h
+++ b/freetype/src/autofit/aftypes.h
@@ -34,10 +34,10 @@
 
 #include <ft2build.h>
 
-#include FT_FREETYPE_H
+#include <freetype.h>
 #include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
+#include <internal/ftobjs.h>
+#include <internal/ftdebug.h>
 
 #include "afblue.h"