--- freetype-2.0.1.20010317.orig/builds/unix/configure.in
+++ freetype-2.0.1.20010317/builds/unix/configure.in
@@ -40,6 +40,7 @@
 
 AC_CHECK_PROG(RMF, rm, rm -f)
 AC_CHECK_PROG(RMDIR, rmdir, rmdir)
+AC_CHECK_PROG(SED, sed, sed)
 
 dnl Since this file will be finally moved to another directory we make
 dnl the path of the install script absolute.  This small code snippet has
--- freetype-2.0.1.20010317.orig/builds/unix/install.mk
+++ freetype-2.0.1.20010317/builds/unix/install.mk
@@ -35,6 +35,14 @@
 	-for P in $(CACHE_H) ; do                                      \
           $(INSTALL_DATA) $$P $(includedir)/freetype2/freetype/cache ; \
         done
+	$(SED) -e 's!^\(#define.\+\)<freetype/\([a-z0-9]\+.h\)>!\1FT2_PUBLIC_FILE(\2)!' \
+               -e 's!^\(#define.\+\)<freetype/config/\([a-z0-9]\+.h\)>!\1FT2_CONFIG_FILE(\2)!' \
+               -e 's!^\(#define.\+\)<freetype/internal/\([a-z0-9]\+.h\)>!\1FT2_INTERNAL_FILE(\2)!' \
+               $(CONFIG_)ftheader.h \
+               > $(includedir)/freetype2/freetype/config/ftheader.h
+	$(SED) -e 's!^\(#define.\+\)<freetype/internal/\([a-z0-9]\+.h\)>!\1FT2_INTERNAL_FILE(\2)!' \
+               $(INTERNAL_)internal.h \
+               > $(includedir)/freetype2/freetype/internal/internal.h
 	$(INSTALL_DATA) $(BUILD)/ft2unix.h $(includedir)/ft2build.h
 	$(INSTALL_SCRIPT) -m 755 $(BUILD)/freetype-config \
           $(bindir)/freetype-config
--- freetype-2.0.1.20010317.orig/builds/unix/ft2unix.h
+++ freetype-2.0.1.20010317/builds/unix/ft2unix.h
@@ -30,11 +30,8 @@
 #ifndef __FT2_BUILD_UNIX_H__
 #define __FT2_BUILD_UNIX_H__
 
-#define FT2_PUBLIC_FILE( x )    <freetype2/freetype/ ## x ## >
-#define FT2_CONFIG_FILE( x )    <freetype2/freetype/config/ ## x ## >
-#define FT2_INTERNAL_FILE( x )  <freetype2/freetype/internal/ ## x ## >
-
-#include FT2_CONFIG_FILE( ft2build.h )
+#define FT2_ROOT  freetype2/freetype
+#include <freetype2/freetype/config/ftheader.h>
 
 #endif /* __FT2_BUILD_UNIX_H__ */
 
--- freetype-2.0.1.20010317.orig/builds/unix/unix-def.in
+++ freetype-2.0.1.20010317/builds/unix/unix-def.in
@@ -20,6 +20,7 @@
 
 DELETE        := @RMF@
 DELDIR        := @RMDIR@
+SED           := @SED@
 SEP           := /
 HOSTSEP       := $(SEP)
 BUILD         := $(TOP)/builds/unix
--- freetype-2.0.1.20010317.orig/include/freetype/config/ftheader.h
+++ freetype-2.0.1.20010317/include/freetype/config/ftheader.h
@@ -30,9 +30,7 @@
   /*     #define __FT2_BUILD_UNIX_H__                                      */
   /*                                                                       */
   /*     #define FT2_ROOT  freetype2                                       */
-  /*     #include <freetype2/config/ft2build.h>                            */
-  /*                                                                       */
-  /*     #include FT2_CONFIG_FILE( ft2build.h )                            */
+  /*     #include <freetype2/config/ftheader.h>                            */
   /*                                                                       */
   /*     #endif                                                            */
   /*                                                                       */