diff --git a/ChangeLog b/ChangeLog
index 23a753c70c..6e8fa4c37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
+
+	* gdk/gdkinternals.h: Restore G_BEGIN_DECLS at the
+	top of this file to make C++ compilers happy.
+
 2007-06-19  Matthias Clasen <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index f97b97be04..45887c27c5 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -33,6 +33,8 @@
 #ifndef __GDK_INTERNALS_H__
 #define __GDK_INTERNALS_H__
 
+G_BEGIN_DECLS
+
 /**********************
  * General Facilities * 
  **********************/