Another adjustment to header locations.

This change is a result of a discussion thread on freetype-devel

  http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html

Re-introduce the `freetype2' subdirectory for all FreeType header
files after installation, and rename the `freetype2' subdirectory in
the git repository to `freetype'.

* include/freetype2: Renamed to...
* include/freetype: This.

* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS): Updated.
Update creation of `ftconfig.h'.
Install generated `ftconfig.h'.

* Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.

* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/freetype2.in: Updated.

* builds/unix/freetype-config.in: Updated.
* builds/unix/configure.raw: Don't check for `rmdir'.
* builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable
according to the autoconf info manual.
* builds/unix/install.mk (install, uninstall,
distclean_project_unix): Update and simplify.

* builds/wince/*, builds/windows/*: Updated.

* devel/ft2build.h, include/ft2build.h: Updated.

* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.

* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.

* docs/*: Updated.

27 files changed, 143 insertions, 159 deletions

diff --git a/builds/amiga/README b/builds/amiga/README
index 3ee605701..d0e5ec5d6 100644
--- a/builds/amiga/README
+++ b/builds/amiga/README
@@ -51,7 +51,7 @@ directory.  The results are:
 
 - ftdebug.o, an object module containing the standard version of the
   debugging code which uses vprintf() and exit() (not pure).
-  Debugging can be turned on in FT:include/freetype2/config/ftoption.h
+  Debugging can be turned on in FT:include/freetype/config/ftoption.h
   and with FT_SetTraceLevel().
 
 - ftdebugpure.o, an object module containing the pure version of the
@@ -65,13 +65,13 @@ directory.  The results are:
   program, I decided to use a different scheme: You must #include
   FT:src/base/ftinit.c in your sourcecode and specify with #define
   statements which modules you need.  See
-  include/freetype2/config/ftmodule.h.
+  include/freetype/config/ftmodule.h.
 
 
 To use in your own programs:
 
 - Insert the #define and #include statements from top of
-  include/freetype2/config/ftmodule.h in your source code and
+  include/freetype/config/ftmodule.h in your source code and
   uncomment the #define statements for the FreeType2 modules you need.
 
 - You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
@@ -101,7 +101,7 @@ To adapt to other compilers:
   useful for the src directory).
 
 - An example of how to replace/workaround a problematic include file
-  is include/freetype2/config/ftconfig.h; it changes a #define that
+  is include/freetype/config/ftconfig.h; it changes a #define that
   would prevent SAS/C from generating XDEF's where it should do that and
   then includes the standard FreeType2 include file.
 
diff --git a/builds/amiga/include/config/ftconfig.h b/builds/amiga/include/config/ftconfig.h
index 2f66ff7d5..5ad8ded0f 100644
--- a/builds/amiga/include/config/ftconfig.h
+++ b/builds/amiga/include/config/ftconfig.h
@@ -34,9 +34,9 @@
 /* Now include the original file */
 #ifndef __MORPHOS__
 #ifdef __SASC
-#include "FT:include/freetype2/config/ftconfig.h"
+#include "FT:include/freetype/config/ftconfig.h"
 #else
-#include "/FT/include/freetype2/config/ftconfig.h"
+#include "/FT/include/freetype/config/ftconfig.h"
 #endif
 #else
 /* We must define that, it seems that
@@ -45,7 +45,7 @@
  * binaries from http://www.morphos.de)
  */
 #define _LIBC_LIMITS_H_
