Make macros for header file names optional.

We no longer have to take care of the 8.3 file name limit; this
allows us (a) to introduce longer, meaningful file names, and (b) to
avoid macro names in `#include' lines altogether since some
compilers (most notably Visual C++) doesn't support this properly.

*/*: Replace

   #include FOO_H

with

   #include <freetype/foo.h>

or something similar.  Also update the documentation.

12 files changed, 24 insertions, 24 deletions

diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index ca6ce0c60..3c207a21e 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -23,8 +23,8 @@
    */
 
 #include <ft2build.h>
-#include FT_ADVANCES_H
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/ftadvanc.h>
+#include <freetype/internal/ftdebug.h>
 
 #include "afglobal.h"
 #include "aflatin.h"
diff --git a/src/autofit/aferrors.h b/src/autofit/aferrors.h
index 6c7d0e1d7..f90899944 100644
--- a/src/autofit/aferrors.h
+++ b/src/autofit/aferrors.h
@@ -26,7 +26,7 @@
 #ifndef AFERRORS_H_
 #define AFERRORS_H_
 
-#include FT_MODULE_ERRORS_H
+#include <freetype/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 <freetype/fterrors.h>
 
 #endif /* AFERRORS_H_ */
 
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 5ad4ea921..66aa2f1f3 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -19,7 +19,7 @@
 #include "afglobal.h"
 #include "afranges.h"
 #include "afshaper.h"
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/internal/ftdebug.h>
 
 
   /**************************************************************************
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 5a123b2ba..a8e00890e 100644
--- a/src/autofit/afhints.c
+++ b/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 <freetype/internal/ftcalc.h>
+#include <freetype/internal/ftdebug.h>
 
 
   /**************************************************************************
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index b453fcdf6..41e3e66ff 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include FT_ADVANCES_H
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/ftadvanc.h>
+#include <freetype/internal/ftdebug.h>
 
 #include "afglobal.h"
 #include "aflatin.h"
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index 7bd4156a0..1569c5de5 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -22,7 +22,7 @@
 
 
 #include <ft2build.h>
-#include FT_ADVANCES_H
+#include <freetype/ftadvanc.h>
 
 
 #ifdef FT_OPTION_AUTOFIT2
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index a53fbf2d2..c35d85c4c 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -22,7 +22,7 @@
 #include "aferrors.h"
 #include "afmodule.h"
 
-#include FT_INTERNAL_CALC_H
+#include <freetype/internal/ftcalc.h>
 
 
   /* Initialize glyph loader. */
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index 0bcae4cc2..95d58b840 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -53,10 +53,10 @@
   void*  _af_debug_hints = _af_debug_hints_rec;
 #endif
 
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_DRIVER_H
-#include FT_SERVICE_PROPERTIES_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/ftdriver.h>
+#include <freetype/internal/services/svprop.h>
 
 
   /**************************************************************************
diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h
index efa0240b4..75013ef84 100644
--- a/src/autofit/afmodule.h
+++ b/src/autofit/afmodule.h
@@ -20,8 +20,8 @@
 #define AFMODULE_H_
 
 #include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_MODULE_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/ftmodapi.h>
 
 
 FT_BEGIN_HEADER
diff --git a/src/autofit/afshaper.c b/src/autofit/afshaper.c
index d3902db2e..80143a958 100644
--- a/src/autofit/afshaper.c
+++ b/src/autofit/afshaper.c
@@ -17,8 +17,8 @@
 
 
 #include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_ADVANCES_H
+#include <freetype/freetype.h>
+#include <freetype/ftadvanc.h>
 #include "afglobal.h"
 #include "aftypes.h"
 #include "afshaper.h"
diff --git a/src/autofit/afshaper.h b/src/autofit/afshaper.h
index a7dbf34f1..cc8693d51 100644
--- a/src/autofit/afshaper.h
+++ b/src/autofit/afshaper.h
@@ -21,7 +21,7 @@
 
 
 #include <ft2build.h>
-#include FT_FREETYPE_H
+#include <freetype/freetype.h>
 
 
 #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 7ca0b59e3..4bbe9a787 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -34,10 +34,10 @@
 
 #include <ft2build.h>
 
-#include FT_FREETYPE_H
-#include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
+#include <freetype/freetype.h>
+#include <freetype/ftoutln.h>
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdebug.h>
 
 #include "afblue.h"