Use G_BEGIN_DECLS / G_END_DECLS macros.

28 files changed, 55 insertions, 173 deletions

diff --git a/calendar/gui/a11y/ea-cal-view-event.h b/calendar/gui/a11y/ea-cal-view-event.h
index fccf023a82..548e42b4a7 100644
--- a/calendar/gui/a11y/ea-cal-view-event.h
+++ b/calendar/gui/a11y/ea-cal-view-event.h
@@ -25,9 +25,7 @@
 
 #include <atk/atkgobjectaccessible.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_CAL_VIEW_EVENT                   (ea_cal_view_event_get_type ())
 #define EA_CAL_VIEW_EVENT(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEvent))
@@ -54,9 +52,7 @@ struct _EaCalViewEventClass
 
 AtkObject *ea_cal_view_event_new (GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_CAL_VIEW_EVENT_H__ */
diff --git a/calendar/gui/a11y/ea-cal-view.h b/calendar/gui/a11y/ea-cal-view.h
index 9aa026ef6d..959f7816b5 100644
--- a/calendar/gui/a11y/ea-cal-view.h
+++ b/calendar/gui/a11y/ea-cal-view.h
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include "e-calendar-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_CAL_VIEW                     (ea_cal_view_get_type ())
 #define EA_CAL_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW, EaCalView))
@@ -55,8 +53,6 @@ struct _EaCalViewClass
 
 AtkObject* ea_cal_view_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_CAL_VIEW_H__ */
diff --git a/calendar/gui/a11y/ea-day-view-cell.h b/calendar/gui/a11y/ea-day-view-cell.h
index e0394c639b..669fb1abae 100644
--- a/calendar/gui/a11y/ea-day-view-cell.h
+++ b/calendar/gui/a11y/ea-day-view-cell.h
@@ -27,9 +27,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_DAY_VIEW_CELL                     (e_day_view_cell_get_type ())
 #define E_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCell))
@@ -82,8 +80,6 @@ struct _EaDayViewCellClass
 
 AtkObject*     ea_day_view_cell_new         (GObject *gobj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_DAY_VIEW_CELL_H__ */
diff --git a/calendar/gui/a11y/ea-day-view-main-item.h b/calendar/gui/a11y/ea-day-view-main-item.h
index 0ee7b5e0d1..c782e6acc8 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.h
+++ b/calendar/gui/a11y/ea-day-view-main-item.h
@@ -27,9 +27,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "e-day-view-main-item.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_DAY_VIEW_MAIN_ITEM                     (ea_day_view_main_item_get_type ())
 #define EA_DAY_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItem))
@@ -55,8 +53,6 @@ struct _EaDayViewMainItemClass
 
 AtkObject*     ea_day_view_main_item_new         (GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_DAY_VIEW_MAIN_ITEM_H__ */
diff --git a/calendar/gui/a11y/ea-day-view.h b/calendar/gui/a11y/ea-day-view.h
index 011064a764..33399f6600 100644
--- a/calendar/gui/a11y/ea-day-view.h
+++ b/calendar/gui/a11y/ea-day-view.h
@@ -26,9 +26,7 @@
 #include "ea-cal-view.h"
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_DAY_VIEW                     (ea_day_view_get_type ())
 #define EA_DAY_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW, EaDayView))
@@ -54,8 +52,6 @@ struct _EaDayViewClass
 
 AtkObject*     ea_day_view_new         (GtkWidget       *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_DAY_VIEW_H__ */
diff --git a/calendar/gui/a11y/ea-gnome-calendar.h b/calendar/gui/a11y/ea-gnome-calendar.h
index 56e695a684..b0d2cf71d2 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.h
+++ b/calendar/gui/a11y/ea-gnome-calendar.h
@@ -26,9 +26,7 @@
 #include <gtk/gtk.h>
 #include "gnome-cal.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_GNOME_CALENDAR            (ea_gnome_calendar_get_type ())
 #define EA_GNOME_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendar))
@@ -56,9 +54,7 @@ AtkObject*     ea_gnome_calendar_new         (GtkWidget       *widget);
 
 const gchar *	ea_gnome_calendar_get_label_description (GnomeCalendar *gcal);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_GNOME_CALENDAR_H__ */
diff --git a/calendar/gui/a11y/ea-jump-button.h b/calendar/gui/a11y/ea-jump-button.h
index cb2bea315d..cd3b6e26bb 100644
--- a/calendar/gui/a11y/ea-jump-button.h
+++ b/calendar/gui/a11y/ea-jump-button.h
@@ -26,9 +26,7 @@
 
 #include <atk/atkgobjectaccessible.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_JUMP_BUTTON                   (ea_jump_button_get_type ())
 #define EA_JUMP_BUTTON(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_JUMP_BUTTON, EaJumpButton))
@@ -54,9 +52,7 @@ struct _EaJumpButtonClass
 
 AtkObject *ea_jump_button_new (GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_JUMP_BUTTON_H__ */
diff --git a/calendar/gui/a11y/ea-week-view-cell.h b/calendar/gui/a11y/ea-week-view-cell.h
index 4cd2971b80..1524e9d3a8 100644
--- a/calendar/gui/a11y/ea-week-view-cell.h
+++ b/calendar/gui/a11y/ea-week-view-cell.h
@@ -27,9 +27,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_WEEK_VIEW_CELL                     (e_week_view_cell_get_type ())
 #define E_WEEK_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_WEEK_VIEW_CELL, EWeekViewCell))
@@ -82,8 +80,6 @@ struct _EaWeekViewCellClass
 
 AtkObject*     ea_week_view_cell_new         (GObject *gobj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_WEEK_VIEW_CELL_H__ */
diff --git a/calendar/gui/a11y/ea-week-view-main-item.h b/calendar/gui/a11y/ea-week-view-main-item.h
index 2093de10bd..d9110160c4 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.h
+++ b/calendar/gui/a11y/ea-week-view-main-item.h
@@ -28,9 +28,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "e-week-view-main-item.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_WEEK_VIEW_MAIN_ITEM                     (ea_week_view_main_item_get_type ())
 #define EA_WEEK_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW_MAIN_ITEM, EaWeekViewMainItem))
@@ -56,8 +54,6 @@ struct _EaWeekViewMainItemClass
 
 AtkObject*     ea_week_view_main_item_new         (GObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_WEEK_VIEW_MAIN_ITEM_H__ */
diff --git a/calendar/gui/a11y/ea-week-view.h b/calendar/gui/a11y/ea-week-view.h
index 5a83276059..bb71c17e74 100644
--- a/calendar/gui/a11y/ea-week-view.h
+++ b/calendar/gui/a11y/ea-week-view.h
@@ -27,9 +27,7 @@
 #include "ea-cal-view.h"
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_WEEK_VIEW                     (ea_week_view_get_type ())
 #define EA_WEEK_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW, EaWeekView))
@@ -55,9 +53,7 @@ struct _EaWeekViewClass
 
 AtkObject*     ea_week_view_new         (GtkWidget       *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_WEEK_VIEW_H__ */
diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h
index 4ec9980532..d92993c1a6 100644
--- a/calendar/gui/dialogs/calendar-setup.h
+++ b/calendar/gui/dialogs/calendar-setup.h
@@ -27,10 +27,7 @@
 struct _GtkWindow;
 struct _ESource;
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
+G_BEGIN_DECLS
 
 void calendar_setup_edit_calendar  (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group);
 void calendar_setup_new_calendar   (struct _GtkWindow *parent);
@@ -41,8 +38,6 @@ void calendar_setup_new_task_list  (struct _GtkWindow *parent);
 void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source);
 void calendar_setup_new_memo_list (struct _GtkWindow *parent);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __CALENDAR_SETUP_H__ */
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index f9876e7adf..52989aa0e2 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -29,10 +29,7 @@
 #include <libecal/e-cal.h>
 #include "e-util/e-config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
+G_BEGIN_DECLS
 
 typedef struct _ECalConfig ECalConfig;
 typedef struct _ECalConfigClass ECalConfigClass;
@@ -89,8 +86,6 @@ struct _ECalConfigHookClass {
 
 GType e_cal_config_hook_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index 4932157f37..e219679f89 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -29,10 +29,7 @@
 #include "e-util/e-event.h"
 #include "shell/e-shell-backend.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
+G_BEGIN_DECLS
 
 typedef struct _ECalEvent ECalEvent;
 typedef struct _ECalEventClass ECalEventClass;
@@ -82,8 +79,6 @@ struct _ECalEventHookClass {
 
 GType e_cal_event_hook_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __E_CAL_EVENT_H__ */
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index f1d9f4b729..0667f92051 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -28,10 +28,7 @@
 
 #include "e-util/e-menu.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _ECalMenu ECalMenu;
 typedef struct _ECalMenuClass ECalMenuClass;
@@ -119,8 +116,6 @@ struct _ECalMenuHookClass {
 
 GType e_cal_menu_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E_CAL_MENU_H__ */
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 9887c66366..ed59ae29e6 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -29,10 +29,7 @@
 #include "e-util/e-popup.h"
 #include "dialogs/comp-editor.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _ECalPopup ECalPopup;
 typedef struct _ECalPopupClass ECalPopupClass;
@@ -211,8 +208,6 @@ struct _ECalPopupHookClass {
 
 GType e_cal_popup_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E_CAL_POPUP_H__ */
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index f3d431ca20..36f2e0c52d 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -26,9 +26,7 @@
 
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* I've split these functions away from EDayView so we can use them for
    printing. */
@@ -51,8 +49,6 @@ gboolean   e_day_view_find_long_event_days	(EDayViewEvent	*event,
 						 gint		*start_day,
 						 gint		*end_day);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_DAY_VIEW_LAYOUT_H_ */
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index c9ce721341..3f28bde608 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -25,9 +25,7 @@
 
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EDayViewMainItem - canvas item which displays most of the appointment
@@ -57,8 +55,6 @@ typedef struct {
 GType    e_day_view_main_item_get_type      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index 9d7bdcae9f..237b556df6 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -26,9 +26,7 @@
 
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EDayViewTimeItem - canvas item which displays the times down the left of
@@ -71,8 +69,6 @@ GType    e_day_view_time_item_get_type      (void);
 gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index 01a7c44842..61dfdceab8 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -26,9 +26,7 @@
 
 #include "e-day-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
@@ -62,8 +60,6 @@ void e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
 					gchar *buffer, gint buffer_len);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index a259de6619..fb7e32edc7 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -32,10 +32,7 @@
 #include <libecal/e-cal-component.h>
 #include "e-meeting-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_MEETING_ATTENDEE			(e_meeting_attendee_get_type ())
 #define E_MEETING_ATTENDEE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee))
@@ -169,8 +166,6 @@ gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,
 
 void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_MEETING_ATTENDEE_H_ */
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index 310eb4c3a0..e9daa3d56a 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -33,9 +33,7 @@
 
 #include "e-meeting-time-sel.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define E_MEETING_TIME_SELECTOR_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index bfcdfc5854..49ddaf22e3 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -31,10 +31,7 @@
 #include <glib.h>
 #include "e-meeting-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 
@@ -73,8 +70,6 @@ struct _EMeetingFreeBusyPeriod
 	EMeetingFreeBusyType busy_type;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_MEETING_TYPES_H_ */
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index c71efec135..cd2e76df38 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -31,19 +31,14 @@
 #include <glib.h>
 #include "e-meeting-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 
 gint e_meeting_time_compare_times (EMeetingTime *time1,
 				   EMeetingTime *time2);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_MEETING_UTILS_H_ */
 
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 69d041f046..ebc5d07e07 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -26,9 +26,7 @@
 
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EWeekViewEventItem - displays the background, times and icons for an event
@@ -63,8 +61,6 @@ GType    e_week_view_event_item_get_type      (void);
 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index 0acd41d232..67975b2b20 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -26,9 +26,7 @@
 
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* I've split these functions away from EWeekView so we can use them for
    printing. */
@@ -63,8 +61,6 @@ gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event,
 					       gboolean	 compress_weekend,
 					       gint	*span_num_days);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_LAYOUT_H_ */
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 34bdfa2e1f..135a25e662 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -26,9 +26,7 @@
 
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EWeekViewMainItem - displays the background grid and dates for the Week and
@@ -59,8 +57,6 @@ GType    e_week_view_main_item_get_type      (void);
 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 0463c95cb0..6ee6cdaa96 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -26,9 +26,7 @@
 
 #include "e-week-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
@@ -59,8 +57,6 @@ GType    e_week_view_titles_item_get_type      (void);
 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 605c96b24b..513dae247b 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -29,9 +29,7 @@
 #include "e-calendar-view.h"
 #include "gnome-cal.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * EWeekView - displays the Week & Month views of the calendar.
@@ -449,8 +447,6 @@ gboolean e_week_view_is_jump_button_visible (EWeekView *week_view,
 					     gint day);
 void e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_H_ */