Simplify header file hierarchy.

This large patch changes the header file directory layout from
`include/freetype/...' to `include/...', effectively removing one
level.  Since the file `ft2build.h' is also located in `include'
(and it stays there even after installation), all FreeType header
files are now in a single directory.

Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler, and
(b) the documented way for header inclusion like

  #include <ft2build.h>
  #include FT_FREETYPE_H
  ...

don't need any change to the source code.

* include/freetype/*: Move up to...
* include/*: ... this directory.

* builds/amiga/include/freetype/*: Move up to...
* builds/amiga/include/*: ... this directory.

*/*: Essentially do `s@/freetype/@/@' where appropriate.

* CMakeList.txt: Simplify.
* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
`--cflags', return a single directory.
* builds/unix/install.mk (install): No longer try to remove `cache'
and `internal' subdirectories; instead, remove the `freetype'
subdirectory.

88 files changed, 119 insertions, 119 deletions

diff --git a/include/freetype/config/ftconfig.h b/include/config/ftconfig.h
index dd192100c..0770e7878 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/config/ftconfig.h
@@ -27,11 +27,11 @@
   /* Note however that if some specific modifications are needed, we       */
   /* advise you to place a modified copy in your build directory.          */
   /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
   /*                                                                       */
-  /* This ANSI version should stay in `include/freetype/config'.           */
+  /* This ANSI version should stay in `include/config/'.                   */
   /*                                                                       */
   /*************************************************************************/
 
@@ -53,7 +53,7 @@ FT_BEGIN_HEADER
   /* These macros can be toggled to suit a specific system.  The current   */
   /* ones are defaults used to compile FreeType in an ANSI C environment   */
   /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
   /*                                                                       */
   /*************************************************************************/
 
diff --git a/include/freetype/config/ftheader.h b/include/config/ftheader.h
index 8371a3161..b62362992 100644
--- a/include/freetype/config/ftheader.h
+++ b/include/config/ftheader.h
@@ -107,7 +107,7 @@
    *
    */
 #ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
+#define FT_CONFIG_CONFIG_H  <config/ftconfig.h>
 #endif
 
 
@@ -122,7 +122,7 @@
    *
    */
 #ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
+#define FT_CONFIG_STANDARD_LIBRARY_H  <config/ftstdlib.h>
 #endif
 
 
@@ -137,7 +137,7 @@
    *
    */
 #ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <config/ftoption.h>
 #endif
 
 
@@ -153,7 +153,7 @@
    *
    */
 #ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
+#define FT_CONFIG_MODULES_H  <config/ftmodule.h>
 #endif
 
   /* */
@@ -170,7 +170,7 @@
    *   base FreeType~2 API.
    *
    */
-#define FT_FREETYPE_H  <freetype/freetype.h>
+#define FT_FREETYPE_H  <freetype.h>
 
 
   /*************************************************************************
@@ -185,7 +185,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_ERRORS_H  <freetype/fterrors.h>
+#define FT_ERRORS_H  <fterrors.h>
 
 
   /*************************************************************************
@@ -198,7 +198,7 @@
    *   list of FreeType~2 module error offsets (and messages).
    *
    */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
+#define FT_MODULE_ERRORS_H  <ftmoderr.h>
 
 
   /*************************************************************************
@@ -214,7 +214,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
+#define FT_SYSTEM_H  <ftsystem.h>
 
 
   /*************************************************************************
@@ -230,7 +230,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_IMAGE_H  <freetype/ftimage.h>
+#define FT_IMAGE_H  <ftimage.h>
 
 
   /*************************************************************************
@@ -245,7 +245,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_TYPES_H  <freetype/fttypes.h>
+#define FT_TYPES_H  <fttypes.h>
 
 
   /*************************************************************************
@@ -260,7 +260,7 @@
    *   (Most applications will never need to include this file.)
    *
    */
-#define FT_LIST_H  <freetype/ftlist.h>
+#define FT_LIST_H  <ftlist.h>
 
 
   /*************************************************************************
@@ -273,7 +273,7 @@
    *   scalable outline management API of FreeType~2.
    *
    */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
+#define FT_OUTLINE_H  <ftoutln.h>
 
 
   /*************************************************************************
@@ -286,7 +286,7 @@
    *   API which manages multiple @FT_Size objects per face.
    *
    */
-#define FT_SIZES_H  <freetype/ftsizes.h>
+#define FT_SIZES_H  <ftsizes.h>
 
 
   /*************************************************************************
@@ -299,7 +299,7 @@
    *   module management API of FreeType~2.
    *
    */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
+#define FT_MODULE_H  <ftmodapi.h>
 
 
   /*************************************************************************
@@ -312,7 +312,7 @@
    *   renderer module management API of FreeType~2.
    *
    */
-#define FT_RENDER_H  <freetype/ftrender.h>
+#define FT_RENDER_H  <ftrender.h>
 
 
   /*************************************************************************
@@ -325,7 +325,7 @@
    *   structures and macros related to the auto-hinting module.
    *
    */
