#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>
#include <string.h>
#include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-helpers.h>
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-account-monitor.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libtelepathy/tp-helpers.h>
-
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mission-control.h>
#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>
#include <string.h>
-#include <libtelepathy/tp-constants.h>
+#include <telepathy-glib/enums.h>
#include "empathy-contact-manager.h"
#include "empathy-contact-list.h"
#include <dbus/dbus-glib.h>
-#include <libtelepathy/tp-helpers.h>
+#include <telepathy-glib/dbus.h>
#include <libtelepathy/tp-conn.h>
#include "empathy-filter.h"
#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"
#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>
#include <glib.h>
#include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
+#include <telepathy-glib/enums.h>
#include <libmissioncontrol/mc-account.h>
#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"
#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"
#include <glib.h>
#include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
#include <libmissioncontrol/mc-account.h>
#include "empathy-contact.h"
#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>
#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"