128 files changed, 361 insertions, 288 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6631fdeb0..9cd9c8a85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,9 +121,9 @@ execute_process(
   OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h
 )
 
-file(GLOB PUBLIC_HEADERS "include/*.h")
-file(GLOB PUBLIC_CONFIG_HEADERS "include/config/*.h")
-file(GLOB PRIVATE_HEADERS "include/internal/*.h")
+file(GLOB PUBLIC_HEADERS "include/freetype2/*.h")
+file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype2/config/*.h")
+file(GLOB PRIVATE_HEADERS "include/freetype2/internal/*.h")
 
 set(BASE_SRCS
   src/autofit/autofit.c
diff --git a/ChangeLog b/ChangeLog
index 4af98ece7..6fbc2ab1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2015-06-22  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #45097.
+
+	We no longer `pollute' the namespace of possible header file names;
+	instead we move `ft2build.h' up by one level so that it gets
+	installed in the default include directory (e.g.,
+	/usr/local/include).  After this commit, only `ft2build.h' stays in
+	the compiler's include path.
+
+	No visible changes for the user who follows the standard FreeType
+	header inclusion rules.
+
+	* include/*: Move to ...
+	* include/freetype2/*: This directory, except `ft2build.h'.
+
+	* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
+	PRIVATE_HEADERS), 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/install.mk (install, uninstall),
+	builds/unix/freetype2.in: Updated.
+
+	* builds/unix/freetype-config.in: Updated.
+	Emit -I directory only if it is not `/usr/include'.
+
+	* 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.
+
 2015-06-21  Werner Lemberg  <wl@gnu.org>
 
 	Make Jam support work again.
diff --git a/Jamfile b/Jamfile
index 90b1d6805..d42dabc04 100644
--- a/Jamfile
+++ b/Jamfile
@@ -143,9 +143,9 @@ CCFLAGS += -DFT2_BUILD_LIBRARY ;
 # macros that are later used in #include statements.  They need to be parsed
 # in order to record these definitions.
 #
-HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) config ftheader.h ] ;
-HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) internal internal.h ] ;
-HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) internal ftserv.h ] ;
+HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) freetype2 config ftheader.h ] ;
+HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) freetype2 internal internal.h ] ;
+HDRMACRO  [ FT2_SubDir  $(FT2_INCLUDE_DIR) freetype2 internal ftserv.h ] ;
 
 
 # Now include the Jamfile in `freetype2/src', used to drive the compilation
@@ -199,8 +199,8 @@ actions RefDoc
          --prefix=ft2
          --title=FreeType-2.6
          --output=$(DOC_DIR)
-         $(FT2_INCLUDE)/*.h
-         $(FT2_INCLUDE)/config/*.h
+         $(FT2_INCLUDE)/freetype2/*.h
+         $(FT2_INCLUDE)/freetype2/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/autogen.sh b/autogen.sh
index 9729af42d..290dd6083 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
 check_tool_version $AUTOCONF   autoconf   AUTOCONF   2.62
 
 # This sets freetype_major, freetype_minor, and freetype_patch.
-eval `sed -nf version.sed include/freetype.h`
+eval `sed -nf version.sed include/freetype2/freetype.h`
 
 # We set freetype-patch to an empty value if it is zero.
 if test "$freetype_patch" = ".0"; then
diff --git a/builds/amiga/README b/builds/amiga/README
index 1a68b107c..3ee605701 100644
--- a/builds/amiga/README
+++ b/builds/amiga/README
@@ -51,8 +51,8 @@ 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/config/ftoption.h and with
-  FT_SetTraceLevel().
+  Debugging can be turned on in FT:include/freetype2/config/ftoption.h
+  and with FT_SetTraceLevel().
 
 - ftdebugpure.o, an object module containing the pure version of the
   debugging code which uses KVPrintf() from lib:debug.lib and no
@@ -64,14 +64,15 @@ directory.  The results are:
   ftsystem.o would force ALL FreeType2 modules to be linked to your
   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/config/ftmodule.h.
+  statements which modules you need.  See
+  include/freetype2/config/ftmodule.h.
 
 
 To use in your own programs:
 
 - Insert the #define and #include statements from top of
-  include/config/ftmodule.h in your source code and uncomment the
-  #define statements for the FreeType2 modules you need.
+  include/freetype2/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
   calling the FreeType2 functions, because the link library and the
@@ -100,8 +101,8 @@ To adapt to other compilers:
   useful for the src directory).
 
 - An example of how to replace/workaround a problematic include file
-  is include/config/ftconfig.h; it changes a #define that would
-  prevent SAS/C from generating XDEF's where it should do that and
+  is include/freetype2/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.
 
 Local Variables:
diff --git a/builds/amiga/include/config/ftconfig.h b/builds/amiga/include/config/ftconfig.h
index 790eeec82..2f66ff7d5 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/config/ftconfig.h"
+#include "FT:include/freetype2/config/ftconfig.h"
 #else
-#include "/FT/include/config/ftconfig.h"
+#include "/FT/include/freetype2/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/config/ftconfig.h"
+#include "/FT/include/freetype2/config/ftconfig.h"
 #endif
 
 /*
diff --git a/builds/amiga/makefile b/builds/amiga/makefile
index bcb45b9ed..7ff3cab9a 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/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype2/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 481fe5950..5350be67e 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/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype2/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 156beb29f..1081ab03f 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/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/freetype2/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 891a597ae..f48910af4 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/internal/fttrace.h> for details of the          */
-  /* available toggle names.                                               */
+  /* See the file <include/freetype2/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 5ea13f058..7f9e056be 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
+PUBLIC_DIR   := $(TOP_DIR)/include/freetype2
 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/freetype'.  $(INTERNAL_H), and $(CONFIG_H) are defined
+# `$(TOP_DIR)/include/freetype2'.  $(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 d3637f238..4480d5037 100644
--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@@ -18,49 +18,49 @@ PRJ_MMPFILES
 freetype.mmp
 
 PRJ_EXPORTS
-../../include/ft2build.h
-../../include/config/ftconfig.h	config/ftconfig.h
-../../include/config/ftheader.h	config/ftheader.h
-../../include/config/ftmodule.h	config/ftmodule.h
-../../include/config/ftoption.h	config/ftoption.h
-../../include/config/ftstdlib.h	config/ftstdlib.h
-../../include/freetype.h	freetype.h
-../../include/ftbbox.h		ftbbox.h
-../../include/ftbdf.h		ftbdf.h
-../../include/ftbitmap.h	ftbitmap.h
-../../include/ftcache.h		ftcache.h
-../../include/ftcid.h		ftcid.h
-../../include/fterrdef.h	fterrdef.h
-../../include/fterrors.h	fterrors.h
-../../include/ftfntfmt.h	ftfntfmt.h
-../../include/ftgasp.h		ftgasp.h
-../../include/ftglyph.h		ftglyph.h
-../../include/ftgxval.h		ftgxval.h
-../../include/ftgzip.h		ftgzip.h
-../../include/ftbzip2.h		ftbzip2.h
-../../include/ftimage.h		ftimage.h
-../../include/ftincrem.h	ftincrem.h
-../../include/ftlcdfil.h	ftlcdfil.h
-../../include/ftlist.h		ftlist.h
-../../include/ftlzw.h		ftlzw.h
-../../include/ftmac.h		ftmac.h
-../../include/ftmm.h		ftmm.h
-../../include/ftmodapi.h	ftmodapi.h
-../../include/ftmoderr.h	ftmoderr.h
-../../include/ftotval.h		ftotval.h
-../../include/ftoutln.h		ftoutln.h
-../../include/ftpfr.h		ftpfr.h
-../../include/ftrender.h	ftrender.h
-../../include/ftsizes.h		ftsizes.h
-../../include/ftsnames.h	ftsnames.h
-../../include/ftstroke.h	ftstroke.h
-../../include/ftsynth.h		ftsynth.h
-../../include/ftsystem.h	ftsystem.h
-../../include/fttrigon.h	fttrigon.h
-../../include/fttypes.h		fttypes.h
-../../include/ftwinfnt.h	ftwinfnt.h
-../../include/t1tables.h	t1tables.h
-../../include/ttnameid.h	ttnameid.h
-../../include/tttables.h	tttables.h
-../../include/tttags.h		tttags.h
-../../include/ttunpat.h		ttunpat.h
+../../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
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 9fe364db5..05d7ec8dc 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/freetype.h))
+work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype2/freetype.h))
 work := $(subst |,x,$(work))
 work := $(subst $(space),|,$(work))
 work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 269356c96..912d77965 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -137,8 +137,9 @@ if test "$echo_ft_version" = "yes" ; then
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  cflags="-I${SYSROOT}$includedir/freetype2"
-  echo $cflags
+  if test "${SYSROOT}$includedir" != "/usr/include"; then
+    echo -I${SYSROOT}$includedir
+  fi
 fi
 
 if test "$echo_libs" = "yes" ; then
diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
index a488d9609..49541b540 100644
--- a/builds/unix/freetype2.in
+++ b/builds/unix/freetype2.in
@@ -1,7 +1,7 @@
 prefix=%prefix%
 exec_prefix=%exec_prefix%
 libdir=%libdir%
-includedir=%includedir%/freetype2
+includedir=%includedir%
 
 Name: FreeType 2
 URL: http://freetype.org
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index f6d459f2e..c97c06ed7 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/config/ftconfig.h.           */
+  /* is copied from default include/freetype2/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 35cff2021..5b4a19ea0 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -45,10 +45,13 @@ install: $(PROJECT_LIBRARY)
           $(INSTALL_DATA)                                  \
             $$P $(DESTDIR)$(includedir)/freetype2/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                 \
@@ -69,6 +72,7 @@ uninstall:
 	-$(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
diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index a1993b4e6..210296667 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\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftheader.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftheader.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftoption.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftoption.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">
       </File>
     </Filter>
   </Files>
diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index 4faf5b400..70fa5176a 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -13469,23 +13469,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftconfig.h"
+				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftheader.h"
+				RelativePath="..\..\..\include\freetype2\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftmodule.h"
+				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftoption.h"
+				RelativePath="..\..\..\include\freetype2\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftstdlib.h"
+				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj
index eb52ab556..6cd6cffdc 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\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftheader.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftheader.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftoption.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftoption.h">
       </File>
-      <File RelativePath="..\..\..\include\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">
       </File>
     </Filter>
   </Files>
diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj
index 738fe7ccf..15dce3dfd 100644
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -2154,23 +2154,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftconfig.h"
+				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftheader.h"
+				RelativePath="..\..\..\include\freetype2\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftmodule.h"
+				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftoption.h"
+				RelativePath="..\..\..\include\freetype2\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftstdlib.h"
+				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 3fa8cd2d0..5fef864b6 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\config\ftconfig.h" />
-    <ClInclude Include="..\..\..\include\config\ftheader.h" />
-    <ClInclude Include="..\..\..\include\config\ftmodule.h" />
-    <ClInclude Include="..\..\..\include\config\ftoption.h" />
-    <ClInclude Include="..\..\..\include\config\ftstdlib.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" />
   </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 f762b0b54..9b7c0615c 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\config\ftconfig.h">
+    <ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\config\ftheader.h">
+    <ClInclude Include="..\..\..\include\freetype2\config\ftheader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\config\ftmodule.h">
+    <ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\config\ftoption.h">
+    <ClInclude Include="..\..\..\include\freetype2\config\ftoption.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\config\ftstdlib.h">
+    <ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp
index 6f0310538..f41296549 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\config\ftconfig.h
+SOURCE=..\..\..\include\freetype2\config\ftconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftheader.h
+SOURCE=..\..\..\include\freetype2\config\ftheader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftmodule.h
+SOURCE=..\..\..\include\freetype2\config\ftmodule.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftoption.h
+SOURCE=..\..\..\include\freetype2\config\ftoption.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftstdlib.h
+SOURCE=..\..\..\include\freetype2\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 f43496494..d5baa4b6d 100644
--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@@ -2153,23 +2153,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftconfig.h"
+				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftheader.h"
+				RelativePath="..\..\..\include\freetype2\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftmodule.h"
+				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftoption.h"
+				RelativePath="..\..\..\include\freetype2\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftstdlib.h"
+				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp
index 6f0310538..f41296549 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\config\ftconfig.h
+SOURCE=..\..\..\include\freetype2\config\ftconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftheader.h
+SOURCE=..\..\..\include\freetype2\config\ftheader.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftmodule.h
+SOURCE=..\..\..\include\freetype2\config\ftmodule.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftoption.h
+SOURCE=..\..\..\include\freetype2\config\ftoption.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\config\ftstdlib.h
+SOURCE=..\..\..\include\freetype2\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 69a9e97e8..dcd384b20 100644
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -13859,23 +13859,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftconfig.h"
+				RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftheader.h"
+				RelativePath="..\..\..\include\freetype2\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftmodule.h"
+				RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftoption.h"
+				RelativePath="..\..\..\include\freetype2\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\config\ftstdlib.h"
+				RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
diff --git a/devel/ft2build.h b/devel/ft2build.h
index 8e9653dbd..67aaa948e 100644
--- a/devel/ft2build.h
+++ b/devel/ft2build.h
@@ -32,7 +32,7 @@
 
 #define FT_CONFIG_OPTIONS_H  <ftoption.h>
 
-#include <config/ftheader.h>
+#include <freetype2/config/ftheader.h>
 
 #endif /* __FT2BUILD_H__ */
 
