diff -Nurd -x'*~' libXft-2.2.0.orig/src/Makefile.in libXft-2.2.0/src/Makefile.in
--- libXft-2.2.0.orig/src/Makefile.in	2010-10-29 19:22:06.000000000 -0400
+++ libXft-2.2.0/src/Makefile.in	2011-04-22 16:40:59.000000000 -0400
@@ -254,8 +254,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
-            $(CWARNFLAGS) -I$(top_builddir)/include/X11/Xft
+AM_CPPFLAGS = -I$(top_builddir)/include/X11/Xft $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS)
 
 lib_LTLIBRARIES = libXft.la
 libXft_la_SOURCES = xftint.h \
diff -Nurd -x'*~' libXft-2.2.0.orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c
--- libXft-2.2.0.orig/src/xftglyphs.c	2009-10-16 17:27:08.000000000 -0400
+++ libXft-2.2.0/src/xftglyphs.c	2015-01-25 01:07:12.000000000 -0500
@@ -21,10 +21,11 @@
  */
 
 #include "xftint.h"
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 
 #if HAVE_FT_GLYPHSLOT_EMBOLDEN
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
 #endif
 
 static const int    filters[3][3] = {