Including <glib.h> directly is rarely needed.

96 files changed, 2 insertions, 100 deletions

diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index 6b0205c493..0cd9183e5f 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -23,7 +23,6 @@
 #ifndef __E_MINICARD_LABEL_H__
 #define __E_MINICARD_LABEL_H__
 
-#include <glib.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 G_BEGIN_DECLS
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index d5804b18d9..a4700db480 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "gal-view-factory-minicard.h"
 #include "gal-view-minicard.h"
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 15b570e608..eed6dbc183 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 555d49df3d..440b757097 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 6d945d48c1..e780cfbfda 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <libebook/e-book.h>
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 261398d59c..6c393595d3 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -28,7 +28,6 @@
 #include "eab-book-util.h"
 
 #include <string.h>
-#include <glib.h>
 #include <glib-object.h>
 
 /*
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 816183dc4a..42dc10c6e9 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 3e09220102..85b2593a8b 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -26,7 +26,6 @@
 #ifndef CONFIG_DATA_H
 #define CONFIG_DATA_H
 
-#include <glib.h>
 #include <libical/ical.h>
 #include <libecal/e-cal.h>
 #include <gconf/gconf-client.h>
diff --git a/calendar/gui/cal-editor-utils.h b/calendar/gui/cal-editor-utils.h
index 211684eb20..00f24a5b33 100644
--- a/calendar/gui/cal-editor-utils.h
+++ b/calendar/gui/cal-editor-utils.h
@@ -20,7 +20,6 @@
 #ifndef CAL_EDITOR_UTILS_H
 #define CAL_EDITOR_UTILS_H
 
-#include <glib.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 #include <shell/e-shell.h>
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index d8cbb32cf3..f905af4d40 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -28,7 +28,6 @@
 #ifndef _CALENDAR_CONFIG_H_
 #define _CALENDAR_CONFIG_H_
 
-#include <glib.h>
 #include <gdk/gdk.h>
 #include <libecal/e-cal.h>
 #include <gconf/gconf-client.h>
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index bd08d93f09..67736985ce 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -26,7 +26,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "calendar-view-factory.h"
 #include "calendar-view.h"
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index 5f1261f1f5..db455b06d7 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -26,7 +26,6 @@
 #ifndef CANCEL_COMP_H
 #define CANCEL_COMP_H
 
-#include <glib.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 
diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h
index 0353d188f2..480edcbd42 100644
--- a/calendar/gui/dialogs/delete-error.h
+++ b/calendar/gui/dialogs/delete-error.h
@@ -26,7 +26,6 @@
 #ifndef DELETE_ERROR_H
 #define DELETE_ERROR_H
 
-#include <glib.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 72104a1cd5..d85e821d91 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -28,7 +28,6 @@
 
 #include "e-send-options-utils.h"
 
-#include <glib.h>
 #include <string.h>
 
 void
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index c5ae9f7ce8..a2e0418cbc 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-time-utils.h>
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 5193267411..0b8b65ad53 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -28,7 +28,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "e-util/e-categories-config.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 65cbc39c9b..01572ce359 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <time.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "calendar-config.h"
 #include "e-meeting-time-sel-item.h"
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index a2952a8618..6e7115cad9 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -25,7 +25,6 @@
 #define _E_MEETING_TYPES_H_
 
 #include <glib.h>
-#include "e-meeting-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index 250437d07c..7c275b19d0 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -24,7 +24,6 @@
 #ifndef _E_MEETING_UTILS_H_
 #define _E_MEETING_UTILS_H_
 
-#include <glib.h>
 #include "e-meeting-types.h"
 
 G_BEGIN_DECLS
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 5084aa0c62..ee0cd400e9 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include "e-week-view-main-item.h"
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index e663a37460..300ca3b738 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -29,7 +29,6 @@
 #include "e-day-view.h"
 #include "e-week-view.h"
 #include "dialogs/goto-dialog.h"
-#include <glib.h>
 #include <glib/gi18n.h>
 
 static void ea_cal_view_class_init (EaCalViewClass *klass);
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 1314a77121..8a2c4b5031 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -29,7 +29,6 @@
 
 #include "ea-calendar-helpers.h"
 #include "ea-gnome-calendar.h"
-#include <glib.h>
 #include <glib/gi18n.h>
 
 static void ea_day_view_class_init (EaDayViewClass *klass);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index ce7734ddcc..789fbcc451 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -33,7 +33,6 @@
 #include <math.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-categories.h>
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 21fe2ac1dc..c5718894fc 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -22,7 +22,6 @@
 
 #include <libical/ical.h>
 #include <string.h>
-#include <glib.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-account-list.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index ed0d235af4..0be794727e 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -33,7 +33,6 @@
 #include <math.h>
 #include <string.h>
 #include <time.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 8b354cf997..53a0439068 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -22,7 +22,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
diff --git a/e-util/e-datetime-format.h b/e-util/e-datetime-format.h
index 80f7d18826..2c19c65133 100644
--- a/e-util/e-datetime-format.h
+++ b/e-util/e-datetime-format.h
@@ -24,7 +24,6 @@
 #define __E_DATETIME_FORMAT__
 
 #include <time.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index f89bff6875..3f5f85488a 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -49,7 +49,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index e2cdd8f6b5..10e3519865 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 
 #include "e-html-utils.h"
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 148dc414a8..2ce5a6717c 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index dbceeb67ce..aa1b233754 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -20,7 +20,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
diff --git a/e-util/e-plugin-util.h b/e-util/e-plugin-util.h
index bedd2c2b32..de1b0b3487 100644
--- a/e-util/e-plugin-util.h
+++ b/e-util/e-plugin-util.h
@@ -22,7 +22,6 @@
 #ifndef _E_PLUGIN_UTIL_H
 #define _E_PLUGIN_UTIL_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <libsoup/soup.h>
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 94ca51872f..4e69359e86 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -23,7 +23,6 @@
 #ifndef _E_SORTER_ARRAY_H_
 #define _E_SORTER_ARRAY_H_
 
-#include <glib.h>
 #include <glib-object.h>
 #include <e-util/e-sorter.h>
 
diff --git a/e-util/e-unicode.h b/e-util/e-unicode.h
index 2979510aa6..c519c2e6e2 100644
--- a/e-util/e-unicode.h
+++ b/e-util/e-unicode.h
@@ -26,7 +26,6 @@
 #define _E_UNICODE_H_
 
 #include <sys/types.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <iconv.h>
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 0c34f48cb8..653b44eb5d 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -36,7 +36,6 @@
 #include <math.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <libxml/parser.h>
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index 9621349b9f..804dc2ed65 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -33,7 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 
 #include <gtk/gtk.h>
diff --git a/libgnomecanvas/gnome-canvas-util.c b/libgnomecanvas/gnome-canvas-util.c
index 43126c3af4..eb19baa6ec 100644
--- a/libgnomecanvas/gnome-canvas-util.c
+++ b/libgnomecanvas/gnome-canvas-util.c
@@ -42,7 +42,6 @@
 #endif
 #include <sys/types.h>
 
-#include <glib.h>
 #include <math.h>
 #include "gnome-canvas.h"
 #include "gnome-canvas-util.h"
diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h
index bd0442618d..282a0feacb 100644
--- a/mail/e-mail-local.h
+++ b/mail/e-mail-local.h
@@ -22,7 +22,6 @@
 #ifndef E_MAIL_LOCAL_H
 #define E_MAIL_LOCAL_H
 
-#include <glib.h>
 #include <camel/camel.h>
 #include <mail/e-mail-enums.h>
 #include <mail/e-mail-session.h>
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 6fef0b9a69..2b4f6207fd 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -37,7 +37,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/mail/e-mail-migrate.h b/mail/e-mail-migrate.h
index 4d7154b55d..c9edcf0f45 100644
--- a/mail/e-mail-migrate.h
+++ b/mail/e-mail-migrate.h
@@ -22,7 +22,6 @@
 #ifndef E_MAIL_SHELL_BACKEND_MIGRATE_H
 #define E_MAIL_SHELL_BACKEND_MIGRATE_H
 
-#include <glib.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 895f0a91f4..5a172e78c1 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include "mail/e-mail-reader.h"
diff --git a/mail/e-mail-pane.c b/mail/e-mail-pane.c
index 2ed275aaca..6fa88afd0f 100644
--- a/mail/e-mail-pane.c
+++ b/mail/e-mail-pane.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "e-mail-pane.h"
 
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index f562bee5b1..d9c44efd2c 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include "e-mail-paned-view.h"
 
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index ffcfc2ea37..af66b333f3 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index a0326b2ded..76a6ee5701 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -22,7 +22,6 @@
 #ifndef E_MAIL_STORE_H
 #define E_MAIL_STORE_H
 
-#include <glib.h>
 #include <camel/camel.h>
 #include <mail/e-mail-session.h>
 #include <libedataserver/e-account.h>
diff --git a/mail/em-event.c b/mail/em-event.c
index a2972afa7f..074b9abfa9 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
 #include "em-event.h"
 #include "composer/e-msg-composer.h"
 
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 017dea8a81..7d16366c0e 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
 #include "em-format-hook.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 37676aef83..5dd2440c5f 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -31,7 +31,6 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #ifdef G_OS_WIN32
 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index 806d79d55a..122a461664 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -30,7 +30,6 @@ requests are always handled in the main gui thread in the correct order.
 #ifndef EM_SYNC_STREAM_H
 #define EM_SYNC_STREAM_H
 
-#include <glib.h>
 #include <camel/camel.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index f7f957ba82..9e8dec8547 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <time.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 9bf663ac50..1c87afc7da 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 0efe54ba7f..aca6ef726e 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include "e-mail-folder-utils.h"
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index f87819ee9d..5832a2088c 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <time.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 24c54c7290..686f6dc0aa 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <libedataserver/e-flag.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index fdf8472cf6..e52996c36e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -31,7 +31,6 @@
 
 #include <errno.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 7c7708b350..476ed67fdb 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -33,7 +33,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 
 #include <glib/gi18n.h>
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index 779a864370..94b19c0d12 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -23,7 +23,6 @@
 #ifndef MAIL_TOOLS_H
 #define MAIL_TOOLS_H
 
-#include <glib.h>
 #include <camel/camel.h>
 
 /* Does a camel_movemail into the local movemail folder
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 12ddb0ecf3..faa5a6ee26 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -26,8 +26,6 @@
 
 #include <string.h>
 
-#include <glib.h>
-
 #include <glib/gi18n.h>
 
 #include <libedataserver/e-account-list.h>
diff --git a/modules/addressbook/autocompletion-config.h b/modules/addressbook/autocompletion-config.h
index 8825161732..c4630f8d66 100644
--- a/modules/addressbook/autocompletion-config.h
+++ b/modules/addressbook/autocompletion-config.h
@@ -25,7 +25,6 @@
 #ifndef _AUTOCOMPLETION_CONFIG_H
 #define _AUTOCOMPLETION_CONFIG_H
 
-#include <glib.h>
 #include <shell/e-shell.h>
 #include <widgets/misc/e-preferences-window.h>
 
diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index c23add1cde..df27f39e47 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -33,7 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 
 #include <gtk/gtk.h>
diff --git a/modules/addressbook/e-book-shell-migrate.h b/modules/addressbook/e-book-shell-migrate.h
index cb6128910a..2bbf3f321f 100644
--- a/modules/addressbook/e-book-shell-migrate.h
+++ b/modules/addressbook/e-book-shell-migrate.h
@@ -25,7 +25,6 @@
 #ifndef E_BOOK_SHELL_MIGRATE_H
 #define E_BOOK_SHELL_MIGRATE_H
 
-#include <glib.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/modules/calendar/e-cal-shell-migrate.h b/modules/calendar/e-cal-shell-migrate.h
index 359ca5ea22..6c021978a0 100644
--- a/modules/calendar/e-cal-shell-migrate.h
+++ b/modules/calendar/e-cal-shell-migrate.h
@@ -22,7 +22,6 @@
 #ifndef E_CAL_SHELL_BACKEND_MIGRATE_H
 #define E_CAL_SHELL_BACKEND_MIGRATE_H
 
-#include <glib.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/modules/calendar/e-memo-shell-migrate.h b/modules/calendar/e-memo-shell-migrate.h
index ba163c6950..b75612539f 100644
--- a/modules/calendar/e-memo-shell-migrate.h
+++ b/modules/calendar/e-memo-shell-migrate.h
@@ -22,7 +22,6 @@
 #ifndef E_MEMO_SHELL_BACKEND_MIGRATE_H
 #define E_MEMO_SHELL_BACKEND_MIGRATE_H
 
-#include <glib.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/modules/calendar/e-task-shell-migrate.h b/modules/calendar/e-task-shell-migrate.h
index 4cb91c9f4a..f33aa82fcc 100644
--- a/modules/calendar/e-task-shell-migrate.h
+++ b/modules/calendar/e-task-shell-migrate.h
@@ -22,7 +22,6 @@
 #ifndef E_TASK_SHELL_BACKEND_MIGRATE_H
 #define E_TASK_SHELL_BACKEND_MIGRATE_H
 
-#include <glib.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 9b862309ee..928998f585 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 23be827182..164cf53e10 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -33,7 +33,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 97855086b2..0d6726fd03 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -32,8 +32,6 @@
 
 #define G_LOG_DOMAIN "bf-junk-filter"
 
-#include <glib.h>
-
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #else
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index 9efa6b126e..3a78217b1a 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -24,7 +24,6 @@
 #endif
 
 #include <glib/gi18n-lib.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <libsoup/soup.h>
diff --git a/plugins/caldav/caldav-browse-server.h b/plugins/caldav/caldav-browse-server.h
index aa8b5e6f5d..0936761bba 100644
--- a/plugins/caldav/caldav-browse-server.h
+++ b/plugins/caldav/caldav-browse-server.h
@@ -22,7 +22,6 @@
 #ifndef CALDAV_BROWSE_SERVER_H
 #define CALDAV_BROWSE_SERVER_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 /* Opens a window with a list of available calendars for a given server;
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 4b6cae1f59..11c651f7d9 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <glib/gi18n-lib.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/plugins/contacts-map/geo-utils.h b/plugins/contacts-map/geo-utils.h
index c830151761..aa1ebcc3eb 100644
--- a/plugins/contacts-map/geo-utils.h
+++ b/plugins/contacts-map/geo-utils.h
@@ -21,7 +21,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <glib.h>
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 48fd243873..663d237434 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -33,7 +33,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <glib-object.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index ee6154e5f9..e8c89bae84 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index f0290246a9..38bbad3385 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 562a74eb9a..95c6238c0a 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 88b5c81893..0e628e0ee4 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 4db7515abf..147b779217 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <e-util/e-plugin-ui.h>
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index ca6ade1a4e..26d0a981f9 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -27,7 +27,6 @@
 #include "url-editor-dialog.h"
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-url.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <e-util/e-util.h>
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index 24df0a16cc..e04d95fbf1 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.h
@@ -20,7 +20,6 @@
  *
  */
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libedataserver/e-source.h>
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 57efaba1c5..71343e8536 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 81cf30c542..ed716d3e89 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 7bc23d5be4..0845e63735 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <e-shell-meego.h>
 
 #ifndef G_OS_WIN32