diff --git a/devel/ftoption.h b/devel/ftoption.h
index ed63aa0cf..0bfc24bc4 100644
--- a/devel/ftoption.h
+++ b/devel/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/config/ftoption.h', where `$BUILD' is the     */
-  /*    name of a directory that is included _before_ the FreeType include */
-  /*    path during compilation.                                           */
+  /*    precisely in `$BUILD/freetype2/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 <config/ftheader.h>                                     */
+  /*      #include <freetype2/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 <config/ftmodule.h>.                         */
+  /*    default, this file is <freetype2/config/ftmodule.h>.               */
   /*                                                                       */
   /* We highly recommend using the third method whenever possible.         */
   /*                                                                       */
diff --git a/docs/CHANGES b/docs/CHANGES
index bc177cff6..fe5ebd51f 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,30 @@
+CHANGES BETWEEN 2.6 and 2.6.1
+
+  I. IMPORTANT CHANGES
+
+    - The header file layout has been slightly changed (again).  After
+      installation,   the  file   `ft2build.h'  is   now  located   in
+      `<prefix>/include'.  Additionally, the  header directory include
+      path  has changed  from  `<prefix>/include/freetype2' to  simply
+      `<prefix>/include'.
+
+      Doing so  reduces the  possibility of  header file  name clashes
+      (e.g., FTGL's  `FTGlyph.h' with  FreeType's `ftglyph.h'  on case
+      insensitive file systems like Mac OS X or Windows).
+
+      Applications  that  use   (a)  `freetype-config'  or  FreeType's
+      `freetype2.pc' file pkg-config 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.
+
+
+======================================================================
 
 CHANGES BETWEEN 2.5.5 and 2.6
 
diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE
index 831edf679..612beb793 100644
--- a/docs/CUSTOMIZE
+++ b/docs/CUSTOMIZE
@@ -8,7 +8,7 @@ How to customize the compilation of the library
 
 I. Configuration macros
 
-  The  file found  in `include/config/ftoption.h'  contains a  list of
+  The  file `include/freetype2/config/ftoption.h'  contains a  list of
   commented configuration macros that can  be toggled by developers to
   indicate which features should be active while building the library.
 
