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

135 files changed, 5 insertions, 731 deletions

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index e5827dc56..03aeacf71 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -23,12 +23,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-utils.h>
 
 #include "empathy-ui-utils.h"
 #include "empathy-account-chooser.h"
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 8e6719464..c027fb250 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -20,18 +20,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-irc-network-dialog.h"
-#include "empathy-irc-network-chooser.h"
-#include "empathy-account-widget.h"
 #include "empathy-account-widget-private.h"
 #include "empathy-account-widget-irc.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 9599ce152..4568cf175 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -21,17 +21,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-utils.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-account-widget-private.h"
 #include "empathy-account-widget-sip.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 8a8475b2f..794e7d524 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -26,19 +26,12 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <gio/gdesktopappinfo.h>
-
 #include <libempathy/empathy-utils.h>
 
-#include <telepathy-glib/telepathy-glib.h>
 #include <dbus/dbus-protocol.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-account-widget-private.h"
 #include "empathy-account-widget-sip.h"
 #include "empathy-account-widget-irc.h"
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 9f2a5e01c..0a4517dec 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -22,13 +22,8 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
 
-#include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
@@ -40,7 +35,6 @@
 #include <cheese-avatar-chooser.h>
 #endif /* HAVE_CHEESE */
 
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index fc21a7a39..dc82c0571 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -24,10 +24,9 @@
 #ifndef __EMPATHY_AVATAR_CHOOSER_H__
 #define __EMPATHY_AVATAR_CHOOSER_H__
 
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-contact.h>
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_AVATAR_CHOOSER        (empathy_avatar_chooser_get_type ())
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index 3fb79692c..acb0903e4 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -24,9 +24,6 @@
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 2271ecc72..9429a2874 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -26,8 +26,6 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-contact.h>
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_AVATAR_IMAGE         (empathy_avatar_image_get_type ())
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index 3a582eac0..a6938b3e5 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -25,7 +25,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
 
 G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index 5cf1c71c4..ad5179806 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -25,8 +25,6 @@
 
 #include <libempathy-gtk/empathy-base-password-dialog.h>
 
-#include <extensions/extensions.h>
-
 G_BEGIN_DECLS
 
 typedef struct _EmpathyBadPasswordDialog EmpathyBadPasswordDialog;
diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
index c144a665b..3f4cfdd5e 100644
--- a/libempathy-gtk/empathy-base-password-dialog.h
+++ b/libempathy-gtk/empathy-base-password-dialog.h
@@ -22,10 +22,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
-#include <libempathy/empathy-server-sasl-handler.h>
-
-#include <extensions/extensions.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
index ab13037a7..f4c82eb4e 100644
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -23,8 +23,6 @@
 
 #include "empathy-calendar-button.h"
 
-#include <libempathy/empathy-utils.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
 #include <libempathy/empathy-debug.h>
 
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index bbbda511c..9f72ce9bb 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -23,13 +23,11 @@
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
-#include <pulse/pulseaudio.h>
 
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-call-utils.h"
 
-#include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-request-util.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 72cb4a7be..3db350935 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-cell-renderer-activatable.h"
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 7ed62b41f..f7c873617 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,8 +21,6 @@
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 
-#include <gtk/gtk.h>
-
 #include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-expander.h"
 
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index d96ccc403..0afd89748 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-text.h"
 
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 5a53867e2..ffd92b1cd 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -30,20 +30,12 @@
 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
-#include <string.h>
-#include <stdlib.h>
-
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-logger/telepathy-logger.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-keyring.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-client-factory.h>
 
 #include "empathy-chat.h"
@@ -54,7 +46,6 @@
 #include "empathy-input-text-view.h"
 #include "empathy-search-bar.h"
 #include "empathy-theme-manager.h"
