Use meta-headers for everything

Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49384

106 files changed, 176 insertions, 310 deletions

diff --git a/gabble/caps-channel-manager.h b/gabble/caps-channel-manager.h
index 9442476ac..a43283944 100644
--- a/gabble/caps-channel-manager.h
+++ b/gabble/caps-channel-manager.h
@@ -24,8 +24,7 @@
 #define GABBLE_CAPS_CHANNEL_MANAGER_H
 
 #include <glib-object.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/handle.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "capabilities.h"
 
diff --git a/gabble/connection.h b/gabble/connection.h
index 5c7bf51e7..0365699d1 100644
--- a/gabble/connection.h
+++ b/gabble/connection.h
@@ -21,8 +21,7 @@
 #ifndef GABBLE_PLUGINS_CONNECTION_H
 #define GABBLE_PLUGINS_CONNECTION_H
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/base-contact-list.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <gabble/capabilities-set.h>
 #include <gabble/types.h>
diff --git a/gabble/plugin-connection.h b/gabble/plugin-connection.h
index 66302a746..1dd0638c2 100644
--- a/gabble/plugin-connection.h
+++ b/gabble/plugin-connection.h
@@ -22,8 +22,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/base-contact-list.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <gabble/capabilities-set.h>
 #include <gabble/types.h>
diff --git a/gabble/plugin.h b/gabble/plugin.h
index faf72a9e4..fcc7290e0 100644
--- a/gabble/plugin.h
+++ b/gabble/plugin.h
@@ -24,8 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/presence-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #include <gabble/plugin-connection.h>
diff --git a/plugins/console.h b/plugins/console.h
index 9a3d5d619..e646d067e 100644
--- a/plugins/console.h
+++ b/plugins/console.h
@@ -21,7 +21,7 @@
 
 #include <gio/gio.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 typedef struct _GabbleConsolePlugin GabbleConsolePlugin;
 typedef struct _GabbleConsolePluginClass GabbleConsolePluginClass;
diff --git a/src/addressing-util.h b/src/addressing-util.h
index 9835e0d70..378d1fe78 100644
--- a/src/addressing-util.h
+++ b/src/addressing-util.h
@@ -20,7 +20,7 @@
 #ifndef __GABBLE_UTIL_ADDRESSING_H__
 #define __GABBLE_UTIL_ADDRESSING_H__
 
-#include <telepathy-glib/handle-repo-dynamic.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 const gchar * const * gabble_get_addressable_uri_schemes (void);
 
diff --git a/src/auth-manager.c b/src/auth-manager.c
index 57a8bbd62..fd90bf517 100644
--- a/src/auth-manager.c
+++ b/src/auth-manager.c
@@ -20,9 +20,8 @@
 #include "config.h"
 #include "auth-manager.h"
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/auth-manager.h b/src/auth-manager.h
index bdf7ebfe2..dad5115f9 100644
--- a/src/auth-manager.h
+++ b/src/auth-manager.h
@@ -22,7 +22,9 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/handle.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/base-call-channel.c b/src/base-call-channel.c
index 5ea79b27b..3c682d2a4 100644
--- a/src/base-call-channel.c
+++ b/src/base-call-channel.c
@@ -25,16 +25,8 @@
 
 #include <gio/gio.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dtmf.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-properties-interface.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "util.h"
 #include "call-content.h"
diff --git a/src/base-call-channel.h b/src/base-call-channel.h
index 068b2dada..04add06e8 100644
--- a/src/base-call-channel.h
+++ b/src/base-call-channel.h
@@ -23,9 +23,8 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/base-call-channel.h>
-#include <telepathy-glib/base-media-call-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "jingle-content.h"
 #include "call-member.h"
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index ac1318fa3..12dcb5207 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -26,7 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
 
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 7a86cd4f8..733f1b886 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -21,7 +21,7 @@
 #define __BYTESTREAM_FACTORY_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include "types.h"
 #include "bytestream-iface.h"
 #include "bytestream-ibb.h"
diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index e46e7339d..a479eb2fb 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -24,7 +24,8 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
 
diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h
index fa1af3a2e..2d96baf12 100644
--- a/src/bytestream-ibb.h
+++ b/src/bytestream-ibb.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c
index 82c555446..84ade6249 100644
--- a/src/bytestream-muc.c
+++ b/src/bytestream-muc.c
@@ -24,7 +24,8 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
 
diff --git a/src/bytestream-muc.h b/src/bytestream-muc.h
index 06dcd2689..393410eec 100644
--- a/src/bytestream-muc.h
+++ b/src/bytestream-muc.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bytestream-multiple.c b/src/bytestream-multiple.c
index 3890ecba9..4fa1cb855 100644
--- a/src/bytestream-multiple.c
+++ b/src/bytestream-multiple.c
@@ -22,7 +22,9 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/interfaces.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
 
diff --git a/src/bytestream-socks5.c b/src/bytestream-socks5.c
index 75c2a6f5f..dfebc2ac2 100644
--- a/src/bytestream-socks5.c
+++ b/src/bytestream-socks5.c
@@ -44,7 +44,9 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/interfaces.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <gibber/gibber-transport.h>
 #include <gibber/gibber-tcp-transport.h>
diff --git a/src/bytestream-socks5.h b/src/bytestream-socks5.h
index 524812f32..f3704e469 100644
--- a/src/bytestream-socks5.h
+++ b/src/bytestream-socks5.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/call-channel.c b/src/call-channel.c
index b2cd814ac..223c22350 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -26,13 +26,8 @@
 
 #include <gio/gio.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "util.h"
 #include "call-channel.h"
diff --git a/src/call-content.c b/src/call-content.c
index 8550b82fc..46616e39f 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -23,12 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/svc-properties-interface.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "call-member.h"
 #include "call-content.h"
diff --git a/src/call-content.h b/src/call-content.h
index ff3205f55..70df5405b 100644
--- a/src/call-content.h
+++ b/src/call-content.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-content.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "jingle-content.h"
 #include "call-member-content.h"
diff --git a/src/call-member.h b/src/call-member.h
index 5554a9ec0..4b052fa7e 100644
--- a/src/call-member.h
+++ b/src/call-member.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/handle.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "types.h"
 #include "jingle-session.h"
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
index 4733dfb81..3b4a063f1 100644
--- a/src/call-muc-channel.c
+++ b/src/call-muc-channel.c
@@ -23,9 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 #include "call-content.h"
diff --git a/src/call-stream.c b/src/call-stream.c
index 4e2aff980..ae9ac5e8f 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -23,11 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/svc-properties-interface.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "call-stream.h"
 #include "connection.h"
diff --git a/src/call-stream.h b/src/call-stream.h
index ed8bb767f..e30593e41 100644
--- a/src/call-stream.h
+++ b/src/call-stream.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-stream.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "jingle-types.h"
 
diff --git a/src/capabilities.c b/src/capabilities.c
index 03a6c146d..ce11067fe 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -24,11 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/handle-repo.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 #include "debug.h"
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index dea13a652..c6b7e16b1 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -23,9 +23,7 @@
 #include "config.h"
 #include "gabble/caps-channel-manager.h"
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/channel-manager.h>
-
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 #include "debug.h"
diff --git a/src/conn-addressing.c b/src/conn-addressing.c
index f70719b4f..6e4605073 100644
--- a/src/conn-addressing.c
+++ b/src/conn-addressing.c
@@ -21,8 +21,8 @@
 
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 748509bc4..ee5c886a6 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -22,10 +22,9 @@
 #include "conn-aliasing.h"
 
 #include <wocky/wocky.h>
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
 
diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index 44efa9d68..7504c6395 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -24,9 +24,8 @@
 
 #include <string.h>
 
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/contacts-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "base64.h"
 #include "presence.h"
diff --git a/src/conn-client-types.c b/src/conn-client-types.c
index 012749c19..1a5ff1e8f 100644
--- a/src/conn-client-types.c
+++ b/src/conn-client-types.c
@@ -22,7 +22,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <extensions/extensions.h>
 
diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
index ace9d4ee1..599197b9b 100644
--- a/src/conn-contact-info.c
+++ b/src/conn-contact-info.c
@@ -24,9 +24,8 @@
 
 #include <string.h>
 
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "vcard-manager.h"
 