-#define FT_AUTOHINTER_H  <freetype/ftautoh.h>
+#define FT_AUTOHINTER_H  <ftautoh.h>
 
 
   /*************************************************************************
@@ -338,7 +338,7 @@
    *   structures and macros related to the CFF driver module.
    *
    */
-#define FT_CFF_DRIVER_H  <freetype/ftcffdrv.h>
+#define FT_CFF_DRIVER_H  <ftcffdrv.h>
 
 
   /*************************************************************************
@@ -351,7 +351,7 @@
    *   structures and macros related to the TrueType driver module.
    *
    */
-#define FT_TRUETYPE_DRIVER_H  <freetype/ftttdrv.h>
+#define FT_TRUETYPE_DRIVER_H  <ftttdrv.h>
 
 
   /*************************************************************************
@@ -364,7 +364,7 @@
    *   types and API specific to the Type~1 format.
    *
    */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
+#define FT_TYPE1_TABLES_H  <t1tables.h>
 
 
   /*************************************************************************
@@ -379,7 +379,7 @@
    *   definitions, taken from the TrueType and OpenType specifications.
    *
    */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
+#define FT_TRUETYPE_IDS_H  <ttnameid.h>
 
 
   /*************************************************************************
@@ -392,7 +392,7 @@
    *   types and API specific to the TrueType (as well as OpenType) format.
    *
    */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
+#define FT_TRUETYPE_TABLES_H  <tttables.h>
 
 
   /*************************************************************************
@@ -406,7 +406,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
+#define FT_TRUETYPE_TAGS_H  <tttags.h>
 
 
   /*************************************************************************
@@ -420,7 +420,7 @@
    *   face.
    *
    */
-#define FT_BDF_H  <freetype/ftbdf.h>
+#define FT_BDF_H  <ftbdf.h>
 
 
   /*************************************************************************
@@ -434,7 +434,7 @@
    *   face.
    *
    */
-#define FT_CID_H  <freetype/ftcid.h>
+#define FT_CID_H  <ftcid.h>
 
 
   /*************************************************************************
@@ -447,7 +447,7 @@
    *   definitions of an API which supports gzip-compressed files.
    *
    */
-#define FT_GZIP_H  <freetype/ftgzip.h>
+#define FT_GZIP_H  <ftgzip.h>
 
 
   /*************************************************************************
@@ -460,7 +460,7 @@
    *   definitions of an API which supports LZW-compressed files.
    *
    */
-#define FT_LZW_H  <freetype/ftlzw.h>
+#define FT_LZW_H  <ftlzw.h>
 
 
   /*************************************************************************
@@ -473,7 +473,7 @@
    *   definitions of an API which supports bzip2-compressed files.
    *
    */
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
+#define FT_BZIP2_H  <ftbzip2.h>
 
 
   /*************************************************************************
@@ -486,7 +486,7 @@
    *   definitions of an API which supports Windows FNT files.
    *
    */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
+#define FT_WINFONTS_H   <ftwinfnt.h>
 
 
   /*************************************************************************
@@ -499,7 +499,7 @@
    *   API of the optional glyph management component.
    *
    */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
+#define FT_GLYPH_H  <ftglyph.h>
 
 
   /*************************************************************************
@@ -512,7 +512,7 @@
    *   API of the optional bitmap conversion component.
    *
    */
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
+#define FT_BITMAP_H  <ftbitmap.h>
 
 
   /*************************************************************************
@@ -525,7 +525,7 @@
    *   API of the optional exact bounding box computation routines.
    *
    */
-#define FT_BBOX_H  <freetype/ftbbox.h>
+#define FT_BBOX_H  <ftbbox.h>
 
 
   /*************************************************************************
@@ -538,7 +538,7 @@
    *   API of the optional FreeType~2 cache sub-system.
    *
    */
-#define FT_CACHE_H  <freetype/ftcache.h>
+#define FT_CACHE_H  <ftcache.h>
 
 
   /*************************************************************************
@@ -612,7 +612,7 @@
    *   compiled on the Mac (note that the base API still works though).
    *
    */
-#define FT_MAC_H  <freetype/ftmac.h>
+#define FT_MAC_H  <ftmac.h>
 
 
   /*************************************************************************
@@ -625,7 +625,7 @@
    *   optional multiple-masters management API of FreeType~2.
    *
    */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
+#define FT_MULTIPLE_MASTERS_H  <ftmm.h>
 
 
   /*************************************************************************
@@ -639,7 +639,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
+#define FT_SFNT_NAMES_H  <ftsnames.h>
 
 
   /*************************************************************************
@@ -653,7 +653,7 @@
    *   GPOS, GSUB, JSTF).
    *
    */
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
+#define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
 
 
   /*************************************************************************
@@ -667,7 +667,7 @@
    *   mort, morx, bsln, just, kern, opbd, trak, prop).
    *
    */
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
+#define FT_GX_VALIDATE_H  <ftgxval.h>
 
 
   /*************************************************************************
@@ -680,7 +680,7 @@
    *   FreeType~2 API which accesses PFR-specific data.
    *
    */
