--- lib/font/FreeType/ftenc.c.orig	Mon Mar 22 11:30:03 2004
+++ lib/font/FreeType/ftenc.c	Mon Mar 22 11:30:20 2004
@@ -35,7 +35,8 @@
 
 #include "fontmisc.h"
 #include "fontenc.h"
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "freetype/ttnameid.h"
 #include "freetype/tttables.h"
 #include "freetype/t1tables.h"
--- lib/font/FreeType/ftfuncs.c.orig	Sat Nov  1 23:43:24 2003
+++ lib/font/FreeType/ftfuncs.c	Mon Mar 22 12:53:58 2004
@@ -42,7 +42,8 @@
 #include "fntfilst.h"
 #include "fontutil.h"
 #include "FSproto.h"
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "freetype/ftsizes.h"
 #include "freetype/ttnameid.h"
 #include "freetype/tttables.h"
@@ -50,7 +51,7 @@
 #include "freetype/ftxf86.h"
 #include "freetype/ftbbox.h"
 #include "freetype/internal/tttypes.h"
-#include "extras/freetype2/src/truetype/ttobjs.h"
+#include "ttobjs.h"
 /*
  *  If you want to use FT_Outline_Get_CBox instead of 
  *  FT_Outline_Get_BBox, define here.
--- lib/font/FreeType/fttools.c.orig	Mon Mar 22 11:37:36 2004
+++ lib/font/FreeType/fttools.c	Mon Mar 22 11:37:53 2004
@@ -34,7 +34,8 @@
 #endif
 
 #include "font.h"
-#include "freetype/freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include "freetype/ftsnames.h"
 #include "freetype/ttnameid.h"
 #include "ft.h"
--- lib/font/FreeType/Imakefile.orig	Mon Mar 22 13:01:24 2004
+++ lib/font/FreeType/Imakefile	Mon Mar 22 13:02:44 2004
@@ -9,10 +9,11 @@
 
 DEFINES = ServerExtraDefines StrcasecmpDefines Freetype2BuildDefines
 
-FT2INCS = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/include
+FT2SOURCEDIR = $(TOP)/extras/freetype2/src
+FT2INCS = $(FREETYPE2INCLUDES)
 
-INCLUDES = -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
-           -I$(SERVERSRC)/include $(FT2INCS) -I$(INCLUDESRC)
+INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
+           -I$(SERVERSRC)/include $(FT2INCS) -I$(FT2SOURCEDIR)/truetype -I$(INCLUDESRC)
 
 SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
 OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