diff --git a/src/conn-location.c b/src/conn-location.c
index bb953832d..f73907735 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -8,8 +8,8 @@
 
 #define DEBUG_FLAG GABBLE_DEBUG_LOCATION
 
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <wocky/wocky.h>
 
 #include <gabble/gabble.h>
diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c
index 68d93ee3f..1735aa212 100644
--- a/src/conn-mail-notif.c
+++ b/src/conn-mail-notif.c
@@ -33,11 +33,9 @@
 #include <string.h>
 
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/util.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 080b95902..755d5daf3 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -23,8 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_OLPC
 
diff --git a/src/conn-presence.c b/src/conn-presence.c
index 1f1809e76..6599b92a6 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -24,11 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/presence-mixin.h>
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/conn-sidecars.c b/src/conn-sidecars.c
index a110dc12f..a196e807c 100644
--- a/src/conn-sidecars.c
+++ b/src/conn-sidecars.c
@@ -20,7 +20,7 @@
 
 #include "conn-sidecars.h"
 
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/connection-manager.c b/src/connection-manager.c
index b2a0edb15..4031d49ae 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -25,8 +25,10 @@
 
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
 #include <wocky/wocky.h>
 
 #include "connection.h"
diff --git a/src/connection-manager.h b/src/connection-manager.h
index 775bba79b..fc269e8d8 100644
--- a/src/connection-manager.h
+++ b/src/connection-manager.h
@@ -22,7 +22,7 @@
 #define __GABBLE_CONNECTION_MANAGER_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/connection.c b/src/connection.c
index ac46929c9..da09b408d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -30,14 +30,8 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/connection.h b/src/connection.h
index 50734b777..39c961df6 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -25,11 +25,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/presence-mixin.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/debug.c b/src/debug.c
index a7616f712..8e3dd0c50 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -16,8 +16,8 @@
 #include <errno.h>
 
 #include <glib/gstdio.h>
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
+
+#include <telepathy-glib/telepathy-glib.h>
 
 static GabbleDebugFlags flags = 0;
 
diff --git a/src/disco.c b/src/disco.c
index 6f142a4e1..20726dd31 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -28,7 +28,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_DISCO
 
diff --git a/src/ft-channel.c b/src/ft-channel.c
index b5c2419bf..bfabae6d7 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -48,14 +48,8 @@
 #include "presence-cache.h"
 #include "util.h"
 
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-channel.h>
-
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void file_transfer_iface_init (gpointer g_iface, gpointer iface_data);
 static void transferred_chunk (GabbleFileTransferChannel *self, guint64 count);
diff --git a/src/ft-channel.h b/src/ft-channel.h
index 323c1e651..87943646b 100644
--- a/src/ft-channel.h
+++ b/src/ft-channel.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <extensions/extensions.h>
 
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 typedef struct _GabbleFileTransferChannel GabbleFileTransferChannel;
 
diff --git a/src/ft-manager.c b/src/ft-manager.c
index b8b09d6d1..068e1cdb4 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -45,14 +45,8 @@
 
 #include <wocky/wocky.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/channel-factory-iface.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_FT
 #include "debug.h"
diff --git a/src/gabble.c b/src/gabble.c
index 0d2fb6e29..f6bbf2c39 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -27,11 +27,8 @@
 
 #include <glib/gstdio.h>
 
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
-#include <telepathy-glib/run.h>
-#include <telepathy-glib/util.h>
-#include <wocky/wocky.h>
+#include <telepathy-glib/telepathy-glib.h>
+
 #include <wocky/wocky.h>
 
 #include "debug.h"
diff --git a/src/im-channel.c b/src/im-channel.c
index d0e939e51..fd9f812c0 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -24,14 +24,9 @@
 #include <string.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
 #include "connection.h"
