Update Wocky snapshot for One Big Header.

https://bugs.freedesktop.org/show_bug.cgi?id=27489

64 files changed, 63 insertions, 102 deletions

diff --git a/gabble/capabilities-set.h b/gabble/capabilities-set.h
index 3f2152595..bc10c13fd 100644
--- a/gabble/capabilities-set.h
+++ b/gabble/capabilities-set.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <wocky/wocky-node.h>
+#include <wocky/wocky.h>
 
 G_BEGIN_DECLS
 
diff --git a/gabble/connection.h b/gabble/connection.h
index 1d7dccad9..5c7bf51e7 100644
--- a/gabble/connection.h
+++ b/gabble/connection.h
@@ -27,7 +27,7 @@
 #include <gabble/capabilities-set.h>
 #include <gabble/types.h>
 
-#include <wocky/wocky-xep-0115-capabilities.h>
+#include <wocky/wocky.h>
 
 G_BEGIN_DECLS
 
diff --git a/gabble/error.h b/gabble/error.h
index 8563bf13b..cd5b4ee67 100644
--- a/gabble/error.h
+++ b/gabble/error.h
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/gabble/plugin.h b/gabble/plugin.h
index 6da99f136..7c3b4743f 100644
--- a/gabble/plugin.h
+++ b/gabble/plugin.h
@@ -26,7 +26,7 @@
 
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/presence-mixin.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 
 #include <gabble/connection.h>
 #include <gabble/sidecar.h>
diff --git a/lib/ext/wocky b/lib/ext/wocky
-Subproject 43d93377facac1a7b9bae8e898c29b245ec476f
+Subproject 132d73e09abb9c08f61cebe1cd0ca6d7cbc8b7c
diff --git a/plugins/console.c b/plugins/console.c
index 13ca0eccf..87a450bd1 100644
--- a/plugins/console.c
+++ b/plugins/console.c
@@ -25,11 +25,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <wocky/wocky-xmpp-error.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include "extensions/extensions.h"
 
diff --git a/plugins/console.h b/plugins/console.h
index a91b95337..9a3d5d619 100644
--- a/plugins/console.h
+++ b/plugins/console.h
@@ -20,7 +20,7 @@
 #include <glib-object.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
 
 typedef struct _GabbleConsolePlugin GabbleConsolePlugin;
diff --git a/plugins/gateways.c b/plugins/gateways.c
index 88a32223f..be08e6228 100644
--- a/plugins/gateways.c
+++ b/plugins/gateways.c
@@ -25,9 +25,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-xmpp-error.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "extensions/extensions.h"
 
diff --git a/plugins/gateways.h b/plugins/gateways.h
index 766fa4bee..e4d734afe 100644
--- a/plugins/gateways.h
+++ b/plugins/gateways.h
@@ -20,7 +20,7 @@
 #include <glib-object.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 
 typedef struct _GabbleGatewayPlugin GabbleGatewayPlugin;
 typedef struct _GabbleGatewayPluginClass GabbleGatewayPluginClass;
diff --git a/plugins/test.c b/plugins/test.c
index 05d784052..29c45a9e1 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -5,8 +5,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <wocky/wocky-disco-identity.h>
-#include <wocky/wocky-data-form.h>
+#include <wocky/wocky.h>
 
 #include "extensions/extensions.h"
 
diff --git a/plugins/test.h b/plugins/test.h
index 6fe0d1434..16a209c7e 100644
--- a/plugins/test.h
+++ b/plugins/test.h
@@ -1,7 +1,7 @@
 #include <glib-object.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 #include <gabble/gabble.h>
 
 /* Plugin */
diff --git a/src/addressing-util.c b/src/addressing-util.c
index 1ea089854..0f1b3ffcc 100644
--- a/src/addressing-util.c
+++ b/src/addressing-util.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "connection.h"
 #include "util.h"
diff --git a/src/auth-manager.c b/src/auth-manager.c
index 5089e9aed..57a8bbd62 100644
--- a/src/auth-manager.c
+++ b/src/auth-manager.c
@@ -24,7 +24,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_AUTH
 
diff --git a/src/auth-manager.h b/src/auth-manager.h
index 61a35a5f0..bdf7ebfe2 100644
--- a/src/auth-manager.h
+++ b/src/auth-manager.h
@@ -21,7 +21,7 @@
 #define __AUTH_MANAGER_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-auth-registry.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/handle.h>
 
 G_BEGIN_DECLS
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 5e4347daa..725f06e9f 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -25,7 +25,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/interfaces.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h
index 2c4a7defe..fa1af3a2e 100644
--- a/src/bytestream-ibb.h
+++ b/src/bytestream-ibb.h
@@ -21,7 +21,7 @@
 #define __GABBLE_BYTESTREAM_IBB_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/base-connection.h>
 
 G_BEGIN_DECLS
