From f9a38137925ff6f712afe21961614a1efb3b35ea Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 14 Sep 2012 15:52:54 +0200
Subject: [PATCH] include telepathy-glib.h

tp-glib 1.0 will enforce to only include telepathy-glib.h so best doing it to
reduce the delta with the future stable branch.
---
 extensions/extensions.h                                | 2 +-
 goa-mc-plugin/mcp-account-manager-goa.c                | 2 +-
 libempathy-gtk/empathy-account-chooser.c               | 3 ---
 libempathy-gtk/empathy-account-widget-sip.c            | 2 +-
 libempathy-gtk/empathy-account-widget.c                | 5 +----
 libempathy-gtk/empathy-chat.c                          | 3 +--
 libempathy-gtk/empathy-contact-chooser.h               | 2 +-
 libempathy-gtk/empathy-contact-widget.c                | 4 +---
 libempathy-gtk/empathy-contactinfo-utils.c             | 2 --
 libempathy-gtk/empathy-contactinfo-utils.h             | 2 +-
 libempathy-gtk/empathy-groups-widget.c                 | 2 +-
 libempathy-gtk/empathy-individual-dialogs.c            | 2 +-
 libempathy-gtk/empathy-individual-edit-dialog.c        | 2 +-
 libempathy-gtk/empathy-individual-information-dialog.c | 2 +-
 libempathy-gtk/empathy-individual-menu.c               | 2 +-
 libempathy-gtk/empathy-individual-store-channel.c      | 2 +-
 libempathy-gtk/empathy-individual-store-manager.c      | 2 +-
 libempathy-gtk/empathy-individual-store.c              | 2 +-
 libempathy-gtk/empathy-individual-view.c               | 3 +--
 libempathy-gtk/empathy-individual-widget.c             | 2 +-
 libempathy-gtk/empathy-location-manager.c              | 3 +--
 libempathy-gtk/empathy-log-window.h                    | 2 +-
 libempathy-gtk/empathy-new-call-dialog.c               | 2 +-
 libempathy-gtk/empathy-new-message-dialog.c            | 2 +-
 libempathy-gtk/empathy-notify-manager.c                | 2 +-
 libempathy-gtk/empathy-plist.c                         | 3 +--
 libempathy-gtk/empathy-presence-chooser.c              | 3 +--
 libempathy-gtk/empathy-protocol-chooser.c              | 2 --
 libempathy-gtk/empathy-protocol-chooser.h              | 2 +-
 libempathy-gtk/empathy-roster-contact.c                | 2 +-
 libempathy-gtk/empathy-share-my-desktop.c              | 6 +-----
 libempathy-gtk/empathy-theme-adium.c                   | 3 +--
 libempathy-gtk/empathy-theme-manager.c                 | 3 +--
 libempathy-gtk/empathy-tls-dialog.c                    | 2 +-
 libempathy-gtk/empathy-ui-utils.c                      | 2 +-
 libempathy/empathy-account-settings.c                  | 5 -----
 libempathy/empathy-account-settings.h                  | 3 +--
 libempathy/empathy-auth-factory.c                      | 2 --
 libempathy/empathy-auth-factory.h                      | 2 +-
 libempathy/empathy-camera-monitor.c                    | 2 +-
 libempathy/empathy-chatroom-manager.c                  | 5 -----
 libempathy/empathy-chatroom-manager.h                  | 2 +-
 libempathy/empathy-chatroom.c                          | 1 -
 libempathy/empathy-chatroom.h                          | 2 +-
 libempathy/empathy-connection-aggregator.c             | 2 --
 libempathy/empathy-connection-aggregator.h             | 2 +-
 libempathy/empathy-connection-managers.c               | 3 ---
 libempathy/empathy-connection-managers.h               | 2 +-
 libempathy/empathy-contact.c                           | 4 ----
 libempathy/empathy-contact.h                           | 3 +--
 libempathy/empathy-debug.c                             | 3 ---
 libempathy/empathy-debug.h                             | 2 +-
 libempathy/empathy-ft-handler.c                        | 4 ----
 libempathy/empathy-ft-handler.h                        | 2 +-
 libempathy/empathy-individual-manager.c                | 4 ----
 libempathy/empathy-irc-network.c                       | 2 +-
 libempathy/empathy-irc-server.c                        | 2 +-
 libempathy/empathy-keyring.h                           | 2 +-
 libempathy/empathy-message.c                           | 4 ----
 libempathy/empathy-message.h                           | 2 +-
 libempathy/empathy-presence-manager.c                  | 4 ----
 libempathy/empathy-presence-manager.h                  | 3 +--
 libempathy/empathy-request-util.c                      | 2 --
 libempathy/empathy-request-util.h                      | 2 +-
 libempathy/empathy-server-sasl-handler.c               | 2 --
 libempathy/empathy-server-sasl-handler.h               | 3 +--
 libempathy/empathy-status-presets.c                    | 2 --
 libempathy/empathy-status-presets.h                    | 2 +-
 libempathy/empathy-tp-chat.c                           | 2 --
 libempathy/empathy-tp-chat.h                           | 3 +--
 libempathy/empathy-utils.c                             | 6 ------
 libempathy/empathy-utils.h                             | 2 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c       | 2 +-
 src/empathy-accounts-common.c                          | 3 +--
 src/empathy-accounts-dialog.c                          | 4 +---
 src/empathy-accounts-dialog.h                          | 2 +-
 src/empathy-accounts.c                                 | 4 +---
 src/empathy-auth-client.c                              | 2 +-
 src/empathy-call-factory.c                             | 5 +----
 src/empathy-call-handler.c                             | 4 +---
 src/empathy-call-window.c                              | 3 +--
 src/empathy-call.c                                     | 2 --
 src/empathy-chat-window.c                              | 2 --
 src/empathy-chat-window.h                              | 2 +-
 src/empathy-chat.c                                     | 2 --
 src/empathy-debug-window.c                             | 6 +-----
 src/empathy-event-manager.c                            | 5 +----
 src/empathy-import-dialog.c                            | 2 +-
 src/empathy-import-pidgin.c                            | 3 +--
 src/empathy-import-utils.c                             | 2 --
 src/empathy-import-utils.h                             | 2 +-
 src/empathy-import-widget.c                            | 3 +--
 src/empathy-invite-participant-dialog.h                | 2 +-
 src/empathy-preferences.c                              | 3 +--
 src/empathy-roster-window.c                            | 3 +--
 src/empathy-status-icon.c                              | 3 +--
 src/empathy.c                                          | 7 +------
 tests/empathy-chatroom-manager-test.c                  | 3 +--
 tests/empathy-parser-test.c                            | 2 +-
 tests/test-helper.h                                    | 2 +-
 100 files changed, 76 insertions(+), 196 deletions(-)

