Tests: disable single include

This will make tests rebuild more often, but makes life easier
to other projects who copy/paste our test utilities (e.g. folks)

51 files changed, 58 insertions, 140 deletions

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 42c099b7b..33c1c6e67 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -83,7 +83,7 @@ include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
 AM_CPPFLAGS = \
-    -D_TP_COMPILATION \
+    -DTP_DISABLE_SINGLE_INCLUDE \
     $(NULL)
 
 AM_CFLAGS = \
diff --git a/tests/lib/broken-client-types-conn.c b/tests/lib/broken-client-types-conn.c
index c73898c32..cdc273a3d 100644
--- a/tests/lib/broken-client-types-conn.c
+++ b/tests/lib/broken-client-types-conn.c
@@ -13,7 +13,8 @@
 
 #include "broken-client-types-conn.h"
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 G_DEFINE_TYPE_WITH_CODE (TpTestsBrokenClientTypesConnection,
     tp_tests_broken_client_types_connection,
diff --git a/tests/lib/bug-19101-conn.c b/tests/lib/bug-19101-conn.c
index bac600cf3..a591d9c5f 100644
--- a/tests/lib/bug-19101-conn.c
+++ b/tests/lib/bug-19101-conn.c
@@ -13,7 +13,8 @@
 
 #include "bug-19101-conn.h"
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "debug.h"
 
diff --git a/tests/lib/bug16307-conn.c b/tests/lib/bug16307-conn.c
index 414d931a0..02323d14f 100644
--- a/tests/lib/bug16307-conn.c
+++ b/tests/lib/bug16307-conn.c
@@ -15,12 +15,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.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>
 
 static void service_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/bug16307-conn.h b/tests/lib/bug16307-conn.h
index 678ba4582..58aa0ec1a 100644
--- a/tests/lib/bug16307-conn.h
+++ b/tests/lib/bug16307-conn.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_BUG16307_CONN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "simple-conn.h"
 
diff --git a/tests/lib/contact-list-manager.h b/tests/lib/contact-list-manager.h
index 8be787c34..bc44863cb 100644
--- a/tests/lib/contact-list-manager.h
+++ b/tests/lib/contact-list-manager.h
@@ -12,7 +12,7 @@
 #ifndef __TP_TESTS_CONTACT_LIST_MANAGER_H__
 #define __TP_TESTS_CONTACT_LIST_MANAGER_H__
 
-#include <telepathy-glib/base-contact-list.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c
index 5b0dcbba2..6cca69f02 100644
--- a/tests/lib/contacts-conn.c
+++ b/tests/lib/contacts-conn.c
@@ -15,12 +15,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.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>
 
 #include "debug.h"
 
diff --git a/tests/lib/contacts-conn.h b/tests/lib/contacts-conn.h
index 64056e039..c596e3e6c 100644
--- a/tests/lib/contacts-conn.h
+++ b/tests/lib/contacts-conn.h
@@ -13,9 +13,7 @@
 #define __TP_TESTS_CONTACTS_CONN_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/telepathy-glib.h>
 
 #include "simple-conn.h"
 #include "contact-list-manager.h"
diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c
index d3e04eebf..2ca6673c9 100644
--- a/tests/lib/dbus-tube-chan.c
+++ b/tests/lib/dbus-tube-chan.c
@@ -13,9 +13,6 @@
 #include "dbus-tube-chan.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/gnio-util.h>
 #include <glib/gstdio.h>
 
 #if defined(G_OS_UNIX)
diff --git a/tests/lib/dbus-tube-chan.h b/tests/lib/dbus-tube-chan.h
index 0a6b1a794..71800970d 100644
--- a/tests/lib/dbus-tube-chan.h
+++ b/tests/lib/dbus-tube-chan.h
@@ -12,8 +12,7 @@
 #define __TP_DBUS_TUBE_CHAN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/echo-chan.c b/tests/lib/echo-chan.c
index 75f27d449..cf6d4f664 100644
--- a/tests/lib/echo-chan.c
+++ b/tests/lib/echo-chan.c
@@ -16,8 +16,7 @@
 #include "echo-chan.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 /* This is for text-mixin unit tests, others should be using ExampleEcho2Channel
  * which uses newer TpMessageMixin */
diff --git a/tests/lib/echo-chan.h b/tests/lib/echo-chan.h
index 7c4e11c8d..687f1e79e 100644
--- a/tests/lib/echo-chan.h
+++ b/tests/lib/echo-chan.h
@@ -13,9 +13,7 @@
 #define __TP_TESTS_CHAN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/text-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/echo-cm.h b/tests/lib/echo-cm.h
index 155f1e5ab..0832d6699 100644
--- a/tests/lib/echo-cm.h
+++ b/tests/lib/echo-cm.h
@@ -11,7 +11,7 @@
 #define __TP_TESTS_ECHO_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/tests/lib/echo-conn.c b/tests/lib/echo-conn.c
index 2ce06a21e..dcadbb50b 100644
--- a/tests/lib/echo-conn.c
+++ b/tests/lib/echo-conn.c
@@ -16,7 +16,6 @@
 #include <dbus/dbus-glib.h>
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
 
 #include "echo-im-manager.h"
 
diff --git a/tests/lib/echo-conn.h b/tests/lib/echo-conn.h
index 7bcad0749..2161481d6 100644
--- a/tests/lib/echo-conn.h
+++ b/tests/lib/echo-conn.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_ECHO_CONN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/file-transfer-chan.c b/tests/lib/file-transfer-chan.c
index 2afea1dbb..a9706cc98 100644
--- a/tests/lib/file-transfer-chan.c
+++ b/tests/lib/file-transfer-chan.c
@@ -16,9 +16,6 @@
 #include "debug.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/gnio-util.h>
 
 #include <glib/gstdio.h>
 
diff --git a/tests/lib/file-transfer-chan.h b/tests/lib/file-transfer-chan.h
index d64264753..19d6c98af 100644
--- a/tests/lib/file-transfer-chan.h
+++ b/tests/lib/file-transfer-chan.h
@@ -13,8 +13,7 @@
 #define __TP_FILE_TRANSFER_CHAN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/my-conn-proxy.c b/tests/lib/my-conn-proxy.c
index 688ac14d7..0d7723c43 100644
--- a/tests/lib/my-conn-proxy.c
+++ b/tests/lib/my-conn-proxy.c
@@ -12,7 +12,7 @@
 
 #include "my-conn-proxy.h"
 
-#include <telepathy-glib/proxy-internal.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_DEFINE_TYPE  (TpTestsMyConnProxy, tp_tests_my_conn_proxy,
     TP_TYPE_CONNECTION)