-#include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 #include "empathy-string-parser.h"
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index d81b56f48..269b00596 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-message.h>
 #include <libempathy/empathy-tp-chat.h>
 
 #include <libempathy-gtk/empathy-theme-adium.h>
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 69cfdef69..80ea9765a 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -11,9 +11,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n-lib.h>
-#include <folks/folks-telepathy.h>
-
 #include "empathy-contact-chooser.h"
 
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h
index 20a9b8c44..fa1c703a8 100644
--- a/libempathy-gtk/empathy-contact-chooser.h
+++ b/libempathy-gtk/empathy-contact-chooser.h
@@ -13,10 +13,7 @@
 #define __EMPATHY_CONTACT_CHOOSER_H__
 
 #include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "libempathy/empathy-tp-chat.h"
+#include <folks/folks.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 0a189b3e1..0b01bf88d 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -26,8 +26,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-client-factory.h>
 
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 0acf2a3e6..cef06d309 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -21,23 +21,12 @@
 
 #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-time.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-client-factory.h>
 
-#include "empathy-calendar-button.h"
 #include "empathy-contact-widget.h"
-#include "empathy-contactinfo-utils.h"
-#include "empathy-account-chooser.h"
-#include "empathy-avatar-chooser.h"
 #include "empathy-avatar-image.h"
 #include "empathy-groups-widget.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 1f3b22135..7ec61310d 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -22,9 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include <glib/gi18n-lib.h>
 
 #include <libempathy/empathy-time.h>
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 986015452..d171f72fc 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -25,9 +25,6 @@
 
 #include <sys/stat.h>
 
-#include <glib.h>
-#include <gdk/gdk.h>
-
 #include "libempathy/empathy-utils.h"
 #include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 2e609cd9f..6b6a0d0dc 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -21,21 +21,12 @@
 
 #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 <folks/folks.h>
-
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-aggregator.h>
 
 #include "empathy-groups-widget.h"
-#include "empathy-ui-utils.h"
 
 /**
  * SECTION:empathy-groups-widget
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 7bbde2659..03874c905 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -21,22 +21,13 @@
 
 #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 <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
 #include <libempathy/empathy-individual-manager.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-individual-dialogs.h"
 #include "empathy-contact-widget.h"
-#include "empathy-ui-utils.h"
 
 #define BULLET_POINT "\342\200\242"
 
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index ec3bf9a1f..bd43adeb8 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -22,21 +22,12 @@
 
 #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 <folks/folks.h>
-
-#include <libempathy/empathy-individual-manager.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-widget.h"
-#include "empathy-ui-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
 
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 88648bdf2..cd6392a9b 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -23,16 +23,7 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
-#include <gio/gdesktopappinfo.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
 
 #include <libempathy/empathy-individual-manager.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 133bd6a80..4cadf22a2 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -22,15 +22,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
 
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-request-util.h>
@@ -39,7 +31,6 @@
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-account-selector-dialog.h"
-#include "empathy-individual-menu.h"
 #include "empathy-images.h"
 #include "empathy-log-window.h"
 #include "empathy-individual-dialogs.h"
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 389175ebf..0fefb9c85 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -25,24 +25,10 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-enum-types.h>
 
 #include "empathy-individual-store-channel.h"
 
-#include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
 
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index 78d3a07e3..ea872b1d1 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -25,25 +25,8 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-enum-types.h>
-#include <libempathy/empathy-individual-manager.h>
-
 #include "empathy-individual-store-manager.h"
 
-#include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
 
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 444a6c5fd..ddaea26b4 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -26,20 +26,10 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-enum-types.h>
 
-#include "empathy-individual-store.h"
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
 
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 9cb8b86a9..7e36fe19a 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -26,16 +26,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
 
 #include <libempathy/empathy-connection-aggregator.h>
 #include <libempathy/empathy-individual-manager.h>
@@ -43,11 +34,7 @@
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
 
-#include "empathy-individual-view.h"
-#include "empathy-individual-menu.h"
-#include "empathy-individual-store.h"
 #include "empathy-individual-edit-dialog.h"
-#include "empathy-individual-dialogs.h"
 #include "empathy-images.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index 87dd20c76..baac701ed 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -31,8 +31,6 @@
 
 #include <folks/folks.h>
 
-#include <libempathy/empathy-enum-types.h>
-
 #include "empathy-live-search.h"
 #include "empathy-individual-menu.h"
 #include "empathy-individual-store.h"
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index d962939f3..12093b577 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -21,17 +21,8 @@
 
 #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 <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
 #ifdef HAVE_LIBCHAMPLAIN
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
@@ -45,7 +36,6 @@
 #include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-individual-widget.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index 24a7f3dc3..b8156c48a 100644
--- a/libempathy-gtk/empathy-individual-widget.h
+++ b/libempathy-gtk/empathy-individual-widget.h
@@ -25,8 +25,6 @@
 
 #include <folks/folks.h>
 
-#include "empathy-contact-widget.h"
-
 G_BEGIN_DECLS
 
 /**
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index e5dbe0155..00e9bf0eb 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -21,18 +21,12 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-irc-network-manager.h>
 
 #include "empathy-irc-network-dialog.h"
-#include "empathy-ui-utils.h"
 #include "empathy-live-search.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index d6c51aee6..e19b3e8ab 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -21,17 +21,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-irc-network-manager.h>
 
-#include "empathy-irc-network-dialog.h"
 #include "empathy-ui-utils.h"
 #include "empathy-irc-network-chooser-dialog.h"
 
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 65f0a41bb..aedb5dc79 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -20,16 +20,10 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
 
-#include <libempathy/empathy-irc-network-manager.h>
 #include "empathy-ui-utils.h"
 #include "totem-subtitle-encoding.h"
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 4a5ba8569..e65adbe4c 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -22,10 +22,6 @@
  */
 
 #include "config.h"
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
 #include <libempathy/empathy-utils.h>
 
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 7cdf2517d..ab72fff7d 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -21,23 +21,12 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <time.h>
-
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <geoclue/geoclue-master.h>
 
