diff -ur libXft-2.1.8.2/include/X11/Xft/Xft.h libXft-2.1.8.2.new/include/X11/Xft/Xft.h
--- libXft-2.1.8.2/include/X11/Xft/Xft.h	2005-10-19 04:46:56.000000000 +0200
+++ libXft-2.1.8.2.new/include/X11/Xft/Xft.h	2006-06-03 17:17:32.000000000 +0200
@@ -129,16 +129,6 @@
 	      Colormap	cmap,
 	      XftColor	*color);
 
-
-/* xftcore.c */
-
-/* xftdir.c */
-FcBool
-XftDirScan (FcFontSet *set, _Xconst char *dir, FcBool force);
-
-FcBool
-XftDirSave (FcFontSet *set, _Xconst char *dir);
-
 /* xftdpy.c */
 Bool
 XftDefaultHasRender (Display *dpy);
@@ -428,9 +418,9 @@
 XftCharIndex (Display	    *dpy, 
 	      XftFont	    *pub,
 	      FcChar32	    ucs4);
-    
-/* xftgram.y */
 
+
+    
 /* xftinit.c */
 FcBool
 XftInit (_Xconst char *config);
@@ -438,8 +428,6 @@
 int
 XftGetVersion (void);
 
-/* xftlex.l */
-
 /* xftlist.c */
 
 FcFontSet *
@@ -447,16 +435,10 @@
 	      int	screen,
 	      ...) _X_SENTINEL(0);
 
-/* xftmatch.c */
-
-/* xftmatrix.c */
-
 /* xftname.c */
 FcPattern 
 *XftNameParse (_Xconst char *name);
 
-/* xftpat.c */
-
 /* xftrender.c */
 void
 XftGlyphRender (Display		*dpy,
@@ -631,8 +613,6 @@
 		    FcEndian	    endian,
 		    int		    len);
 
-/* xftstr.c */
-
 /* xftxlfd.c */
 FcPattern *
 XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete);
diff -ur libXft-2.1.8.2/src/xftglyphs.c libXft-2.1.8.2.new/src/xftglyphs.c
--- libXft-2.1.8.2/src/xftglyphs.c	2005-07-03 09:00:57.000000000 +0200
+++ libXft-2.1.8.2.new/src/xftglyphs.c	2006-06-03 17:18:01.000000000 +0200
@@ -25,6 +25,11 @@
 #include "xftint.h"
 #include <freetype/ftoutln.h>
 
+#if HAVE_FT_GLYPHSLOT_EMBOLDEN
+#include <freetype/ftsynth.h>
+#endif
+
+
 static const int    filters[3][3] = {
     /* red */
 #if 0