-#define FT_PFR_H  <freetype/ftpfr.h>
+#define FT_PFR_H  <ftpfr.h>
 
 
   /*************************************************************************
@@ -692,7 +692,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which provides functions to stroke outline paths.
    */
-#define FT_STROKER_H  <freetype/ftstroke.h>
+#define FT_STROKER_H  <ftstroke.h>
 
 
   /*************************************************************************
@@ -704,7 +704,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs artificial obliquing and emboldening.
    */
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
+#define FT_SYNTHESIS_H  <ftsynth.h>
 
 
   /*************************************************************************
@@ -717,7 +717,7 @@
    *   FreeType~2 API which provides functions specific to the XFree86 and
    *   X.Org X11 servers.
    */
-#define FT_XFREE86_H  <freetype/ftxf86.h>
+#define FT_XFREE86_H  <ftxf86.h>
 
 
   /*************************************************************************
@@ -730,7 +730,7 @@
    *   FreeType~2 API which performs trigonometric computations (e.g.,
    *   cosines and arc tangents).
    */
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
+#define FT_TRIGONOMETRY_H  <fttrigon.h>
 
 
   /*************************************************************************
@@ -742,7 +742,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
+#define FT_LCD_FILTER_H  <ftlcdfil.h>
 
 
   /*************************************************************************
@@ -754,7 +754,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
+#define FT_UNPATENTED_HINTING_H  <ttunpat.h>
 
 
   /*************************************************************************
@@ -766,7 +766,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H  <ftincrem.h>
 
 
   /*************************************************************************
@@ -778,7 +778,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns entries from the TrueType GASP table.
    */
-#define FT_GASP_H  <freetype/ftgasp.h>
+#define FT_GASP_H  <ftgasp.h>
 
 
   /*************************************************************************
@@ -790,38 +790,38 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns individual and ranged glyph advances.
    */
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
+#define FT_ADVANCES_H  <ftadvanc.h>
 
 
   /* */
 
-#define FT_ERROR_DEFINITIONS_H  <freetype/fterrdef.h>
+#define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
 
 
   /* The internals of the cache sub-system are no longer exposed.  We */
   /* default to FT_CACHE_H at the moment just in case, but we know of */
   /* no rogue client that uses them.                                  */
   /*                                                                  */
-#define FT_CACHE_MANAGER_H           <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MRU_H      <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MANAGER_H  <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_CACHE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_GLYPH_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_IMAGE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_SBITS_H    <freetype/ftcache.h>
+#define FT_CACHE_MANAGER_H           <ftcache.h>
+#define FT_CACHE_INTERNAL_MRU_H      <ftcache.h>
+#define FT_CACHE_INTERNAL_MANAGER_H  <ftcache.h>
+#define FT_CACHE_INTERNAL_CACHE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_GLYPH_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_IMAGE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_SBITS_H    <ftcache.h>
 
 
-#define FT_INCREMENTAL_H          <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H          <ftincrem.h>
 
-#define FT_TRUETYPE_UNPATENTED_H  <freetype/ttunpat.h>
+#define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
 
 
   /*
-   * Include internal headers definitions from <freetype/internal/...>
+   * Include internal headers definitions from <internal/...>
    * only when building the library.
    */
 #ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <freetype/internal/internal.h>
+#define  FT_INTERNAL_INTERNAL_H  <internal/internal.h>
 #include FT_INTERNAL_INTERNAL_H
 #endif /* FT2_BUILD_LIBRARY */
 
diff --git a/include/freetype/config/ftmodule.h b/include/config/ftmodule.h
index 76d271a74..76d271a74 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/config/ftmodule.h
diff --git a/include/freetype/config/ftoption.h b/include/config/ftoption.h
index 0883c69e4..fe2ba15b4 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/config/ftoption.h
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
   /*    library from a single source directory.                            */
   /*                                                                       */
   /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
   /*                                                                       */
   /*    The default FreeType Makefiles and Jamfiles use the build          */
   /*    directory `builds/<system>' by default, but you can easily change  */
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <config/ftheader.h>                                     */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <config/ftmodule.h>.                         */
   /*                                                                       */
   /*  We highly recommend using the third method whenever possible.        */
   /*                                                                       */
@@ -528,7 +528,7 @@ FT_BEGIN_HEADER
   /* does not contain any glyph name though.                               */
   /*                                                                       */
   /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftsnames.h'.                                                */
+  /* `ftsnames.h'.                                                         */
   /*                                                                       */
 #define TT_CONFIG_OPTION_SFNT_NAMES
 
