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. * docs/*: Updated.
10 years ago · 8502c98b15
parent 31d97df99f
commit 8502c98b15
128 changed files with 361 additions and 288 deletions
--- 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
--- a/38
+++ b/38
@ -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.
--- a/10
+++ b/10
@ -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 ;
--- 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
--- 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:
--- 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

 /*
--- 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

--- 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

--- 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           \
--- 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.                          */
--- 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
--- 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
--- 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))
--- 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
--- 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
--- 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.                                */
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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">
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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__ */

--- 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.         */
  /*                                                                       */
--- 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

--- 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__ */

--- 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
--- 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
--- a/include/freetype2/config/ftconfig.h
+++ b/include/freetype2/config/ftconfig.h
--- a/include/freetype2/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 */

--- a/include/freetype2/config/ftmodule.h
+++ b/include/freetype2/config/ftmodule.h
--- a/include/freetype2/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.         */
  /*                                                                       */
--- a/include/freetype2/config/ftstdlib.h
+++ b/include/freetype2/config/ftstdlib.h
--- a/include/freetype2/freetype.h
+++ b/include/freetype2/freetype.h
--- a/include/freetype2/ftadvanc.h
+++ b/include/freetype2/ftadvanc.h
--- a/include/freetype2/ftautoh.h
+++ b/include/freetype2/ftautoh.h
--- a/include/freetype2/ftbbox.h
+++ b/include/freetype2/ftbbox.h
--- a/include/freetype2/ftbdf.h
+++ b/include/freetype2/ftbdf.h
--- a/include/freetype2/ftbitmap.h
+++ b/include/freetype2/ftbitmap.h
--- a/include/freetype2/ftbzip2.h
+++ b/include/freetype2/ftbzip2.h
--- a/include/freetype2/ftcache.h
+++ b/include/freetype2/ftcache.h
--- a/include/freetype2/ftcffdrv.h
+++ b/include/freetype2/ftcffdrv.h
--- a/include/freetype2/ftchapters.h
+++ b/include/freetype2/ftchapters.h
--- a/include/freetype2/ftcid.h
+++ b/include/freetype2/ftcid.h
--- a/include/freetype2/fterrdef.h
+++ b/include/freetype2/fterrdef.h
--- a/include/freetype2/fterrors.h
+++ b/include/freetype2/fterrors.h
--- a/include/freetype2/ftfntfmt.h
+++ b/include/freetype2/ftfntfmt.h
--- a/include/freetype2/ftgasp.h
+++ b/include/freetype2/ftgasp.h
--- a/include/freetype2/ftglyph.h
+++ b/include/freetype2/ftglyph.h
--- a/include/freetype2/ftgxval.h
+++ b/include/freetype2/ftgxval.h
--- a/include/freetype2/ftgzip.h
+++ b/include/freetype2/ftgzip.h
--- a/include/freetype2/ftimage.h
+++ b/include/freetype2/ftimage.h
--- a/include/freetype2/ftincrem.h
+++ b/include/freetype2/ftincrem.h
--- a/include/freetype2/ftlcdfil.h
+++ b/include/freetype2/ftlcdfil.h
--- a/include/freetype2/ftlist.h
+++ b/include/freetype2/ftlist.h
--- a/include/freetype2/ftlzw.h
+++ b/include/freetype2/ftlzw.h
--- a/include/freetype2/ftmac.h
+++ b/include/freetype2/ftmac.h
--- a/include/freetype2/ftmm.h
+++ b/include/freetype2/ftmm.h
--- a/include/freetype2/ftmodapi.h
+++ b/include/freetype2/ftmodapi.h
--- a/include/freetype2/ftmoderr.h
+++ b/include/freetype2/ftmoderr.h
--- a/include/freetype2/ftotval.h
+++ b/include/freetype2/ftotval.h
--- a/include/freetype2/ftoutln.h
+++ b/include/freetype2/ftoutln.h
--- a/include/freetype2/ftpfr.h
+++ b/include/freetype2/ftpfr.h
--- a/include/freetype2/ftrender.h
+++ b/include/freetype2/ftrender.h
--- a/include/freetype2/ftsizes.h
+++ b/include/freetype2/ftsizes.h
--- a/include/freetype2/ftsnames.h
+++ b/include/freetype2/ftsnames.h
--- a/include/freetype2/ftstroke.h
+++ b/include/freetype2/ftstroke.h
--- a/include/freetype2/ftsynth.h
+++ b/include/freetype2/ftsynth.h
--- a/include/freetype2/ftsystem.h
+++ b/include/freetype2/ftsystem.h
--- a/include/freetype2/fttrigon.h
+++ b/include/freetype2/fttrigon.h
--- a/include/freetype2/ftttdrv.h
+++ b/include/freetype2/ftttdrv.h
--- a/include/freetype2/fttypes.h
+++ b/include/freetype2/fttypes.h
--- a/include/freetype2/ftwinfnt.h
+++ b/include/freetype2/ftwinfnt.h
--- a/include/freetype2/internal/autohint.h
+++ b/include/freetype2/internal/autohint.h
--- a/include/freetype2/internal/ftcalc.h
+++ b/include/freetype2/internal/ftcalc.h
--- a/include/freetype2/internal/ftdebug.h
+++ b/include/freetype2/internal/ftdebug.h
--- a/include/freetype2/internal/ftdriver.h
+++ b/include/freetype2/internal/ftdriver.h
--- a/include/freetype2/internal/ftgloadr.h
+++ b/include/freetype2/internal/ftgloadr.h
--- a/include/freetype2/internal/ftmemory.h
+++ b/include/freetype2/internal/ftmemory.h
--- a/include/freetype2/internal/ftobjs.h
+++ b/include/freetype2/internal/ftobjs.h
--- a/include/freetype2/internal/ftpic.h
+++ b/include/freetype2/internal/ftpic.h
--- a/include/freetype2/internal/ftrfork.h
+++ b/include/freetype2/internal/ftrfork.h
--- a/include/freetype2/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>

 /* */

--- a/include/freetype2/internal/ftstream.h
+++ b/include/freetype2/internal/ftstream.h
--- a/include/freetype2/internal/fttrace.h
+++ b/include/freetype2/internal/fttrace.h
--- a/include/freetype2/internal/ftvalid.h
+++ b/include/freetype2/internal/ftvalid.h
--- a/include/freetype2/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++) */
--- a/include/freetype2/internal/psaux.h
+++ b/include/freetype2/internal/psaux.h
--- a/include/freetype2/internal/pshints.h
+++ b/include/freetype2/internal/pshints.h
--- a/include/freetype2/internal/services/svbdf.h
+++ b/include/freetype2/internal/services/svbdf.h
--- a/include/freetype2/internal/services/svcid.h
+++ b/include/freetype2/internal/services/svcid.h
--- a/include/freetype2/internal/services/svfntfmt.h
+++ b/include/freetype2/internal/services/svfntfmt.h
--- a/include/freetype2/internal/services/svgldict.h
+++ b/include/freetype2/internal/services/svgldict.h
--- a/include/freetype2/internal/services/svgxval.h
+++ b/include/freetype2/internal/services/svgxval.h
--- a/include/freetype2/internal/services/svkern.h
+++ b/include/freetype2/internal/services/svkern.h
--- a/Show More
+++ b/Show More