diff --git a/ChangeLog b/ChangeLog
index 59a7fd004f..ace7cd56ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2005-03-30  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/gdkpixbuf.h: Include cairo.h
 
 	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): 
 	Don't accept n_targets == -1.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 59a7fd004f..ace7cd56ce 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,6 @@
 2005-03-30  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/gdkpixbuf.h: Include cairo.h
 
 	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): 
 	Don't accept n_targets == -1.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 59a7fd004f..ace7cd56ce 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,6 @@
 2005-03-30  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/gdkpixbuf.h: Include cairo.h
 
 	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): 
 	Don't accept n_targets == -1.
diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 26d72d04a8..04f00a7eef 100644
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -1,13 +1,12 @@
 #ifndef __GDK_PIXBUF_H__
 #define __GDK_PIXBUF_H__
 
+#include <cairo.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkrgb.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Rendering to a drawable */
 
@@ -84,8 +83,6 @@ GdkPixbuf *gdk_pixbuf_get_from_image    (GdkPixbuf   *dest,
 void gdk_pixbuf_set_as_cairo_source (GdkPixbuf *pixbuf,
 				     cairo_t   *cr);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXBUF_H__ */