diff --git a/src/bytestream-iface.h b/src/bytestream-iface.h
index 5d68122f5..6a5323124 100644
--- a/src/bytestream-iface.h
+++ b/src/bytestream-iface.h
@@ -21,7 +21,7 @@
 #define __GABBLE_BYTESTREAM_IFACE_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-node.h>
+#include <wocky/wocky.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bytestream-muc.h b/src/bytestream-muc.h
index 295e3e23d..06dcd2689 100644
--- a/src/bytestream-muc.h
+++ b/src/bytestream-muc.h
@@ -21,7 +21,7 @@
 #define __GABBLE_BYTESTREAM_MUC_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/base-connection.h>
 
 G_BEGIN_DECLS
diff --git a/src/bytestream-socks5.h b/src/bytestream-socks5.h
index 9728f2f87..524812f32 100644
--- a/src/bytestream-socks5.h
+++ b/src/bytestream-socks5.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/base-connection.h>
 
 G_BEGIN_DECLS
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
index f07088f21..3f7810f4f 100644
--- a/src/call-muc-channel.c
+++ b/src/call-muc-channel.c
@@ -28,7 +28,7 @@
 #include <telepathy-yell/enums.h>
 #include <telepathy-yell/interfaces.h>
 
-#include <wocky/wocky-muc.h>
+#include <wocky/wocky.h>
 #include "call-content.h"
 
 #include "muc-channel.h"
diff --git a/src/caps-hash.c b/src/caps-hash.c
index bd143eecd..12d302ec3 100644
--- a/src/caps-hash.c
+++ b/src/caps-hash.c
@@ -29,8 +29,7 @@
 
 #include <string.h>
 
-#include <wocky/wocky-disco-identity.h>
-#include <wocky/wocky-caps-hash.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 3be800433..f48758eaf 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -21,12 +21,11 @@
 #include "config.h"
 #include "conn-aliasing.h"
 
-#include <wocky/wocky-utils.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 <wocky/wocky-utils.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
 
diff --git a/src/conn-location.c b/src/conn-location.c
index 685570979..b9ac05474 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -10,7 +10,7 @@
 
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include <gabble/gabble.h>
 
diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c
index 9bd5373c1..2fe12e41e 100644
--- a/src/conn-mail-notif.c
+++ b/src/conn-mail-notif.c
@@ -39,7 +39,7 @@
 #include <telepathy-glib/svc-connection.h>
 #include <telepathy-glib/util.h>
 
-#include <wocky/wocky-c2s-porter.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MAIL_NOTIF
 #include "connection.h"