diff --git a/src/im-channel.h b/src/im-channel.h
index fdbae19bf..076565ef5 100644
--- a/src/im-channel.h
+++ b/src/im-channel.h
@@ -24,9 +24,7 @@
 #include <glib-object.h>
 #include <time.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/message-mixin.h>
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/im-factory.c b/src/im-factory.c
index 72c33956d..6c17a84a8 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -24,10 +24,8 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
diff --git a/src/jingle-info.c b/src/jingle-info.c
index 4bc15b529..7aed3bbc1 100644
--- a/src/jingle-info.c
+++ b/src/jingle-info.c
@@ -20,7 +20,7 @@
 #include "jingle-info.h"
 
 #include <stdlib.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 #include "debug.h"
diff --git a/src/legacy-caps.c b/src/legacy-caps.c
index 3f4ebde5c..827fc15ea 100644
--- a/src/legacy-caps.c
+++ b/src/legacy-caps.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "legacy-caps.h"
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 #include "debug.h"
diff --git a/src/media-channel-hold.c b/src/media-channel-hold.c
index ebd1cf2a3..ca8241c34 100644
--- a/src/media-channel-hold.c
+++ b/src/media-channel-hold.c
@@ -23,7 +23,7 @@
 #include "media-channel.h"
 #include "media-channel-internal.h"
 
-#include <telepathy-glib/channel-iface.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/media-channel-internal.h b/src/media-channel-internal.h
index 9264eac8b..ff931b567 100644
--- a/src/media-channel-internal.h
+++ b/src/media-channel-internal.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/dtmf.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "media-stream.h"
 #include "jingle-session.h"
diff --git a/src/media-channel.c b/src/media-channel.c
index 386c71fe2..f2b3e523a 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -26,14 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-properties-interface.h>
-#include <telepathy-glib/svc-media-interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/media-channel.h b/src/media-channel.h
index b10886ca2..cbe488af2 100644
--- a/src/media-channel.h
+++ b/src/media-channel.h
@@ -23,8 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/properties-mixin.h>
 
 #include "presence.h"
diff --git a/src/media-factory.c b/src/media-factory.c
index 7b7a00bc3..7710584cb 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -25,9 +25,9 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/media-stream.c b/src/media-stream.c
index d3b1b5520..300269214 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -27,12 +27,9 @@
 #include <string.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-media-interfaces.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/media-stream.h b/src/media-stream.h
index c8c50929a..277399d07 100644
--- a/src/media-stream.h
+++ b/src/media-stream.h
@@ -22,12 +22,9 @@
 #define __GABBLE_MEDIA_STREAM_H__
 
 #include <glib-object.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "jingle-types.h"
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dtmf.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/message-util.c b/src/message-util.c
index 008bbe513..2c284e37e 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 33bc04bd8..69852a7ef 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -28,12 +28,8 @@
 #include <wocky/wocky.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MUC
 #include "connection.h"
diff --git a/src/muc-channel.h b/src/muc-channel.h
index f28b7a07e..e6479478b 100644
--- a/src/muc-channel.h
+++ b/src/muc-channel.h
@@ -27,10 +27,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/message-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "types.h"
 #include "tubes-channel.h"
diff --git a/src/muc-factory.c b/src/muc-factory.c
index ab1de5bd9..9dbe11917 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -25,11 +25,9 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MUC
 
diff --git a/src/olpc-activity.h b/src/olpc-activity.h
index 47101bd66..4c08df6cf 100644
--- a/src/olpc-activity.h
+++ b/src/olpc-activity.h
@@ -22,8 +22,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/handle-repo.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 
diff --git a/src/plugin-connection.c b/src/plugin-connection.c
index 0d0d95e9f..dcbb74bc6 100644
--- a/src/plugin-connection.c
+++ b/src/plugin-connection.c
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <gabble/types.h>
-#include <telepathy-glib/errors.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <debug.h>
 
 
diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index 56acda0e6..d308437ee 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -28,8 +28,7 @@
 # include <gmodule.h>
 #endif
 
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/presence-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PLUGINS
 #include "debug.h"
