use TP_DISABLE_SINGLE_INCLUDE

13 files changed, 12 insertions, 34 deletions

diff --git a/rakia/base-connection.h b/rakia/base-connection.h
index 2d2d526..1bd505d 100644
--- a/rakia/base-connection.h
+++ b/rakia/base-connection.h
@@ -23,8 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sofia-decls.h>
 #include <rakia/event-target.h>
diff --git a/rakia/call-channel.c b/rakia/call-channel.c
index 51267f2..63280b4 100644
--- a/rakia/call-channel.c
+++ b/rakia/call-channel.c
@@ -30,10 +30,6 @@
 #define DEBUG_FLAG RAKIA_DEBUG_CALL
 #include "rakia/debug.h"
 
-
-#include <telepathy-glib/exportable-channel.h>
-
-
 G_DEFINE_TYPE (RakiaCallChannel, rakia_call_channel,
     TP_TYPE_BASE_MEDIA_CALL_CHANNEL)
 
diff --git a/rakia/call-channel.h b/rakia/call-channel.h
index 06c2eaf..4bb07a8 100644
--- a/rakia/call-channel.h
+++ b/rakia/call-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/rakia/call-content.h b/rakia/call-content.h
index 65dd415..ccfe0e1 100644
--- a/rakia/call-content.h
+++ b/rakia/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 "rakia/call-channel.h"
 #include "rakia/sip-session.h"
diff --git a/rakia/call-stream.h b/rakia/call-stream.h
index ccc15ab..8bdbb69 100644
--- a/rakia/call-stream.h
+++ b/rakia/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 "rakia/call-content.h"
 #include "rakia/sip-media.h"
diff --git a/rakia/codec-param-formats.h b/rakia/codec-param-formats.h
index 668ee4f..add8f5e 100644
--- a/rakia/codec-param-formats.h
+++ b/rakia/codec-param-formats.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sip-media.h>
 
diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index aec89fa..e585601 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -25,11 +25,7 @@
 #include <rakia/base-connection.h>
 #include <rakia/handles.h>
 
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/handles.h"
 
diff --git a/rakia/debug.c b/rakia/debug.c
index b33563e..1709d6e 100644
--- a/rakia/debug.c
+++ b/rakia/debug.c
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "config.h"
 
diff --git a/rakia/handles.h b/rakia/handles.h
index da71e2b..02d429f 100644
--- a/rakia/handles.h
+++ b/rakia/handles.h
@@ -21,7 +21,7 @@
 #ifndef RAKIA_HANDLE_H
 #define RAKIA_HANDLE_H
 
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <sofia-sip/sip.h>
 
 G_BEGIN_DECLS
diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index 7b996e0..2db7580 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -24,9 +24,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/base-connection.h"
 #include "rakia/call-channel.h"
diff --git a/rakia/text-channel.c b/rakia/text-channel.c
index ca18970..130b095 100644
--- a/rakia/text-channel.c
+++ b/rakia/text-channel.c
@@ -32,13 +32,7 @@
 #include <time.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.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 "rakia/event-target.h"
 #include "rakia/base-connection.h"
diff --git a/rakia/text-channel.h b/rakia/text-channel.h
index 4de8fa0..398f752 100644
--- a/rakia/text-channel.h
+++ b/rakia/text-channel.h
@@ -22,9 +22,7 @@
 #define __RAKIA_TEXT_CHANNEL_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/handle.h>
-#include <telepathy-glib/message-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sofia-decls.h>
 
diff --git a/rakia/text-manager.c b/rakia/text-manager.c
index 12d88f5..290b56c 100644
--- a/rakia/text-manager.c
+++ b/rakia/text-manager.c
@@ -24,9 +24,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/text-channel.h"
 #include "rakia/base-connection.h"