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

31 files changed, 2 insertions, 138 deletions

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>