diff --git a/ChangeLog b/ChangeLog
index c41768e86..c42745ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-11  Carl Worth  <cworth@isi.edu>
+
+	* src/cairo-xlib.h: Add extern "C" stuff. (Thanks to Soory Kuloor
+	for the reminder).
+
 2003-10-09  Carl Worth  <cworth@isi.edu>
 
 	* src/cairo_font.c: Stub out NULL_POINTER errors as
diff --git a/src/cairo-xlib.h b/src/cairo-xlib.h
index 0e282cbd4..258cc5fc5 100644
--- a/src/cairo-xlib.h
+++ b/src/cairo-xlib.h
@@ -29,12 +29,15 @@
 #define _CAIRO_XLIB_H_
 
 #include "cairo.h"
+#ifdef _CAIROINT_H_
+#include <slim_export.h>
+#else
+#include <slim_import.h>
+#endif
 
-#ifdef _CAIROINT_H_                                                                                                                     
-#include <slim_export.h>                                                                                                                
-#else                                                                                                                                   
-#include <slim_import.h>                                                                                                                
-#endif                                                                                                                                  
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* XXX: This is a mess from the user's POV. Should the Visual or the
    cairo_format_t control what render format is used? Maybe I can have
@@ -53,4 +56,10 @@ cairo_set_target_drawable (cairo_t	*cr,
 			   Display	*dpy,
 			   Drawable	drawable);
 
+#ifdef __cplusplus
+}
+#endif
+
+#undef __external_linkage
+
 #endif