diff --git a/tests/lib/myassert.h b/tests/lib/myassert.h
index 4100c6035..1fd6fd3bf 100644
--- a/tests/lib/myassert.h
+++ b/tests/lib/myassert.h
@@ -2,7 +2,7 @@
 #define TP_TESTS_MYASSERT_H
 
 #include <glib.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define MYASSERT(assertion, extra_format, ...)\
   G_STMT_START {\
diff --git a/tests/lib/params-cm.c b/tests/lib/params-cm.c
index 42b49b787..2714d6e66 100644
--- a/tests/lib/params-cm.c
+++ b/tests/lib/params-cm.c
@@ -25,8 +25,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_DEFINE_TYPE (TpTestsParamConnectionManager,
     tp_tests_param_connection_manager,
diff --git a/tests/lib/params-cm.h b/tests/lib/params-cm.h
index c54a2c975..eb3971cd3 100644
--- a/tests/lib/params-cm.h
+++ b/tests/lib/params-cm.h
@@ -23,7 +23,7 @@
 #define __TP_TESTS_PARAM_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/tests/lib/room-list-chan.c b/tests/lib/room-list-chan.c
index 49ed291ab..e6134a3db 100644
--- a/tests/lib/room-list-chan.c
+++ b/tests/lib/room-list-chan.c
@@ -4,8 +4,6 @@
 #include "room-list-chan.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
 
 static void room_list_iface_init (gpointer iface,
     gpointer data);
diff --git a/tests/lib/room-list-chan.h b/tests/lib/room-list-chan.h
index b41be273b..52dbd2e8e 100644
--- a/tests/lib/room-list-chan.h
+++ b/tests/lib/room-list-chan.h
@@ -3,7 +3,7 @@
 #define __TP_TESTS_ROOM_LIST_CHAN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-account-manager.c b/tests/lib/simple-account-manager.c
index e1fec6749..c38132ce5 100644
--- a/tests/lib/simple-account-manager.c
+++ b/tests/lib/simple-account-manager.c
@@ -13,12 +13,8 @@
 
 #include "simple-account-manager.h"
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void account_manager_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/simple-account-manager.h b/tests/lib/simple-account-manager.h
index d1608d518..94a60cddd 100644
--- a/tests/lib/simple-account-manager.h
+++ b/tests/lib/simple-account-manager.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_SIMPLE_ACCOUNT_MANAGER_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 
 G_BEGIN_DECLS
diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
index dc0912057..eeead165c 100644
--- a/tests/lib/simple-account.c
+++ b/tests/lib/simple-account.c
@@ -12,14 +12,8 @@
 
 #include "simple-account.h"
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-account.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void account_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/simple-account.h b/tests/lib/simple-account.h
index b8547bd75..351c6cc22 100644
--- a/tests/lib/simple-account.h
+++ b/tests/lib/simple-account.h
@@ -13,8 +13,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-channel-dispatch-operation.c b/tests/lib/simple-channel-dispatch-operation.c
index 6a809f624..82b381972 100644
--- a/tests/lib/simple-channel-dispatch-operation.c
+++ b/tests/lib/simple-channel-dispatch-operation.c
@@ -13,15 +13,8 @@
 
 #include "simple-channel-dispatch-operation.h"
 
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-channel-dispatch-operation.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void channel_dispatch_operation_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/simple-channel-dispatch-operation.h b/tests/lib/simple-channel-dispatch-operation.h
index 84d8f0417..3e9ee9341 100644
--- a/tests/lib/simple-channel-dispatch-operation.h
+++ b/tests/lib/simple-channel-dispatch-operation.h
@@ -14,8 +14,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-channel-dispatcher.c b/tests/lib/simple-channel-dispatcher.c
index 116df9a02..4be6e77e7 100644
--- a/tests/lib/simple-channel-dispatcher.c
+++ b/tests/lib/simple-channel-dispatcher.c
@@ -12,13 +12,8 @@
 
 #include "simple-channel-dispatcher.h"
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-channel-dispatcher.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "simple-channel-request.h"
 #include "simple-conn.h"
diff --git a/tests/lib/simple-channel-dispatcher.h b/tests/lib/simple-channel-dispatcher.h
index 4512e99d0..da2140617 100644
--- a/tests/lib/simple-channel-dispatcher.h
+++ b/tests/lib/simple-channel-dispatcher.h
@@ -12,7 +12,7 @@
 #define __TP_TESTS_SIMPLE_CHANNEL_DISPATCHER_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 
 G_BEGIN_DECLS
diff --git a/tests/lib/simple-channel-manager.c b/tests/lib/simple-channel-manager.c
index 7d33f1be6..46523c673 100644
--- a/tests/lib/simple-channel-manager.c
+++ b/tests/lib/simple-channel-manager.c
@@ -10,7 +10,7 @@
 
 #include "config.h"
 
-#include <telepathy-glib/channel-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "simple-channel-manager.h"
 #include "util.h"
diff --git a/tests/lib/simple-channel-manager.h b/tests/lib/simple-channel-manager.h
index ee22ca3ff..ad711cd57 100644
--- a/tests/lib/simple-channel-manager.h
+++ b/tests/lib/simple-channel-manager.h
@@ -13,7 +13,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 typedef struct _TpTestsSimpleChannelManager TpTestsSimpleChannelManager;
 typedef struct _TpTestsSimpleChannelManagerClass TpTestsSimpleChannelManagerClass;
diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c
index c97253099..111f320ef 100644
--- a/tests/lib/simple-channel-request.c
+++ b/tests/lib/simple-channel-request.c
@@ -12,13 +12,9 @@
 
 #include "simple-channel-request.h"
 
-#include <telepathy-glib/client.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/svc-channel-request.h>
-#include <telepathy-glib/svc-generic.h>
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
+#include <telepathy-glib/proxy-subclass.h>
 
 #include "tests/lib/util.h"
 #include "tests/lib/textchan-null.h"
diff --git a/tests/lib/simple-channel-request.h b/tests/lib/simple-channel-request.h
index 85c12f80a..60ea3be64 100644
--- a/tests/lib/simple-channel-request.h
+++ b/tests/lib/simple-channel-request.h
@@ -13,8 +13,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "simple-conn.h"
 
diff --git a/tests/lib/simple-client.c b/tests/lib/simple-client.c
index 15da26bb1..227201049 100644
--- a/tests/lib/simple-client.c
+++ b/tests/lib/simple-client.c
@@ -16,12 +16,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/dbus.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/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "tests/lib/util.h"
 
diff --git a/tests/lib/simple-client.h b/tests/lib/simple-client.h
index ec4fd31b8..f3f78694c 100644
--- a/tests/lib/simple-client.h
+++ b/tests/lib/simple-client.h
@@ -12,7 +12,7 @@
 #define __TP_TESTS_SIMPLE_CLIENT_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c
index c78e1278a..6cdc6b019 100644
--- a/tests/lib/simple-conn.c
+++ b/tests/lib/simple-conn.c
@@ -17,13 +17,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dbus-properties-mixin.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/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "textchan-null.h"
 #include "room-list-chan.h"
diff --git a/tests/lib/simple-conn.h b/tests/lib/simple-conn.h
index 837400bc3..14d227528 100644
--- a/tests/lib/simple-conn.h
+++ b/tests/lib/simple-conn.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_SIMPLE_CONN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-manager.c b/tests/lib/simple-manager.c
index a4296028d..da78210ea 100644
--- a/tests/lib/simple-manager.c
+++ b/tests/lib/simple-manager.c
@@ -16,8 +16,7 @@
 #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 "simple-conn.h"
 #include "tests/lib/util.h"
diff --git a/tests/lib/simple-manager.h b/tests/lib/simple-manager.h
index 426d7d0b1..232db926f 100644
--- a/tests/lib/simple-manager.h
+++ b/tests/lib/simple-manager.h
@@ -12,7 +12,7 @@
 #define __TP_TESTS_SIMPLE_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/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
index e2fd2e086..8da189ef3 100644
--- a/tests/lib/stream-tube-chan.c
+++ b/tests/lib/stream-tube-chan.c
@@ -16,9 +16,6 @@
 #include "util.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/gnio-util.h>
 
 #ifdef HAVE_GIO_UNIX
 #include <gio/gunixsocketaddress.h>
diff --git a/tests/lib/stream-tube-chan.h b/tests/lib/stream-tube-chan.h
index b0c8fbde0..26729127a 100644
--- a/tests/lib/stream-tube-chan.h
+++ b/tests/lib/stream-tube-chan.h
@@ -12,8 +12,7 @@
 #define __TP_STREAM_TUBE_CHAN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/textchan-group.c b/tests/lib/textchan-group.c
index 8c33f53c0..6339e5d04 100644
--- a/tests/lib/textchan-group.c
+++ b/tests/lib/textchan-group.c
@@ -13,13 +13,8 @@
 
 #include "textchan-group.h"
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dbus-properties-mixin.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>
 
 /* This is for text-mixin unit tests, others should be using ExampleEcho2Channel
  * which uses newer TpMessageMixin */
diff --git a/tests/lib/textchan-group.h b/tests/lib/textchan-group.h
index b33a5d35b..dfd922f16 100644
--- a/tests/lib/textchan-group.h
+++ b/tests/lib/textchan-group.h
@@ -13,10 +13,7 @@
 #define __TEST_TEXT_CHANNEL_GROUP_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/base-channel.h>
-#include <telepathy-glib/group-mixin.h>
-#include <telepathy-glib/text-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/textchan-null.c b/tests/lib/textchan-null.c
index bbeb0c719..c426acfac 100644
--- a/tests/lib/textchan-null.c
+++ b/tests/lib/textchan-null.c
@@ -13,13 +13,8 @@
 
 #include "textchan-null.h"
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dbus-properties-mixin.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>
 
 /* This is for text-mixin unit tests, others should be using ExampleEcho2Channel
  * which uses newer TpMessageMixin */
diff --git a/tests/lib/textchan-null.h b/tests/lib/textchan-null.h
index 583bec571..076defb40 100644
--- a/tests/lib/textchan-null.h
+++ b/tests/lib/textchan-null.h
@@ -13,9 +13,7 @@
 #define __TP_TESTS_TEXT_CHANNEL_NULL_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/text-mixin.h>
-#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/tls-certificate.c b/tests/lib/tls-certificate.c
index 8a936e922..102c17cab 100644
--- a/tests/lib/tls-certificate.c
+++ b/tests/lib/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 TP_TESTS_DEBUG_TLS
 #include "debug.h"
diff --git a/tests/lib/tls-certificate.h b/tests/lib/tls-certificate.h
index 7ce0cf4aa..1de31927a 100644
--- a/tests/lib/tls-certificate.h
+++ b/tests/lib/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/tests/lib/util.c b/tests/lib/util.c
index 022c56b30..96fd18bee 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -12,7 +12,7 @@
 
 #include "util.h"
 
-#include <telepathy-glib/connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <glib/gstdio.h>
 #include <string.h>
diff --git a/tests/lib/util.h b/tests/lib/util.h
index 18d868790..7c7576528 100644
--- a/tests/lib/util.h
+++ b/tests/lib/util.h
@@ -12,7 +12,6 @@
 #define __TP_TESTS_LIB_UTIL_H__
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/base-connection.h>
 
 TpDBusDaemon *tp_tests_dbus_daemon_dup_or_die (void);