diff --git a/ChangeLog b/ChangeLog
index da418d9228..f94d8c1d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-26  Michael Natterer  <mitch@imendio.com>
+
+	* examples/gtkdial/gtkdial.h
+	* modules/input/gtkimcontextthai.h: use G_BEGIN/END_DECLS.
+
 2008-05-26  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkimmodule.h: fix indentation.
diff --git a/examples/gtkdial/gtkdial.h b/examples/gtkdial/gtkdial.h
index 850d7ea1e0..7f9096df9b 100644
--- a/examples/gtkdial/gtkdial.h
+++ b/examples/gtkdial/gtkdial.h
@@ -1,4 +1,3 @@
-
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
@@ -17,6 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __GTK_DIAL_H__
 #define __GTK_DIAL_H__
 
@@ -26,9 +26,7 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_DIAL(obj)          GTK_CHECK_CAST (obj, gtk_dial_get_type (), GtkDial)
@@ -83,9 +81,9 @@ void           gtk_dial_set_update_policy      (GtkDial      *dial,
 
 void           gtk_dial_set_adjustment         (GtkDial      *dial,
 						GtkAdjustment *adjustment);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+
+G_END_DECLS
 
 
 #endif /* __GTK_DIAL_H__ */
diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h
index 8c4049739e..06b37f015f 100644
--- a/modules/input/gtkimcontextthai.h
+++ b/modules/input/gtkimcontextthai.h
@@ -24,9 +24,7 @@
 
 #include <gtk/gtkimcontext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 extern GType gtk_type_im_context_thai;
 
@@ -74,9 +72,6 @@ GtkIMContextThaiISCMode
   gtk_im_context_thai_set_isc_mode (GtkIMContextThai *context_thai,
                                     GtkIMContextThaiISCMode mode);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IM_CONTEXT_THAI_H__ */