-#include <extensions/extensions.h>
-
 #include "empathy-location-manager.h"
 
-#include "libempathy/empathy-enum-types.h"
 #include "libempathy/empathy-gsettings.h"
 #include "libempathy/empathy-location.h"
-#include "libempathy/empathy-utils.h"
 #include "libempathy/empathy-time.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 3bc2967fd..80733da1b 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -24,29 +24,18 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 #include <webkit/webkit.h>
 
-#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
-#include <telepathy-logger/telepathy-logger.h>
-
 #include <extensions/extensions.h>
 
 #include <libempathy/action-chain-internal.h>
 #include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-message.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-time.h>
 
 #include "empathy-log-window.h"
 #include "empathy-account-chooser.h"
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 1fff3c7ae..d770d6d98 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -20,17 +20,10 @@
 
 #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-camera-monitor.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -40,7 +33,6 @@
 #include <libempathy-gtk/empathy-images.h>
 
 #include "empathy-new-call-dialog.h"
-#include "empathy-account-chooser.h"
 #include "empathy-call-utils.h"
 
 static EmpathyNewCallDialog *dialog_singleton = NULL;
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index c12803278..c38a1c75b 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -20,16 +20,9 @@
 
 #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-request-util.h>
-#include <libempathy/empathy-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -39,7 +32,6 @@
 #include <libempathy-gtk/empathy-images.h>
 
 #include "empathy-new-message-dialog.h"
-#include "empathy-account-chooser.h"
 
 static EmpathyNewMessageDialog *dialog_singleton = NULL;
 
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 383a423c8..d142b7fa3 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,13 +18,9 @@
  */
 
 #include "config.h"
-#include <string.h>
 
-#include <libnotify/notification.h>
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index a85a9d8e6..07fb69fc0 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -25,7 +25,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
 
 G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index d561af14a..ee1c993b4 100644
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -27,8 +27,6 @@
 
 #include <libempathy-gtk/empathy-base-password-dialog.h>
 
-#include <extensions/extensions.h>
-
 G_BEGIN_DECLS
 
 typedef struct _EmpathyPasswordDialog EmpathyPasswordDialog;
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index be7b23a47..ddaa97b7f 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 16b7a54e9..a047890bb 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -26,14 +26,7 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-utils.h>
@@ -43,7 +36,6 @@
 #include <libempathy/empathy-debug.h>
 
 #include "empathy-ui-utils.h"
