diff -ru libgdiplus-1.2.4/cairo/src/cairo-glitz-private.h libgdiplus-1.2.4-fix/cairo/src/cairo-glitz-private.h
--- libgdiplus-1.2.4/cairo/src/cairo-glitz-private.h	2006-12-01 07:48:14.000000000 +0100
+++ libgdiplus-1.2.4-fix/cairo/src/cairo-glitz-private.h	2006-12-21 10:20:00.000000000 +0100
@@ -34,7 +34,7 @@
 #define CAIRO_GLITZ_PRIVATE_H
 
 #include "cairoint.h"
-#include "cairo-glitz.h"
+#include "cairo/cairo-glitz.h"
 
 slim_hidden_proto (cairo_glitz_surface_create);
 
diff -ru libgdiplus-1.2.4/cairo/src/cairo-glitz-surface.c libgdiplus-1.2.4-fix/cairo/src/cairo-glitz-surface.c
--- libgdiplus-1.2.4/cairo/src/cairo-glitz-surface.c	2006-12-01 07:48:14.000000000 +0100
+++ libgdiplus-1.2.4-fix/cairo/src/cairo-glitz-surface.c	2006-12-21 10:19:42.000000000 +0100
@@ -25,7 +25,7 @@
  */
 
 #include "cairoint.h"
-#include "cairo-glitz.h"
+#include "cairo/cairo-glitz.h"
 #include "cairo-glitz-private.h"
 
 typedef struct _cairo_glitz_surface {
diff -ru libgdiplus-1.2.4/cairo/src/cairo-xcb-surface.c libgdiplus-1.2.4-fix/cairo/src/cairo-xcb-surface.c
--- libgdiplus-1.2.4/cairo/src/cairo-xcb-surface.c	2006-12-01 07:48:14.000000000 +0100
+++ libgdiplus-1.2.4-fix/cairo/src/cairo-xcb-surface.c	2006-12-21 10:19:42.000000000 +0100
@@ -35,7 +35,7 @@
  */
 
 #include "cairoint.h"
-#include "cairo-xcb.h"
+#include "cairo/cairo-xcb.h"
-#include "cairo-xcb-xrender.h"
+#include "cairo/cairo-xcb-xrender.h"
 #include "cairo-clip-private.h"
 #include <xcb/xcb_renderutil.h>