3 files changed, 6 insertions, 21 deletions
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.h b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
index f223f24a0c..4607746337 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook-view.h
+++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
@@ -26,10 +26,7 @@
 #include <gtk/gtk.h>
 #include "e-addressbook-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_AB_VIEW			(ea_ab_view_get_type ())
 #define EA_AB_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_AB_VIEW, EaABView))
@@ -54,9 +51,7 @@ struct _EaABViewClass
 GType ea_ab_view_get_type (void);
 AtkObject* ea_ab_view_new(GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.h b/addressbook/gui/widgets/a11y/ea-minicard-view.h
index f20ef4487b..c564dac8c8 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.h
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.h
@@ -26,10 +26,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "e-minicard-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_MINICARD_VIEW			(ea_minicard_view_get_type ())
 #define EA_MINICARD_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD_VIEW, EaMinicardView))
@@ -56,9 +53,7 @@ GType ea_minicard_view_get_type (void);
 
 AtkObject* ea_minicard_view_new(GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.h b/addressbook/gui/widgets/a11y/ea-minicard.h
index 15f89e19c3..879463b629 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.h
+++ b/addressbook/gui/widgets/a11y/ea-minicard.h
@@ -27,10 +27,7 @@
 #include "e-minicard.h"
 #include "e-minicard-label.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_MINICARD			(ea_minicard_get_type ())
 #define EA_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD, EaMinicard))
@@ -55,9 +52,7 @@ struct _EaMinicardClass
 GType ea_minicard_get_type (void);
 AtkObject* ea_minicard_new(GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_MINICARD_H__ */