diff --git a/src/conn-power-saving.c b/src/conn-power-saving.c
index e1f25ad95..07b6a896b 100644
--- a/src/conn-power-saving.c
+++ b/src/conn-power-saving.c
@@ -26,8 +26,7 @@
 #include "util.h"
 #include "conn-util.h"
 
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-c2s-porter.h>
+#include <wocky/wocky.h>
 
 enum
 {
diff --git a/src/conn-presence.c b/src/conn-presence.c
index ac7603cd5..9dfd6b6b1 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -30,8 +30,7 @@
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
 
diff --git a/src/conn-util.c b/src/conn-util.c
index 585ef39e2..98be2448e 100644
--- a/src/conn-util.c
+++ b/src/conn-util.c
@@ -26,7 +26,7 @@
 #include "namespaces.h"
 #include "util.h"
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 static void
 conn_util_send_iq_cb (GObject *source_object,
diff --git a/src/connection-manager.c b/src/connection-manager.c
index 8267299d7..b2a0edb15 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/errors.h>
-#include <wocky/wocky-caps-cache.h>
+#include <wocky/wocky.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/connection.c b/src/connection.c
index 44a5202d7..25ae603b3 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -27,13 +27,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib-object.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-disco-identity.h>
-#include <wocky/wocky-tls-handler.h>
-#include <wocky/wocky-ping.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-error.h>
-#include <wocky/wocky-data-form.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/channel-manager.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/enums.h>
diff --git a/src/connection.h b/src/connection.h
index f1fcf3ecd..1c783e03f 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -31,8 +31,7 @@
 #include <telepathy-glib/dbus-properties-mixin.h>
 #include <telepathy-glib/dbus.h>
 
-#include <wocky/wocky-session.h>
-#include <wocky/wocky-pep-service.h>
+#include <wocky/wocky.h>
 
 #include "gabble/connection.h"
 #include "gabble/capabilities.h"
diff --git a/src/debug.h b/src/debug.h
index 02cfe8525..83bf43247 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -4,7 +4,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/disco.h b/src/disco.h
index 50a4c2c15..3a47f31a3 100644
--- a/src/disco.h
+++ b/src/disco.h
@@ -25,7 +25,7 @@
 #define __GABBLE_DISCO_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-node.h>
+#include <wocky/wocky.h>
 
 #include "types.h"
 
diff --git a/src/error.c b/src/error.c
index c867b146c..e79ddef32 100644
--- a/src/error.c
+++ b/src/error.c
@@ -27,14 +27,7 @@
 #include "namespaces.h"
 #include "util.h"
 
-#include <wocky/wocky-auth-registry.h>
-#include <wocky/wocky-auth-registry-enumtypes.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-connector-enumtypes.h>
-#include <wocky/wocky-tls.h>
-#include <wocky/wocky-tls-enumtypes.h>
-#include <wocky/wocky-xmpp-error.h>
-#include <wocky/wocky-xmpp-error-enumtypes.h>
+#include <wocky/wocky.h>
 
 static inline TpError
 set_conn_reason (TpConnectionStatusReason *p,
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 314ed0936..0bab5685a 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -39,7 +39,7 @@
 #include "presence-cache.h"
 #include "util.h"
 
-#include <wocky/wocky-data-form.h>
+#include <wocky/wocky.h>
 
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/channel-factory-iface.h>
diff --git a/src/gabble.c b/src/gabble.c
index fef4454e7..c4b3c592f 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -32,7 +32,7 @@
 #include <telepathy-glib/run.h>
 #include <telepathy-glib/util.h>
 #include <wocky/wocky.h>
-#include <wocky/wocky-debug.h>
+#include <wocky/wocky.h>
 
 #include "debug.h"
 #include "connection-manager.h"
diff --git a/src/im-factory.c b/src/im-factory.c
index 6350961f5..0459c2dc0 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -28,7 +28,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
-#include <wocky/wocky-c2s-porter.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
 
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 02b251df2..3dba1596a 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -25,8 +25,7 @@
 #include <stdlib.h>
 #include <glib.h>
 
-#include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 55eda0d4d..27c080822 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 
 #include <telepathy-glib/handle-repo-dynamic.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_MEDIA
 
diff --git a/src/jingle-session.h b/src/jingle-session.h
index b3c3a81ec..44ba3b34d 100644
--- a/src/jingle-session.h
+++ b/src/jingle-session.h
@@ -21,7 +21,7 @@
 #define __JINGLE_SESSION_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 
 #include "jingle-content.h"
 #include "jingle-factory.h"
diff --git a/src/jingle-transport-iface.h b/src/jingle-transport-iface.h
index 5119c69a5..0ac5329e4 100644
--- a/src/jingle-transport-iface.h
+++ b/src/jingle-transport-iface.h
@@ -21,7 +21,7 @@
 #define __GABBLE_JINGLE_TRANSPORT_IFACE_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-node.h>
+#include <wocky/wocky.h>
 
 #include "jingle-factory.h"
 #include "types.h"
diff --git a/src/message-util.c b/src/message-util.c
index d810510c4..ee9c1d028 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -28,7 +28,7 @@
 #include <time.h>
 
 #include <telepathy-glib/dbus.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
 #include "debug.h"
diff --git a/src/message-util.h b/src/message-util.h
index 1c857886d..80853c890 100644
--- a/src/message-util.h
+++ b/src/message-util.h
@@ -24,7 +24,7 @@
 #include <telepathy-glib/message-mixin.h>
 
 #include <wocky/wocky.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "connection.h"
 
diff --git a/src/muc-channel.c b/src/muc-channel.c
index fe184f3bf..605cd26ac 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -25,9 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <wocky/wocky-muc.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include <dbus/dbus-glib.h>
 #include <telepathy-glib/dbus.h>
diff --git a/src/muc-factory.c b/src/muc-factory.c
index ddef7d825..e8fa83813 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -24,7 +24,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/channel-manager.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
diff --git a/src/muc-factory.h b/src/muc-factory.h
index a18359638..3707043da 100644
--- a/src/muc-factory.h
+++ b/src/muc-factory.h
@@ -21,7 +21,7 @@
 #define __MUC_FACTORY_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 
 #include "bytestream-iface.h"
 #include "types.h"
diff --git a/src/plugin-loader.h b/src/plugin-loader.h
index 9983d4b44..210042008 100644
--- a/src/plugin-loader.h
+++ b/src/plugin-loader.h
@@ -25,7 +25,7 @@
 
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/presence-mixin.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 
 #include "gabble/sidecar.h"
 
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 4b73104d3..6fe08f6fb 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -37,13 +37,7 @@
 #include <dbus/dbus-glib.h>
 #include <telepathy-glib/channel-manager.h>
 #include <telepathy-glib/intset.h>
-#include <wocky/wocky-caps-cache.h>
-#include <wocky/wocky-caps-hash.h>
-#include <wocky/wocky-disco-identity.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-data-form.h>
-#include <wocky/wocky-xmpp-error-enumtypes.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
diff --git a/src/presence.c b/src/presence.c
index b23656d37..704834ca2 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -23,8 +23,7 @@
 
 #include <string.h>
 #include <telepathy-glib/channel-manager.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xep-0115-capabilities.h>
+#include <wocky/wocky.h>
 
 #include "gabble/capabilities.h"
 #include "conn-presence.h"
diff --git a/src/request-pipeline.h b/src/request-pipeline.h
index dcc8a311e..2b094e765 100644
--- a/src/request-pipeline.h
+++ b/src/request-pipeline.h
@@ -22,7 +22,7 @@
 #define __GABBLE_REQUEST_PIPELINE_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include "types.h"
 
 G_BEGIN_DECLS
diff --git a/src/roster.c b/src/roster.c
index 7ddcae325..711ea01ad 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -28,10 +28,7 @@
 #include <telepathy-glib/channel-manager.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
-#include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-node.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_ROSTER
 
diff --git a/src/search-channel.c b/src/search-channel.c
index 628cba90a..afbb098ee 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -29,7 +29,7 @@
 #include <telepathy-glib/svc-channel.h>
 #include <telepathy-glib/util.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_SEARCH
 #include <gabble/error.h>
diff --git a/src/search-manager.c b/src/search-manager.c
index b96bd5e54..c78598fb1 100644
--- a/src/search-manager.c
+++ b/src/search-manager.c
@@ -25,7 +25,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_SEARCH
 
diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
index 3b28e4bbd..961d6d491 100644
--- a/src/server-sasl-channel.c
+++ b/src/server-sasl-channel.c
@@ -34,8 +34,7 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
-#include <wocky/wocky-auth-registry.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include <telepathy-glib/channel-iface.h>
 #include <telepathy-glib/dbus.h>
diff --git a/src/server-sasl-channel.h b/src/server-sasl-channel.h
index f26fd47c7..69b469974 100644
--- a/src/server-sasl-channel.h
+++ b/src/server-sasl-channel.h
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 
 #include <telepathy-glib/base-channel.h>
-#include <wocky/wocky-auth-registry.h>
+#include <wocky/wocky.h>
 
 #include "types.h"
 
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
index e6f8267fc..859edb4d6 100644
--- a/src/server-tls-channel.c
+++ b/src/server-tls-channel.c
@@ -27,7 +27,7 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/channel-iface.h>
 
-#include <wocky/wocky-tls.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_TLS
 #include "debug.h"
diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index a82814281..890a4d637 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -32,7 +32,7 @@
 
 #include "extensions/extensions.h"
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 static void channel_manager_iface_init (gpointer, gpointer);
 
diff --git a/src/server-tls-manager.h b/src/server-tls-manager.h
index 529ff7543..e8f10af1b 100644
--- a/src/server-tls-manager.h
+++ b/src/server-tls-manager.h
@@ -22,7 +22,7 @@
 #define __GABBLE_SERVER_TLS_MANAGER_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-tls-handler.h>
+#include <wocky/wocky.h>
 
 #include <telepathy-glib/enums.h>
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 8cab0ddbd..aa259acf6 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/channel-iface.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/exportable-channel.h>
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index 4bda0b886..dbf7d5fd4 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -21,7 +21,7 @@
 #define __GABBLE_TUBES_CHANNEL_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/exportable-channel.h>
 
diff --git a/src/util.c b/src/util.c
index beb3697a4..c637ee04d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -30,7 +30,7 @@
 
 #include <gobject/gvaluecollector.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 #include <telepathy-glib/handle-repo-dynamic.h>
 #include <telepathy-glib/dbus.h>
 
diff --git a/src/util.h b/src/util.h
index 9aba4170b..c86763f58 100644
--- a/src/util.h
+++ b/src/util.h
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <telepathy-glib/handle-repo.h>
 #include <telepathy-glib/util.h>
-#include <wocky/wocky-bare-contact.h>
+#include <wocky/wocky.h>
 
 #include "jingle-factory.h"
 #include "jingle-content.h"
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index b553bca5d..67466be01 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -26,7 +26,7 @@
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/heap.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_VCARD
 
diff --git a/src/vcard-manager.h b/src/vcard-manager.h
index 7ae7521af..8f877050a 100644
--- a/src/vcard-manager.h
+++ b/src/vcard-manager.h
@@ -23,7 +23,7 @@
 #define __GABBLE_VCARD_MANAGER_H__
 
 #include <glib-object.h>
-#include <wocky/wocky-node.h>
+#include <wocky/wocky.h>
 
 #include "types.h"
 
diff --git a/tests/test-jid-decode.c b/tests/test-jid-decode.c
index f7d8c45e9..b1c835fe1 100644
--- a/tests/test-jid-decode.c
+++ b/tests/test-jid-decode.c
@@ -3,7 +3,7 @@
 
 #include <string.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "src/util.h"