diff --git a/include/freetype/config/ftstdlib.h b/include/config/ftstdlib.h
index b940efc42..b940efc42 100644
--- a/include/freetype/config/ftstdlib.h
+++ b/include/config/ftstdlib.h
diff --git a/include/freetype/freetype.h b/include/freetype.h
index 1797bbee1..d2eba4a61 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype.h
@@ -3027,7 +3027,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    This function is not compiled within the library if the config     */
   /*    macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in              */
-  /*    `include/freetype/config/ftoptions.h'.                             */
+  /*    `ftoptions.h'.                                                     */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Get_Glyph_Name( FT_Face     face,
diff --git a/include/ft2build.h b/include/ft2build.h
index 923d887df..fafe50afd 100644
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -5,7 +5,7 @@
 /*    FreeType 2 build and setup macros.                                   */
 /*    (Generic version)                                                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2006 by                                           */
+/*  Copyright 1996-2001, 2006, 2013 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -31,7 +31,7 @@
 #ifndef __FT2_BUILD_GENERIC_H__
 #define __FT2_BUILD_GENERIC_H__
 
-#include <freetype/config/ftheader.h>
+#include <config/ftheader.h>
 
 #endif /* __FT2_BUILD_GENERIC_H__ */
 
diff --git a/include/freetype/ftadvanc.h b/include/ftadvanc.h
index 8f7e2fce5..8f7e2fce5 100644
--- a/include/freetype/ftadvanc.h
+++ b/include/ftadvanc.h
diff --git a/include/freetype/ftautoh.h b/include/ftautoh.h
index bf97b3f24..bf97b3f24 100644
--- a/include/freetype/ftautoh.h
+++ b/include/ftautoh.h
diff --git a/include/freetype/ftbbox.h b/include/ftbbox.h
index 8938841a6..8938841a6 100644
--- a/include/freetype/ftbbox.h
+++ b/include/ftbbox.h
diff --git a/include/freetype/ftbdf.h b/include/ftbdf.h
index 4f8baf840..4f8baf840 100644
--- a/include/freetype/ftbdf.h
+++ b/include/ftbdf.h
diff --git a/include/freetype/ftbitmap.h b/include/ftbitmap.h
index 7dbf5ba3f..7dbf5ba3f 100644
--- a/include/freetype/ftbitmap.h
+++ b/include/ftbitmap.h
diff --git a/include/freetype/ftbzip2.h b/include/ftbzip2.h
index 1bf81b15e..1bf81b15e 100644
--- a/include/freetype/ftbzip2.h
+++ b/include/ftbzip2.h
diff --git a/include/freetype/ftcache.h b/include/ftcache.h
index a5d7100a3..a5d7100a3 100644
--- a/include/freetype/ftcache.h
+++ b/include/ftcache.h
diff --git a/include/freetype/ftcffdrv.h b/include/ftcffdrv.h
index e4d039d02..e4d039d02 100644
--- a/include/freetype/ftcffdrv.h
+++ b/include/ftcffdrv.h
diff --git a/include/freetype/ftchapters.h b/include/ftchapters.h
index 4b1059a85..4b1059a85 100644
--- a/include/freetype/ftchapters.h
+++ b/include/ftchapters.h
diff --git a/include/freetype/ftcid.h b/include/ftcid.h
index 203a30caf..203a30caf 100644
--- a/include/freetype/ftcid.h
+++ b/include/ftcid.h
diff --git a/include/freetype/fterrdef.h b/include/fterrdef.h
index 76c7b9e36..76c7b9e36 100644
--- a/include/freetype/fterrdef.h
+++ b/include/fterrdef.h
diff --git a/include/freetype/fterrors.h b/include/fterrors.h
index 0fa3e4dce..0fa3e4dce 100644
--- a/include/freetype/fterrors.h
+++ b/include/fterrors.h
diff --git a/include/freetype/ftgasp.h b/include/ftgasp.h
index 453d4fa42..453d4fa42 100644
--- a/include/freetype/ftgasp.h
+++ b/include/ftgasp.h
diff --git a/include/freetype/ftglyph.h b/include/ftglyph.h
index 2d30ed9de..2d30ed9de 100644
--- a/include/freetype/ftglyph.h
+++ b/include/ftglyph.h
diff --git a/include/freetype/ftgxval.h b/include/ftgxval.h
index 6d38e327a..6d38e327a 100644
--- a/include/freetype/ftgxval.h
+++ b/include/ftgxval.h
diff --git a/include/freetype/ftgzip.h b/include/ftgzip.h
index 78e726999..78e726999 100644
--- a/include/freetype/ftgzip.h
+++ b/include/ftgzip.h
diff --git a/include/freetype/ftimage.h b/include/ftimage.h
index 14ab5c46a..ea71a78ef 100644
--- a/include/freetype/ftimage.h
+++ b/include/ftimage.h
@@ -836,8 +836,8 @@ FT_BEGIN_HEADER
   /* a a bitmap.  This section contains the public API for rasters.        */
   /*                                                                       */
   /* Note that in FreeType 2, all rasters are now encapsulated within      */
-  /* specific modules called `renderers'.  See `freetype/ftrender.h' for   */
-  /* more details on renderers.                                            */
+  /* specific modules called `renderers'.  See `ftrender.h' for more       */
+  /* details on renderers.                                                 */
   /*                                                                       */
   /*************************************************************************/
 
diff --git a/include/freetype/ftincrem.h b/include/ftincrem.h
index aaf689ff1..aaf689ff1 100644
--- a/include/freetype/ftincrem.h
+++ b/include/ftincrem.h
diff --git a/include/freetype/ftlcdfil.h b/include/ftlcdfil.h
index 39206f019..39206f019 100644
--- a/include/freetype/ftlcdfil.h
+++ b/include/ftlcdfil.h
diff --git a/include/freetype/ftlist.h b/include/ftlist.h
index 241e21e55..241e21e55 100644
--- a/include/freetype/ftlist.h
+++ b/include/ftlist.h
diff --git a/include/freetype/ftlzw.h b/include/ftlzw.h
index 00d40169a..00d40169a 100644
--- a/include/freetype/ftlzw.h
+++ b/include/ftlzw.h
diff --git a/include/freetype/ftmac.h b/include/ftmac.h
index ad0d347f9..42874fe6f 100644
--- a/include/freetype/ftmac.h
+++ b/include/ftmac.h
@@ -18,7 +18,7 @@
 
 /***************************************************************************/
 /*                                                                         */
-/* NOTE: Include this file after <freetype/freetype.h> and after any       */
+/* NOTE: Include this file after FT_FREETYPE_H and after any               */
 /*       Mac-specific headers (because this header uses Mac types such as  */
 /*       Handle, FSSpec, FSRef, etc.)                                      */
 /*                                                                         */
diff --git a/include/freetype/ftmm.h b/include/ftmm.h
index 837975a0b..837975a0b 100644
--- a/include/freetype/ftmm.h
+++ b/include/ftmm.h
diff --git a/include/freetype/ftmodapi.h b/include/ftmodapi.h
index 22878f8c6..22878f8c6 100644
--- a/include/freetype/ftmodapi.h
+++ b/include/ftmodapi.h
diff --git a/include/freetype/ftmoderr.h b/include/ftmoderr.h
index 5a27db151..5a27db151 100644
--- a/include/freetype/ftmoderr.h
+++ b/include/ftmoderr.h
diff --git a/include/freetype/ftotval.h b/include/ftotval.h
index bb52dc4a0..bb52dc4a0 100644
--- a/include/freetype/ftotval.h
+++ b/include/ftotval.h
diff --git a/include/freetype/ftoutln.h b/include/ftoutln.h
index 8c7c57d99..8c7c57d99 100644
--- a/include/freetype/ftoutln.h
+++ b/include/ftoutln.h
diff --git a/include/freetype/ftpfr.h b/include/ftpfr.h
index 0b7b7d427..0b7b7d427 100644
--- a/include/freetype/ftpfr.h
+++ b/include/ftpfr.h
diff --git a/include/freetype/ftrender.h b/include/ftrender.h
index dd0229b81..dd0229b81 100644
--- a/include/freetype/ftrender.h
+++ b/include/ftrender.h
diff --git a/include/freetype/ftsizes.h b/include/ftsizes.h
index 416704570..416704570 100644
--- a/include/freetype/ftsizes.h
+++ b/include/ftsizes.h
diff --git a/include/freetype/ftsnames.h b/include/ftsnames.h
index 88af44035..88af44035 100644
--- a/include/freetype/ftsnames.h
+++ b/include/ftsnames.h
diff --git a/include/freetype/ftstroke.h b/include/ftstroke.h
index a498e4a88..a498e4a88 100644
--- a/include/freetype/ftstroke.h
+++ b/include/ftstroke.h
diff --git a/include/freetype/ftsynth.h b/include/ftsynth.h
index 839ab5e40..839ab5e40 100644
--- a/include/freetype/ftsynth.h
+++ b/include/ftsynth.h
diff --git a/include/freetype/ftsystem.h b/include/ftsystem.h
index e07460c55..e07460c55 100644
--- a/include/freetype/ftsystem.h
+++ b/include/ftsystem.h
diff --git a/include/freetype/fttrigon.h b/include/fttrigon.h
index 65143cb8c..65143cb8c 100644
--- a/include/freetype/fttrigon.h
+++ b/include/fttrigon.h
diff --git a/include/freetype/ftttdrv.h b/include/ftttdrv.h
index 8d9c16c19..8d9c16c19 100644
--- a/include/freetype/ftttdrv.h
+++ b/include/ftttdrv.h
diff --git a/include/freetype/fttypes.h b/include/fttypes.h
index bd944a493..bd944a493 100644
--- a/include/freetype/fttypes.h
+++ b/include/fttypes.h
diff --git a/include/freetype/ftwinfnt.h b/include/ftwinfnt.h
index 0b6735179..0b6735179 100644
--- a/include/freetype/ftwinfnt.h
+++ b/include/ftwinfnt.h
diff --git a/include/freetype/ftxf86.h b/include/ftxf86.h
index 493cccdd0..493cccdd0 100644
--- a/include/freetype/ftxf86.h
+++ b/include/ftxf86.h
diff --git a/include/freetype/internal/autohint.h b/include/internal/autohint.h
index 545de938c..545de938c 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/internal/autohint.h
diff --git a/include/freetype/internal/ftcalc.h b/include/internal/ftcalc.h
index 03bd68eb1..03bd68eb1 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/internal/ftcalc.h
diff --git a/include/freetype/internal/ftdebug.h b/include/internal/ftdebug.h
index 58a3916d7..58a3916d7 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/internal/ftdebug.h
diff --git a/include/freetype/internal/ftdriver.h b/include/internal/ftdriver.h
index 940218e62..940218e62 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/internal/ftdriver.h
diff --git a/include/freetype/internal/ftgloadr.h b/include/internal/ftgloadr.h
index ce4dc6c9c..ce4dc6c9c 100644
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/internal/ftgloadr.h
diff --git a/include/freetype/internal/ftmemory.h b/include/internal/ftmemory.h
index 3d51aeec6..3d51aeec6 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/internal/ftmemory.h
diff --git a/include/freetype/internal/ftobjs.h b/include/internal/ftobjs.h
index 701c850eb..701c850eb 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/internal/ftobjs.h
diff --git a/include/freetype/internal/ftpic.h b/include/internal/ftpic.h
index 485ce7a24..485ce7a24 100644
--- a/include/freetype/internal/ftpic.h
+++ b/include/internal/ftpic.h
diff --git a/include/freetype/internal/ftrfork.h b/include/internal/ftrfork.h
index 6307f2d0c..6307f2d0c 100644
--- a/include/freetype/internal/ftrfork.h
+++ b/include/internal/ftrfork.h
diff --git a/include/freetype/internal/ftserv.h b/include/internal/ftserv.h
index cd5fbd0fa..1203ec812 100644
--- a/include/freetype/internal/ftserv.h
+++ b/include/internal/ftserv.h
@@ -734,24 +734,24 @@ FT_BEGIN_HEADER
    *  The header files containing the services.
    */
 
-#define FT_SERVICE_BDF_H                <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_CID_H                <freetype/internal/services/svcid.h>
-#define FT_SERVICE_GLYPH_DICT_H         <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_GX_VALIDATE_H        <freetype/internal/services/svgxval.h>
-#define FT_SERVICE_KERNING_H            <freetype/internal/services/svkern.h>
-#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype/internal/services/svmm.h>
-#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype/internal/services/svotval.h>
-#define FT_SERVICE_PFR_H                <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_PROPERTIES_H         <freetype/internal/services/svprop.h>
-#define FT_SERVICE_SFNT_H               <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype/internal/services/svtteng.h>
-#define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
-#define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
-#define FT_SERVICE_XFREE86_NAME_H       <freetype/internal/services/svxf86nm.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
+#define FT_SERVICE_BDF_H                <internal/services/svbdf.h>
+#define FT_SERVICE_CID_H                <internal/services/svcid.h>
+#define FT_SERVICE_GLYPH_DICT_H         <internal/services/svgldict.h>
+#define FT_SERVICE_GX_VALIDATE_H        <internal/services/svgxval.h>
+#define FT_SERVICE_KERNING_H            <internal/services/svkern.h>
+#define FT_SERVICE_MULTIPLE_MASTERS_H   <internal/services/svmm.h>
+#define FT_SERVICE_OPENTYPE_VALIDATE_H  <internal/services/svotval.h>
+#define FT_SERVICE_PFR_H                <internal/services/svpfr.h>
+#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <internal/services/svpscmap.h>
+#define FT_SERVICE_POSTSCRIPT_INFO_H    <internal/services/svpsinfo.h>
+#define FT_SERVICE_POSTSCRIPT_NAME_H    <internal/services/svpostnm.h>
+#define FT_SERVICE_PROPERTIES_H         <internal/services/svprop.h>
+#define FT_SERVICE_SFNT_H               <internal/services/svsfnt.h>
+#define FT_SERVICE_TRUETYPE_ENGINE_H    <internal/services/svtteng.h>
+#define FT_SERVICE_TT_CMAP_H            <internal/services/svttcmap.h>
+#define FT_SERVICE_WINFNT_H             <internal/services/svwinfnt.h>
+#define FT_SERVICE_XFREE86_NAME_H       <internal/services/svxf86nm.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <internal/services/svttglyf.h>
 
  /* */
 
diff --git a/include/freetype/internal/ftstream.h b/include/internal/ftstream.h
index 266185832..266185832 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/internal/ftstream.h
diff --git a/include/freetype/internal/fttrace.h b/include/internal/fttrace.h
index a9d98b60a..a9d98b60a 100644
--- a/include/freetype/internal/fttrace.h
+++ b/include/internal/fttrace.h
diff --git a/include/freetype/internal/ftvalid.h b/include/internal/ftvalid.h
index 12ad03685..12ad03685 100644
--- a/include/freetype/internal/ftvalid.h
+++ b/include/internal/ftvalid.h
diff --git a/include/freetype/internal/internal.h b/include/internal/internal.h
index 262afcfa8..e0ddb06b7 100644
--- a/include/freetype/internal/internal.h
+++ b/include/internal/internal.h
@@ -24,28 +24,28 @@
   /*************************************************************************/
 
 
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_PIC_H                 <freetype/internal/ftpic.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-#define FT_INTERNAL_RFORK_H               <freetype/internal/ftrfork.h>
-#define FT_INTERNAL_VALIDATE_H            <freetype/internal/ftvalid.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype/internal/psglobal.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
+#define FT_INTERNAL_OBJECTS_H             <internal/ftobjs.h>
+#define FT_INTERNAL_PIC_H                 <internal/ftpic.h>
+#define FT_INTERNAL_STREAM_H              <internal/ftstream.h>
+#define FT_INTERNAL_MEMORY_H              <internal/ftmemory.h>
+#define FT_INTERNAL_DEBUG_H               <internal/ftdebug.h>
+#define FT_INTERNAL_CALC_H                <internal/ftcalc.h>
+#define FT_INTERNAL_DRIVER_H              <internal/ftdriver.h>
+#define FT_INTERNAL_TRACE_H               <internal/fttrace.h>
+#define FT_INTERNAL_GLYPH_LOADER_H        <internal/ftgloadr.h>
+#define FT_INTERNAL_SFNT_H                <internal/sfnt.h>
+#define FT_INTERNAL_SERVICE_H             <internal/ftserv.h>
+#define FT_INTERNAL_RFORK_H               <internal/ftrfork.h>
+#define FT_INTERNAL_VALIDATE_H            <internal/ftvalid.h>
+
+#define FT_INTERNAL_TRUETYPE_TYPES_H      <internal/tttypes.h>
+#define FT_INTERNAL_TYPE1_TYPES_H         <internal/t1types.h>
+
+#define FT_INTERNAL_POSTSCRIPT_AUX_H      <internal/psaux.h>
+#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <internal/pshints.h>
+#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <internal/psglobal.h>
+
+#define FT_INTERNAL_AUTOHINT_H            <internal/autohint.h>
 
 
 #if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
diff --git a/include/freetype/internal/psaux.h b/include/internal/psaux.h
index e903114f8..e903114f8 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/internal/psaux.h
diff --git a/include/freetype/internal/pshints.h b/include/internal/pshints.h
index 3fb18dc2d..3fb18dc2d 100644
--- a/include/freetype/internal/pshints.h
+++ b/include/internal/pshints.h
diff --git a/include/freetype/internal/services/svbdf.h b/include/internal/services/svbdf.h
index 0974752a7..0974752a7 100644
--- a/include/freetype/internal/services/svbdf.h
+++ b/include/internal/services/svbdf.h
diff --git a/include/freetype/internal/services/svcid.h b/include/internal/services/svcid.h
index 6be3f9374..6be3f9374 100644
--- a/include/freetype/internal/services/svcid.h
+++ b/include/internal/services/svcid.h
diff --git a/include/freetype/internal/services/svgldict.h b/include/internal/services/svgldict.h
index 1d1253472..1d1253472 100644
--- a/include/freetype/internal/services/svgldict.h
+++ b/include/internal/services/svgldict.h
diff --git a/include/freetype/internal/services/svgxval.h b/include/internal/services/svgxval.h
index 2cdab5065..2cdab5065 100644
--- a/include/freetype/internal/services/svgxval.h
+++ b/include/internal/services/svgxval.h
diff --git a/include/freetype/internal/services/svkern.h b/include/internal/services/svkern.h
index 1488adf49..1488adf49 100644
--- a/include/freetype/internal/services/svkern.h
+++ b/include/internal/services/svkern.h
diff --git a/include/freetype/internal/services/svmm.h b/include/internal/services/svmm.h
index b08a663d6..b08a663d6 100644
--- a/include/freetype/internal/services/svmm.h
+++ b/include/internal/services/svmm.h
diff --git a/include/freetype/internal/services/svotval.h b/include/internal/services/svotval.h
index 970bbd575..970bbd575 100644
--- a/include/freetype/internal/services/svotval.h
+++ b/include/internal/services/svotval.h
diff --git a/include/freetype/internal/services/svpfr.h b/include/internal/services/svpfr.h
index 462786f9c..462786f9c 100644
--- a/include/freetype/internal/services/svpfr.h
+++ b/include/internal/services/svpfr.h
diff --git a/include/freetype/internal/services/svpostnm.h b/include/internal/services/svpostnm.h
index a76b4fe05..a76b4fe05 100644
--- a/include/freetype/internal/services/svpostnm.h
+++ b/include/internal/services/svpostnm.h
diff --git a/include/freetype/internal/services/svprop.h b/include/internal/services/svprop.h
index 22da0bbc6..22da0bbc6 100644
--- a/include/freetype/internal/services/svprop.h
+++ b/include/internal/services/svprop.h
diff --git a/include/freetype/internal/services/svpscmap.h b/include/internal/services/svpscmap.h
index 030948ea6..030948ea6 100644
--- a/include/freetype/internal/services/svpscmap.h
+++ b/include/internal/services/svpscmap.h
diff --git a/include/freetype/internal/services/svpsinfo.h b/include/internal/services/svpsinfo.h
index 4bfb50671..4bfb50671 100644
--- a/include/freetype/internal/services/svpsinfo.h
+++ b/include/internal/services/svpsinfo.h
diff --git a/include/freetype/internal/services/svsfnt.h b/include/internal/services/svsfnt.h
index d3835aa1c..d3835aa1c 100644
--- a/include/freetype/internal/services/svsfnt.h
+++ b/include/internal/services/svsfnt.h
diff --git a/include/freetype/internal/services/svttcmap.h b/include/internal/services/svttcmap.h
index 83994aaf8..4370f4c2d 100644
--- a/include/freetype/internal/services/svttcmap.h
+++ b/include/internal/services/svttcmap.h
@@ -7,7 +7,7 @@
 /*  Copyright 2003 by                                                      */
 /*  Masatake YAMATO, Redhat K.K.                                           */
 /*                                                                         */
-/*  Copyright 2003, 2008, 2009, 2012 by                                    */
+/*  Copyright 2003, 2008, 2009, 2012, 2013 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -47,7 +47,7 @@ FT_BEGIN_HEADER
   /* <Fields>                                                              */
   /*    language ::                                                        */
   /*      The language ID used in Mac fonts.  Definitions of values are in */
-  /*      freetype/ttnameid.h.                                             */
+  /*      `ttnameid.h'.                                                    */
   /*                                                                       */
   /*    format ::                                                          */
   /*      The cmap format.  OpenType 1.5 defines the formats 0 (byte       */
diff --git a/include/freetype/internal/services/svtteng.h b/include/internal/services/svtteng.h
index 58e02a6f9..58e02a6f9 100644
--- a/include/freetype/internal/services/svtteng.h
+++ b/include/internal/services/svtteng.h
diff --git a/include/freetype/internal/services/svttglyf.h b/include/internal/services/svttglyf.h
index 369eb8421..369eb8421 100644
--- a/include/freetype/internal/services/svttglyf.h
+++ b/include/internal/services/svttglyf.h
diff --git a/include/freetype/internal/services/svwinfnt.h b/include/internal/services/svwinfnt.h
index 57f7765d9..57f7765d9 100644
--- a/include/freetype/internal/services/svwinfnt.h
+++ b/include/internal/services/svwinfnt.h
diff --git a/include/freetype/internal/services/svxf86nm.h b/include/internal/services/svxf86nm.h
index ca5d884a8..ca5d884a8 100644
--- a/include/freetype/internal/services/svxf86nm.h
+++ b/include/internal/services/svxf86nm.h
diff --git a/include/freetype/internal/sfnt.h b/include/internal/sfnt.h
index 6b5e41f1a..6b5e41f1a 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/internal/sfnt.h
diff --git a/include/freetype/internal/t1types.h b/include/internal/t1types.h
index e20237c14..e20237c14 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/internal/t1types.h
diff --git a/include/freetype/internal/tttypes.h b/include/internal/tttypes.h
index f4da3f956..f4da3f956 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/internal/tttypes.h
diff --git a/include/freetype/t1tables.h b/include/t1tables.h
index a14255e5f..a14255e5f 100644
--- a/include/freetype/t1tables.h
+++ b/include/t1tables.h
diff --git a/include/freetype/ttnameid.h b/include/ttnameid.h
index 9711d1d94..9711d1d94 100644
--- a/include/freetype/ttnameid.h
+++ b/include/ttnameid.h
diff --git a/include/freetype/tttables.h b/include/tttables.h
index 8d4b202c1..a2077be1a 100644
--- a/include/freetype/tttables.h
+++ b/include/tttables.h
@@ -740,7 +740,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Return TrueType/sfnt specific cmap language ID.  Definitions of    */
-  /*    language ID values are in `freetype/ttnameid.h'.                   */
+  /*    language ID values are in `ttnameid.h'.                            */
   /*                                                                       */
   /* <Input>                                                               */
   /*    charmap ::                                                         */
diff --git a/include/freetype/tttags.h b/include/tttags.h
index d59aa19a3..d59aa19a3 100644
--- a/include/freetype/tttags.h
+++ b/include/tttags.h
diff --git a/include/freetype/ttunpat.h b/include/ttunpat.h
index a0162759b..a0162759b 100644
--- a/include/freetype/ttunpat.h
+++ b/include/ttunpat.h