@@ -35,9 +35,9 @@ II. Modules list
   can keep the source files `clean'.
 
   If  you don't  use  GNU make  you  have to  manually  edit the  file
-  `include/config/ftmodule.h' (which  is *not*  used with  if compiled
-  with GNU make) to add or  remove the drivers and components you want
-  to   compile  into   the  library.    See  `INSTALL.ANY'   for  more
+  `include/freetype2/config/ftmodule.h' (which  is *not* used  with if
+  compiled with GNU make) to add  or remove the drivers and components
+  you want  to compile into  the library.  See `INSTALL.ANY'  for more
   information.
 
 
@@ -95,8 +95,9 @@ IV. Overriding default configuration and module headers
       #include FT_CONFIG_OPTIONS_H
       #include FT_CONFIG_MODULES_H
 
-    are compiled.  Their default  values being <config/ftoption.h> and
-    <config/ftmodule.h>, you can do something like:
+    are      compiled.       Their      default      values      being
+    <freetype2/config/ftoption.h>  and  <freetype2/config/ftmodule.h>,
+    you can do something like:
 
       custom/
         config/
@@ -122,7 +123,7 @@ IV. Overriding default configuration and module headers
       #define FT_CONFIG_OPTIONS_H  <custom/my-ftoption.h>
       #define FT_CONFIG_MODULES_H  <custom/my-ftmodule.h>
 
-      #include <config/ftheader.h>
+      #include <freetype2/config/ftheader.h>
 
       #endif /* __FT2_BUILD_MY_PLATFORM_H__ */
 
diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY
index e7d6ddd18..aa0bbb767 100644
--- a/docs/INSTALL.ANY
+++ b/docs/INSTALL.ANY
@@ -16,8 +16,8 @@ I. Standard procedure
     which are not correctly supported by this compiler while being ISO
     C compliant!
 
-  * You  need  to  add  the directories  `freetype2/include'  to  your
-    include path when compiling the library.
+  * You need to add the directory `include' to your  include path when
+    compiling the library.
 
   * FreeType 2 is made of  several components; each of them is located
     in    a   subdirectory    of   `freetype2/src'.     For   example,
@@ -103,7 +103,7 @@ I. Standard procedure
       `type1cid.c' needs `psaux.c', `pshinter.c', and `psnames.c'
       `type42.c'   needs `truetype.c'
 
-      Please consult the central `include/config/ftoption.h'
+      Please consult the central `include/freetype2/config/ftoption.h'
       configuration file for details on additional libraries necessary
       for some optional features.
 
@@ -132,10 +132,10 @@ II. Support for flat-directory compilation
 
   2. Compile sources
 
-      cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftsystem.c
-      cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftinit.c
-      cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftdebug.c
-      cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftbase.c
+      cc -c -Iinclude -DFT2_BUILD_LIBRARY ftsystem.c
+      cc -c -Iinclude -DFT2_BUILD_LIBRARY ftinit.c
+      cc -c -Iinclude -DFT2_BUILD_LIBRARY ftdebug.c
+      cc -c -Iinclude -DFT2_BUILD_LIBRARY ftbase.c
       etc.
 
     You don't  need to define  the FT_FLAT_COMPILATION macro  (as this
diff --git a/docs/release b/docs/release
index bd92b23f9..7fe45477c 100644
--- a/docs/release
+++ b/docs/release
@@ -1,7 +1,7 @@
 How to prepare a new release
 ----------------------------
 