-#include "empathy-images.h"
 #include "empathy-presence-chooser.h"
 #include "empathy-status-preset-dialog.h"
 
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 50a96da71..d5b0de7c1 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -22,10 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <gtk/gtk.h>
-
 #include <glib/gi18n-lib.h>
 
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index 7ab808746..d8410b5e6 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -4,8 +4,6 @@
 
 #include "empathy-roster-contact.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-images.h>
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index a11a69d39..a81b2c254 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -21,10 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "config.h"
 
-#include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
 #include "empathy-roster-model-aggregator.h"
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index c3ae66e25..ed57be3d4 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -10,8 +10,6 @@
 #include <libempathy-gtk/empathy-roster-group.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <libempathy/empathy-utils.h>
-
 G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
 
 /* Flashing delay for icons (milliseconds). */
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 769276b13..018a068ab 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -19,15 +19,10 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib-object.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
 #include <libempathy/empathy-utils.h>
 
-#include "empathy-theme-adium.h"
 #include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
 
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 0414f7d4b..8b0845048 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -20,11 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
-#include <dbus/dbus-glib.h>
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
 #include <libempathy/empathy-debug.h>
 
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 05107d9e1..99caa51d7 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <libempathy/empathy-utils.h>
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 7b68dc0e0..3291a9a92 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -21,9 +21,7 @@
 
 #include "empathy-sound-manager.h"
 
-#include <canberra-gtk.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 709d09be0..4242b5738 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -23,9 +23,6 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include <glib/gi18n-lib.h>
 
 #ifdef HAVE_ENCHANT
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index e68f080fb..19f1fee6a 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -37,7 +37,6 @@
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-status-presets.h>
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index 3f4d16fcd..cb7d3c3e1 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "empathy-string-parser.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index d304c5e19..67ec4d08f 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -21,15 +21,8 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <webkit/webkit.h>
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <pango/pango.h>
-#include <gdk/gdk.h>
-
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index e743e2fa5..f3d8d67bc 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -24,16 +24,11 @@
 
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
 
 #include "empathy-theme-manager.h"
-#include "empathy-theme-adium.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 2ef15f72b..82244403a 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -24,9 +24,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <gcr/gcr.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 56b85856e..9f4300840 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -31,21 +31,14 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-#include <folks/folks.h>
-
 #include "empathy-ui-utils.h"
 #include "empathy-images.h"
 #include "empathy-live-search.h"