diff --git a/shell/e-shell-meego.h b/shell/e-shell-meego.h
index 54a7d528b4..ba0b23d50c 100644
--- a/shell/e-shell-meego.h
+++ b/shell/e-shell-meego.h
@@ -19,6 +19,8 @@
 #ifndef E_SHELL_MEEGO_H
 #define E_SHELL_MEEGO_H
 
+#include <glib.h>
+
 extern void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen);
 
 #endif /* E_SHELL_MEEGO_H */
diff --git a/shell/es-event.c b/shell/es-event.c
index f079afd8b5..7628f64869 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
 #include "es-event.h"
 #include "e-shell.h"
 
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 4cc4fb90d1..ed7e6a65c1 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -43,7 +43,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 50a18e87f3..39ce216ce1 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <glib.h>
 #include <libxml/parser.h>
 #include <libedataserver/e-xml-utils.h>
 
diff --git a/widgets/misc/e-port-entry.c b/widgets/misc/e-port-entry.c
index b00a90f3ec..a353613039 100644
--- a/widgets/misc/e-port-entry.c
+++ b/widgets/misc/e-port-entry.c
@@ -19,7 +19,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <glib.h>
 
 struct _EPortEntryPrivate {
 	guint port;
diff --git a/widgets/misc/e-searching-tokenizer.h b/widgets/misc/e-searching-tokenizer.h
index 7eb603a25d..ab13203c36 100644
--- a/widgets/misc/e-searching-tokenizer.h
+++ b/widgets/misc/e-searching-tokenizer.h
@@ -24,7 +24,6 @@
 #ifndef E_SEARCHING_TOKENIZER_H
 #define E_SEARCHING_TOKENIZER_H
 
-#include <glib.h>
 #include <gtkhtml/htmltokenizer.h>
 
 /* Standard GObject macros */
diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index a3acca0b2a..89fcf3a031 100644
--- a/widgets/misc/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
@@ -28,7 +28,6 @@
 #include <time.h>
 #include <string.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include <glib.h>
 #include <e-util/e-util.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/widgets/misc/ea-cell-table.h b/widgets/misc/ea-cell-table.h
index 353bbd0634..bcd6efdc85 100644
--- a/widgets/misc/ea-cell-table.h
+++ b/widgets/misc/ea-cell-table.h
@@ -22,7 +22,6 @@
 
 /* EaCellTable */
 
-#include <glib.h>
 #include <glib-object.h>
 
 struct _EaCellTable {
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 750b4dea0b..7517ad0e9c 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -33,7 +33,6 @@
 
 #include <string.h>
 #include <time.h>
-#include <glib.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 020f1d8ca5..9215e7b2fb 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 174d20a1de..659677eceb 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <string.h> /* strlen() */
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 03a66f9b98..76c268ad11 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 3acf7c6c21..f755cbc451 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 56669ec515..4cfd74fe68 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>