-#include "/FT/include/freetype2/config/ftconfig.h"
+#include "/FT/include/freetype/config/ftconfig.h"
 #endif
 
 /*
diff --git a/builds/amiga/makefile b/builds/amiga/makefile
index 7ff3cab9a..038e4686a 100644
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@@ -43,7 +43,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
 
 all:	libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
 
diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4
index 5350be67e..b7930558e 100644
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@@ -40,7 +40,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
 
 all:	assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
 
diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile
index 1081ab03f..145b1ad6e 100644
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@@ -40,7 +40,7 @@
 #
 # link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
 # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
 
 OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
 	  ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o           \
diff --git a/builds/amiga/src/base/ftdebug.c b/builds/amiga/src/base/ftdebug.c
index f48910af4..14c353e3c 100644
--- a/builds/amiga/src/base/ftdebug.c
+++ b/builds/amiga/src/base/ftdebug.c
@@ -176,8 +176,8 @@
   /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <include/freetype2/internal/fttrace.h> for details of    */
-  /* the available toggle names.                                           */
+  /* See the file `include/freetype/internal/fttrace.h' for details of the */
+  /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 7; 0 means quiet (except for serious  */
   /* runtime errors), and 7 means _very_ verbose.                          */
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 7f9e056be..1cc7e29bc 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base
 
 # Other derived directories.
 #
-PUBLIC_DIR   := $(TOP_DIR)/include/freetype2
+PUBLIC_DIR   := $(TOP_DIR)/include/freetype
 INTERNAL_DIR := $(PUBLIC_DIR)/internal
 SERVICES_DIR := $(INTERNAL_DIR)/services
 CONFIG_DIR   := $(PUBLIC_DIR)/config
@@ -175,7 +175,7 @@ OBJECTS_LIST :=
 
 
 # Define $(PUBLIC_H) as the list of all public header files located in
-# `$(TOP_DIR)/include/freetype2'.  $(INTERNAL_H), and $(CONFIG_H) are defined
+# `$(TOP_DIR)/include/freetype'.  $(INTERNAL_H), and $(CONFIG_H) are defined
 # similarly.
 #
 # This is used to simplify the dependency rules -- if one of these files
diff --git a/builds/symbian/bld.inf b/builds/symbian/bld.inf
index 4480d5037..b5aeb1e5b 100644
--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@@ -18,49 +18,49 @@ PRJ_MMPFILES
 freetype.mmp
 
 PRJ_EXPORTS
-../../include/freetype2/ft2build.h
-../../include/freetype2/config/ftconfig.h	config/ftconfig.h
-../../include/freetype2/config/ftheader.h	config/ftheader.h
-../../include/freetype2/config/ftmodule.h	config/ftmodule.h
-../../include/freetype2/config/ftoption.h	config/ftoption.h
-../../include/freetype2/config/ftstdlib.h	config/ftstdlib.h
-../../include/freetype2/freetype.h		freetype.h
-../../include/freetype2/ftbbox.h		ftbbox.h
-../../include/freetype2/ftbdf.h			ftbdf.h
-../../include/freetype2/ftbitmap.h		ftbitmap.h
-../../include/freetype2/ftcache.h		ftcache.h
-../../include/freetype2/ftcid.h			ftcid.h
-../../include/freetype2/fterrdef.h		fterrdef.h
-../../include/freetype2/fterrors.h		fterrors.h
-../../include/freetype2/ftfntfmt.h		ftfntfmt.h
-../../include/freetype2/ftgasp.h		ftgasp.h
-../../include/freetype2/ftglyph.h		ftglyph.h
-../../include/freetype2/ftgxval.h		ftgxval.h
-../../include/freetype2/ftgzip.h		ftgzip.h
-../../include/freetype2/ftbzip2.h		ftbzip2.h
-../../include/freetype2/ftimage.h		ftimage.h
-../../include/freetype2/ftincrem.h		ftincrem.h
-../../include/freetype2/ftlcdfil.h		ftlcdfil.h
-../../include/freetype2/ftlist.h		ftlist.h
-../../include/freetype2/ftlzw.h			ftlzw.h
-../../include/freetype2/ftmac.h			ftmac.h
-../../include/freetype2/ftmm.h			ftmm.h
-../../include/freetype2/ftmodapi.h		ftmodapi.h
-../../include/freetype2/ftmoderr.h		ftmoderr.h
-../../include/freetype2/ftotval.h		ftotval.h
-../../include/freetype2/ftoutln.h		ftoutln.h
-../../include/freetype2/ftpfr.h			ftpfr.h
-../../include/freetype2/ftrender.h		ftrender.h
-../../include/freetype2/ftsizes.h		ftsizes.h
-../../include/freetype2/ftsnames.h		ftsnames.h
-../../include/freetype2/ftstroke.h		ftstroke.h
-../../include/freetype2/ftsynth.h		ftsynth.h
-../../include/freetype2/ftsystem.h		ftsystem.h
-../../include/freetype2/fttrigon.h		fttrigon.h
-../../include/freetype2/fttypes.h		fttypes.h
-../../include/freetype2/ftwinfnt.h		ftwinfnt.h
-../../include/freetype2/t1tables.h		t1tables.h
-../../include/freetype2/ttnameid.h		ttnameid.h
-../../include/freetype2/tttables.h		tttables.h
-../../include/freetype2/tttags.h		tttags.h
-../../include/freetype2/ttunpat.h		ttunpat.h
+../../include/freetype/ft2build.h
+../../include/freetype/config/ftconfig.h	config/ftconfig.h
+../../include/freetype/config/ftheader.h	config/ftheader.h
+../../include/freetype/config/ftmodule.h	config/ftmodule.h
+../../include/freetype/config/ftoption.h	config/ftoption.h
+../../include/freetype/config/ftstdlib.h	config/ftstdlib.h
+../../include/freetype/freetype.h		freetype.h
+../../include/freetype/ftbbox.h			ftbbox.h
+../../include/freetype/ftbdf.h			ftbdf.h
+../../include/freetype/ftbitmap.h		ftbitmap.h
+../../include/freetype/ftcache.h		ftcache.h
+../../include/freetype/ftcid.h			ftcid.h
+../../include/freetype/fterrdef.h		fterrdef.h
+../../include/freetype/fterrors.h		fterrors.h
+../../include/freetype/ftfntfmt.h		ftfntfmt.h
+../../include/freetype/ftgasp.h			ftgasp.h
+../../include/freetype/ftglyph.h		ftglyph.h
+../../include/freetype/ftgxval.h		ftgxval.h
+../../include/freetype/ftgzip.h			ftgzip.h
+../../include/freetype/ftbzip2.h		ftbzip2.h
+../../include/freetype/ftimage.h		ftimage.h
+../../include/freetype/ftincrem.h		ftincrem.h
+../../include/freetype/ftlcdfil.h		ftlcdfil.h
+../../include/freetype/ftlist.h			ftlist.h
+../../include/freetype/ftlzw.h			ftlzw.h
+../../include/freetype/ftmac.h			ftmac.h
+../../include/freetype/ftmm.h			ftmm.h
+../../include/freetype/ftmodapi.h		ftmodapi.h
+../../include/freetype/ftmoderr.h		ftmoderr.h
+../../include/freetype/ftotval.h		ftotval.h
+../../include/freetype/ftoutln.h		ftoutln.h
+../../include/freetype/ftpfr.h			ftpfr.h
+../../include/freetype/ftrender.h		ftrender.h
+../../include/freetype/ftsizes.h		ftsizes.h
+../../include/freetype/ftsnames.h		ftsnames.h
+../../include/freetype/ftstroke.h		ftstroke.h
+../../include/freetype/ftsynth.h		ftsynth.h
+../../include/freetype/ftsystem.h		ftsystem.h
+../../include/freetype/fttrigon.h		fttrigon.h
+../../include/freetype/fttypes.h		fttypes.h
+../../include/freetype/ftwinfnt.h		ftwinfnt.h
+../../include/freetype/t1tables.h		t1tables.h
+../../include/freetype/ttnameid.h		ttnameid.h
+../../include/freetype/tttables.h		tttables.h
+../../include/freetype/tttags.h			tttags.h
+../../include/freetype/ttunpat.h		ttunpat.h
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 05d7ec8dc..243c11330 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -172,7 +172,7 @@ include $(TOP_DIR)/builds/modules.mk
 # get FreeType version string, using a
 # poor man's `sed' emulation with make's built-in string functions
 #
-work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype2/freetype.h))
+work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h))
 work := $(subst |,x,$(work))
 work := $(subst $(space),|,$(work))
 work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index b828bf095..ec9e7e075 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -70,11 +70,6 @@ AC_SUBST(CC_BUILD)
 AC_SUBST(EXEEXT_BUILD)
 
 