diff --git a/src/plugin-loader.h b/src/plugin-loader.h
index 15bce505e..985cccbc5 100644
--- a/src/plugin-loader.h
+++ b/src/plugin-loader.h
@@ -23,8 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/presence-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #include "gabble/sidecar.h"
diff --git a/src/plugin.c b/src/plugin.c
index f5c26427e..2ddd23ea6 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -22,9 +22,7 @@
 
 #include "gabble/plugin.h"
 
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/presence-mixin.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PLUGINS
 #include "debug.h"
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 7cb0a3fe0..1b405e168 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -35,8 +35,7 @@
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/intset.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
diff --git a/src/presence.c b/src/presence.c
index 704834ca2..db9830c6e 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -22,7 +22,7 @@
 #include "presence.h"
 
 #include <string.h>
-#include <telepathy-glib/channel-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #include "gabble/capabilities.h"
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 2c781e529..16e857a27 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -25,12 +25,9 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/util.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/private-tubes-factory.h b/src/private-tubes-factory.h
index d9895199d..f5cfd1b76 100644
--- a/src/private-tubes-factory.h
+++ b/src/private-tubes-factory.h
@@ -22,7 +22,8 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
+
 #include "connection.h"
 #include "bytestream-iface.h"
 #include "tubes-channel.h"
diff --git a/src/protocol.c b/src/protocol.c
index eb054e15e..dda494fba 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -22,8 +22,9 @@
 #include "protocol.h"
 
 #include <string.h>
-#include <telepathy-glib/base-connection-manager.h>
-#include <telepathy-glib/interfaces.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/protocol.h b/src/protocol.h
index 30809df47..c013d9913 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -21,7 +21,7 @@
 #define JABBER_PROTOCOL_H
 
 #include <glib-object.h>
-#include <telepathy-glib/base-protocol.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/request-pipeline.c b/src/request-pipeline.c
index 30c1dd493..7b4eb5cc0 100644
--- a/src/request-pipeline.c
+++ b/src/request-pipeline.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "request-pipeline.h"
 
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PIPELINE
 
diff --git a/src/room-config.h b/src/room-config.h
index a2981c186..ce5247201 100644
--- a/src/room-config.h
+++ b/src/room-config.h
@@ -21,7 +21,7 @@
 #define GABBLE_ROOM_CONFIG_H
 
 #include <glib-object.h>
-#include <telepathy-glib/base-room-config.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 typedef struct _GabbleRoomConfig GabbleRoomConfig;
 typedef struct _GabbleRoomConfigClass GabbleRoomConfigClass;
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 9109db19e..d8e222e9a 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -24,14 +24,9 @@
 #include <string.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_ROOMLIST
 
diff --git a/src/roomlist-channel.h b/src/roomlist-channel.h
index e86d6b028..5c74f3485 100644
--- a/src/roomlist-channel.h
+++ b/src/roomlist-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 
diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c
index 20e7c8ad5..ff2f37fef 100644
--- a/src/roomlist-manager.c
+++ b/src/roomlist-manager.c
@@ -25,10 +25,9 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MUC
 
diff --git a/src/roster.c b/src/roster.c
index 975b56697..2ccab4d1b 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -25,9 +25,8 @@
 #include <string.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_ROSTER
diff --git a/src/roster.h b/src/roster.h
index 185dde514..4cc2b0dcf 100644
--- a/src/roster.h
+++ b/src/roster.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-contact-list.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "types.h"
 
diff --git a/src/search-channel.c b/src/search-channel.c
index 94abbd99f..cbebe1fbd 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -23,11 +23,8 @@
 
 #include <string.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/search-channel.h b/src/search-channel.h
index 9b6c748ab..066fd8535 100644
--- a/src/search-channel.h
+++ b/src/search-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/search-manager.c b/src/search-manager.c
index 60f07fc3d..d0d4beaaa 100644
--- a/src/search-manager.c
+++ b/src/search-manager.c
@@ -21,9 +21,8 @@
 #include "config.h"
 #include "search-manager.h"
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
index 7077420bd..7857dfa1d 100644
--- a/src/server-sasl-channel.c
+++ b/src/server-sasl-channel.c
@@ -36,15 +36,8 @@
 #include <dbus/dbus-glib.h>
 #include <wocky/wocky.h>
 
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_AUTH
 
