4 files changed, 15 insertions, 28 deletions
diff --git a/capplets/common/file-transfer-dialog.h b/capplets/common/file-transfer-dialog.h
index 140b1510..530d1cce 100644
--- a/capplets/common/file-transfer-dialog.h
+++ b/capplets/common/file-transfer-dialog.h
@@ -24,11 +24,10 @@
 #ifndef __FILE_TRANSFER_DIALOG_H__
 #define __FILE_TRANSFER_DIALOG_H__
 
+#include <glib.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define FILE_TRANSFER_DIALOG(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, file_transfer_dialog_get_type (), FileTransferDialog)
 #define FILE_TRANSFER_DIALOG_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, file_transfer_dialog_get_type (), FileTransferDialogClass)
@@ -66,8 +65,6 @@ void	       file_transfer_dialog_copy_async (FileTransferDialog *dlg,
 						int priority);
 
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __FILE_TRANSFER_DIALOG_H__ */
diff --git a/capplets/keybindings/eggaccelerators.h b/capplets/keybindings/eggaccelerators.h
index 4f503d6b..794879b8 100644
--- a/capplets/keybindings/eggaccelerators.h
+++ b/capplets/keybindings/eggaccelerators.h
@@ -21,12 +21,11 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /* Where a value is also in GdkModifierType we coincide,
  * otherwise we don't overlap.
@@ -91,9 +90,6 @@ gchar* egg_virtual_accelerator_label (guint                  accelerator_key,
 				      guint		     keycode,
 				      EggVirtualModifierType accelerator_mods);
 
-#ifdef __cplusplus
-}
-#endif
-
+G_END_DECLS
 
 #endif /* __EGG_ACCELERATORS_H__ */
diff --git a/capplets/keybindings/eggcellrendererkeys.h b/capplets/keybindings/eggcellrendererkeys.h
index 1b5f4262..061bd07a 100644
--- a/capplets/keybindings/eggcellrendererkeys.h
+++ b/capplets/keybindings/eggcellrendererkeys.h
@@ -20,12 +20,11 @@
 #ifndef __EGG_CELL_RENDERER_KEYS_H__
 #define __EGG_CELL_RENDERER_KEYS_H__
 
+#include <glib.h>
 #include <gtk/gtk.h>
 #include "eggaccelerators.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define EGG_TYPE_CELL_RENDERER_KEYS		(egg_cell_renderer_keys_get_type ())
 #define EGG_CELL_RENDERER_KEYS(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys))
@@ -84,10 +83,6 @@ void             egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys
 void             egg_cell_renderer_keys_set_accel_mode  (EggCellRendererKeys     *keys,
 							 EggCellRendererKeysMode  accel_mode);
 
-
-#ifdef __cplusplus
-}
-#endif
-
+G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_KEYS_H__ */
diff --git a/capplets/keyboard/mate-keyboard-properties-xkb.h b/capplets/keyboard/mate-keyboard-properties-xkb.h
index 55827e12..9e80eba0 100644
--- a/capplets/keyboard/mate-keyboard-properties-xkb.h
+++ b/capplets/keyboard/mate-keyboard-properties-xkb.h
@@ -24,13 +24,13 @@
 #ifndef __MATE_KEYBOARD_PROPERTY_XKB_H
 #define __MATE_KEYBOARD_PROPERTY_XKB_H
 
+#include <glib.h>
 #include <gio/gio.h>
 
 #include "libmatekbd/matekbd-keyboard-config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
+
 #define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s))
 extern XklEngine *engine;
 extern XklConfigRegistry *config_registry;
@@ -91,7 +91,6 @@ extern void xkb_save_default_group (gint group_no);
 
 extern gint xkb_get_default_group (void);
 
-#ifdef __cplusplus
-}
-#endif
-#endif				/* __MATE_KEYBOARD_PROPERTY_XKB_H */
+G_END_DECLS
+
+#endif /* __MATE_KEYBOARD_PROPERTY_XKB_H */