diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 3f2fca11a0..14bc58e671 100644
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-26  Michael Natterer  <mitch@imendio.com>
+
+	* libgail-util/gailmisc.h
+	* libgail-util/gailtextutil.h: use G_BEGIN/END_DECLS.
+
 2008-05-24  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 504706 – wrong deallocator used for GError in gailtextview.c
diff --git a/modules/other/gail/libgail-util/gailmisc.h b/modules/other/gail/libgail-util/gailmisc.h
index ced98e60dd..eaece96507 100644
--- a/modules/other/gail/libgail-util/gailmisc.h
+++ b/modules/other/gail/libgail-util/gailmisc.h
@@ -20,14 +20,12 @@
 #ifndef __GAIL_MISC_H__
 #define __GAIL_MISC_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus */
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 
+G_BEGIN_DECLS
+
 AtkAttributeSet* gail_misc_add_attribute          (AtkAttributeSet   *attrib_set,
                                                    AtkTextAttribute   attr,
                                                    gchar             *value);
@@ -79,8 +77,6 @@ AtkAttributeSet* gail_misc_buffer_get_run_attributes
                                                    gint              *start_offset,
                                                    gint              *end_offset);
 
-#ifdef __cplusplus 
-}
-#endif /*cplusplus */
+G_END_DECLS
 
 #endif /*__GAIL_MISC_H__ */
diff --git a/modules/other/gail/libgail-util/gailtextutil.h b/modules/other/gail/libgail-util/gailtextutil.h
index 530e699b0f..b8b916a165 100644
--- a/modules/other/gail/libgail-util/gailtextutil.h
+++ b/modules/other/gail/libgail-util/gailtextutil.h
@@ -20,13 +20,11 @@
 #ifndef __GAIL_TEXT_UTIL_H__
 #define __GAIL_TEXT_UTIL_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus */
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 #define GAIL_TYPE_TEXT_UTIL                  (gail_text_util_get_type ())
 #define GAIL_TEXT_UTIL(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_UTIL, GailTextUtil))
 #define GAIL_TEXT_UTIL_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_TEXT_UTIL, GailTextUtilClass))
@@ -84,8 +82,6 @@ gchar*        gail_text_util_get_substring (GailTextUtil    *textutil,
                                             gint            start_pos,
                                             gint            end_pos);
 
-#ifdef __cplusplus 
-}
-#endif /*cplusplus */
+G_END_DECLS
 
 #endif /*__GAIL_TEXT_UTIL_H__ */