-# auxiliary programs
-
-AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
-
-
 # Since this file will be finally moved to another directory we make
 # the path of the install script absolute.  This small code snippet has
 # been taken from automake's `ylwrap' script.
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 912d77965..a28c65876 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -124,22 +124,20 @@ else
 fi
 
 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_MAJOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_MINOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_PATCH \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
   echo $major.$minor.$patch
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  if test "${SYSROOT}$includedir" != "/usr/include"; then
-    echo -I${SYSROOT}$includedir
-  fi
+  echo -I${SYSROOT}$includedir/freetype2
 fi
 
 if test "$echo_libs" = "yes" ; then
diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
index 49541b540..c4dfda4ab 100644
--- a/builds/unix/freetype2.in
+++ b/builds/unix/freetype2.in
@@ -11,4 +11,4 @@ Requires:
 Requires.private: %REQUIRES_PRIVATE%
 Libs: -L${libdir} -lfreetype
 Libs.private: %LIBS_PRIVATE%
-Cflags: -I${includedir}
+Cflags: -I${includedir}/freetype2
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index 03e09db5c..fc5c89ba3 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -86,7 +86,7 @@ FT_BEGIN_HEADER
 #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
 
   /* Following cpp computation of the bit length of int and long */
-  /* is copied from default include/freetype2/config/ftconfig.h. */
+  /* is copied from default include/freetype/config/ftconfig.h.  */
   /* If any improvement is required for this file, it should be  */
   /* applied to the original header file for the builders that   */
   /* do not use configure script.                                */
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 5b4a19ea0..c7a20a35e 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -24,38 +24,34 @@
 
 # Unix installation and deinstallation targets.
 #