-. include/freetype.h:  Update FREETYPE_MAJOR, FREETYPE_MINOR,
+. include/freetype2/freetype.h:  Update FREETYPE_MAJOR, FREETYPE_MINOR,
   and FREETYPE_PATCH.
 
 . Update version numbers in all files where necessary (for example, do
diff --git a/include/config/ftconfig.h b/include/freetype2/config/ftconfig.h
index 086db76ab..086db76ab 100644
--- a/include/config/ftconfig.h
+++ b/include/freetype2/config/ftconfig.h
diff --git a/include/config/ftheader.h b/include/freetype2/config/ftheader.h
index 4906bc1f2..f9419f5e0 100644
--- a/include/config/ftheader.h
+++ b/include/freetype2/config/ftheader.h
@@ -107,7 +107,7 @@
    *
    */
 #ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <config/ftconfig.h>
+#define FT_CONFIG_CONFIG_H  <freetype2/config/ftconfig.h>
 #endif
 
 
@@ -122,7 +122,7 @@
    *
    */
 #ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <config/ftstdlib.h>
+#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype2/config/ftstdlib.h>
 #endif
 
 
@@ -137,7 +137,7 @@
    *
    */
 #ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <config/ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <freetype2/config/ftoption.h>
 #endif
 
 
@@ -153,7 +153,7 @@
    *
    */
 #ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <config/ftmodule.h>
+#define FT_CONFIG_MODULES_H  <freetype2/config/ftmodule.h>
 #endif
 
   /* */
@@ -170,7 +170,7 @@
    *   base FreeType~2 API.
    *
    */
-#define FT_FREETYPE_H  <freetype.h>
+#define FT_FREETYPE_H  <freetype2/freetype.h>
 
 
   /*************************************************************************
@@ -185,7 +185,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_ERRORS_H  <fterrors.h>
+#define FT_ERRORS_H  <freetype2/fterrors.h>
 
 
   /*************************************************************************
@@ -198,7 +198,7 @@
    *   list of FreeType~2 module error offsets (and messages).
    *
    */
-#define FT_MODULE_ERRORS_H  <ftmoderr.h>
+#define FT_MODULE_ERRORS_H  <freetype2/ftmoderr.h>
 
 
   /*************************************************************************
@@ -214,7 +214,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_SYSTEM_H  <ftsystem.h>
+#define FT_SYSTEM_H  <freetype2/ftsystem.h>
 
 
   /*************************************************************************
@@ -230,7 +230,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_IMAGE_H  <ftimage.h>
+#define FT_IMAGE_H  <freetype2/ftimage.h>
 
 
   /*************************************************************************
@@ -245,7 +245,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_TYPES_H  <fttypes.h>
+#define FT_TYPES_H  <freetype2/fttypes.h>
 
 
   /*************************************************************************
@@ -260,7 +260,7 @@
    *   (Most applications will never need to include this file.)
    *
    */
-#define FT_LIST_H  <ftlist.h>
+#define FT_LIST_H  <freetype2/ftlist.h>
 
 
   /*************************************************************************
@@ -273,7 +273,7 @@
    *   scalable outline management API of FreeType~2.
    *
    */
-#define FT_OUTLINE_H  <ftoutln.h>
+#define FT_OUTLINE_H  <freetype2/ftoutln.h>
 
 
   /*************************************************************************
@@ -286,7 +286,7 @@
    *   API which manages multiple @FT_Size objects per face.
    *
    */
-#define FT_SIZES_H  <ftsizes.h>
+#define FT_SIZES_H  <freetype2/ftsizes.h>
 
 
   /*************************************************************************
@@ -299,7 +299,7 @@
    *   module management API of FreeType~2.
    *
    */
-#define FT_MODULE_H  <ftmodapi.h>
+#define FT_MODULE_H  <freetype2/ftmodapi.h>
 
 
   /*************************************************************************
@@ -312,7 +312,7 @@
    *   renderer module management API of FreeType~2.
    *
    */
-#define FT_RENDER_H  <ftrender.h>
+#define FT_RENDER_H  <freetype2/ftrender.h>
 
 
   /*************************************************************************
@@ -325,7 +325,7 @@
    *   structures and macros related to the auto-hinting module.
    *
    */
-#define FT_AUTOHINTER_H  <ftautoh.h>
+#define FT_AUTOHINTER_H  <freetype2/ftautoh.h>
 
 
   /*************************************************************************
@@ -338,7 +338,7 @@
    *   structures and macros related to the CFF driver module.
    *
    */
-#define FT_CFF_DRIVER_H  <ftcffdrv.h>
+#define FT_CFF_DRIVER_H  <freetype2/ftcffdrv.h>
 
 
   /*************************************************************************
@@ -351,7 +351,7 @@
    *   structures and macros related to the TrueType driver module.
    *
    */
-#define FT_TRUETYPE_DRIVER_H  <ftttdrv.h>
+#define FT_TRUETYPE_DRIVER_H  <freetype2/ftttdrv.h>
 
 
   /*************************************************************************
@@ -364,7 +364,7 @@
    *   types and API specific to the Type~1 format.
    *
    */
-#define FT_TYPE1_TABLES_H  <t1tables.h>
+#define FT_TYPE1_TABLES_H  <freetype2/t1tables.h>
 
 
   /*************************************************************************
@@ -379,7 +379,7 @@
    *   definitions, taken from the TrueType and OpenType specifications.
    *
    */
-#define FT_TRUETYPE_IDS_H  <ttnameid.h>
+#define FT_TRUETYPE_IDS_H  <freetype2/ttnameid.h>
 
 
   /*************************************************************************
@@ -392,7 +392,7 @@
    *   types and API specific to the TrueType (as well as OpenType) format.
    *
    */
-#define FT_TRUETYPE_TABLES_H  <tttables.h>
+#define FT_TRUETYPE_TABLES_H  <freetype2/tttables.h>
 
 
   /*************************************************************************
@@ -406,7 +406,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_TRUETYPE_TAGS_H  <tttags.h>
+#define FT_TRUETYPE_TAGS_H  <freetype2/tttags.h>
 
 
   /*************************************************************************
@@ -420,7 +420,7 @@
    *   face.
    *
    */
-#define FT_BDF_H  <ftbdf.h>
+#define FT_BDF_H  <freetype2/ftbdf.h>
 
 
   /*************************************************************************
@@ -434,7 +434,7 @@
    *   face.
    *
    */
-#define FT_CID_H  <ftcid.h>
+#define FT_CID_H  <freetype2/ftcid.h>
 
 
   /*************************************************************************
@@ -447,7 +447,7 @@
    *   definitions of an API which supports gzip-compressed files.
    *
    */
-#define FT_GZIP_H  <ftgzip.h>
+#define FT_GZIP_H  <freetype2/ftgzip.h>
 
 
   /*************************************************************************
@@ -460,7 +460,7 @@
    *   definitions of an API which supports LZW-compressed files.
    *
    */
-#define FT_LZW_H  <ftlzw.h>
+#define FT_LZW_H  <freetype2/ftlzw.h>
 
 
   /*************************************************************************
@@ -473,7 +473,7 @@
    *   definitions of an API which supports bzip2-compressed files.
    *
    */
-#define FT_BZIP2_H  <ftbzip2.h>
+#define FT_BZIP2_H  <freetype2/ftbzip2.h>
 
 
   /*************************************************************************
@@ -486,7 +486,7 @@
    *   definitions of an API which supports Windows FNT files.
    *
    */
-#define FT_WINFONTS_H   <ftwinfnt.h>
+#define FT_WINFONTS_H   <freetype2/ftwinfnt.h>
 
 
   /*************************************************************************
@@ -499,7 +499,7 @@
    *   API of the optional glyph management component.
    *
    */
-#define FT_GLYPH_H  <ftglyph.h>
+#define FT_GLYPH_H  <freetype2/ftglyph.h>
 
 
   /*************************************************************************
@@ -512,7 +512,7 @@
    *   API of the optional bitmap conversion component.
    *
    */
-#define FT_BITMAP_H  <ftbitmap.h>
+#define FT_BITMAP_H  <freetype2/ftbitmap.h>
 
 
   /*************************************************************************
@@ -525,7 +525,7 @@
    *   API of the optional exact bounding box computation routines.
    *
    */
-#define FT_BBOX_H  <ftbbox.h>
+#define FT_BBOX_H  <freetype2/ftbbox.h>
 
 
   /*************************************************************************
@@ -538,7 +538,7 @@
    *   API of the optional FreeType~2 cache sub-system.
    *
    */
-#define FT_CACHE_H  <ftcache.h>
+#define FT_CACHE_H  <freetype2/ftcache.h>
 
 
   /*************************************************************************
@@ -612,7 +612,7 @@
    *   compiled on the Mac (note that the base API still works though).
    *
    */
-#define FT_MAC_H  <ftmac.h>
+#define FT_MAC_H  <freetype2/ftmac.h>
 
 
   /*************************************************************************
@@ -625,7 +625,7 @@
    *   optional multiple-masters management API of FreeType~2.
    *
    */
-#define FT_MULTIPLE_MASTERS_H  <ftmm.h>
+#define FT_MULTIPLE_MASTERS_H  <freetype2/ftmm.h>
 
 
   /*************************************************************************
@@ -639,7 +639,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_SFNT_NAMES_H  <ftsnames.h>
+#define FT_SFNT_NAMES_H  <freetype2/ftsnames.h>
 
 
   /*************************************************************************
@@ -653,7 +653,7 @@
    *   GPOS, GSUB, JSTF).
    *
    */
-#define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
+#define FT_OPENTYPE_VALIDATE_H  <freetype2/ftotval.h>
 
 
   /*************************************************************************
@@ -667,7 +667,7 @@
    *   mort, morx, bsln, just, kern, opbd, trak, prop).
    *
    */
-#define FT_GX_VALIDATE_H  <ftgxval.h>
+#define FT_GX_VALIDATE_H  <freetype2/ftgxval.h>
 
 
   /*************************************************************************
@@ -680,7 +680,7 @@
    *   FreeType~2 API which accesses PFR-specific data.
    *
    */
-#define FT_PFR_H  <ftpfr.h>
+#define FT_PFR_H  <freetype2/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  <ftstroke.h>
+#define FT_STROKER_H  <freetype2/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  <ftsynth.h>
+#define FT_SYNTHESIS_H  <freetype2/ftsynth.h>
 
 
   /*************************************************************************
@@ -716,7 +716,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which provides functions specific to font formats.
    */
-#define FT_FONT_FORMATS_H  <ftfntfmt.h>
+#define FT_FONT_FORMATS_H  <freetype2/ftfntfmt.h>
 
   /* deprecated */
 #define FT_XFREE86_H  FT_FONT_FORMATS_H
@@ -732,7 +732,7 @@
    *   FreeType~2 API which performs trigonometric computations (e.g.,
    *   cosines and arc tangents).
    */
-#define FT_TRIGONOMETRY_H  <fttrigon.h>
+#define FT_TRIGONOMETRY_H  <freetype2/fttrigon.h>
 
 
   /*************************************************************************
@@ -744,7 +744,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  <ftlcdfil.h>
+#define FT_LCD_FILTER_H  <freetype2/ftlcdfil.h>
 
 
   /*************************************************************************
@@ -756,7 +756,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  <ttunpat.h>
+#define FT_UNPATENTED_HINTING_H  <freetype2/ttunpat.h>
 
 
   /*************************************************************************
@@ -768,7 +768,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  <ftincrem.h>
+#define FT_INCREMENTAL_H  <freetype2/ftincrem.h>
 
 
   /*************************************************************************
@@ -780,7 +780,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  <ftgasp.h>
+#define FT_GASP_H  <freetype2/ftgasp.h>
 
 
   /*************************************************************************
@@ -792,30 +792,30 @@
    *   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  <ftadvanc.h>
+#define FT_ADVANCES_H  <freetype2/ftadvanc.h>
 
 
   /* */
 
-#define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
+#define FT_ERROR_DEFINITIONS_H  <freetype2/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           <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_CACHE_MANAGER_H           <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_MRU_H      <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_MANAGER_H  <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_CACHE_H    <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_GLYPH_H    <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_IMAGE_H    <freetype2/ftcache.h>
+#define FT_CACHE_INTERNAL_SBITS_H    <freetype2/ftcache.h>
 
 
-#define FT_INCREMENTAL_H          <ftincrem.h>
+#define FT_INCREMENTAL_H          <freetype2/ftincrem.h>
 
-#define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
+#define FT_TRUETYPE_UNPATENTED_H  <freetype2/ttunpat.h>
 
 
   /*
@@ -823,7 +823,7 @@
    * only when building the library.
    */
 #ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <internal/internal.h>
+#define  FT_INTERNAL_INTERNAL_H  <freetype2/internal/internal.h>
 #include FT_INTERNAL_INTERNAL_H
 #endif /* FT2_BUILD_LIBRARY */
 
diff --git a/include/config/ftmodule.h b/include/freetype2/config/ftmodule.h
index 76d271a74..76d271a74 100644
--- a/include/config/ftmodule.h
+++ b/include/freetype2/config/ftmodule.h
diff --git a/include/config/ftoption.h b/include/freetype2/config/ftoption.h
index 1536c7236..390464517 100644
--- a/include/config/ftoption.h
+++ b/include/freetype2/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/config/ftoption.h', where `$BUILD' is the     */
-  /*    name of a directory that is included _before_ the FreeType include */
-  /*    path during compilation.                                           */
+  /*    precisely in `$BUILD/freetype2/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 <config/ftheader.h>                                     */
+  /*      #include <freetype2/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 <config/ftmodule.h>.                         */
+  /*    default, this file is <freetype2/config/ftmodule.h>.               */
   /*                                                                       */
   /* We highly recommend using the third method whenever possible.         */
   /*                                                                       */
diff --git a/include/config/ftstdlib.h b/include/freetype2/config/ftstdlib.h
index 8ef43c04b..8ef43c04b 100644
--- a/include/config/ftstdlib.h
+++ b/include/freetype2/config/ftstdlib.h
diff --git a/include/freetype.h b/include/freetype2/freetype.h
index 31f9e11f4..31f9e11f4 100644
--- a/include/freetype.h
+++ b/include/freetype2/freetype.h
diff --git a/include/ftadvanc.h b/include/freetype2/ftadvanc.h
index b4d2aed56..b4d2aed56 100644
--- a/include/ftadvanc.h
+++ b/include/freetype2/ftadvanc.h
diff --git a/include/ftautoh.h b/include/freetype2/ftautoh.h
index cf7b76f49..cf7b76f49 100644
--- a/include/ftautoh.h
+++ b/include/freetype2/ftautoh.h
diff --git a/include/ftbbox.h b/include/freetype2/ftbbox.h
index 9d9d04076..9d9d04076 100644
--- a/include/ftbbox.h
+++ b/include/freetype2/ftbbox.h
diff --git a/include/ftbdf.h b/include/freetype2/ftbdf.h
index 0bdabf481..0bdabf481 100644
--- a/include/ftbdf.h
+++ b/include/freetype2/ftbdf.h
diff --git a/include/ftbitmap.h b/include/freetype2/ftbitmap.h
index 46cc47b7d..46cc47b7d 100644
--- a/include/ftbitmap.h
+++ b/include/freetype2/ftbitmap.h
diff --git a/include/ftbzip2.h b/include/freetype2/ftbzip2.h
index c25f9469d..c25f9469d 100644
--- a/include/ftbzip2.h
+++ b/include/freetype2/ftbzip2.h
diff --git a/include/ftcache.h b/include/freetype2/ftcache.h
index 68525bb82..68525bb82 100644
--- a/include/ftcache.h
+++ b/include/freetype2/ftcache.h
diff --git a/include/ftcffdrv.h b/include/freetype2/ftcffdrv.h
index 6c8e416ce..6c8e416ce 100644
--- a/include/ftcffdrv.h
+++ b/include/freetype2/ftcffdrv.h
diff --git a/include/ftchapters.h b/include/freetype2/ftchapters.h
index d333761c8..d333761c8 100644
--- a/include/ftchapters.h
+++ b/include/freetype2/ftchapters.h
diff --git a/include/ftcid.h b/include/freetype2/ftcid.h
index 05741c85b..05741c85b 100644
--- a/include/ftcid.h
+++ b/include/freetype2/ftcid.h
diff --git a/include/fterrdef.h b/include/freetype2/fterrdef.h
index 1bf0751b1..1bf0751b1 100644
--- a/include/fterrdef.h
+++ b/include/freetype2/fterrdef.h
diff --git a/include/fterrors.h b/include/freetype2/fterrors.h
index 376bee6f8..376bee6f8 100644
--- a/include/fterrors.h
+++ b/include/freetype2/fterrors.h
diff --git a/include/ftfntfmt.h b/include/freetype2/ftfntfmt.h
index 1f8ff28f1..1f8ff28f1 100644
--- a/include/ftfntfmt.h
+++ b/include/freetype2/ftfntfmt.h
diff --git a/include/ftgasp.h b/include/freetype2/ftgasp.h
index 9a9b6321b..9a9b6321b 100644
--- a/include/ftgasp.h
+++ b/include/freetype2/ftgasp.h
diff --git a/include/ftglyph.h b/include/freetype2/ftglyph.h
index 803ad3962..803ad3962 100644
--- a/include/ftglyph.h
+++ b/include/freetype2/ftglyph.h
diff --git a/include/ftgxval.h b/include/freetype2/ftgxval.h
index 0e9ac1dad..0e9ac1dad 100644
--- a/include/ftgxval.h
+++ b/include/freetype2/ftgxval.h
diff --git a/include/ftgzip.h b/include/freetype2/ftgzip.h
index b3a532d5e..b3a532d5e 100644
--- a/include/ftgzip.h
+++ b/include/freetype2/ftgzip.h
diff --git a/include/ftimage.h b/include/freetype2/ftimage.h
index 82f284c4f..82f284c4f 100644
--- a/include/ftimage.h
+++ b/include/freetype2/ftimage.h
diff --git a/include/ftincrem.h b/include/freetype2/ftincrem.h
index 840af25b0..840af25b0 100644
--- a/include/ftincrem.h
+++ b/include/freetype2/ftincrem.h
diff --git a/include/ftlcdfil.h b/include/freetype2/ftlcdfil.h
index 4cd999a4b..4cd999a4b 100644
--- a/include/ftlcdfil.h
+++ b/include/freetype2/ftlcdfil.h
diff --git a/include/ftlist.h b/include/freetype2/ftlist.h
index 12b48c78f..12b48c78f 100644
--- a/include/ftlist.h
+++ b/include/freetype2/ftlist.h
diff --git a/include/ftlzw.h b/include/freetype2/ftlzw.h
index d3ec28e55..d3ec28e55 100644
--- a/include/ftlzw.h
+++ b/include/freetype2/ftlzw.h
diff --git a/include/ftmac.h b/include/freetype2/ftmac.h
index 14c55cfe2..14c55cfe2 100644
--- a/include/ftmac.h
+++ b/include/freetype2/ftmac.h
diff --git a/include/ftmm.h b/include/freetype2/ftmm.h
index 6ef47987e..6ef47987e 100644
--- a/include/ftmm.h
+++ b/include/freetype2/ftmm.h
diff --git a/include/ftmodapi.h b/include/freetype2/ftmodapi.h
index 2ef3f4674..2ef3f4674 100644
--- a/include/ftmodapi.h
+++ b/include/freetype2/ftmodapi.h
diff --git a/include/ftmoderr.h b/include/freetype2/ftmoderr.h
index 9d7f98140..9d7f98140 100644
--- a/include/ftmoderr.h
+++ b/include/freetype2/ftmoderr.h
diff --git a/include/ftotval.h b/include/freetype2/ftotval.h
index e744b713f..e744b713f 100644
--- a/include/ftotval.h
+++ b/include/freetype2/ftotval.h
diff --git a/include/ftoutln.h b/include/freetype2/ftoutln.h
index 106cfde06..106cfde06 100644
--- a/include/ftoutln.h
+++ b/include/freetype2/ftoutln.h
diff --git a/include/ftpfr.h b/include/freetype2/ftpfr.h
index a1c02a2f5..a1c02a2f5 100644
--- a/include/ftpfr.h
+++ b/include/freetype2/ftpfr.h
diff --git a/include/ftrender.h b/include/freetype2/ftrender.h
index ec8da700b..ec8da700b 100644
--- a/include/ftrender.h
+++ b/include/freetype2/ftrender.h
diff --git a/include/ftsizes.h b/include/freetype2/ftsizes.h
index bef842471..bef842471 100644
--- a/include/ftsizes.h
+++ b/include/freetype2/ftsizes.h
diff --git a/include/ftsnames.h b/include/freetype2/ftsnames.h
index 0f7fbe174..0f7fbe174 100644
--- a/include/ftsnames.h
+++ b/include/freetype2/ftsnames.h
diff --git a/include/ftstroke.h b/include/freetype2/ftstroke.h
index 7ebb1e740..7ebb1e740 100644
--- a/include/ftstroke.h
+++ b/include/freetype2/ftstroke.h
diff --git a/include/ftsynth.h b/include/freetype2/ftsynth.h
index fbcbad871..fbcbad871 100644
--- a/include/ftsynth.h
+++ b/include/freetype2/ftsynth.h
diff --git a/include/ftsystem.h b/include/freetype2/ftsystem.h
index 2bc999910..2bc999910 100644
--- a/include/ftsystem.h
+++ b/include/freetype2/ftsystem.h
diff --git a/include/fttrigon.h b/include/freetype2/fttrigon.h
index 3d821ba16..3d821ba16 100644
--- a/include/fttrigon.h
+++ b/include/freetype2/fttrigon.h
diff --git a/include/ftttdrv.h b/include/freetype2/ftttdrv.h
index f56040b82..f56040b82 100644
--- a/include/ftttdrv.h
+++ b/include/freetype2/ftttdrv.h
diff --git a/include/fttypes.h b/include/freetype2/fttypes.h
index 706a1be4e..706a1be4e 100644
--- a/include/fttypes.h
+++ b/include/freetype2/fttypes.h
diff --git a/include/ftwinfnt.h b/include/freetype2/ftwinfnt.h
index caedaa1cc..caedaa1cc 100644
--- a/include/ftwinfnt.h
+++ b/include/freetype2/ftwinfnt.h
diff --git a/include/internal/autohint.h b/include/freetype2/internal/autohint.h
index 8d5a9773c..8d5a9773c 100644
--- a/include/internal/autohint.h
+++ b/include/freetype2/internal/autohint.h
diff --git a/include/internal/ftcalc.h b/include/freetype2/internal/ftcalc.h
index 75752c3d9..75752c3d9 100644
--- a/include/internal/ftcalc.h
+++ b/include/freetype2/internal/ftcalc.h
diff --git a/include/internal/ftdebug.h b/include/freetype2/internal/ftdebug.h
index 216c73031..216c73031 100644
--- a/include/internal/ftdebug.h
+++ b/include/freetype2/internal/ftdebug.h
diff --git a/include/internal/ftdriver.h b/include/freetype2/internal/ftdriver.h
index 16856d3df..16856d3df 100644
--- a/include/internal/ftdriver.h
+++ b/include/freetype2/internal/ftdriver.h
diff --git a/include/internal/ftgloadr.h b/include/freetype2/internal/ftgloadr.h
index 970dd70cc..970dd70cc 100644
--- a/include/internal/ftgloadr.h
+++ b/include/freetype2/internal/ftgloadr.h
diff --git a/include/internal/ftmemory.h b/include/freetype2/internal/ftmemory.h
index c0c553b4f..c0c553b4f 100644
--- a/include/internal/ftmemory.h
+++ b/include/freetype2/internal/ftmemory.h
diff --git a/include/internal/ftobjs.h b/include/freetype2/internal/ftobjs.h
index 37317a43c..37317a43c 100644
--- a/include/internal/ftobjs.h
+++ b/include/freetype2/internal/ftobjs.h
diff --git a/include/internal/ftpic.h b/include/freetype2/internal/ftpic.h
index 7f9154f41..7f9154f41 100644
--- a/include/internal/ftpic.h
+++ b/include/freetype2/internal/ftpic.h
diff --git a/include/internal/ftrfork.h b/include/freetype2/internal/ftrfork.h
index da61ca75b..da61ca75b 100644
--- a/include/internal/ftrfork.h
+++ b/include/freetype2/internal/ftrfork.h
diff --git a/include/internal/ftserv.h b/include/freetype2/internal/ftserv.h
index 8f837e475..b0b9e1063 100644
--- a/include/internal/ftserv.h
+++ b/include/freetype2/internal/ftserv.h
@@ -734,24 +734,24 @@ FT_BEGIN_HEADER
    *  The header files containing the services.
    */
 
-#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_FONT_FORMAT_H        <internal/services/svfntfmt.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <internal/services/svttglyf.h>
+#define FT_SERVICE_BDF_H                <freetype2/internal/services/svbdf.h>
+#define FT_SERVICE_CID_H                <freetype2/internal/services/svcid.h>
+#define FT_SERVICE_GLYPH_DICT_H         <freetype2/internal/services/svgldict.h>
+#define FT_SERVICE_GX_VALIDATE_H        <freetype2/internal/services/svgxval.h>
+#define FT_SERVICE_KERNING_H            <freetype2/internal/services/svkern.h>
+#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype2/internal/services/svmm.h>
+#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype2/internal/services/svotval.h>
+#define FT_SERVICE_PFR_H                <freetype2/internal/services/svpfr.h>
+#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype2/internal/services/svpscmap.h>
+#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype2/internal/services/svpsinfo.h>
+#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype2/internal/services/svpostnm.h>
+#define FT_SERVICE_PROPERTIES_H         <freetype2/internal/services/svprop.h>
+#define FT_SERVICE_SFNT_H               <freetype2/internal/services/svsfnt.h>
+#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype2/internal/services/svtteng.h>
+#define FT_SERVICE_TT_CMAP_H            <freetype2/internal/services/svttcmap.h>
+#define FT_SERVICE_WINFNT_H             <freetype2/internal/services/svwinfnt.h>
+#define FT_SERVICE_FONT_FORMAT_H        <freetype2/internal/services/svfntfmt.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype2/internal/services/svttglyf.h>
 
  /* */
 
diff --git a/include/internal/ftstream.h b/include/freetype2/internal/ftstream.h
index 384e5df30..384e5df30 100644
--- a/include/internal/ftstream.h
+++ b/include/freetype2/internal/ftstream.h
diff --git a/include/internal/fttrace.h b/include/freetype2/internal/fttrace.h
index 9d28d214d..9d28d214d 100644
--- a/include/internal/fttrace.h
+++ b/include/freetype2/internal/fttrace.h
diff --git a/include/internal/ftvalid.h b/include/freetype2/internal/ftvalid.h
index 9cda6eef5..9cda6eef5 100644
--- a/include/internal/ftvalid.h
+++ b/include/freetype2/internal/ftvalid.h
diff --git a/include/internal/internal.h b/include/freetype2/internal/internal.h
index 1c1fd0ee1..a3f93a153 100644
--- a/include/internal/internal.h
+++ b/include/freetype2/internal/internal.h
@@ -24,28 +24,28 @@
   /*************************************************************************/
 
 
-#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>
+#define FT_INTERNAL_OBJECTS_H             <freetype2/internal/ftobjs.h>
+#define FT_INTERNAL_PIC_H                 <freetype2/internal/ftpic.h>
+#define FT_INTERNAL_STREAM_H              <freetype2/internal/ftstream.h>
+#define FT_INTERNAL_MEMORY_H              <freetype2/internal/ftmemory.h>
+#define FT_INTERNAL_DEBUG_H               <freetype2/internal/ftdebug.h>
+#define FT_INTERNAL_CALC_H                <freetype2/internal/ftcalc.h>
+#define FT_INTERNAL_DRIVER_H              <freetype2/internal/ftdriver.h>
+#define FT_INTERNAL_TRACE_H               <freetype2/internal/fttrace.h>
+#define FT_INTERNAL_GLYPH_LOADER_H        <freetype2/internal/ftgloadr.h>
+#define FT_INTERNAL_SFNT_H                <freetype2/internal/sfnt.h>
+#define FT_INTERNAL_SERVICE_H             <freetype2/internal/ftserv.h>
+#define FT_INTERNAL_RFORK_H               <freetype2/internal/ftrfork.h>
+#define FT_INTERNAL_VALIDATE_H            <freetype2/internal/ftvalid.h>
+
+#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype2/internal/tttypes.h>
+#define FT_INTERNAL_TYPE1_TYPES_H         <freetype2/internal/t1types.h>
+
+#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype2/internal/psaux.h>
+#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype2/internal/pshints.h>
+#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype2/internal/psglobal.h>
+
+#define FT_INTERNAL_AUTOHINT_H            <freetype2/internal/autohint.h>
 
 
 #if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
diff --git a/include/internal/psaux.h b/include/freetype2/internal/psaux.h
index 1c5f784f5..1c5f784f5 100644
--- a/include/internal/psaux.h
+++ b/include/freetype2/internal/psaux.h
diff --git a/include/internal/pshints.h b/include/freetype2/internal/pshints.h
index 12aaabacd..12aaabacd 100644
--- a/include/internal/pshints.h
+++ b/include/freetype2/internal/pshints.h
diff --git a/include/internal/services/svbdf.h b/include/freetype2/internal/services/svbdf.h
index 865b53687..865b53687 100644
--- a/include/internal/services/svbdf.h
+++ b/include/freetype2/internal/services/svbdf.h
diff --git a/include/internal/services/svcid.h b/include/freetype2/internal/services/svcid.h
index 4a535a6f4..4a535a6f4 100644
--- a/include/internal/services/svcid.h
+++ b/include/freetype2/internal/services/svcid.h
diff --git a/include/internal/services/svfntfmt.h b/include/freetype2/internal/services/svfntfmt.h
index f8b361736..f8b361736 100644
--- a/include/internal/services/svfntfmt.h
+++ b/include/freetype2/internal/services/svfntfmt.h
diff --git a/include/internal/services/svgldict.h b/include/freetype2/internal/services/svgldict.h
index f78bca5d7..f78bca5d7 100644
--- a/include/internal/services/svgldict.h
+++ b/include/freetype2/internal/services/svgldict.h
diff --git a/include/internal/services/svgxval.h b/include/freetype2/internal/services/svgxval.h
index 59cc3b704..59cc3b704 100644
--- a/include/internal/services/svgxval.h
+++ b/include/freetype2/internal/services/svgxval.h
diff --git a/include/internal/services/svkern.h b/include/freetype2/internal/services/svkern.h
index bc26f1594..bc26f1594 100644
--- a/include/internal/services/svkern.h
+++ b/include/freetype2/internal/services/svkern.h
diff --git a/include/internal/services/svmm.h b/include/freetype2/internal/services/svmm.h
index f2cecfbb3..f2cecfbb3 100644
--- a/include/internal/services/svmm.h
+++ b/include/freetype2/internal/services/svmm.h
diff --git a/include/internal/services/svotval.h b/include/freetype2/internal/services/svotval.h
index a82a6420f..a82a6420f 100644
--- a/include/internal/services/svotval.h
+++ b/include/freetype2/internal/services/svotval.h
diff --git a/include/internal/services/svpfr.h b/include/freetype2/internal/services/svpfr.h
index d4eb1693d..d4eb1693d 100644
--- a/include/internal/services/svpfr.h
+++ b/include/freetype2/internal/services/svpfr.h
diff --git a/include/internal/services/svpostnm.h b/include/freetype2/internal/services/svpostnm.h
index a89f79e47..a89f79e47 100644
--- a/include/internal/services/svpostnm.h
+++ b/include/freetype2/internal/services/svpostnm.h
diff --git a/include/internal/services/svprop.h b/include/freetype2/internal/services/svprop.h
index c9f07ce33..c9f07ce33 100644
--- a/include/internal/services/svprop.h
+++ b/include/freetype2/internal/services/svprop.h
diff --git a/include/internal/services/svpscmap.h b/include/freetype2/internal/services/svpscmap.h
index 66da6e104..66da6e104 100644
--- a/include/internal/services/svpscmap.h
+++ b/include/freetype2/internal/services/svpscmap.h
diff --git a/include/internal/services/svpsinfo.h b/include/freetype2/internal/services/svpsinfo.h
index 752a26602..752a26602 100644
--- a/include/internal/services/svpsinfo.h
+++ b/include/freetype2/internal/services/svpsinfo.h
diff --git a/include/internal/services/svsfnt.h b/include/freetype2/internal/services/svsfnt.h
index 252ae1cf5..252ae1cf5 100644
--- a/include/internal/services/svsfnt.h
+++ b/include/freetype2/internal/services/svsfnt.h
diff --git a/include/internal/services/svttcmap.h b/include/freetype2/internal/services/svttcmap.h
index 4351a9ae0..4351a9ae0 100644
--- a/include/internal/services/svttcmap.h
+++ b/include/freetype2/internal/services/svttcmap.h
diff --git a/include/internal/services/svtteng.h b/include/freetype2/internal/services/svtteng.h
index 272ee8c05..272ee8c05 100644
--- a/include/internal/services/svtteng.h
+++ b/include/freetype2/internal/services/svtteng.h
diff --git a/include/internal/services/svttglyf.h b/include/freetype2/internal/services/svttglyf.h
index f5cb76a9f..f5cb76a9f 100644
--- a/include/internal/services/svttglyf.h
+++ b/include/freetype2/internal/services/svttglyf.h
diff --git a/include/internal/services/svwinfnt.h b/include/freetype2/internal/services/svwinfnt.h
index 0036929b2..0036929b2 100644
--- a/include/internal/services/svwinfnt.h
+++ b/include/freetype2/internal/services/svwinfnt.h
diff --git a/include/internal/sfnt.h b/include/freetype2/internal/sfnt.h
index 97ce390c3..97ce390c3 100644
--- a/include/internal/sfnt.h
+++ b/include/freetype2/internal/sfnt.h
diff --git a/include/internal/t1types.h b/include/freetype2/internal/t1types.h
index 029acc400..029acc400 100644
--- a/include/internal/t1types.h
+++ b/include/freetype2/internal/t1types.h
diff --git a/include/internal/tttypes.h b/include/freetype2/internal/tttypes.h
index 31dd0aac6..31dd0aac6 100644
--- a/include/internal/tttypes.h
+++ b/include/freetype2/internal/tttypes.h
diff --git a/include/t1tables.h b/include/freetype2/t1tables.h
index a6ea415af..a6ea415af 100644
--- a/include/t1tables.h
+++ b/include/freetype2/t1tables.h
diff --git a/include/ttnameid.h b/include/freetype2/ttnameid.h
index c9585f241..c9585f241 100644
--- a/include/ttnameid.h
+++ b/include/freetype2/ttnameid.h
diff --git a/include/tttables.h b/include/freetype2/tttables.h
index 1568f4036..1568f4036 100644
--- a/include/tttables.h
+++ b/include/freetype2/tttables.h
diff --git a/include/tttags.h b/include/freetype2/tttags.h
index 3836c7bbf..3836c7bbf 100644
--- a/include/tttags.h
+++ b/include/freetype2/tttags.h
diff --git a/include/ttunpat.h b/include/freetype2/ttunpat.h
index 8ea556895..8ea556895 100644
--- a/include/ttunpat.h
+++ b/include/freetype2/ttunpat.h
diff --git a/include/ft2build.h b/include/ft2build.h
index 09c19d42a..9483d3307 100644
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -34,7 +34,7 @@
 #ifndef __FT2BUILD_H__
 #define __FT2BUILD_H__
 
-#include <config/ftheader.h>
+#include <freetype2/config/ftheader.h>
 
 #endif /* __FT2BUILD_H__ */
 
diff --git a/modules.cfg b/modules.cfg
index 9ba66dfc8..3d70a7c72 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -19,7 +19,7 @@
 # activate a module, remove the comment character.
 #
 # Note that many modules and components are further controlled with macros
-# in the file `include/config/ftoption.h'.
+# in the file `include/freetype2/config/ftoption.h'.
 
 
 ####
@@ -85,7 +85,7 @@ HINTING_MODULES += autofit
 HINTING_MODULES += pshinter
 
 # The TrueType hinting engine doesn't have a module of its own but is
-# controlled in file include/config/ftoption.h
+# controlled in file include/freetype2/config/ftoption.h
 # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends).
 
 
@@ -106,7 +106,7 @@ RASTER_MODULES += smooth
 
 # FreeType's cache sub-system (quite stable but still in beta -- this means
 # that its public API is subject to change if necessary).  See
-# include/ftcache.h.  Needs ftglyph.c.
+# include/freetype2/ftcache.h.  Needs ftglyph.c.
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
@@ -114,17 +114,17 @@ AUX_MODULES += cache
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
-# See include/ftgzip.h for the API.
+# See include/freetype2/ftgzip.h for the API.
 AUX_MODULES += gzip
 
 # Support for streams compressed with LZW (files with suffix .Z).
 #
-# See include/ftlzw.h for the API.
+# See include/freetype2/ftlzw.h for the API.
 AUX_MODULES += lzw
 
 # Support for streams compressed with bzip2 (files with suffix .bz2).
 #
-# See include/ftbzip2.h for the API.
+# See include/freetype2/ftbzip2.h for the API.
 AUX_MODULES += bzip2
 
 # OpenType table validation.  Needs ftotval.c below.
@@ -149,95 +149,95 @@ AUX_MODULES += psnames
 
 # Exact bounding box calculation.
 #
-# See include/ftbbox.h for the API.
+# See include/freetype2/ftbbox.h for the API.
 BASE_EXTENSIONS += ftbbox.c
 
 # Access BDF-specific strings.  Needs BDF font driver.
 #
-# See include/ftbdf.h for the API.
+# See include/freetype2/ftbdf.h for the API.
 BASE_EXTENSIONS += ftbdf.c
 
 # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
 # 8bpp format, and for emboldening of bitmap glyphs.
 #
-# See include/ftbitmap.h for the API.
+# See include/freetype2/ftbitmap.h for the API.
 BASE_EXTENSIONS += ftbitmap.c
 
 # Access CID font information.
 #
-# See include/ftcid.h for the API.
+# See include/freetype2/ftcid.h for the API.
 BASE_EXTENSIONS += ftcid.c
 
 # Support functions for font formats.
 #
-# See include/ftfntfmt.h for the API.
+# See include/freetype2/ftfntfmt.h for the API.
 BASE_EXTENSIONS += ftfntfmt.c
 
 # Access FSType information.  Needs fttype1.c.
 #
-# See include/freetype.h for the API.
+# See include/freetype2/freetype.h for the API.
 BASE_EXTENSIONS += ftfstype.c
 
 # Support for GASP table queries.
 #
-# See include/ftgasp.h for the API.
+# See include/freetype2/ftgasp.h for the API.
 BASE_EXTENSIONS += ftgasp.c
 
 # Convenience functions to handle glyphs.  Needs ftbitmap.c.
 #
-# See include/ftglyph.h for the API.
+# See include/freetype2/ftglyph.h for the API.
 BASE_EXTENSIONS += ftglyph.c
 
 # Interface for gxvalid module.
 #
-# See include/ftgxval.h for the API.
+# See include/freetype2/ftgxval.h for the API.
 BASE_EXTENSIONS += ftgxval.c
 
 # Support for LCD color filtering of subpixel bitmaps.
 #
-# See include/ftlcdfil.h for the API.
+# See include/freetype2/ftlcdfil.h for the API.
 BASE_EXTENSIONS += ftlcdfil.c
 
 # Multiple Master font interface.
 #
-# See include/ftmm.h for the API.
+# See include/freetype2/ftmm.h for the API.
 BASE_EXTENSIONS += ftmm.c
 
 # Interface for otvalid module.
 #
-# See include/ftotval.h for the API.
+# See include/freetype2/ftotval.h for the API.
 BASE_EXTENSIONS += ftotval.c
 
 # Support for FT_Face_CheckTrueTypePatents.
 #
-# See include/freetype.h for the API.
+# See include/freetype2/freetype.h for the API.
 BASE_EXTENSIONS += ftpatent.c
 
 # Interface for accessing PFR-specific data.  Needs PFR font driver.
 #
-# See include/ftpfr.h for the API.
+# See include/freetype2/ftpfr.h for the API.
 BASE_EXTENSIONS += ftpfr.c
 
 # Path stroker.  Needs ftglyph.c.
 #
-# See include/ftstroke.h for the API.
+# See include/freetype2/ftstroke.h for the API.
 BASE_EXTENSIONS += ftstroke.c
 
 # Support for synthetic embolding and slanting of fonts.  Needs ftbitmap.c.
 #
-# See include/ftsynth.h for the API.
+# See include/freetype2/ftsynth.h for the API.
 BASE_EXTENSIONS += ftsynth.c
 
 # Interface to access data specific to PostScript Type 1 and Type 2 (CFF)
 # fonts.
 #
-# See include/t1tables.h for the API.
+# See include/freetype2/t1tables.h for the API.
 BASE_EXTENSIONS += fttype1.c
 
 # Interface for accessing data specific to Windows FNT files.  Needs winfnt
 # driver.
 #
-# See include/ftwinfnt.h for the API.
+# See include/freetype2/ftwinfnt.h for the API.
 BASE_EXTENSIONS += ftwinfnt.c
 
 ####
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 2cdb7c242..bbbcca8dd 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -152,8 +152,8 @@
   /* the memory and stream components which are set to 7 and 5,            */
   /* respectively.                                                         */
   /*                                                                       */
-  /* See the file <include/internal/fttrace.h> for details of the          */
-  /* available toggle names.                                               */
+  /* See the file <include/freetype2/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/src/base/ftinit.c b/src/base/ftinit.c
index cc95e6a6a..72d4dc9c2 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -23,8 +23,8 @@
   /*  FT_Add_Default_Modules():                                            */
   /*     This function is used to add the set of default modules to a      */
   /*     fresh new library object.  The set is taken from the header file  */
-  /*     `config/ftmodule.h'.  See the document `FreeType 2.0 Build        */
-  /*     System' for more information.                                     */
+  /*     `freetype2/config/ftmodule.h'.  See the document `FreeType 2.0    */
+  /*     Build System' for more information.                               */
   /*                                                                       */
   /*  FT_Init_FreeType():                                                  */
   /*     This function creates a system object for the current platform,   */
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index eeab14352..73ab05537 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/raster/ftraster.c' (this file) to your current directory  */
   /*                                                                       */
-  /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current  */
-  /*   directory                                                           */
+  /* - copy `include/freetype2/ftimage.h' and `src/raster/ftmisc.h' to     */
+  /*   your current directory                                              */
   /*                                                                       */
   /* - compile `ftraster' with the _STANDALONE_ macro defined, as in       */
   /*                                                                       */
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 77b58f25f..cc14a0578 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -24,8 +24,8 @@
   /*                                                                       */
   /* - copy `src/smooth/ftgrays.c' (this file) to your current directory   */
   /*                                                                       */
-  /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same     */
-  /*   directory                                                           */
+  /* - copy `include/freetype2/ftimage.h' and `src/smooth/ftgrays.h' to    */
+  /*   the same directory                                                  */
   /*                                                                       */
   /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in        */
   /*                                                                       */
diff --git a/src/tools/chktrcmp.py b/src/tools/chktrcmp.py
index ce6500c7e..802cb2475 100755
--- a/src/tools/chktrcmp.py
+++ b/src/tools/chktrcmp.py
@@ -15,7 +15,7 @@ USED_COMPONENT  = {}
 KNOWN_COMPONENT = {}
 
 SRC_FILE_DIRS   = [ "src" ]
-TRACE_DEF_FILES = [ "include/internal/fttrace.h" ]
+TRACE_DEF_FILES = [ "include/freetype2/internal/fttrace.h" ]
 
 
 # --------------------------------------------------------------
diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py
index 6887f0b84..322477ef0 100644
--- a/src/tools/docmaker/content.py
+++ b/src/tools/docmaker/content.py
@@ -53,9 +53,10 @@ re_identifier = re.compile( r'((?:\w|-)*)' )
 
 #
 # We collect macro names ending in `_H' (group 1), as defined in
-# `config/ftheader.h'.  While outputting the object data, we use this info
-# together with the object's file location (group 2) to emit the appropriate
-# header file macro and its associated file name before the object itself.
+# `freetype2/config/ftheader.h'.  While outputting the object data, we use
+# this info together with the object's file location (group 2) to emit the
+# appropriate header file macro and its associated file name before the
+# object itself.
 #
 # Example:
 #