diff --git a/extensions/extensions.h b/extensions/extensions.h
index d97dc830..2dbd79cc 100644
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -2,7 +2,7 @@
 #define __EMP_EXTENSIONS_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"
 #include "extensions/_gen/cli-misc.h"
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 95728516..4b64e546 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 6e7ec294..e5827dc5 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -28,9 +28,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-utils.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 8aa4e89d..9599ce15 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-account-widget.h"
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 17ab236e..2a98120e 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -35,10 +35,7 @@
 
 #include <libempathy/empathy-utils.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-account-widget.h"
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 917f4c02..9a12d1f0 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -36,8 +36,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-keyring.h>
diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h
index 66c8fbe4..20a9b8c4 100644
--- a/libempathy-gtk/empathy-contact-chooser.h
+++ b/libempathy-gtk/empathy-contact-chooser.h
@@ -14,7 +14,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "libempathy/empathy-tp-chat.h"
 
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 2b770ca1..421cb913 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 67186d2a..5e4fad78 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -27,8 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-request-util.h>
 
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index b91f419c..80c18ffa 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 7d231d40..cc3653bb 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 2c5dc274..e3b653b3 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index b49e29f8..8fba058f 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include <libempathy/empathy-individual-manager.h>
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 2e8fcb66..65dc68af 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index e9edf44f..e5974812 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index e5edb264..389175eb 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -33,7 +33,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index f8610cf1..78d3a07e 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -33,7 +33,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 9199af6b..444a6c5f 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -34,7 +34,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index c143ef23..9cb8b86a 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -32,8 +32,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 832d944d..73539745 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 576ced52..7cdf2517 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -26,8 +26,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <geoclue/geoclue-master.h>
 
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index 4c1244cc..f8f76905 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 079afe47..c8538b5c 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 14199578..0b707c4f 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index bccc3e21..25035428 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -23,7 +23,7 @@
 #include <libnotify/notification.h>
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index 1bd4d8ec..be7b23a4 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -23,8 +23,7 @@
 #include <string.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-plist.h"
 
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 1eb4a48a..16b7a54e 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -33,8 +33,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 8c0df8fa..2ff35644 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <telepathy-glib/util.h>
-
 #include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 5aa0a4c4..eeaab60c 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-account-settings.h>
 
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index afb6de4f..e72ae449 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -2,7 +2,7 @@
 
 #include "empathy-roster-contact.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 8f14fb6b..0414f7d4 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -23,11 +23,7 @@
 #include <gtk/gtk.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/contact.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/interfaces.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-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 2e243c46..37c8698e 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -24,8 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <webkit/webkit.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <pango/pango.h>
 #include <gdk/gdk.h>
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 7d21b796..fd58ac49 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -25,10 +25,9 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <telepathy-glib/dbus.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index bf36e9ac..34af2f03 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <gcr/gcr.h>
 
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 967d59cd..97ba5281 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -39,7 +39,7 @@
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include "empathy-ui-utils.h"
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 9c25faf0..8731479b 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -23,11 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
-
 #include "empathy-account-settings.h"
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index c5406525..162def48 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -24,8 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index a4bc15a6..f20ce8a3 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -22,8 +22,6 @@
 
 #include "empathy-auth-factory.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
 #include "empathy-keyring.h"
diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 5d31b1ed..16d6ad34 100644
--- a/libempathy/empathy-auth-factory.h
+++ b/libempathy/empathy-auth-factory.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 977b1f2c..74fdb44d 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-camera-monitor.h"
 #include "cheese-camera-device-monitor.h"
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 9a9a7b25..da3c4e20 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -30,11 +30,6 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-observer.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"
diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index be330150..b8232dc6 100644
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"
 
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5238af36..bfa3280d 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <telepathy-glib/util.h>
 
 #include "empathy-chatroom.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index f86f8ca9..57ca685c 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-tp-chat.h>
 
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index f42e18fd..32a3bbb0 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -22,8 +22,6 @@
 
 #include "empathy-connection-aggregator.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h
index 5f85193c..71e6e439 100644
--- a/libempathy/empathy-connection-aggregator.h
+++ b/libempathy/empathy-connection-aggregator.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 93985f5d..cd95a4b2 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -23,9 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-connection-managers.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index 14833734..d8bcb390 100644
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 562fba45..4fe42895 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -25,10 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 6b15d5ea..14c3f644 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -24,8 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/contact.h>
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>
 
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 038748ff..49ee9371 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -29,9 +29,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index 0869e80b..e6b93cc7 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -25,7 +25,7 @@
 
 
 #include <glib.h>
-#include <telepathy-glib/debug.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 169020d5..d9d87e20 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -25,10 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
 
 #include "empathy-ft-handler.h"
 #include "empathy-time.h"
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index 7111cd25..a120f241 100644
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/file-transfer-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 97be8b8a..8d14cdf0 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -25,10 +25,6 @@
 #include <string.h>
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/util.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index ec0cfffb..66c1f49d 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.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 cb1fbfc2..f0a13d09 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-irc-server.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 05c460e5..7e945dc0 100644
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -21,7 +21,7 @@
 
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 0a8ca408..fe197511 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -28,10 +28,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-message.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index c49a2840..fa6e07be 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -26,7 +26,7 @@
 #define __EMPATHY_MESSAGE_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/message.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 29af2a10..25039892 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -27,10 +27,6 @@
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 63599cbf..6357aeec 100644
--- a/libempathy/empathy-presence-manager.h
+++ b/libempathy/empathy-presence-manager.h
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 6b53dab9..196925b5 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -25,8 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index cdecc631..497c65ee 100644
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index aa0760d6..06f7a9e6 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -21,8 +21,6 @@
 
 #include "empathy-server-sasl-handler.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <extensions/extensions.h>
 
 #include <string.h>
diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index 94be69b1..d25d90ab 100644
--- a/libempathy/empathy-server-sasl-handler.h
+++ b/libempathy/empathy-server-sasl-handler.h
@@ -23,8 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 319ca53d..94025334 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -32,8 +32,6 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/util.h>
-
 #include "empathy-utils.h"
 #include "empathy-status-presets.h"
 
diff --git a/libempathy/empathy-status-presets.h b/libempathy/empathy-status-presets.h
index 331c630d..5e490221 100644
--- a/libempathy/empathy-status-presets.h
+++ b/libempathy/empathy-status-presets.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_STATUS_PRESETS_H__
 #define __EMPATHY_STATUS_PRESETS_H__
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index d6a0e13c..39ed8e2a 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -22,8 +22,6 @@
 
 #include <string.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <extensions/extensions.h>
 
 #include "empathy-tp-chat.h"
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 66fb96d7..d8d4ac31 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index eb1e27f4..e33bf3af 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -42,12 +42,6 @@
 
 #include <dbus/dbus-protocol.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-utils.h"
 #include "empathy-individual-manager.h"
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index c3a5886a..a310d2b0 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -34,7 +34,7 @@
 #include <libxml/tree.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 56c55f57..8b1bafb7 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-debug.h>
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index d975c55b..346803c2 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -32,8 +32,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index f865e874..6275e6a8 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -34,9 +34,7 @@
 #include <dbus/dbus-glib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 5fe6f51f..d436fed0 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index aa0e5b67..e3bf938a 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -36,9 +36,7 @@
 #include <cheese-gtk.h>
 #endif
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index d1f905c4..578e63f6 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <libempathy/empathy-debug.h>
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 9401ae71..45469e7b 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -23,10 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/simple-handler.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-request-util.h>
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index be0987e9..3b870be0 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -23,9 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5a3b0d88..db7605bf 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -34,9 +34,8 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
-#include <telepathy-glib/util.h>
 #include <telepathy-farstream/telepathy-farstream.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 9d7a2b35..5b50f957 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -34,8 +34,6 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <telepathy-glib/debug-sender.h>
-
 #include <libempathy/empathy-client-factory.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6231b57b..f21db033 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -35,8 +35,6 @@
 #include <glib/gi18n.h>
 #include <libnotify/notification.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 7804bd4b..d7ddc2b6 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -30,7 +30,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy-gtk/empathy-chat.h>
 
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 3094b513..0f7173a9 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -28,8 +28,6 @@
 
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/debug-sender.h>
-
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-individual-manager.h>
 
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 159db0b0..33b12627 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -37,11 +37,7 @@
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 7e34f4ce..b0017e60 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -24,10 +24,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-approver.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-connection-aggregator.h>
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 4e00bd11..500e82b8 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-import-dialog.h"
 #include "empathy-import-pidgin.h"
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index f50b1836..56a742d2 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -30,8 +30,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 2c942b58..7007dee5 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,8 +19,6 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-utils.h>
 
diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 09b85e0b..59e1cb4d 100644
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_IMPORT_UTILS_H__
 #define __EMPATHY_IMPORT_UTILS_H__
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 1994280e..93df3963 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -35,8 +35,7 @@
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 7d32bdd8..7946fa00 100644
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -14,7 +14,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "libempathy/empathy-tp-chat.h"
 
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 99d920fc..02b34dcf 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -30,8 +30,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-gsettings.h>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index c6a04fa8..0c0d9243 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -28,8 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include <libempathy/empathy-contact.h>
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 517dd1df..b26b925c 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -29,8 +29,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
diff --git a/src/empathy.c b/src/empathy.c
index a75cf3e1..fcfa0bc6 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -37,12 +37,7 @@
 
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/debug-sender.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-logger/telepathy-logger.h>
 
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 3ba0239f..7ecb82ac 100644
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -3,8 +3,7 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-chatroom-manager.h>
 
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index feef03b5..4ae6f775 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -6,7 +6,7 @@
 
 #include "test-helper.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include <libempathy/empathy-debug.h>
diff --git a/tests/test-helper.h b/tests/test-helper.h
index 67e371ed..cacd18b5 100644
--- a/tests/test-helper.h
+++ b/tests/test-helper.h
@@ -20,7 +20,7 @@
 #ifndef __TEST_HELPER_H__
 #define __TEST_HELPER_H__
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 void test_init (int argc,
     char **argv);
-- 
2.39.2