-# Note that we remove any data in the `freetype' subdirectory found in
-# `$(includedir)/freetype2', which was the previous location of the header
-# files up to version 2.5.0.
+# Note that we remove any data found in `$(includedir)/freetype2' before
+# installing new files to avoid interferences with files installed by
+# previous FreeType versions (which use slightly different locations).
 #
 install: $(PROJECT_LIBRARY)
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                      \
-                         $(DESTDIR)$(libdir)/pkgconfig            \
-                         $(DESTDIR)$(includedir)/freetype2/config \
-                         $(DESTDIR)$(bindir)                      \
-                         $(DESTDIR)$(datadir)/aclocal             \
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                               \
+                         $(DESTDIR)$(libdir)/pkgconfig                     \
+                         $(DESTDIR)$(includedir)/freetype2/freetype/config \
+                         $(DESTDIR)$(bindir)                               \
+                         $(DESTDIR)$(datadir)/aclocal                      \
                          $(DESTDIR)$(mandir)/man1
 	$(LIBTOOL) --mode=install $(INSTALL)                             \
                                   $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-	-for P in $(PUBLIC_H) ; do                  \
-          $(INSTALL_DATA)                           \
-            $$P $(DESTDIR)$(includedir)/freetype2 ; \
+	-for P in $(PUBLIC_H) ; do                           \
+          $(INSTALL_DATA)                                    \
+            $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
         done
