Drop unused/redundant header inclusions

With the help of the script posted at http://stackoverflow.com/a/7135530
and some manual fixes, drop the unused or redundant #include directives.

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

39 files changed, 0 insertions, 250 deletions

diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index d63002f80..2480d7569 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -25,9 +25,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-about-dialog.h"
 
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index dbef97e32..537b43e3d 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -26,16 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-accounts-common.h"
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 6d5a64414..f0a2db9a2 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -26,28 +26,14 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
-#include <dbus/dbus-glib.h>
-#include <gio/gdesktopappinfo.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-pkg-kit.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-account-widget-irc.h>
 #include <libempathy-gtk/empathy-account-widget-sip.h>
-#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
 #include <libempathy-gtk/empathy-user-info.h>
-#include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
 #include <libempathy-gtk/empathy-new-account-dialog.h>
 
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 3de54d887..90d7947e9 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -26,25 +26,16 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #ifdef HAVE_CHEESE
 #include <cheese-gtk.h>
 #endif
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include "empathy-accounts.h"
 #include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 862d71e5c..0c3693b6f 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -20,20 +20,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gst/audio/audio.h>
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
 #else
 #include <gst/interfaces/streamvolume.h>
 #endif
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-audio-utils.h"
-
 #include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index c9dc1d403..fe62a6c4b 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
 #else
@@ -33,7 +30,6 @@
 #include "empathy-audio-utils.h"
 
 #include "empathy-audio-src.h"
-
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 6a7d4f6a5..f1d42b74c 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -21,20 +21,13 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-auth-factory.h>
-#include <libempathy/empathy-server-sasl-handler.h>
 #include <libempathy/empathy-server-tls-handler.h>
 #include <libempathy/empathy-tls-verifier.h>
-#include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-bad-password-dialog.h>
 #include <libempathy-gtk/empathy-password-dialog.h>
@@ -45,8 +38,6 @@
 
 #include <gnutls/gnutls.h>
 
-#include <extensions/extensions.h>
-
 #define TIMEOUT 60
 
 static gboolean use_timer = TRUE;
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 45469e7b6..dbd5ecf77 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -20,14 +20,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 63c4f48a3..b1d4f2977 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -20,11 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <telepathy-farstream/telepathy-farstream.h>
 
 #include <libempathy/empathy-utils.h>
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 266691311..bf42b055a 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -22,17 +22,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libnotify/notification.h>
-
-#include <libempathy/empathy-utils.h>
-
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-notify-manager.h>
 
-#include <extensions/extensions.h>
-
 #include "empathy-call-observer.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index 1b993458b..ca2914724 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -24,8 +24,6 @@
 
 #include "empathy-call-window-fullscreen.h"
 
-#include <gtk/gtk.h>
-
 #include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 43b0b91fb..37090319b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -20,22 +20,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <math.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gst/gst.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <clutter/clutter.h>
-#include <clutter-gtk/clutter-gtk.h>
-#include <clutter-gst/clutter-gst.h>
-
 #include <telepathy-farstream/telepathy-farstream.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
@@ -45,7 +32,6 @@
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
 
-#include <libempathy-gtk/empathy-avatar-image.h>
 #include <libempathy-gtk/empathy-dialpad-widget.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-sound-manager.h>
@@ -56,13 +42,9 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
 
-#include "empathy-call-window.h"
 #include "empathy-call-window-fullscreen.h"
-#include "empathy-call-factory.h"
 #include "empathy-about-dialog.h"
-#include "empathy-audio-src.h"
 #include "empathy-audio-sink.h"
-#include "empathy-video-src.h"
 #include "empathy-mic-menu.h"
 #include "empathy-preferences.h"
 #include "empathy-rounded-actor.h"
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 495c76e56..9d5ab8a83 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -22,11 +22,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
-#include <clutter/clutter.h>
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
@@ -34,8 +31,6 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <libempathy/empathy-client-factory.h>
-
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-call-window.h"
@@ -44,8 +39,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
 
-#include <gst/gst.h>
-
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index fa2c97e15..a6f8d3d12 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-gsettings.h>
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index f93b90235..15a4e7a4f 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -19,12 +19,10 @@
 
 #include "config.h"
 
-#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-individual-manager.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 0d20d6cc7..292c1a9a7 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -27,17 +27,10 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
 #include <glib/gi18n.h>
-#include <libnotify/notification.h>
 
 #include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-message.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
