diff -aur cairo-0.3.0-orig/src/cairo-xlib.h cairo-0.3.0/src/cairo-xlib.h
--- cairo-0.3.0-orig/src/cairo-xlib.h	2005-01-20 11:28:54.000000000 -0500
+++ cairo-0.3.0/src/cairo-xlib.h	2005-04-08 20:23:30.000000000 -0400
@@ -40,6 +40,9 @@
 #define CAIRO_XLIB_H
 #ifdef  CAIRO_HAS_XLIB_SURFACE
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 #include <X11/extensions/Xrender.h>
 
 /* XXX: This shold be renamed to cairo_set_target_xlib to match the
@@ -66,6 +69,10 @@
 cairo_xlib_surface_set_size (cairo_surface_t *surface, int width, int height);
 */
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
 #endif /* CAIRO_HAS_XLIB_SURFACE */
 #endif /* CAIRO_XLIB_H */