Clean up #include directives in source files

https://bugzilla.gnome.org/show_bug.cgi?id=697076

66 files changed, 2 insertions, 105 deletions

diff --git a/extensions/extensions.h b/extensions/extensions.h
index 2dbd79cc6..c1c421643 100644
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -1,7 +1,6 @@
 #ifndef __EMP_EXTENSIONS_H__
 #define __EMP_EXTENSIONS_H__
 
-#include <glib-object.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 4af7828a3..dc9e036ee 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -28,7 +28,6 @@
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG g_debug
 #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 3431d0ec8..d4e8ae297 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <mission-control-plugins/mission-control-plugins.h>
-
 #include "mcp-account-manager-goa.h"
 
 GObject *
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 4be6d61a9..c102d6ea6 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
-#include <gtk/gtk.h>
-
 #include "empathy-account-widget.h"
 #include "empathy-irc-network-chooser.h"
 
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 4fc9a3197..044e3a991 100644
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,9 +22,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
-#include <glib.h>
-#include <gtk/gtk.h>
-
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 807d57dff..4fed35ec9 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
-#include <gtk/gtk.h>
-
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index 0b025af85..a7d0a6f8c 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -20,9 +20,6 @@
 #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
 #define __EMPATHY_BAD_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
index 3f4cfdd5e..0c8ff5251 100644
--- a/libempathy-gtk/empathy-base-password-dialog.h
+++ b/libempathy-gtk/empathy-base-password-dialog.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
 #define __EMPATHY_BASE_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h
