diff -Nurd -x'*~' libgnomeprint-2.18.8.orig/configure libgnomeprint-2.18.8/configure
--- libgnomeprint-2.18.8.orig/configure	2010-09-28 05:27:21.000000000 -0400
+++ libgnomeprint-2.18.8/configure	2013-11-30 15:10:14.000000000 -0500
@@ -17880,7 +17880,7 @@
 $as_echo "Cups found but the version found is less than 1.1.20" >&6; }
               cups_msg="Version requirement not satisfied"
 	    else
-		    CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
+		    CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs | perl -p -e 's/(-\S*framework)\s+(\S+)/-Wl,\1,\2/g'`"
 		    CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found version $verstxt" >&5
 $as_echo "Found version $verstxt" >&6; }
diff -Nurd -x'*~' libgnomeprint-2.18.8.orig/libgnomeprint/gnome-font-face.c libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c
--- libgnomeprint-2.18.8.orig/libgnomeprint/gnome-font-face.c	2010-02-09 07:32:51.000000000 -0500
+++ libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c	2013-11-30 15:12:06.000000000 -0500
@@ -36,7 +36,8 @@
 #include <stdarg.h>
 #include <locale.h>
 
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 
 #include <libgnomeprint/gnome-print-private.h>
 #include <libgnomeprint/gnome-font-private.h>
diff -Nurd -x'*~' libgnomeprint-2.18.8.orig/libgnomeprint/gnome-print-gdi.c libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c
--- libgnomeprint-2.18.8.orig/libgnomeprint/gnome-print-gdi.c	2010-02-09 07:32:51.000000000 -0500
+++ libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c	2013-11-30 15:12:10.000000000 -0500
@@ -36,7 +36,7 @@
 #include <libgnomeprint/gp-gc-private.h>
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
+#include FT_FREETYPE_H
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff -Nurd -x'*~' libgnomeprint-2.18.8.orig/libgnomeprint/gnome-rfont.c libgnomeprint-2.18.8/libgnomeprint/gnome-rfont.c
--- libgnomeprint-2.18.8.orig/libgnomeprint/gnome-rfont.c	2010-02-09 07:32:51.000000000 -0500
+++ libgnomeprint-2.18.8/libgnomeprint/gnome-rfont.c	2013-11-30 15:12:12.000000000 -0500
@@ -28,8 +28,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/ftglyph.h>
-#include <freetype/ftbbox.h>
+#include FT_GLYPH_H
+#include FT_BBOX_H
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_vpath.h>
diff -Nurd -x'*~' libgnomeprint-2.18.8.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.18.8/libgnomeprint/modules/cups/gnome-print-cups-transport.c
--- libgnomeprint-2.18.8.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2010-02-09 07:32:51.000000000 -0500
+++ libgnomeprint-2.18.8/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2013-11-30 15:10:14.000000000 -0500
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <locale.h>
+#include <stdio.h>
 
 #include <cups/cups.h>
 #include <libgnomeprint/gnome-print.h>