diff --git a/src/server-sasl-channel.h b/src/server-sasl-channel.h
index 69b469974..32cae43ed 100644
--- a/src/server-sasl-channel.h
+++ b/src/server-sasl-channel.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #include "types.h"
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
index 859edb4d6..9fa913426 100644
--- a/src/server-tls-channel.c
+++ b/src/server-tls-channel.c
@@ -22,10 +22,8 @@
 
 #include "server-tls-channel.h"
 
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <wocky/wocky.h>
 
diff --git a/src/server-tls-channel.h b/src/server-tls-channel.h
index 45afbf2a3..a21f1e358 100644
--- a/src/server-tls-channel.h
+++ b/src/server-tls-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <extensions/extensions.h>
 
diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index d4109b6cc..dc2a71602 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -21,7 +21,8 @@
 #include "config.h"
 #include "server-tls-manager.h"
 
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_TLS
 #include "debug.h"
diff --git a/src/server-tls-manager.h b/src/server-tls-manager.h
index e8f10af1b..816866b5e 100644
--- a/src/server-tls-manager.h
+++ b/src/server-tls-manager.h
@@ -23,8 +23,7 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index fabb541b5..303b70644 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -22,7 +22,7 @@
 #include "tls-certificate.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/svc-tls.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_TLS
 #include "debug.h"
diff --git a/src/tls-certificate.h b/src/tls-certificate.h
index e71245d1c..271ce09d7 100644
--- a/src/tls-certificate.h
+++ b/src/tls-certificate.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index d7f06bba9..a443098cc 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -27,12 +27,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/tube-dbus.h b/src/tube-dbus.h
index 35073ce3f..5423daaa2 100644
--- a/src/tube-dbus.h
+++ b/src/tube-dbus.h
@@ -22,10 +22,8 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "bytestream-iface.h"
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 62585eb33..c56dca764 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -20,7 +20,8 @@
 #include "config.h"
 #include "tube-iface.h"
 
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "util.h"
diff --git a/src/tube-iface.h b/src/tube-iface.h
index 311bf65bc..b727f391d 100644
--- a/src/tube-iface.h
+++ b/src/tube-iface.h
@@ -21,7 +21,7 @@
 #define __GABBLE_TUBE_IFACE_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "bytestream-iface.h"
 
diff --git a/src/tube-stream.c b/src/tube-stream.c
index a315a2d7d..d620117ff 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -31,12 +31,8 @@
 #endif
 
 #include <glib/gstdio.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "extensions/extensions.h"
 
diff --git a/src/tube-stream.h b/src/tube-stream.h
index 991116238..96838bf80 100644
--- a/src/tube-stream.h
+++ b/src/tube-stream.h
@@ -22,9 +22,8 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "extensions/extensions.h"
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 5620ff060..7d9281220 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -32,16 +32,8 @@
 
 #include <glib/gstdio.h>
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_TUBES
 
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index dbf7d5fd4..cff0d6110 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -22,8 +22,7 @@
 
 #include <glib-object.h>
 #include <wocky/wocky.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/exportable-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "bytestream-iface.h"
 #include "muc-channel.h"
diff --git a/src/types.h b/src/types.h
index 1c9de3f1a..977ff3fb7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <telepathy-glib/handle.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "gabble/types.h"
 
diff --git a/src/util.c b/src/util.c
index 56075452d..57b46605f 100644
--- a/src/util.c
+++ b/src/util.c
@@ -31,9 +31,8 @@
 #include <gobject/gvaluecollector.h>
 
 #include <wocky/wocky.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_JID
 
diff --git a/src/util.h b/src/util.h
index 10b2b6eec..cfea342d5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -25,8 +25,7 @@
 #include <config.h>
 
 #include <glib.h>
-#include <telepathy-glib/handle-repo.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <wocky/wocky.h>
 
 #ifdef ENABLE_VOIP
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index d52fd1eaa..b8777a4e2 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/heap.h>
+#include <telepathy-glib/telepathy-glib.h>
+
 #include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_VCARD
diff --git a/tests/test-handles.c b/tests/test-handles.c
index 46d28aa84..a0d60be49 100644
--- a/tests/test-handles.c
+++ b/tests/test-handles.c
@@ -4,9 +4,8 @@
 #include <string.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/errors.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "src/connection.h"