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

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index e5827dc560b2b85fb45dc39025bb99925f975c45..03aeacf7113ebbb4bba0d689e7cdffa37ff0839f 100644 (file)
--- 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 8e67194642ab1bfefeb4ece1ed6e69f3c39028b3..c027fb25096cf10af2f09cb2d9a98ee0fceacc1c 100644 (file)
--- 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 9599ce152fdc3cb9c66fe00d1472db21ed64d518..4568cf1751be1b13f7a031064841d5cdaddb263a 100644 (file)
--- 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 8a8475b2f64e66a6daa24e6cf4a12a393d03a52b..794e7d5247a4ccb84dc81abf73183ad93930f5fd 100644 (file)
--- 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 9f2a5e01cbe54ac9e556178bea1072cee6c43c75..0a4517dec4a267e429558660c8fcebb08dc486b1 100644 (file)
--- 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 fc21a7a39e67d75a00435633bbd38f8d811a69f5..dc82c0571c4718b33da86aa99c83e9b652e63ce5 100644 (file)
--- 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 3fb79692c333405f94361e80156dfa08b4263240..acb0903e47bd77c234bfd76734b5d63abcf72f9a 100644 (file)
--- 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 2271ecc72aca7cbfbfce3f212bed036f8c24f8a1..9429a28748f7144c46b22ae9849589de449eac13 100644 (file)
--- 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 3a582eac09b2d72c9bb5207688f94c0d980b1106..a6938b3e5eff30d0fd06ae8b10ce44534438d40c 100644 (file)
--- 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 5cf1c71c4a6d3760574b132c094457df1c57c238..ad5179806253af520e1a1c4ca440727c25dd7ba9 100644 (file)
--- 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 c144a665bcb98758cc503703402325d1d19c12b2..3f4cfdd5e2db83b0e4774629b491ff572ae0be42 100644 (file)
--- 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 ab13037a7a4ba5422e4dded6e91fd3878b74989e..f4c82eb4e81fc2700b737cedc48168092020d565 100644 (file)
--- 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 bbbda511cec796f3f38b8a227c46de8f93e42df4..9f72ce9bbe203e54e117ff15881171395add9403 100644 (file)
--- 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 72cb4a7be653677641d778986bcb1ccf9e7df10a..3db350935d8daaef72375baa76db36827a0f40a0 100644 (file)
--- 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 7ed62b41fe986c07d06af0ab44f07441611ea9df..f7c8736172e957559d8c2ade29ebb359e573c258 100644 (file)
--- 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 d96ccc403e886f8c4886f9e82f672b10f8dbd3c3..0afd89748b521cbf6ed20bc7d64e6e59661a82f2 100644 (file)
--- 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 5a53867e21226e347e1769d2563caf3d4bcb1618..ffd92b1cdc7de824dc8f3cbfad9f245050508527 100644 (file)
--- 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 d81b56f48dd4aac3dd2f006d99d498a01a018079..269b00596eb4c49847f981e826ce191af3828ada 100644 (file)
--- 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 69cfdef69c974c4a75a49d928298db8f89dd5a7f..80ea9765afc3661e49228fb2e1f6206095852e8f 100644 (file)
--- 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 20a9b8c44eb0ea4ec8d5f0b394f89a7acb714a53..fa1c703a82af6d3f540247c88637837ab8dd3b96 100644 (file)
--- 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 0a189b3e184c49691ec81bb62e13ac32936b7a64..0b01bf88d6df7af0c0036afdcba0d8f13b5d120c 100644 (file)
--- 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 0acf2a3e60a89ba335959e9d48a0d5c9ef094cfa..cef06d309ceae5f438c3f60246f6d0b39d95c156 100644 (file)
--- 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 1f3b2213584dbba0cc83d745da21a54fe645236b..7ec61310db7e0f71237f3e70cc46b08ca1f0f899 100644 (file)
--- 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 986015452967ee5715aa1218de05f30144dc259f..d171f72fc442a0496105d5c2d12c962957967701 100644 (file)
--- 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 2e609cd9fc90e2a3d5bd03052b23e7ee3ae9a3f0..6b6a0d0dc770691b460040917020882931cbb3b8 100644 (file)
--- 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 7bbde26592eee0100e9f1e0fe2b930d06b9e576d..03874c90569330ac1af692707be7bc7f351d7ad6 100644 (file)
--- 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 ec3bf9a1f9d911c5868605c517f3eb166915f1e5..bd43adeb8112beca10101900cd2fb7b7ee259f55 100644 (file)
--- 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 88648bdf28a032f3ccdd0bce8b9cf2a1145add15..cd6392a9b1b8663a3997d45c872ce537d4c9f7a4 100644 (file)
--- 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 133bd6a80fe8c14b8a8134b2b9591a36d6dfa53d..4cadf22a2c6eb360de9e9ba2c3ff1e010381a80a 100644 (file)
--- 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 389175ebf16dc7c4c96d6227ffd1b2ffcae32679..0fefb9c85837885209611b64db1feaa880a8bf3e 100644 (file)
--- 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 78d3a07e32bd05c1d665701c7aa4394536369f11..ea872b1d1d2a79b31bb56001c1af4bac2173ec19 100644 (file)
--- 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 444a6c5fd7ad5e32ce2047a0410469441c84d136..ddaea26b48144fc4f85027cd898a48c98fe869f4 100644 (file)
--- 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 9cb8b86a96934889b114d91df9f05de125a5469b..7e36fe19a8a9706fa1644cafa5cb1eca0de3ed94 100644 (file)
--- 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 87dd20c7623fd2caddb5b90fd8e3b7172ee96576..baac701edfd3ee03430d36aee7b914106c90b27f 100644 (file)
--- 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 d962939f379f316d1cb9c4bdf2143ec56c391501..12093b5771c3358a8527d5d7784e13180b8cec64 100644 (file)
--- 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 24a7f3dc3f129530328feed2488ac1c37ba38941..b8156c48ad834d8268d5d49c3f81349ec18ba855 100644 (file)
--- 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 e5dbe015571f1e3dd315c179cd14d2fbb47ce87c..00e9bf0eba36e16be58af257db9d0296975dd695 100644 (file)
--- 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 d6c51aee6cdf5e805c7dc3168295098bf4a461b9..e19b3e8abd6be7f0c28222ab8c430d96bc61bad3 100644 (file)
--- 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 65f0a41bb51c5af09370b37f9ddcbee03416e051..aedb5dc798a4bee9e4d7bbe70a644039f37e9c94 100644 (file)
--- 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 4a5ba8569a7fcc664634f04148282a76ea69e36f..e65adbe4c6ca3538447f36c693fd3ad79f112e71 100644 (file)
--- 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 7cdf2517d59f702595821b539af3ea9b88ef6193..ab72fff7db967ca781b2959d7df82100744455ce 100644 (file)
--- 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 3bc2967fd36c9745615e87026aec24cc9eca1e26..80733da1b1a8e595b258ba12b18b5b1deefe8e57 100644 (file)
--- 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 1fff3c7aee9e930b2d4363c489238d26249bc1d7..d770d6d988b36dd569981d4d49baa5b7fcda5d4a 100644 (file)
--- 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 c12803278d6dd9786b204d2b5092638922cf0915..c38a1c75b7ec491ac4caf38ee72e30593cb97629 100644 (file)
--- 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 383a423c8ed7ee1269adc7c759f1b8bc6c16b95b..d142b7fa30f49f6bae0c89f18a6b67304216458e 100644 (file)
--- 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 a85a9d8e6a541f75fd9281cde74cf89973e2e266..07fb69fc0e0dcee04c8a10abbed7bc508f5a3f42 100644 (file)
--- 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 d561af14aee3671b39781478056b57e6b759fa29..ee1c993b419ddd03cfb98627e9ec5225a9f28f0d 100644 (file)
--- 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 be7b23a4703f1a87120346c26fdf2824e36aa6a7..ddaa97b7ff7d429b5d27a8915059359bba6cdb63 100644 (file)
--- 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 16b7a54e9f8706d8597ffd81a92c4adf3d3922f7..a047890bb445509b97975286aecff5d2840e9f9b 100644 (file)
--- 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 50a96da71d1b895e78d0c4035b100a4effa206ab..d5b0de7c1ca337319af5887a4316a3b4239c1c8c 100644 (file)
--- 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 7ab8087465d3827e607ee376bba15d057c11d4cd..d8410b5e648523ba55f8f80d6dcd8e8720959b61 100644 (file)
--- 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 a11a69d396f66af9cf11034692c55729c07d042e..a81b2c254cdf92a239fb3626b256e0fca3177b6b 100644 (file)
--- 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 c3ae66e25ba05fe62197a6b364b9ada0a5b32936..ed57be3d43138543f5109708826d7fe26c41da1d 100644 (file)
--- 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 769276b13a6af6515dbde8d85c2a3e8a6307f42e..018a068abdc349dd0765195238cbed311c736136 100644 (file)
--- 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 0414f7d4bc002d1868fbc04e060e76f91447905c..8b0845048f354bf276c271b3d75b74489039c486 100644 (file)
--- 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 05107d9e116b4df09604705ef24e2bad785962ee..99caa51d7f41113e35ab5d3483889bbbed4f8326 100644 (file)
--- 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 7b68dc0e0f9c3cbd93b452376931fb090f231933..3291a9a92838ea51d810304a3a020d49bd9802d4 100644 (file)
--- 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 709d09be09bcab542319870ec2dcd09c6c88e094..4242b5738cb8f32d1e9f3435b954bdfef36d7d4c 100644 (file)
--- 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 e68f080fbc0e57850565a6a0ec48f0964d158044..19f1fee6a6c97cd0882970c4fbdbf26dacdd4f51 100644 (file)
--- 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 3f4d16fcd9e47a255139011adc11a73864e52cd6..cb7d3c3e191a89e135a2ab90cbbf07fe96891738 100644 (file)
--- 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 d304c5e19a85588be18a0085b689d37f0eb4b458..67ec4d08f73f81ec5a5a4613c7be860e8e9571f4 100644 (file)
--- 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 e743e2fa5599620ea1dbb30b4764140475a73f22..f3d8d67bcb1f093ab7249afb2474a74a3177c997 100644 (file)
--- 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 2ef15f72be903c1f33f184720b459815331cd686..82244403af026e27cd72de785dbc03883d2a09ee 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -23,9 +23,6 @@
 #include "empathy-tls-dialog.h"
 
 #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

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 56b85856ec2a236cabd4adee4bec8e5e159d937f..9f4300840431ba77f90cce61c0e5d994aa15a421 100644 (file)
--- 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 f376ea7287ce8b24a8dc2ee6821c270ff23df02f..2db1c23c020f195d74af02948445ba04f697850e 100644 (file)
--- 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 42065f68d630e3e6caa08a906e5ada413d772839..3b937ce9a24609fd176784a4f0e1ba94cd43fd2f 100644 (file)
--- 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 a0e42cc77c06f0ebf197787e0ea708cd0538543f..12b28b8ba245dd9eee6d549b50467aa8040198ea 100644 (file)
--- 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 5337477502f110ae54fd8b2fb7196905dbd5b4ef..1e603e9890c94fdbab1cdb5399d9a5e5ab6337de 100644 (file)
--- 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 f1c7293d175a8e989e801a66e2bea83ae6f68446..ebdc504333a5e883276ae4820d23e353a0ea232a 100644 (file)
--- 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 bfa3280de7b90457590d189f1814b6d520d97b3b..dcc72d5f730fe3e4f8d8028ae50b58e8bf6122c7 100644 (file)
--- 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 034f6e6fd1c2e9c844688e71281ae6efe204b301..2f426116729c31dd6fb62e3e997afe33f8ea5804 100644 (file)
--- 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 f1018a1b72e825b602cc2006b4fc45baf2116a15..83e15f15d1b8206431af5f5af016bb9172199a65 100644 (file)
--- 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 cd95a4b246ed62aface2720b2585e1bcc5d5360e..abf862bca1a21a45c41d75f5a4aee86f5f007768 100644 (file)
--- 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 726824ea43ad03adfbc9a9ad49d5d91a505214cb..8d49f0519e74f28b1628fe651d31a829a9bb7590 100644 (file)
--- 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 9f5a956238f6fb69ab30e91ff24de20937a0e541..3c91e6319573fece88a48626256abed9edd7fb96 100644 (file)
--- 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 49ee9371f3e37946789bbdcfecd3da3bc61b9ede..09573c39ae5b0b099ab3881c08f8b3d34f4bbcb7 100644 (file)
--- 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 2c213b0500c19780232f8aea28ebb00cd25731cd..9cf90014b458b14bc38ad39993572cddf54ce55d 100644 (file)
--- 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 d9d87e20af1a219e23b54a82963bd493efb65307..30711c7d1197529481e02712bd8293f8966d66a3 100644 (file)
--- 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 db37eab541f61352ba73985642e0d5ae12ba8ef7..3659b372863c3704defc3b31da8393b018089bc5 100644 (file)
--- 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 e99a6e86f2a62b20317aa8db2f869785a1851f8c..f3c7565a11798a9683e48df9e08978926da5b33b 100644 (file)
--- 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 daef0405939a9a4dc616c9ef8c7c6c4fc01814e2..7f6ed9df8cd568658f7fbc204faebb1bb0ec36d9 100644 (file)
--- 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 41128dae40aaeba66b1e3e67005b0adf88a2fcbc..e0bc84f7d99cb1b528f778c5a88990db53d99961 100644 (file)
--- 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 04fd21de76f9103abc034fca5f55a75ca4bbbf8c..5457f23a1ce7a957e4e7e438ddacb32c719844b2 100644 (file)
--- 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 a67c510949841125635ecf986b68e81876266552..837b2d5199df003cd6471b4a6fef046c13b594a8 100644 (file)
--- 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 fe1975119b17596f2947204a40b0ad4c642cfad7..e19f69b090303bbc2d9dbdb5a2549ad4d6bbbefb 100644 (file)
--- 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 fa6e07be15544159ea4b94c08d27b1e544645b16..db38ddfd9b1b238da17e0bb889d0846492c305eb 100644 (file)
--- 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 25039892886c35b222547d752ea55adb6b35bbd4..cdc45fbe97646e392fa8c351e902a4e3bb130c87 100644 (file)
--- 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 f83cb4c595bc751083bb5e5dde488d5f8b70448b..8532da57bbb62d2b59d9fb45f79b21e2bee399cc 100644 (file)
--- 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 3eaa0108d7d4fb52b9a0c879c6294cc50887bf2c..303bf9e3e4665d5f8f6287127a6548bb6669b7ad 100644 (file)
--- 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 06f7a9e6822eedd7dfa7b1ce3aead558ca570478..bdca7b623c8c9b5dac8c20e17dae015c3b679d15 100644 (file)
--- 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 940253343c51dde5af430738c329bead1c1cb055..d8faa4fe9da3eab8da4b0f6e044b9ebe900c2aae 100644 (file)
--- 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 31b8a54995e4776cfb866e03edd7fd36586f54b2..cbb6b3bdb8e0dac3f34a5f35797bb8cfc7778bcc 100644 (file)
--- 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 16948b1b930a9ad2f7aab1ad4bdfdb322b931b3a..00447cc40f931f7085edc3162f06bbbc1b4edfb9 100644 (file)
--- 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 ae3ed3f1737304bead92e941b64107531a5a8056..e15a8c41b8cc78ef9cf533e9b7789838506cdb26 100644 (file)
--- 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 000d61e6aee4c0adff280fc81eb493b6d0560302..74770c159142e265087d68b1ab1ddb8312e8d114 100644 (file)
--- 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 3950c5be3e5dfdfb3000c2577fe9764075220d52..5fe79e9ee4e593225724d634370b324a51f3efc6 100644 (file)
--- 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 d63002f80ffbbcbec06059655271c356c1008123..2480d756983d958fdcb40c409c46ff94f2914cdc 100644 (file)
--- 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 dbef97e321105aecc9ecd2446a0c542d1357a305..537b43e3df77a90f7a89696a58de08d1b9f58f57 100644 (file)
--- 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 6d5a64414417d5a039d92681b77621cdecd35257..f0a2db9a25a6f758614060bf13b32b591997ef0e 100644 (file)
--- 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 3de54d887bb1ba093b8dcce11745fc8619cab0a6..90d7947e9549c82e8377ad720abe2b8e22f10572 100644 (file)
--- 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 862d71e5ce9e252b4ff6d0af64b4610045d41f8c..0c3693b6fd2d4936d51359f28b38d7a33bc9bb7c 100644 (file)
--- 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 c9dc1d40322b70eee9cf9c8c910ac7282692dc42..fe62a6c4bf0a2fec3e3f241816844e4930b6f1b9 100644 (file)
--- 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 6a7d4f6a5f11dba62fb4fc1919056f407c3df4fd..f1d42b74cf8fa6c4d09ff57319829548a5ade042 100644 (file)
--- 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 45469e7b6f82ad9c95dda0e8c260612889b16ad8..dbd5ecf7774937e2101e828501ad17bc6611db31 100644 (file)
--- 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 63c4f48a381de9945528383efb252b4b8bb41ddd..b1d4f2977724d0e1c58d1d188955fc4a2dfac025 100644 (file)
--- 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 2666913110aa8145e2ea230900080aa07cb3eb28..bf42b055a38f90d2b9437c19df74db187f68b2e3 100644 (file)
--- 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 1b993458bb93b6e79484c5fd1be36e02cd7e1379..ca291472425ec7ed9d1b4ca285bde89ef453ad87 100644 (file)
--- 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 43b0b91fb5570f685613ce7c9bf89b7a00c341e5..37090319bd0825ac8f725ec8bd365e9d2e62ca15 100644 (file)
--- 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 495c76e56d3d8d9dc58d5dfdbd49446f883129e1..9d5ab8a83f64b6b51141ac3b11dd874f1a68f2ea 100644 (file)
--- 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 fa2c97e15f7c23a3c34a086756d84fd4dbed9791..a6f8d3d12ef1ac356d888be2daa17f451c0344f4 100644 (file)
--- 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 f93b90235afcd28eacfeac2ad5343e1a8860ff2b..15a4e7a4fa7f4e85e2566a1c17d9afb433413650 100644 (file)
--- 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 0d20d6cc708fefdffdb4ed331000b93d883b2b1f..292c1a9a7a4f399e656a716e5acb7dd968ae976a 100644 (file)
--- 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 acae7ec6d4261d9829acdf5fa0135fc28bde0341..0e70885d730aa3ea643e5a6230c1592356542390 100644 (file)
--- 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 76c2e3608dea85a4c56f7bb77ad8a6b116467ea6..a18cccb1fc176c65e052eabe29c708c6bd911c5f 100644 (file)
--- 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 f1bd6da5ec29cd0d67081874f5154de5a6479cce..7d56b684926806686a9ba5ea74420064574d6018 100644 (file)
--- 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 5249491edb9b78d8c984d32e720268e704572799..00dc98c8da4701f0fad0e0d6519efae9567f37c7 100644 (file)
--- 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 39a1f2962e17b3a71d7a54a79c16d8264a365685..f652c2164bb9d7a6f72a5074f5546bcd43edd862 100644 (file)
--- 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 18ca1938a3e57041a9eb6ba70b09ee61f1f382f4..f89004f32c6cb4246f34bcecf0b73f89a6517171 100644 (file)
--- 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 e3433c5305d6a6079eef7c62e7451843c1269883..d4dd70d01c275403c8db81612c4a8ee34bcad16e 100644 (file)
--- 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 fa5cc7434e9ab367205eb6df92745e6f66a15e9d..8fd7eaef42cf7f5139c959203118d16b28d767fa 100644 (file)
--- 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 e085ebaff58d7531f50b2c5b69c2409fed9e1465..77048a4b7fa87aa82eef3d31eac29456b5c8ceae 100644 (file)
--- 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 8588b84842aa79259ba407eb75e6b425346c98cc..0b42ab4a754aa7b7558c6073303875b9781f64c7 100644 (file)
--- 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 9e8141a8791d42d77611e9f73ac48f03aee22fee..b86aec4be9ca6b696376cf3ac2ff53e1ed8656a4 100644 (file)
--- 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 2f04fbbca88e2f6bbda0a8fe08155e3ee467fb5d..c06e786ed78ccd8a68b8ca90b72604b76d012a7b 100644 (file)
--- 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 031d1730e6add3fb14be3ab8f9c62c3dd5958ca4..5de844bd41e60343eff7e8183330483f07e9d7a3 100644 (file)
--- 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 a91e2961d5138768a7bb013c4920e44787951683..c3c996bd64fe0bd77c91314debb3ac1d2f20ae51 100644 (file)
--- 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 b7bae34ffe6ad33a6d8155c2ab2865cedb680d1d..bfeef61b69b8684e1fdc4b0ff1067a15d177d2f9 100644 (file)
--- 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 41cd74e70617f5204fe01e088b0923fdfc431fb4..05d2a1fbac2052a1c13eda5bd450beefd6956607 100644 (file)
--- 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 646682fb596a7b18d344fb188c3931b01b0cca84..038cb49552b52ae911fe9049f218d25e5569777a 100644 (file)
--- 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 1de5eb44227b593f5088bb0d356f2cdf27c8350e..67c0e27c00b2d6c0e895db3b8c049a78ba503758 100644 (file)
--- 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 0619cd13e77b8500ec21b40415cd7ffa177dcc0f..7ac7d040d72e20b80def4540d8ee40e097586c28 100644 (file)
--- 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 e3688c6c41b5b72d4e9fdb3c2f605f033511af2d..f7ac7d9964500e31c625279ac9a32a43136cc61c 100644 (file)
--- 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 b51a5651a2bef1df140c709f29fc2e7e713944e6..54e49a30e57f33b285d769396c19b6281d44ea65 100644 (file)
--- 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 2fc483567e20b6c21d8ea58b770d9289af28289b..12f8d6b478dcf69c359b1f1751acfb26a11e648a 100644 (file)
--- 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 8a5dce0598a2ab14a60e11d65d0d51c761d68a90..90370e6211c5e66107f53ab86cd501ab7df68b65 100644 (file)
--- 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>