-	-for P in $(CONFIG_H) ; do                         \
-          $(INSTALL_DATA)                                  \
-            $$P $(DESTDIR)$(includedir)/freetype2/config ; \
+	-for P in $(CONFIG_H) ; do                                  \
+          $(INSTALL_DATA)                                           \
+            $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
         done
-	$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \
-          $(DESTDIR)$(includedir)/ft2build.h
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/ft2build.h
-	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h               \
-          $(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
-	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                 \
-          $(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
+	$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h  \
+          $(DESTDIR)$(includedir)/freetype2/ft2build.h
+	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h                        \
+          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
+	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                          \
+          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
 	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
           $(DESTDIR)$(bindir)/freetype-config
 	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
@@ -68,11 +64,7 @@ install: $(PROJECT_LIBRARY)
 
 uninstall:
 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
 	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
 	-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
 	-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
@@ -94,7 +86,6 @@ clean_project_unix:
 
 distclean_project_unix: clean_project_unix
 	-$(DELETE) $(PROJECT_LIBRARY)
-	-$(DELETE) $(OBJ_DIR)/.libs/*
 	-$(DELDIR) $(OBJ_DIR)/.libs
 	-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
 
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index ed9fd1ea8..852968367 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -17,7 +17,7 @@ SHELL := @SHELL@
 TOP_DIR := $(shell cd $(TOP_DIR); pwd)
 
 DELETE := rm -f
-DELDIR := @RMDIR@
+DELDIR := rm -rf
 CAT    := cat
 SEP    := /
 
diff --git a/builds/wince/ftdebug.c b/builds/wince/ftdebug.c
index 74c73b56c..17b4d6145 100644
--- a/builds/wince/ftdebug.c
+++ b/builds/wince/ftdebug.c
@@ -148,8 +148,8 @@
   /* for the memory and stream components which are set to 6 and 5,        */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <internal/fttrace.h> for details of the available toggle */
-  /* names.                                                                */
+  /* See the file `include/freetype/internal/fttrace.h' for details of the */
+  /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 6; 0 means quiet (except for serious  */
   /* runtime errors), and 6 means _very_ verbose.                          */
diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index 210296667..f555dcf42 100644
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj
@@ -3822,15 +3822,15 @@
     <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">

       <File RelativePath="..\..\..\include\ft2build.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftheader.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftoption.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">

       </File>

     </Filter>

   </Files>

diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index 70fa5176a..3032b4b3f 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -13469,23 +13469,23 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"

+				RelativePath="..\..\..\include\freetype\config\ftconfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftheader.h"

+				RelativePath="..\..\..\include\freetype\config\ftheader.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"

+				RelativePath="..\..\..\include\freetype\config\ftmodule.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftoption.h"

+				RelativePath="..\..\..\include\freetype\config\ftoption.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"

+				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"

 				>

 			</File>

 		</Filter>

diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
index 2adcc52b4..09c3b65a7 100644
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@@ -137,8 +137,8 @@
   /* for the memory and stream components which are set to 6 and 5,        */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <internal/fttrace.h> for details of the available toggle */
-  /* names.                                                                */
+  /* See the file `include/freetype/internal/fttrace.h' for details of the */
+  /* available toggle names.                                               */
   /*                                                                       */
   /* The level must be between 0 and 6; 0 means quiet (except for serious  */
   /* runtime errors), and 6 means _very_ verbose.                          */
diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj
index 6cd6cffdc..d02d370fd 100644
--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/vc2005/freetype.vcproj
@@ -629,15 +629,15 @@
     <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">

       <File RelativePath="..\..\..\include\ft2build.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftheader.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftoption.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">

       </File>

-      <File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">

+      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">

       </File>

     </Filter>

   </Files>

diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj
index 15dce3dfd..28cbc1f99 100644
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -2154,23 +2154,23 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"

+				RelativePath="..\..\..\include\freetype\config\ftconfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftheader.h"

+				RelativePath="..\..\..\include\freetype\config\ftheader.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"

+				RelativePath="..\..\..\include\freetype\config\ftmodule.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftoption.h"

+				RelativePath="..\..\..\include\freetype\config\ftoption.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"

+				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"

 				>

 			</File>

 		</Filter>

diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 5fef864b6..2c2556111 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -1706,11 +1706,11 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\include\ft2build.h" />

-    <ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h" />

-    <ClInclude Include="..\..\..\include\freetype2\config\ftheader.h" />

-    <ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h" />

-    <ClInclude Include="..\..\..\include\freetype2\config\ftoption.h" />

-    <ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h" />

+    <ClInclude Include="..\..\..\include\freetype\config\ftconfig.h" />

+    <ClInclude Include="..\..\..\include\freetype\config\ftheader.h" />

+    <ClInclude Include="..\..\..\include\freetype\config\ftmodule.h" />

+    <ClInclude Include="..\..\..\include\freetype\config\ftoption.h" />

+    <ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/builds/windows/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters
index 9b7c0615c..29cb5c906 100644
--- a/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/builds/windows/vc2010/freetype.vcxproj.filters
@@ -136,19 +136,19 @@
     <ClInclude Include="..\..\..\include\ft2build.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h">

+    <ClInclude Include="..\..\..\include\freetype\config\ftconfig.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\include\freetype2\config\ftheader.h">

+    <ClInclude Include="..\..\..\include\freetype\config\ftheader.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h">

+    <ClInclude Include="..\..\..\include\freetype\config\ftmodule.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\include\freetype2\config\ftoption.h">

+    <ClInclude Include="..\..\..\include\freetype\config\ftoption.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h">

+    <ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp
index f41296549..0a7bd7be1 100644
--- a/builds/windows/visualc/freetype.dsp
+++ b/builds/windows/visualc/freetype.dsp
@@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftconfig.h

+SOURCE=..\..\..\include\freetype\config\ftconfig.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftheader.h

+SOURCE=..\..\..\include\freetype\config\ftheader.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftmodule.h

+SOURCE=..\..\..\include\freetype\config\ftmodule.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftoption.h

+SOURCE=..\..\..\include\freetype\config\ftoption.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftstdlib.h

+SOURCE=..\..\..\include\freetype\config\ftstdlib.h

 # End Source File

 # End Group

 # End Target

diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj
index d5baa4b6d..a7da92f6e 100644
--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@@ -2153,23 +2153,23 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"

+				RelativePath="..\..\..\include\freetype\config\ftconfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftheader.h"

+				RelativePath="..\..\..\include\freetype\config\ftheader.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"

+				RelativePath="..\..\..\include\freetype\config\ftmodule.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftoption.h"

+				RelativePath="..\..\..\include\freetype\config\ftoption.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"

+				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"

 				>

 			</File>

 		</Filter>

diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp
index f41296549..0a7bd7be1 100644
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/visualce/freetype.dsp
@@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftconfig.h

+SOURCE=..\..\..\include\freetype\config\ftconfig.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftheader.h

+SOURCE=..\..\..\include\freetype\config\ftheader.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftmodule.h

+SOURCE=..\..\..\include\freetype\config\ftmodule.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftoption.h

+SOURCE=..\..\..\include\freetype\config\ftoption.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\..\include\freetype2\config\ftstdlib.h

+SOURCE=..\..\..\include\freetype\config\ftstdlib.h

 # End Source File

 # End Group

 # End Target

diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj
index dcd384b20..65821d1fa 100644
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -13859,23 +13859,23 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"

+				RelativePath="..\..\..\include\freetype\config\ftconfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftheader.h"

+				RelativePath="..\..\..\include\freetype\config\ftheader.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"

+				RelativePath="..\..\..\include\freetype\config\ftmodule.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftoption.h"

+				RelativePath="..\..\..\include\freetype\config\ftoption.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"

+				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"

 				>

 			</File>

 		</Filter>