-#include "empathy-smiley-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c
index f376ea728..2db1c23c0 100644
--- a/libempathy-gtk/totem-subtitle-encoding.c
+++ b/libempathy-gtk/totem-subtitle-encoding.c
@@ -30,7 +30,6 @@
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include "totem-subtitle-encoding.h"
-#include <string.h>
 
 typedef enum
 {
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 42065f68d..3b937ce9a 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -25,7 +25,6 @@
   #include "config.h"
 #endif
 
-#include <glib-object.h>
 #include <string.h>
 
 #ifdef HAVE_UDEV
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index a0e42cc77..12b28b8ba 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "empathy-account-settings.h"
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 533747750..1e603e989 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -20,13 +20,8 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-camera-monitor.h"
 #include "cheese-camera-device-monitor.h"
-#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index f1c7293d1..ebdc50433 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -23,15 +23,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 #include "empathy-client-factory.h"
-#include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index bfa3280de..dcc72d5f7 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -21,10 +21,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-
 #include "empathy-chatroom.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-client-factory.h b/libempathy/empathy-client-factory.h
index 034f6e6fd..2f4261167 100644
--- a/libempathy/empathy-client-factory.h
+++ b/libempathy/empathy-client-factory.h
@@ -24,7 +24,6 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-
 #include "empathy-contact.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index f1018a1b7..83e15f15d 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -24,10 +24,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-utils.h"
-
-
-#include "extensions/extensions.h"
 
 G_DEFINE_TYPE (EmpathyConnectionAggregator, empathy_connection_aggregator,
     G_TYPE_OBJECT);
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index cd95a4b24..abf862bca 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "empathy-connection-managers.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index 726824ea4..8d49f0519 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -22,16 +22,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 #include "empathy-utils.h"
 #include "empathy-contact-groups.h"
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 9f5a95623..3c91e6319 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -21,23 +21,12 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
 #endif
 
-#include "empathy-contact.h"
-#include "empathy-camera-monitor.h"
-#include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
-#include "empathy-location.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 49ee9371f..09573c39a 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -20,15 +20,6 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 2c213b050..9cf90014b 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -21,12 +21,7 @@
 
 /* empathy-ft-factory.c */
 
-#include <glib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-ft-factory.h"
-#include "empathy-ft-handler.h"
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index d9d87e20a..30711c7d1 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ft-handler.h"
diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c
index db37eab54..3659b3728 100644
--- a/libempathy/empathy-goa-auth-handler.c
+++ b/libempathy/empathy-goa-auth-handler.c
@@ -25,7 +25,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 #include "empathy-goa-auth-handler.h"
 #include "empathy-sasl-mechanisms.h"
 
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index e99a6e86f..f3c7565a1 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -22,15 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <extensions/extensions.h>
-
 #include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index daef04059..7f6ed9df8 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
-#include <string.h>
-#include <sys/types.h>
+
 #include <sys/stat.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
 
 #include "empathy-utils.h"
 #include "empathy-irc-network-manager.h"
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index 41128dae4..e0bc84f7d 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -20,12 +20,6 @@
  */
 
 #include "config.h"
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-irc-network.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 04fd21de7..5457f23a1 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -19,12 +19,6 @@
  */
 
 #include "config.h"
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-irc-server.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index a67c51094..837b2d519 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -22,8 +22,6 @@
 
 #include "empathy-keyring.h"
 
-#include <string.h>
-
 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index fe1975119..e19f69b09 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -24,12 +24,11 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include <glib/gi18n-lib.h>
 
 #include "empathy-client-factory.h"
 #include "empathy-message.h"
+#include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
 
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index fa6e07be1..db38ddfd9 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -30,7 +30,6 @@
 #include <telepathy-logger/telepathy-logger.h>
 
 #include "empathy-contact.h"
-#include "empathy-time.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 250398928..cdc45fbe9 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -22,11 +22,6 @@
 
 #include "empathy-presence-manager.h"
 
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <dbus/dbus-glib.h>
-
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index f83cb4c59..8532da57b 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -21,13 +21,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-request-util.h"
-#include "empathy-utils.h"
-#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index 3eaa0108d..303bf9e3e 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <libsoup/soup.h>
-#include <string.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 06f7a9e68..bdca7b623 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -23,8 +23,6 @@
 
 #include <extensions/extensions.h>
 
-#include <string.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
 #include "empathy-keyring.h"
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 940253343..d8faa4fe9 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -22,15 +22,7 @@
 
 #include "config.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
 
 #include "empathy-utils.h"
 #include "empathy-status-presets.h"
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index 31b8a5499..cbb6b3bdb 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <glib/gi18n-lib.h>
 
 #include "empathy-time.h"
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 16948b1b9..00447cc40 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index ae3ed3f17..e15a8c41b 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -20,13 +20,8 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <extensions/extensions.h>
-
 #include "empathy-tp-chat.h"
 #include "empathy-request-util.h"
-#include "empathy-time.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CHAT
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 000d61e6a..74770c159 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -28,25 +28,14 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <sys/types.h>
-
 #include <glib/gi18n-lib.h>
 
 #include <libxml/uri.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
 #include "empathy-utils.h"
-#include "empathy-individual-manager.h"
 #include "empathy-presence-manager.h"
-#include "empathy-request-util.h"
 
 #include <extensions/extensions.h>
 
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 3950c5be3..5fe79e9ee 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -28,9 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
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>