--- src/core/compositor.c.orig	2008-03-10 08:49:15.000000000 +1100
+++ src/core/compositor.c	2008-04-28 07:23:44.000000000 +1000
@@ -37,12 +37,16 @@
 #include "compositor.h"
 #include "xprops.h"
 #include <X11/Xatom.h>
+#include <X11/Xprotostr.h>
 #include <X11/extensions/shape.h>
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/compositeproto.h>
+#include <X11/extensions/damageproto.h>
+#include <X11/extensions/xfixesproto.h>
 #include <X11/extensions/Xrender.h>
 
+typedef XID XserverRegion;
+typedef XID Damage;
+
 #if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2
 #define HAVE_NAME_WINDOW_PIXMAP 1
 #endif
@@ -249,7 +253,7 @@
 
   if (!compositor->debug)
     return;
-
+#if 0
   if (region)
     {
       rects = XFixesFetchRegionAndBounds (dpy, region, &nrects, &bounds);
@@ -268,6 +272,7 @@
     }
   else
     fprintf (stderr, "%s (XSR): null\n", location);
+#endif
 }
 
 /*