14 files changed, 9 insertions, 15 deletions
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
index 53b623cb2..151c172ca 100644
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/libempathy-gtk/empathy-accounts-dialog.c
@@ -37,7 +37,6 @@
 #include <libmissioncontrol/mission-control.h>
 #include <libmissioncontrol/mc-account-monitor.h>
 #include <telepathy-glib/util.h>
-#include <libtelepathy/tp-constants.h>
 
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
diff --git a/libempathy-gtk/empathy-call-window.c b/libempathy-gtk/empathy-call-window.c
index 7b3ebc2b5..c7f202ee3 100644
--- a/libempathy-gtk/empathy-call-window.c
+++ b/libempathy-gtk/empathy-call-window.c
@@ -21,7 +21,6 @@
 #include <string.h>
 
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-helpers.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-account-monitor.h>
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 24174c8b7..3e659b08c 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -31,8 +31,6 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libtelepathy/tp-helpers.h>
-
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
diff --git a/libempathy/empathy-chandler.c b/libempathy/empathy-chandler.c
index 7ac1ddfbb..9dd6bfdb0 100644
--- a/libempathy/empathy-chandler.c
+++ b/libempathy/empathy-chandler.c
@@ -23,7 +23,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <libtelepathy/tp-helpers.h>
+#include <telepathy-glib/dbus.h>
 #include <libtelepathy/tp-conn.h>
 #include <libtelepathy/tp-chan.h>
 
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index c40fc3c4b..1ef3b683a 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <libtelepathy/tp-constants.h>
+#include <telepathy-glib/enums.h>
 
 #include "empathy-contact-manager.h"
 #include "empathy-contact-list.h"
diff --git a/libempathy/empathy-filter.c b/libempathy/empathy-filter.c
index 881ed8a73..e5e31235d 100644
--- a/libempathy/empathy-filter.c
+++ b/libempathy/empathy-filter.c
@@ -23,7 +23,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <libtelepathy/tp-helpers.h>
+#include <telepathy-glib/dbus.h>
 #include <libtelepathy/tp-conn.h>
 
 #include "empathy-filter.h"
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 6e5752b8a..d5ce3bd9b 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libtelepathy/tp-helpers.h>
+#include <telepathy-glib/dbus.h>
 #include <libmissioncontrol/mc-enum-types.h>
 
 #include "empathy-idle.h"
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index d218fd8ef..3842d2436 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -23,7 +23,6 @@
 
 #include <libtelepathy/tp-chan-type-streamed-media-gen.h>
 #include <libtelepathy/tp-connmgr.h>
-#include <libtelepathy/tp-helpers.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/dbus.h>
 
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 0f47d12c1..4fb7f3997 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
+#include <telepathy-glib/enums.h>
 
 #include <libmissioncontrol/mc-account.h>
 
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 779aa6132..41985d9a8 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -25,11 +25,11 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-conn.h>
 #include <libtelepathy/tp-chan.h>
 #include <libtelepathy/tp-chan-type-contact-list-gen.h>
 #include <telepathy-glib/util.h>
+#include <telepathy-glib/dbus.h>
 
 #include "empathy-tp-contact-list.h"
 #include "empathy-contact-list.h"
diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index ec60e9bf8..022565beb 100644
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -26,8 +26,8 @@
 #include <libtelepathy/tp-chan.h>
 #include <libtelepathy/tp-chan-gen.h>
 #include <libtelepathy/tp-chan-iface-group-gen.h>
-#include <libtelepathy/tp-constants.h>
 #include <libtelepathy/tp-conn.h>
+#include <telepathy-glib/interfaces.h>
 
 #include "empathy-tp-group.h"
 #include "empathy-contact-factory.h"
diff --git a/libempathy/empathy-tp-group.h b/libempathy/empathy-tp-group.h
index 80e562594..b8eb2e1c0 100644
--- a/libempathy/empathy-tp-group.h
+++ b/libempathy/empathy-tp-group.h
@@ -26,7 +26,6 @@
 #include <glib.h>
 
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
 #include <libmissioncontrol/mc-account.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index c9fe6b5fd..d099d082c 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -24,9 +24,9 @@
 #include <string.h>
 
 #include <libtelepathy/tp-chan-type-room-list-gen.h>
-#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-conn.h>
 #include <libtelepathy/tp-chan.h>
+#include <telepathy-glib/dbus.h>
 
 #include <libmissioncontrol/mission-control.h>
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index c24927b36..25e0860d2 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -33,8 +33,8 @@
 #include <glib/gi18n.h>
 
 #include <libxml/uri.h>
-#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-conn.h>
+#include <telepathy-glib/dbus.h>
 
 #include "empathy-debug.h"
 #include "empathy-utils.h"