index 3f1aed1f1..ecc8c78c5 100644
--- a/libempathy-gtk/empathy-calendar-button.h
+++ b/libempathy-gtk/empathy-calendar-button.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_CALENDAR_BUTTON_H__
 #define __EMPATHY_CALENDAR_BUTTON_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index cbcfdce89..ebf320471 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-request-util.h"
 
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 7e342d819..788d828f5 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 
-#include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index c102c5dd0..64514f09d 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CONTACTINFO_UTILS_H__
 #define __EMPATHY_CONTACTINFO_UTILS_H__
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h
index f9f85c1c9..e1412ab8a 100644
--- a/libempathy-gtk/empathy-geometry.h
+++ b/libempathy-gtk/empathy-geometry.h
@@ -24,7 +24,6 @@
 #ifndef __EMPATHY_GEOMETRY_H__
 #define __EMPATHY_GEOMETRY_H__
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 8726c1fd1..d442e7ca5 100644
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 
-#include <gtk/gtk.h>
+#include <glib-object.h>
 
 #include "empathy-individual-manager.h"
 #include "empathy-individual-store.h"
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index fc3cc1fb3..35457f592 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -24,7 +24,6 @@
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.h"
-#include "empathy-utils.h"
 #include "totem-subtitle-encoding.h"
 
 typedef struct {
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 3650a33c3..526569a51 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <telepathy-glib/proxy-subclass.h>
-#include <webkit/webkit.h>
 
 #include "action-chain-internal.h"
 #include "empathy-account-chooser.h"
diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h
index d3f05e64e..e7413568c 100644
--- a/libempathy-gtk/empathy-new-call-dialog.h
+++ b/libempathy-gtk/empathy-new-call-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_CALL_DIALOG_H__
 #define __EMPATHY_NEW_CALL_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index 390101a2b..5adc4cf9e 100644
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index ee01e7ab9..7c2fa8c4a 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NOTIFY_MANAGER_H__
 #define __EMPATHY_NOTIFY_MANAGER_H__
 
-#include <glib-object.h>
 #include <libnotify/notification.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index fe84019f3..1b19375a3 100644
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_PASSWORD_DIALOG_H__
 #define __EMPATHY_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include "empathy-base-password-dialog.h"
diff --git a/libempathy-gtk/empathy-plist.h b/libempathy-gtk/empathy-plist.h
index a15ad6a01..216896b42 100644
--- a/libempathy-gtk/empathy-plist.h
+++ b/libempathy-gtk/empathy-plist.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_PLIST_H__
 #define __EMPATHY_PLIST_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index efa3089e5..2ae8017ef 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__
 #define __EMPATHY_PROTOCOL_CHOOSER_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 9a211946d..1b35f1a1c 100644
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_ROSTER_MODEL_H__
 #define __EMPATHY_ROSTER_MODEL_H__
 
-#include <glib-object.h>
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h
index afda250b2..a710965b5 100644
--- a/libempathy-gtk/empathy-search-bar.h
+++ b/libempathy-gtk/empathy-search-bar.h
@@ -20,8 +20,7 @@
 #ifndef __EMPATHY_SEARCH_BAR_H__
 #define __EMPATHY_SEARCH_BAR_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
 
 #include "empathy-theme-adium.h"
 
diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h
index 1d6eaac54..b9e753bf6 100644
--- a/libempathy-gtk/empathy-smiley-manager.h
+++ b/libempathy-gtk/empathy-smiley-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_SMILEY_MANAGER__H__
 #define __EMPATHY_SMILEY_MANAGER_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 5e592186b..b2fd0d291 100644
--- a/libempathy-gtk/empathy-sound-manager.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_SOUND_MANAGER_H__
 #define __EMPATHY_SOUND_MANAGER_H__
 
-#include <gtk/gtk.h>
 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5de6071e3..625547fe5 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.h
+++ b/libempathy-gtk/empathy-status-preset-dialog.h
@@ -28,7 +28,6 @@
 #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index d921372ab..81361c1ef 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -23,9 +23,6 @@
 #include "config.h"
 #include "empathy-theme-manager.h"
 
-#include <string.h>
-#include <gtk/gtk.h>
-
 #include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index 812b02616..590c343f3 100644
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_THEME_MANAGER_H__
 #define __EMPATHY_THEME_MANAGER_H__
 
-#include <glib-object.h>
 #include "empathy-theme-adium.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h
index 6b08ee399..b85e7d097 100644
--- a/libempathy-gtk/empathy-tls-dialog.h
+++ b/libempathy-gtk/empathy-tls-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_TLS_DIALOG_H__
 #define __EMPATHY_TLS_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 962246f52..c9eb5ca6f 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -30,7 +30,6 @@
 #include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
-#include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 1ae728546..de7923858 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -22,21 +22,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
 
-#include <telepathy-glib/telepathy-glib.h>
 
-#include "empathy-contact.h"
 #include "empathy-debug.h"
 #include "empathy-ft-factory.h"
-#include "empathy-ft-handler.h"
 
-#include "empathy-roster-model.h"
 #include "empathy-roster-model-manager.h"
-#include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
 #include "empathy-roster-view.h"
 #include "empathy-roster-contact.h"
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index ccbaab9d8..772e6868e 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -28,7 +28,6 @@
 #include "empathy-accounts-common.h"
 
 #include "empathy-accounts-dialog.h"
-#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index e4a4a6626..1cb24d7dd 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_ACCOUNTS_COMMON_H__
 #define __EMPATHY_ACCOUNTS_COMMON_H__
 
-#include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-audio-sink.h b/src/empathy-audio-sink.h
index ceb0bbe36..85b576c42 100644
--- a/src/empathy-audio-sink.h
+++ b/src/empathy-audio-sink.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SINK_H__
 #define __EMPATHY_GST_AUDIO_SINK_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index ef87c44c4..2d1a6960d 100644
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SRC_H__
 #define __EMPATHY_GST_AUDIO_SRC_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 #include <gio/gio.h>
 
diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index c400fc2fa..b913d8e57 100644
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_FACTORY_H__
 #define __EMPATHY_CALL_FACTORY_H__
 
-#include <glib-object.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index face00887..5050d801e 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_CALL_HANDLER_H__
 #define __EMPATHY_CALL_HANDLER_H__
 
-#include <glib-object.h>
-#include <gst/gst.h>
 #include <farstream/fs-conference.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h
index 1d5a58b57..3fdb6b797 100644
--- a/src/empathy-call-observer.h
+++ b/src/empathy-call-observer.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_OBSERVER_H__
 #define __EMPATHY_CALL_OBSERVER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h
index 7e9bd63e5..56ddf99b8 100644
--- a/src/empathy-call-window-fullscreen.h
+++ b/src/empathy-call-window-fullscreen.h
@@ -20,8 +20,6 @@
 #ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 #define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
 
 #include "empathy-call-window.h"
 
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index d4d1b7cb3..2090b1beb 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include "empathy-audio-src.h"
diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h
index 92760f67d..b55726bed 100644
--- a/src/empathy-camera-menu.h
+++ b/src/empathy-camera-menu.h
@@ -19,7 +19,6 @@
 #ifndef __EMPATHY_CAMERA_MENU_H__
 #define __EMPATHY_CAMERA_MENU_H__
 
-#include <glib-object.h>
 
 #include "empathy-call-window.h"
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 89f230dc3..02ed0d949 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -24,7 +24,6 @@
 
 #include "empathy-chatroom-manager.h"
 #include "empathy-chat-window.h"
-#include "empathy-individual-manager.h"
 #include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
 #include "extensions.h"
diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index ab3817ea9..b5516c33d 100644
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_CHAT_MANAGER_H__
 #define __EMPATHY_CHAT_MANAGER_H__
 
-#include <glib-object.h>
 
 #include "empathy-chat.h"
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 9dafa5fe2..480570d0b 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "empathy-chat-window.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "empathy-about-dialog.h"
@@ -38,7 +37,6 @@
 #include "empathy-geometry.h"
 #include "empathy-gsettings.h"
 #include "empathy-images.h"
-#include "empathy-individual-manager.h"
 #include "empathy-invite-participant-dialog.h"
 #include "empathy-notify-manager.h"
 #include "empathy-request-util.h"
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 8c5955972..ae986cc7f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -27,7 +27,6 @@
 #ifndef __EMPATHY_CHAT_WINDOW_H__
 #define __EMPATHY_CHAT_WINDOW_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 5269bcfc5..c8944bf03 100644
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 511a5ed57..f2878c7ca 100644
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_EVENT_MANAGER_H__
 #define __EMPATHY_EVENT_MANAGER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
 #include "empathy-contact.h"
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 22d47a76f..be41730eb 100644
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -25,9 +25,7 @@
 #ifndef __EMPATHY_FT_MANAGER_H__
 #define __EMPATHY_FT_MANAGER_H__
 
-#include <gtk/gtk.h>
 #include <glib-object.h>
-#include <glib.h>
 
 #include "empathy-ft-handler.h"
 
diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 59e1cb4d4..d860c4ee8 100644
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_IMPORT_UTILS_H__
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index a572ad0c6..86dc95150 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-import-dialog.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 508706fb8..8e9f32f5a 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -25,7 +25,6 @@
 #ifndef __EMPATHY_IMPORT_WIDGET_H__
 #define __EMPATHY_IMPORT_WIDGET_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include "empathy-connection-managers.h"
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 90d1088ff..ae2b0c071 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "empathy-mic-monitor.h"
 
-#include <gtk/gtk.h>
 #include <pulse/glib-mainloop.h>
 
 #include "empathy-utils.h"
diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h
index 6d545483e..73771681a 100644
--- a/src/empathy-mic-monitor.h
+++ b/src/empathy-mic-monitor.h
@@ -19,7 +19,6 @@
 #ifndef __EMPATHY_MIC_MONITOR_H__
 #define __EMPATHY_MIC_MONITOR_H__
 
-#include <glib-object.h>
 #include <gio/gio.h>
 #include <pulse/pulseaudio.h>
 
diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h
index 9f7796dbe..31212cb56 100644
--- a/src/empathy-new-chatroom-dialog.h
+++ b/src/empathy-new-chatroom-dialog.h
@@ -24,7 +24,6 @@
 #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
index 49fc03fd3..29a7797a6 100644
--- a/src/empathy-rounded-actor.h
+++ b/src/empathy-rounded-actor.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_ACTOR_H__
 #define __EMPATHY_ROUNDED_ACTOR_H__
 
-#include <glib-object.h>
 #include <clutter-gtk/clutter-gtk.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h
index e4bf72c6e..b9988d53c 100644
--- a/src/empathy-rounded-rectangle.h
+++ b/src/empathy-rounded-rectangle.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_RECTANGLE_H__
 #define __EMPATHY_ROUNDED_RECTANGLE_H__
 
-#include <glib-object.h>
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-rounded-texture.h b/src/empathy-rounded-texture.h
index ab75757dd..c5d870d03 100644
--- a/src/empathy-rounded-texture.h
+++ b/src/empathy-rounded-texture.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_TEXTURE_H__
 #define __EMPATHY_ROUNDED_TEXTURE_H__
 
-#include <glib-object.h>
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h
index 44a0b1253..586e651e2 100644
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_STATUS_ICON_H__
 #define __EMPATHY_STATUS_ICON_H__
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h
index e49c79a00..60127ba2d 100644
--- a/src/empathy-video-src.h
+++ b/src/empathy-video-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_VIDEO_SRC_H__
 #define __EMPATHY_GST_VIDEO_SRC_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 323bbb98b..7ebf87803 100644
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -1,9 +1,3 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib/gstdio.h>
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-chatroom-manager.h"
 #include "test-helper.h"
 
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 3e5706c6a..2155c68b2 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -1,11 +1,5 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <gcr/gcr.h>
 #include <gnutls/gnutls.h>
-#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/svc-tls.h>
-#include <telepathy-glib/svc-generic.h>
 
 #include "empathy-tls-verifier.h"
 #include "mock-pkcs11.h"
diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 997b3311c..572221acc 100644
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "mock-pkcs11.h"
 
-#include <gcr/gcr.h>
-#include <glib.h>
 #include <string.h>
 
 /*
diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h
index 11b219d48..aa024fcc9 100644
--- a/tests/mock-pkcs11.h
+++ b/tests/mock-pkcs11.h
@@ -18,10 +18,8 @@
  * 02111-1307, USA.
  */
 
-#include <glib.h>
 #include <gck/pkcs11x.h>
 #include <gcr/gcr.h>
-#include <p11-kit/pkcs11.h>
 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H
diff --git a/tests/test-helper.c b/tests/test-helper.c
index 8d7be5f4a..efe3e3fd6 100644
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -20,11 +20,6 @@
 #include "config.h"
 #include "test-helper.h"
 
-#include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
 #include "empathy-ui-utils.h"
 
 void
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index ed7a6924e..6010bc186 100644
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,6 @@
-#include <stdlib.h>
 #include <string.h>
 
-#include "empathy-irc-network.h"
 #include "empathy-irc-network-manager.h"
-#include "empathy-irc-server.h"
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__