@@ -45,7 +38,6 @@
 #include <libempathy/empathy-individual-manager.h>
 
 #include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-log-window.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-smiley-manager.h>
 #include <libempathy-gtk/empathy-sound-manager.h>
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index acae7ec6d..0e70885d7 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -22,9 +22,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include <libnotify/notify.h>
 
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 76c2e3608..a18cccb1f 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -25,11 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <libempathy/empathy-chatroom-manager.h>
@@ -39,7 +34,6 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-chatrooms-window.h"
-#include "empathy-new-chatroom-dialog.h"
 
 typedef struct {
 	EmpathyChatroomManager *manager;
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index f1bd6da5e..7d56b6849 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -21,26 +21,16 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <gdk/gdkkeysyms.h>
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
 
-#include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "extensions/extensions.h"
-
 #include "empathy-debug-window.h"
 
 G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 5249491ed..00dc98c8d 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -19,10 +19,8 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-debug-window.h"
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 39a1f2962..f652c2164 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -21,11 +21,8 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-connection-aggregator.h>
 #include <libempathy/empathy-tp-chat.h>
@@ -33,8 +30,6 @@
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-sasl-mechanisms.h>
 
-#include <extensions/extensions.h>
-
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -42,7 +37,6 @@
 #include <libempathy-gtk/empathy-subscription-dialog.h>
 
 #include "empathy-event-manager.h"
-#include "empathy-roster-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #include <libempathy/empathy-debug.h>
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 18ca1938a..f89004f32 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -29,11 +29,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
 #include <libempathy/empathy-debug.h>
@@ -41,7 +37,6 @@
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-images.h>
 
 #include "empathy-ft-manager.h"
 
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index e3433c530..d4dd70d01 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -22,20 +22,14 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-import-dialog.h"
-#include "empathy-import-pidgin.h"
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
 
 enum {
   PROP_PARENT = 1,
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index fa5cc7434..8fd7eaef4 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -21,16 +21,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <unistd.h>
-
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"
@@ -39,8 +31,6 @@
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 /* Pidgin to CM map */
 typedef struct
 {
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index e085ebaff..77048a4b7 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -26,17 +26,13 @@
 
 #include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
-#include "empathy-import-pidgin.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 8588b8484..0b42ab4a7 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -12,15 +12,12 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <folks/folks-telepathy.h>
 
 #include "empathy-invite-participant-dialog.h"
 
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-individual-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index 9e8141a87..b86aec4be 100644
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include "empathy-mic-menu.h"
 #include "empathy-mic-monitor.h"
 
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 2f04fbbca..c06e786ed 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -20,13 +20,10 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-
-#include <pulse/pulseaudio.h>
 #include <pulse/glib-mainloop.h>
 
 #include "empathy-mic-monitor.h"
 
-
 #include <libempathy/empathy-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 031d1730e..5de844bd4 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -23,16 +23,8 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gprintf.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-gsettings.h>
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index a91e2961d..c3c996bd6 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -18,12 +18,8 @@
  */
 
 #include "config.h"
-#include <string.h>
 
 #include <glib/gi18n.h>
-#include <libnotify/notification.h>
-#include <libnotify/notify.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy-gtk/empathy-notify-manager.h>
 #include <libempathy-gtk/empathy-call-utils.h>
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index b7bae34ff..bfeef61b6 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -25,12 +25,7 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-gsettings.h>
@@ -39,8 +34,6 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-theme-manager.h>
 #include <libempathy-gtk/empathy-spell.h>
-#include <libempathy-gtk/empathy-gtk-enum-types.h>
-#include <libempathy-gtk/empathy-theme-adium.h>
 
 #include "empathy-preferences.h"
 
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 41cd74e70..05d2a1fba 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -24,39 +24,27 @@
 #include "config.h"
 
 #include <sys/stat.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-#include <folks/folks.h>
-
-#include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-individual-manager.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-status-presets.h>
 #include <libempathy/empathy-presence-manager.h>
 
-#include <libempathy-gtk/empathy-live-search.h>
 #include <libempathy-gtk/empathy-contact-blocking-dialog.h>
 #include <libempathy-gtk/empathy-contact-search-dialog.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-gtk-enum-types.h>
 #include <libempathy-gtk/empathy-individual-dialogs.h>
-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-roster-model.h>
 #include <libempathy-gtk/empathy-roster-model-manager.h>
 #include <libempathy-gtk/empathy-roster-view.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
 #include <libempathy-gtk/empathy-new-call-dialog.h>
 #include <libempathy-gtk/empathy-log-window.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-accounts-dialog.h"
@@ -65,7 +53,6 @@
 #include "empathy-roster-window.h"
 #include "empathy-preferences.h"
 #include "empathy-about-dialog.h"
-#include "empathy-debug-window.h"
 #include "empathy-new-chatroom-dialog.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-event-manager.h"
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 646682fb5..038cb4955 100644
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <clutter/clutter.h>
-#include <clutter-gtk/clutter-gtk.h>
-
 #include "empathy-rounded-actor.h"
 
 G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index 1de5eb442..67c0e27c0 100644
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -22,8 +22,6 @@
 
 #include <math.h>
 
-#include <clutter/clutter.h>
-
 #include "empathy-rounded-rectangle.h"
 
 G_DEFINE_TYPE (EmpathyRoundedRectangle,
diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c
index 0619cd13e..7ac7d040d 100644
--- a/src/empathy-rounded-texture.c
+++ b/src/empathy-rounded-texture.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
-#include <clutter/clutter.h>
-
 #include "empathy-rounded-texture.h"
 
 G_DEFINE_TYPE (EmpathyRoundedTexture,
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index e3688c6c4..f7ac7d996 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -25,9 +25,6 @@
 
 #include "empathy-sanity-cleaning.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-account-settings.h>
 #include <libempathy/empathy-gsettings.h>
 
 #include <libempathy-gtk/empathy-theme-manager.h>
@@ -43,7 +40,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-keyring.h>
 
 /*
  * This number has to be increased each time a new task is added or modified.
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index b51a5651a..54e49a30e 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -21,28 +21,15 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-presence-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
 #include <libempathy-gtk/empathy-new-call-dialog.h>
 
-#include "empathy-accounts-dialog.h"
 #include "empathy-status-icon.h"
-#include "empathy-preferences.h"
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 2fc483567..12f8d6b47 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
 #else
diff --git a/src/empathy.c b/src/empathy.c
index 8a5dce059..90370e621 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -21,15 +21,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <clutter-gtk/clutter-gtk.h>
@@ -37,25 +30,17 @@
 
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <telepathy-logger/telepathy-logger.h>
-
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-connection-aggregator.h>
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-ft-factory.h>
 #include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-tp-chat.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-location-manager.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
 
 #include "empathy-roster-window.h"
 #include "empathy-accounts-common.h"
@@ -64,8 +49,6 @@
 #include "empathy-ft-manager.h"
 #include "empathy-notifications-approver.h"
 
-#include "extensions/extensions.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>