--- cairo-xlib.h	2005-01-20 17:28:54.000000000 +0100
+++ /usr/include/cairo/cairo-xlib.h	2005-03-31 14:42:11.000000000 +0200
@@ -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_status_t
 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 */