Merge branch 'headers'

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

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

137 files changed, 535 insertions, 271 deletions

diff --git a/examples/receive-messages.c b/examples/receive-messages.c
index f3f7d02..fbec62f 100644
--- a/examples/receive-messages.c
+++ b/examples/receive-messages.c
@@ -6,11 +6,7 @@
 #include <glib.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-xmpp-connection.h>
 #include <wocky/wocky.h>
-#include <wocky/wocky-porter.h>
-#include <wocky/wocky-session.h>
 
 GMainLoop *mainloop;
 
diff --git a/examples/register.c b/examples/register.c
index 97374cf..d59bf80 100644
--- a/examples/register.c
+++ b/examples/register.c
@@ -6,8 +6,7 @@
 #include <glib.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 GMainLoop *mainloop;
 
diff --git a/examples/send-message.c b/examples/send-message.c
index 828ad6e..3e10465 100644
--- a/examples/send-message.c
+++ b/examples/send-message.c
@@ -6,11 +6,7 @@
 #include <glib.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-xmpp-connection.h>
 #include <wocky/wocky.h>
-#include <wocky/wocky-porter.h>
-#include <wocky/wocky-session.h>
 
 GMainLoop *mainloop;
 char *recipient;
diff --git a/examples/unregister.c b/examples/unregister.c
index 0f8211e..34e09b1 100644
--- a/examples/unregister.c
+++ b/examples/unregister.c
@@ -6,8 +6,7 @@
 #include <glib.h>
 
 #include <gio/gio.h>
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 GMainLoop *mainloop;
 int rval = -1;
diff --git a/tests/wocky-bare-contact-test.c b/tests/wocky-bare-contact-test.c
index b03e528..336df13 100644
--- a/tests/wocky-bare-contact-test.c
+++ b/tests/wocky-bare-contact-test.c
@@ -4,9 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-bare-contact.h>
-#include <wocky/wocky-resource-contact.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-caps-hash-test.c b/tests/wocky-caps-hash-test.c
index 8cbd83b..55cf9e3 100644
--- a/tests/wocky-caps-hash-test.c
+++ b/tests/wocky-caps-hash-test.c
@@ -1,7 +1,6 @@
 #include <glib.h>
 
-#include <wocky/wocky-caps-hash.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c
index 663cc49..82c12b2 100644
--- a/tests/wocky-connector-test.c
+++ b/tests/wocky-connector-test.c
@@ -19,11 +19,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include <wocky/wocky-connector.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-sasl-auth.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-connector-server.h"
 #include "test-resolver.h"
diff --git a/tests/wocky-contact-factory-test.c b/tests/wocky-contact-factory-test.c
index 864e15a..99dd7b1 100644
--- a/tests/wocky-contact-factory-test.c
+++ b/tests/wocky-contact-factory-test.c
@@ -4,8 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-contact-factory.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-data-form-test.c b/tests/wocky-data-form-test.c
index 6ea1e69..29c4410 100644
--- a/tests/wocky-data-form-test.c
+++ b/tests/wocky-data-form-test.c
@@ -4,10 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-data-form.h>
-#include <wocky/wocky-stanza.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-http-proxy-test.c b/tests/wocky-http-proxy-test.c
index 9567401..ac9cca2 100644
--- a/tests/wocky-http-proxy-test.c
+++ b/tests/wocky-http-proxy-test.c
@@ -3,8 +3,14 @@
 
 #include <string.h>
 
+#include <wocky/wocky.h>
+
+/* WockyHttpProxy isn't public API, so we need to be a bit sneaky to get the
+ * header.
+ */
+#define WOCKY_COMPILATION
 #include <wocky/wocky-http-proxy.h>
-#include <wocky/wocky-utils.h>
+#undef WOCKY_COMPILATION
 
 typedef enum
 {
diff --git a/tests/wocky-jid-validation-test.c b/tests/wocky-jid-validation-test.c
index e3f10ca..b2d22bf 100644
--- a/tests/wocky-jid-validation-test.c
+++ b/tests/wocky-jid-validation-test.c
@@ -1,6 +1,6 @@
 #include <glib.h>
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-loopback-test.c b/tests/wocky-loopback-test.c
index 712fc3e..9afc7a3 100644
--- a/tests/wocky-loopback-test.c
+++ b/tests/wocky-loopback-test.c
@@ -1,5 +1,4 @@
-#include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-loopback-stream.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-node-tree-test.c b/tests/wocky-node-tree-test.c
index 5dc6cb6..8385bea 100644
--- a/tests/wocky-node-tree-test.c
+++ b/tests/wocky-node-tree-test.c
@@ -4,8 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-node-tree.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-pep-service-test.c b/tests/wocky-pep-service-test.c
index bb8bcae..85f88fc 100644
--- a/tests/wocky-pep-service-test.c
+++ b/tests/wocky-pep-service-test.c
@@ -4,9 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-pep-service.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-ping-test.c b/tests/wocky-ping-test.c
index 22783e5..6470791 100644
--- a/tests/wocky-ping-test.c
+++ b/tests/wocky-ping-test.c
@@ -4,10 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-ping.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-porter-test.c b/tests/wocky-porter-test.c
index 662428a..e96f965 100644
--- a/tests/wocky-porter-test.c
+++ b/tests/wocky-porter-test.c
@@ -4,10 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-pubsub-node-test.c b/tests/wocky-pubsub-node-test.c
index fb53370..6320753 100644
--- a/tests/wocky-pubsub-node-test.c
+++ b/tests/wocky-pubsub-node-test.c
@@ -4,9 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-pubsub-node.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include "wocky-pubsub-test-helpers.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-pubsub-service-test.c b/tests/wocky-pubsub-service-test.c
index 2ea4df4..ee91547 100644
--- a/tests/wocky-pubsub-service-test.c
+++ b/tests/wocky-pubsub-service-test.c
@@ -4,11 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-pubsub-service.h>
-#include <wocky/wocky-pubsub-node.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "wocky-pubsub-test-helpers.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-pubsub-test-helpers.c b/tests/wocky-pubsub-test-helpers.c
index 102377e..96c5a96 100644
--- a/tests/wocky-pubsub-test-helpers.c
+++ b/tests/wocky-pubsub-test-helpers.c
@@ -1,6 +1,6 @@
 #include "wocky-pubsub-test-helpers.h"
 
-#include <wocky/wocky-pubsub-node.h>
+#include <wocky/wocky.h>
 
 void
 test_pubsub_add_subscription_nodes (
diff --git a/tests/wocky-pubsub-test-helpers.h b/tests/wocky-pubsub-test-helpers.h
index 98824dd..8ba455c 100644
--- a/tests/wocky-pubsub-test-helpers.h
+++ b/tests/wocky-pubsub-test-helpers.h
@@ -2,7 +2,7 @@
 #define WOCKY_PUBSUB_TEST_HELPERS_H
 
 #include <glib.h>
-#include <wocky/wocky-pubsub-service.h>
+#include <wocky/wocky.h>
 
 typedef struct {
     const gchar *node;
diff --git a/tests/wocky-resource-contact-test.c b/tests/wocky-resource-contact-test.c
index 00fe11a..355a76e 100644
--- a/tests/wocky-resource-contact-test.c
+++ b/tests/wocky-resource-contact-test.c
@@ -4,8 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-resource-contact.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-roster-test.c b/tests/wocky-roster-test.c
index 7ead218..37c1309 100644
--- a/tests/wocky-roster-test.c
+++ b/tests/wocky-roster-test.c
@@ -4,13 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-roster.h>
-#include <wocky/wocky-porter.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-bare-contact.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
diff --git a/tests/wocky-sasl-utils-test.c b/tests/wocky-sasl-utils-test.c
index 98a1d08..aec6cf4 100644
--- a/tests/wocky-sasl-utils-test.c
+++ b/tests/wocky-sasl-utils-test.c
@@ -18,7 +18,7 @@
  */
 
 #include <stdio.h>
-#include <wocky/wocky-sasl-utils.h>
+#include <wocky/wocky.h>
 
 typedef struct {
   guint8 *key;
diff --git a/tests/wocky-scram-sha1-test.c b/tests/wocky-scram-sha1-test.c
index ca889ef..a1a8ed8 100644
--- a/tests/wocky-scram-sha1-test.c
+++ b/tests/wocky-scram-sha1-test.c
@@ -18,7 +18,7 @@
  */
 
 #include <stdio.h>
-#include <wocky/wocky-sasl-scram.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-session-test.c b/tests/wocky-session-test.c
index 8cca2a5..60eb2ac 100644
--- a/tests/wocky-session-test.c
+++ b/tests/wocky-session-test.c
@@ -4,8 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-session.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-stanza-test.c b/tests/wocky-stanza-test.c
index cf60d17..87a9508 100644
--- a/tests/wocky-stanza-test.c
+++ b/tests/wocky-stanza-test.c
@@ -4,10 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-stanza.h>
-#include <wocky/wocky-xmpp-error.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-test-connector-server.c b/tests/wocky-test-connector-server.c
index a908493..5ca5bd1 100644
--- a/tests/wocky-test-connector-server.c
+++ b/tests/wocky-test-connector-server.c
@@ -28,18 +28,17 @@
 
 #include "wocky-test-connector-server.h"
 
-#include <wocky/wocky-stanza.h>
-#include <wocky/wocky-xmpp-connection.h>
-
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-utils.h>
-
-#include <wocky/wocky-tls.h>
+#include <wocky/wocky.h>
 
 #define INITIAL_STREAM_ID "0-HAI"
 
+/* We're being a bit naughty here by including wocky-debug.h, but we're
+ * internal *enough*.
+ */
 #define DEBUG_FLAG DEBUG_CONNECTOR
-#include <wocky/wocky-debug.h>
+#define WOCKY_COMPILATION
+#include <wocky/wocky-debug-internal.h>
+#undef WOCKY_COMPILATION
 
 G_DEFINE_TYPE (TestConnectorServer, test_connector_server, G_TYPE_OBJECT);
 
diff --git a/tests/wocky-test-helper.c b/tests/wocky-test-helper.c
index 0acc7cf..e8713f0 100644
--- a/tests/wocky-test-helper.c
+++ b/tests/wocky-test-helper.c
@@ -1,6 +1,4 @@
 #include <wocky/wocky.h>
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-porter.h>
 
 #include "wocky-test-helper.h"
 #include "wocky-test-stream.h"
diff --git a/tests/wocky-test-helper.h b/tests/wocky-test-helper.h
index 9cc47cf..4c9b25c 100644
--- a/tests/wocky-test-helper.h
+++ b/tests/wocky-test-helper.h
@@ -3,9 +3,7 @@
 
 G_BEGIN_DECLS
 
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-porter.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
 #include "wocky-test-stream.h"
 
 typedef struct {
diff --git a/tests/wocky-test-sasl-auth-server.c b/tests/wocky-test-sasl-auth-server.c
index 2e4da52..d4647b2 100644
--- a/tests/wocky-test-sasl-auth-server.c
+++ b/tests/wocky-test-sasl-auth-server.c
@@ -28,9 +28,6 @@
 
 #include "wocky-test-sasl-auth-server.h"
 
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
 #include "config.h"
 
 #ifdef HAVE_LIBSASL2
diff --git a/tests/wocky-test-sasl-auth-server.h b/tests/wocky-test-sasl-auth-server.h
index e2fe0b9..d24a9fa 100644
--- a/tests/wocky-test-sasl-auth-server.h
+++ b/tests/wocky-test-sasl-auth-server.h
@@ -25,8 +25,7 @@
 
 #include <gio/gio.h>
 
-#include <wocky/wocky-stanza.h>
-#include <wocky/wocky-xmpp-connection.h>
+#include <wocky/wocky.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/wocky-test-sasl-auth.c b/tests/wocky-test-sasl-auth.c
index 8629172..8a5ce63 100644
--- a/tests/wocky-test-sasl-auth.c
+++ b/tests/wocky-test-sasl-auth.c
@@ -5,9 +5,7 @@
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
 
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-sasl-auth.h>
-#include <wocky/wocky-auth-registry.h>
+#include <wocky/wocky.h>
 
 typedef struct {
   gchar *description;
diff --git a/tests/wocky-test-sasl-handler.c b/tests/wocky-test-sasl-handler.c
index 3305aa3..d7c83c0 100644
--- a/tests/wocky-test-sasl-handler.c
+++ b/tests/wocky-test-sasl-handler.c
@@ -1,7 +1,7 @@
 
 #include "wocky-test-sasl-handler.h"
 
-#include <wocky/wocky-auth-handler.h>
+#include <wocky/wocky.h>
 
 static void
 auth_handler_iface_init (gpointer g_iface);
diff --git a/tests/wocky-tls-test.c b/tests/wocky-tls-test.c
index dac091c..9412631 100644
--- a/tests/wocky-tls-test.c
+++ b/tests/wocky-tls-test.c
@@ -6,8 +6,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-tls.h>
+#include <wocky/wocky.h>
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-utils-test.c b/tests/wocky-utils-test.c
index 57419be..efd9808 100644
--- a/tests/wocky-utils-test.c
+++ b/tests/wocky-utils-test.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 static void
 test_compose_jid (void)
diff --git a/tests/wocky-xmpp-connection-test.c b/tests/wocky-xmpp-connection-test.c
index a9031c1..01623d4 100644
--- a/tests/wocky-xmpp-connection-test.c
+++ b/tests/wocky-xmpp-connection-test.c
@@ -4,8 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
 #include "wocky-test-stream.h"
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-xmpp-node-test.c b/tests/wocky-xmpp-node-test.c
index b1ba458..0bef12b 100644
--- a/tests/wocky-xmpp-node-test.c
+++ b/tests/wocky-xmpp-node-test.c
@@ -4,10 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-stanza.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-xmpp-reader-test.c b/tests/wocky-xmpp-reader-test.c
index fd592e4..de64cf1 100644
--- a/tests/wocky-xmpp-reader-test.c
+++ b/tests/wocky-xmpp-reader-test.c
@@ -5,8 +5,6 @@
 #include <glib.h>
 
 #include <wocky/wocky.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-utils.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/tests/wocky-xmpp-readwrite-test.c b/tests/wocky-xmpp-readwrite-test.c
index 2a70ead..a9f9511 100644
--- a/tests/wocky-xmpp-readwrite-test.c
+++ b/tests/wocky-xmpp-readwrite-test.c
@@ -4,9 +4,7 @@
 
 #include <glib.h>
 
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-utils.h>
+#include <wocky/wocky.h>
 
 #include "wocky-test-helper.h"
 
diff --git a/wocky/Makefile.am b/wocky/Makefile.am
index 1a15061..74ce41a 100644
--- a/wocky/Makefile.am
+++ b/wocky/Makefile.am
@@ -58,6 +58,7 @@ handwritten_headers = \
   wocky-contact-factory.h \
   wocky-data-form.h \
   wocky-debug.h \
+  wocky-debug-internal.h \
   wocky-disco-identity.h \
   wocky-heartbeat-source.h \
   wocky-jabber-auth.h \
@@ -78,6 +79,7 @@ handwritten_headers = \
   wocky-pubsub-helpers.h \
   wocky-pubsub-node.h \
   wocky-pubsub-node-protected.h \
+  wocky-pubsub-node-internal.h \
   wocky-pubsub-service.h \
   wocky-pubsub-service-protected.h \
   wocky-resource-contact.h \
@@ -210,7 +212,9 @@ wocky-signals-marshal.list: $(handwritten_sources) Makefile.am
 AM_CFLAGS = $(ERROR_CFLAGS) $(GCOV_CFLAGS) \
             @GLIB_CFLAGS@ @LIBXML2_CFLAGS@ @SQLITE_CFLAGS@ @TLS_CFLAGS@ \
             @LIBIPHB_CFLAGS@ \
-            -DG_LOG_DOMAIN=\"wocky\"
+            -DG_LOG_DOMAIN=\"wocky\" \
+            -DWOCKY_COMPILATION
+
 
 AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @LIBXML2_LIBS@ @SQLITE_LIBS@ @TLS_LIBS@ @LIBIPHB_LIBS@
 
diff --git a/wocky/wocky-auth-handler.c b/wocky/wocky-auth-handler.c
index 37e0b38..d1d3daf 100644
--- a/wocky/wocky-auth-handler.c
+++ b/wocky/wocky-auth-handler.c
@@ -32,18 +32,50 @@ wocky_auth_handler_get_type (void)
   return g_define_type_id__volatile;
 }
 
+/**
+ * wocky_auth_handler_get_mechanism:
+ * @handler: a handler for a SASL mechanism.
+ *
+ * Returns the name of the SASL mechanism @handler implements.
+ *
+ * Returns: the name of the SASL mechanism @handler implements.
+ */
 const gchar *
 wocky_auth_handler_get_mechanism (WockyAuthHandler *handler)
 {
   return WOCKY_AUTH_HANDLER_GET_IFACE (handler)->mechanism;
 }
 
+/**
+ * wocky_auth_handler_is_plain:
+ * @handler: a handler for a SASL mechanism.
+ *
+ * Checks whether @handler sends secrets in plaintext. This may be used to
+ * decide whether to use @handler on an insecure XMPP connection.
+ *
+ * Returns: %TRUE if @handler sends secrets in plaintext.
+ */
 gboolean
 wocky_auth_handler_is_plain (WockyAuthHandler *handler)
 {
   return WOCKY_AUTH_HANDLER_GET_IFACE (handler)->plain;
 }
 
+/**
+ * wocky_auth_handler_get_initial_response:
+ * @handler: a handler for a SASL mechanism
+ * @initial_data: (out) (transfer full): initial data to send to the server, if
+ *  any
+ * @error: an optional location for a #GError to fill, or %NULL
+ *
+ * Called when authentication begins to fetch the initial data to send to the
+ * server in the <code>&lt;auth/&gt;</code> stanza.
+ *
+ * If this function returns %TRUE, @initial_data will be non-%NULL if @handler
+ * provides an initial response, and %NULL otherwise.
+ *
+ * Returns: %TRUE on success; %FALSE otherwise.
+ */
 gboolean
 wocky_auth_handler_get_initial_response (WockyAuthHandler *handler,
     GString **initial_data,
@@ -61,6 +93,20 @@ wocky_auth_handler_get_initial_response (WockyAuthHandler *handler,
   return func (handler, initial_data, error);
 }
 
+/**
+ * wocky_auth_handler_handle_auth_data:
+ * @handler: a #WockyAuthHandler object
+ * @data: the challenge string
+ * @response: (out) (transfer full): a location to fill with a challenge
+ *  response in a #GString
+ * @error: an optional location for a #GError to fill, or %NULL
+ *
+ * Asks @handler to respond to a <code>&lt;challenge/&gt;</code> stanza or a
+ * <code>&lt;success/&gt;</code> with data. On success, @handler will put
+ * response data into @response, Base64-encoding it if appropriate.
+ *
+ * Returns: %TRUE on success, otherwise %FALSE
+ */
 gboolean
 wocky_auth_handler_handle_auth_data (
     WockyAuthHandler *handler,
@@ -85,6 +131,19 @@ wocky_auth_handler_handle_auth_data (
   return func (handler, data, response, error);
 }
 
+/**
+ * wocky_auth_handler_handle_success:
+ * @handler: a #WockyAuthHandler object
+ * @error: an optional location for a #GError to fill, or %NULL
+ *
+ * Called when a <code>&lt;success/&gt;</code> stanza is received
+ * during authentication. If no error is returned, then authentication
+ * is considered finished. (Typically, an error is only raised if the
+ * <code>&lt;success/&gt;</code> stanza was received earlier than
+ * expected)
+ *
+ * Returns: %TRUE on success, otherwise %FALSE
+ */
 gboolean
 wocky_auth_handler_handle_success (
     WockyAuthHandler *handler,
diff --git a/wocky/wocky-auth-handler.h b/wocky/wocky-auth-handler.h
index 3d8238b..b72b6c1 100644
--- a/wocky/wocky-auth-handler.h
+++ b/wocky/wocky-auth-handler.h
@@ -1,3 +1,6 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef _WOCKY_AUTH_HANDLER_H
 #define _WOCKY_AUTH_HANDLER_H
@@ -21,7 +24,7 @@ typedef struct _WockyAuthHandler WockyAuthHandler;
 /**
  * WockyAuthInitialResponseFunc:
  * @handler: a #WockyAuthHandler object
- * @initial_data: a #GString location to fill with the initial data, or %NULL to ignre
+ * @initial_data: (out): a #GString location to fill with the initial data
  * @error: an optional location for a #GError to fill, or %NULL
  *
  * Called when authentication begins, if the mechanism allows a
@@ -29,10 +32,10 @@ typedef struct _WockyAuthHandler WockyAuthHandler;
  * XMPP, corresponds to sending the <code>&lt;auth/&gt;</code> stanza
  * to the server).
  *
- * The function should return %TRUE on success and optionally set the
- * @initial_data to a string (allocated using g_malloc()) if there is
- * initial data to send. On error it should return %FALSE and set the
- * error
+ * The function should return %TRUE on success, and optionally set the
+ * @initial_data to a string if there is
+ * initial data to send. On error, it should return %FALSE and set
+ * @error.
  *
  * Returns: %TRUE on success, otherwise %FALSE
  **/
@@ -43,14 +46,15 @@ typedef gboolean (*WockyAuthInitialResponseFunc) (WockyAuthHandler *handler,
 /**
  * WockyAuthChallengeFunc:
  * @handler: a #WockyAuthHandler object
- * @data: the challange string
- * @response: a location to fill with a challenge response in a #GString
+ * @data: the challenge string
+ * @response: (out) (transfer full): a location to fill with a challenge
+ *  response in a #GString
  * @error: an optional location for a #GError to fill, or %NULL
  *
- * Called During authentication, when a
+ * Called during authentication when a
  * <code>&lt;challenge/&gt;</code> stanza or a
  * <code>&lt;success/&gt;</code> with data is received. The handler
- * should put response data in response (allocate using g_malloc()) if
+ * should put response data into @response if
  * appropriate. The handler is responsible for Base64-encoding
  * responses if appropriate.
  *
@@ -82,9 +86,6 @@ typedef gboolean (*WockyAuthSuccessFunc) (
     WockyAuthHandler *handler,
     GError **error);
 
-void
-wocky_auth_handler_free (WockyAuthHandler *handler);
-
 GType
 wocky_auth_handler_get_type (void);
 
diff --git a/wocky/wocky-auth-registry.c b/wocky/wocky-auth-registry.c
index bd6f5fd..9b027bc 100644
--- a/wocky/wocky-auth-registry.c
+++ b/wocky/wocky-auth-registry.c
@@ -10,7 +10,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyAuthRegistry, wocky_auth_registry, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-auth-registry.h b/wocky/wocky-auth-registry.h
index 38f197f..30da931 100644
--- a/wocky/wocky-auth-registry.h
+++ b/wocky/wocky-auth-registry.h
@@ -1,11 +1,15 @@
-/* wocky-auth-registry.h */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
+/* wocky-auth-registry.h */
 #ifndef _WOCKY_AUTH_REGISTRY_H
 #define _WOCKY_AUTH_REGISTRY_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
 #include "wocky-auth-handler.h"
+#include "wocky-auth-registry-enumtypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/wocky-bare-contact.c b/wocky/wocky-bare-contact.c
index 11e7bd1..fc9a190 100644
--- a/wocky/wocky-bare-contact.c
+++ b/wocky/wocky-bare-contact.c
@@ -48,7 +48,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_ROSTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyBareContact, wocky_bare_contact, WOCKY_TYPE_CONTACT)
 
diff --git a/wocky/wocky-bare-contact.h b/wocky/wocky-bare-contact.h
index 1ebe270..e902bae 100644
--- a/wocky/wocky-bare-contact.h
+++ b/wocky/wocky-bare-contact.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_BARE_CONTACT_H__
 #define __WOCKY_BARE_CONTACT_H__
diff --git a/wocky/wocky-c2s-porter.c b/wocky/wocky-c2s-porter.c
index 1bd8010..944c183 100644
--- a/wocky/wocky-c2s-porter.c
+++ b/wocky/wocky-c2s-porter.c
@@ -50,7 +50,7 @@
 #include "wocky-contact-factory.h"
 
 #define DEBUG_FLAG DEBUG_PORTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void wocky_porter_iface_init (gpointer g_iface, gpointer iface_data);
 
@@ -1710,7 +1710,7 @@ wocky_c2s_porter_register_handler_from_server_by_stanza (
  *  the stanza (Wocky will continue to the next handler, if any), or %TRUE to
  *  stop further processing.
  * @user_data: Passed to @callback.
- * @Varargs: a wocky_stanza_build() specification. The handler
+ * @...: a wocky_stanza_build() specification. The handler
  *  will match a stanza only if the stanza received is a superset of the one
  *  passed to this function, as per wocky_node_is_superset().
  *
diff --git a/wocky/wocky-c2s-porter.h b/wocky/wocky-c2s-porter.h
index 70e43af..83f7638 100644
--- a/wocky/wocky-c2s-porter.h
+++ b/wocky/wocky-c2s-porter.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_C2S_PORTER_H__
 #define __WOCKY_C2S_PORTER_H__
diff --git a/wocky/wocky-caps-cache.c b/wocky/wocky-caps-cache.c
index c4376ac..5ce4ef9 100644
--- a/wocky/wocky-caps-cache.c
+++ b/wocky/wocky-caps-cache.c
@@ -36,7 +36,7 @@
 #include "wocky-xmpp-writer.h"
 
 #define DEBUG_FLAG DEBUG_PRESENCE
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #define DB_USER_VERSION 2
 
diff --git a/wocky/wocky-caps-cache.h b/wocky/wocky-caps-cache.h
index 178daf1..a22331d 100644
--- a/wocky/wocky-caps-cache.h
+++ b/wocky/wocky-caps-cache.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_CAPS_CACHE_H__
 #define __WOCKY_CAPS_CACHE_H__
diff --git a/wocky/wocky-caps-hash.c b/wocky/wocky-caps-hash.c
index a610075..867fb80 100644
--- a/wocky/wocky-caps-hash.c
+++ b/wocky/wocky-caps-hash.c
@@ -40,7 +40,7 @@
 #include "wocky-namespaces.h"
 
 #define DEBUG_FLAG DEBUG_PRESENCE
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static gint
 char_cmp (gconstpointer a,
diff --git a/wocky/wocky-caps-hash.h b/wocky/wocky-caps-hash.h
index 5a8480c..83e369c 100644
--- a/wocky/wocky-caps-hash.h
+++ b/wocky/wocky-caps-hash.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_CAPS_HASH_H__
 #define __WOCKY_CAPS_HASH_H__
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c
index 244f94b..ebc3419 100644
--- a/wocky/wocky-connector.c
+++ b/wocky/wocky-connector.c
@@ -99,7 +99,7 @@
 #include <gio/gio.h>
 
 #define DEBUG_FLAG DEBUG_CONNECTOR
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #include "wocky-http-proxy.h"
 #include "wocky-sasl-auth.h"
@@ -109,7 +109,6 @@
 #include "wocky-namespaces.h"
 #include "wocky-xmpp-connection.h"
 #include "wocky-xmpp-error.h"
-#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
diff --git a/wocky/wocky-connector.h b/wocky/wocky-connector.h
index c678ee8..3d5d600 100644
--- a/wocky/wocky-connector.h
+++ b/wocky/wocky-connector.h
@@ -17,18 +17,21 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_CONNECTOR_H__
 #define __WOCKY_CONNECTOR_H__
 
 #include <glib-object.h>
 
+#include "wocky-connector-enumtypes.h"
 #include "wocky-sasl-auth.h"
 #include "wocky-xmpp-connection.h"
 #include "wocky-stanza.h"
 
 #include "wocky-tls.h"
-#include "wocky-tls-enumtypes.h"
 #include "wocky-tls-handler.h"
 
 G_BEGIN_DECLS
diff --git a/wocky/wocky-contact-factory.c b/wocky/wocky-contact-factory.c
index 8f78b34..58521ca 100644
--- a/wocky/wocky-contact-factory.c
+++ b/wocky/wocky-contact-factory.c
@@ -49,7 +49,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_ROSTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyContactFactory, wocky_contact_factory, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-contact-factory.h b/wocky/wocky-contact-factory.h
index be3c39a..06eba01 100644
--- a/wocky/wocky-contact-factory.h
+++ b/wocky/wocky-contact-factory.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_CONTACT_FACTORY_H__
 #define __WOCKY_CONTACT_FACTORY_H__
diff --git a/wocky/wocky-contact.c b/wocky/wocky-contact.c
index 84a6da6..eb38fa2 100644
--- a/wocky/wocky-contact.c
+++ b/wocky/wocky-contact.c
@@ -46,7 +46,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_ROSTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyContact, wocky_contact, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-contact.h b/wocky/wocky-contact.h
index 763c8b4..addfa61 100644
--- a/wocky/wocky-contact.h
+++ b/wocky/wocky-contact.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_CONTACT_H__
 #define __WOCKY_CONTACT_H__
diff --git a/wocky/wocky-data-form.c b/wocky/wocky-data-form.c
index 3830265..f151b32 100644
--- a/wocky/wocky-data-form.c
+++ b/wocky/wocky-data-form.c
@@ -32,12 +32,11 @@
 
 #include <string.h>
 
-#include "wocky-data-form-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_DATA_FORM
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyDataForm, wocky_data_form, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-data-form.h b/wocky/wocky-data-form.h
index 16e46df..931c535 100644
--- a/wocky/wocky-data-form.h
+++ b/wocky/wocky-data-form.h
@@ -17,12 +17,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef WOCKY_DATA_FORM_H
 #define WOCKY_DATA_FORM_H
 
 #include <glib-object.h>
 
+#include "wocky-data-form-enumtypes.h"
 #include "wocky-node.h"
 
 G_BEGIN_DECLS
diff --git a/wocky/wocky-debug-internal.h b/wocky/wocky-debug-internal.h
new file mode 100644
index 0000000..3880519
--- /dev/null
+++ b/wocky/wocky-debug-internal.h
@@ -0,0 +1,86 @@
+#if !defined (WOCKY_COMPILATION)
+# error "This is an internal header."
+#endif
+
+#ifndef WOCKY_DEBUG_INTERNAL_H
+#define WOCKY_DEBUG_INTERNAL_H
+
+#include "config.h"
+
+#include <glib.h>
+
+#include "wocky-debug.h"
+#include "wocky-stanza.h"
+
+G_BEGIN_DECLS
+
+#ifdef ENABLE_DEBUG
+
+void wocky_debug_set_flags_from_env (void);
+gboolean wocky_debug_flag_is_set (WockyDebugFlags flag);
+
+void wocky_debug_valist (WockyDebugFlags flag,
+    const gchar *format, va_list args);
+
+void wocky_debug (WockyDebugFlags flag, const gchar *format, ...)
+    G_GNUC_PRINTF (2, 3);
+void wocky_debug_stanza (WockyDebugFlags flag, WockyStanza *stanza,
+    const gchar *format, ...)
+    G_GNUC_PRINTF (3, 4);
+void wocky_debug_node_tree (WockyDebugFlags flag, WockyNodeTree *tree,
+    const gchar *format, ...)
+    G_GNUC_PRINTF (3, 4);
+
+#ifdef DEBUG_FLAG
+
+#define DEBUG(format, ...) \
+  wocky_debug (DEBUG_FLAG, "%s: %s: " format, G_STRFUNC, G_STRLOC, \
+      ##__VA_ARGS__)
+
+#define DEBUG_STANZA(stanza, format, ...) \
+  wocky_debug_stanza (DEBUG_FLAG, stanza, "%s: " format, G_STRFUNC,\
+      ##__VA_ARGS__)
+
+#define DEBUG_NODE_TREE(tree, format, ...) \
+  wocky_debug_node_tree (DEBUG_FLAG, tree, "%s: " format, G_STRFUNC,\
+      ##__VA_ARGS__)
+
+#define DEBUGGING wocky_debug_flag_is_set(DEBUG_FLAG)
+
+#endif /* DEBUG_FLAG */
+
+#else /* ENABLE_DEBUG */
+
+#ifdef DEBUG_FLAG
+
+static inline void
+DEBUG (
+    const gchar *format,
+    ...)
+{
+  /* blah blah blah */
+}
+
+static inline void
+DEBUG_STANZA (WockyStanza *stanza,
+    const gchar *format,
+    ...)
+{
+}
+
+static inline void
+DEBUG_NODE_TREE (WockyNodeTree *tree,
+    const gchar *format,
+    ...)
+{
+}
+
+#define DEBUGGING 0
+
+#endif /* DEBUG_FLAG */
+
+#endif /* ENABLE_DEBUG */
+
+G_END_DECLS
+
+#endif
diff --git a/wocky/wocky-debug.c b/wocky/wocky-debug.c
index d9f4f8f..0af0a32 100644
--- a/wocky/wocky-debug.c
+++ b/wocky/wocky-debug.c
@@ -3,7 +3,7 @@
 
 #include <glib.h>
 
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #ifdef ENABLE_DEBUG
 
@@ -133,5 +133,11 @@ wocky_debug_stanza (WockyDebugFlags flag,
   wocky_debug_node_tree_va (flag, (WockyNodeTree *) stanza, format, args);
   va_end (args);
 }
+#else /* !ENABLE_DEBUG */
+
+void
+wocky_debug_set_flags (WockyDebugFlags flags)
+{
+}
 
 #endif
diff --git a/wocky/wocky-debug.h b/wocky/wocky-debug.h
index daef7d6..f3f5324 100644
--- a/wocky/wocky-debug.h
+++ b/wocky/wocky-debug.h
@@ -1,17 +1,12 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_DEBUG_H__
 #define __WOCKY_DEBUG_H__
 
-#include "config.h"
-
-#include <glib.h>
-
-#include "wocky-stanza.h"
-
 G_BEGIN_DECLS
 
-#ifdef ENABLE_DEBUG
-
 typedef enum
 {
   /*< private > */
@@ -40,71 +35,7 @@ typedef enum
 
 #define DEBUG_XMPP (DEBUG_XMPP_READER | DEBUG_XMPP_WRITER)
 
-void wocky_debug_set_flags_from_env (void);
 void wocky_debug_set_flags (WockyDebugFlags flags);
-gboolean wocky_debug_flag_is_set (WockyDebugFlags flag);
-
-void wocky_debug_valist (WockyDebugFlags flag,
-    const gchar *format, va_list args);
-
-void wocky_debug (WockyDebugFlags flag, const gchar *format, ...)
-    G_GNUC_PRINTF (2, 3);
-void wocky_debug_stanza (WockyDebugFlags flag, WockyStanza *stanza,
-    const gchar *format, ...)
-    G_GNUC_PRINTF (3, 4);
-void wocky_debug_node_tree (WockyDebugFlags flag, WockyNodeTree *tree,
-    const gchar *format, ...)
-    G_GNUC_PRINTF (3, 4);
-
-#ifdef DEBUG_FLAG
-
-#define DEBUG(format, ...) \
-  wocky_debug (DEBUG_FLAG, "%s: %s: " format, G_STRFUNC, G_STRLOC, \
-      ##__VA_ARGS__)
-
-#define DEBUG_STANZA(stanza, format, ...) \
-  wocky_debug_stanza (DEBUG_FLAG, stanza, "%s: " format, G_STRFUNC,\
-      ##__VA_ARGS__)
-
-#define DEBUG_NODE_TREE(tree, format, ...) \
-  wocky_debug_node_tree (DEBUG_FLAG, tree, "%s: " format, G_STRFUNC,\
-      ##__VA_ARGS__)
-
-#define DEBUGGING wocky_debug_flag_is_set(DEBUG_FLAG)
-
-#endif /* DEBUG_FLAG */
-
-#else /* ENABLE_DEBUG */
-
-#ifdef DEBUG_FLAG
-
-static inline void
-DEBUG (
-    const gchar *format,
-    ...)
-{
-  /* blah blah blah */
-}
-
-static inline void
-DEBUG_STANZA (WockyStanza *stanza,
-    const gchar *format,
-    ...)
-{
-}
-
-static inline void
-DEBUG_NODE_TREE (WockyNodeTree *tree,
-    const gchar *format,
-    ...)
-{
-}
-
-#define DEBUGGING 0
-
-#endif /* DEBUG_FLAG */
-
-#endif /* ENABLE_DEBUG */
 
 G_END_DECLS
 
diff --git a/wocky/wocky-disco-identity.c b/wocky/wocky-disco-identity.c
index f356f3b..70316ac 100644
--- a/wocky/wocky-disco-identity.c
+++ b/wocky/wocky-disco-identity.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #define DEBUG_FLAG DEBUG_PRESENCE
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_BOXED_TYPE (WockyDiscoIdentity, wocky_disco_identity,
     wocky_disco_identity_copy, wocky_disco_identity_free)
diff --git a/wocky/wocky-disco-identity.h b/wocky/wocky-disco-identity.h
index c66fe35..2a9b13e 100644
--- a/wocky/wocky-disco-identity.h
+++ b/wocky/wocky-disco-identity.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_DISCO_IDENTITY_H__
 #define __WOCKY_DISCO_IDENTITY_H__
diff --git a/wocky/wocky-heartbeat-source.c b/wocky/wocky-heartbeat-source.c
index 4fff4f7..d0ae396 100644
--- a/wocky/wocky-heartbeat-source.c
+++ b/wocky/wocky-heartbeat-source.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #define DEBUG_FLAG DEBUG_HEARTBEAT
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #ifdef HAVE_IPHB
 # include <iphbd/libiphb.h>
diff --git a/wocky/wocky-heartbeat-source.h b/wocky/wocky-heartbeat-source.h
index 73009e1..056726e 100644
--- a/wocky/wocky-heartbeat-source.h
+++ b/wocky/wocky-heartbeat-source.h
@@ -18,6 +18,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_COMPILATION)
+# error "This is an internal header."
+#endif
+
 #ifndef WOCKY_HEARTBEAT_SOURCE_H
 #define WOCKY_HEARTBEAT_SOURCE_H
 
diff --git a/wocky/wocky-http-proxy.h b/wocky/wocky-http-proxy.h
index 235a00b..b9f9485 100644
--- a/wocky/wocky-http-proxy.h
+++ b/wocky/wocky-http-proxy.h
@@ -18,6 +18,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_COMPILATION)
+# error "This is an internal header."
+#endif
 
 #ifndef _WOCKY_HTTP_PROXY_H_
 #define _WOCKY_HTTP_PROXY_H_
diff --git a/wocky/wocky-jabber-auth-digest.c b/wocky/wocky-jabber-auth-digest.c
index e665e0b..42f9854 100644
--- a/wocky/wocky-jabber-auth-digest.c
+++ b/wocky/wocky-jabber-auth-digest.c
@@ -3,7 +3,7 @@
 
 #include "wocky-auth-registry.h"
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void
 auth_handler_iface_init (gpointer g_iface);
diff --git a/wocky/wocky-jabber-auth-digest.h b/wocky/wocky-jabber-auth-digest.h
index c9e0fee..878efa3 100644
--- a/wocky/wocky-jabber-auth-digest.h
+++ b/wocky/wocky-jabber-auth-digest.h
@@ -1,3 +1,7 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
+
 #ifndef _WOCKY_JABBER_AUTH_DIGEST_H
 #define _WOCKY_JABBER_AUTH_DIGEST_H
 
diff --git a/wocky/wocky-jabber-auth-password.c b/wocky/wocky-jabber-auth-password.c
index cfa0c44..a2b4ecf 100644
--- a/wocky/wocky-jabber-auth-password.c
+++ b/wocky/wocky-jabber-auth-password.c
@@ -3,7 +3,7 @@
 
 #include "wocky-auth-registry.h"
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void
 auth_handler_iface_init (gpointer g_iface);
diff --git a/wocky/wocky-jabber-auth-password.h b/wocky/wocky-jabber-auth-password.h
index 7e6ae63..d05cdae 100644
--- a/wocky/wocky-jabber-auth-password.h
+++ b/wocky/wocky-jabber-auth-password.h
@@ -1,3 +1,7 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
+
 #ifndef _WOCKY_JABBER_AUTH_PASSWORD_H
 #define _WOCKY_JABBER_AUTH_PASSWORD_H
 
diff --git a/wocky/wocky-jabber-auth.c b/wocky/wocky-jabber-auth.c
index 5783e58..acce5e2 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -27,10 +27,9 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE(WockyJabberAuth, wocky_jabber_auth, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-jabber-auth.h b/wocky/wocky-jabber-auth.h
index b55f9e1..d8181c0 100644
--- a/wocky/wocky-jabber-auth.h
+++ b/wocky/wocky-jabber-auth.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_JABBER_AUTH_H__
 #define __WOCKY_JABBER_AUTH_H__
diff --git a/wocky/wocky-ll-connection-factory.c b/wocky/wocky-ll-connection-factory.c
index 892a718..9f0f4bd 100644
--- a/wocky/wocky-ll-connection-factory.c
+++ b/wocky/wocky-ll-connection-factory.c
@@ -26,7 +26,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_CONNECTION_FACTORY
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyLLConnectionFactory, wocky_ll_connection_factory, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-ll-connection-factory.h b/wocky/wocky-ll-connection-factory.h
index f4437cc..d73cb96 100644
--- a/wocky/wocky-ll-connection-factory.h
+++ b/wocky/wocky-ll-connection-factory.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_LL_CONNECTION_FACTORY_H__
 #define __WOCKY_LL_CONNECTION_FACTORY_H__
diff --git a/wocky/wocky-ll-connector.c b/wocky/wocky-ll-connector.c
index 8699cf2..e66a97d 100644
--- a/wocky/wocky-ll-connector.c
+++ b/wocky/wocky-ll-connector.c
@@ -29,7 +29,7 @@
 #include "wocky-namespaces.h"
 
 #define DEBUG_FLAG DEBUG_CONNECTOR
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void initable_iface_init (gpointer, gpointer);
 
diff --git a/wocky/wocky-ll-connector.h b/wocky/wocky-ll-connector.h
index b9a6b7f..60fe040 100644
--- a/wocky/wocky-ll-connector.h
+++ b/wocky/wocky-ll-connector.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_LL_CONNECTOR_H__
 #define __WOCKY_LL_CONNECTOR_H__
diff --git a/wocky/wocky-ll-contact.h b/wocky/wocky-ll-contact.h
index 13ae1d9..ba26171 100644
--- a/wocky/wocky-ll-contact.h
+++ b/wocky/wocky-ll-contact.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_LL_CONTACT_H__
 #define __WOCKY_LL_CONTACT_H__
diff --git a/wocky/wocky-loopback-stream.h b/wocky/wocky-loopback-stream.h
index b31063e..d44412f 100644
--- a/wocky/wocky-loopback-stream.h
+++ b/wocky/wocky-loopback-stream.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_LOOPBACK_STREAM_H__
 #define __WOCKY_LOOPBACK_STREAM_H__
diff --git a/wocky/wocky-meta-porter.c b/wocky/wocky-meta-porter.c
index a511db3..ec90dbe 100644
--- a/wocky/wocky-meta-porter.c
+++ b/wocky/wocky-meta-porter.c
@@ -43,7 +43,7 @@ typedef uint16_t u_int16_t;
 #include "wocky-loopback-stream.h"
 
 #define DEBUG_FLAG DEBUG_PORTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void wocky_porter_iface_init (gpointer g_iface,
     gpointer iface_data);
diff --git a/wocky/wocky-meta-porter.h b/wocky/wocky-meta-porter.h
index 35f4200..e2264d9 100644
--- a/wocky/wocky-meta-porter.h
+++ b/wocky/wocky-meta-porter.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_META_PORTER_H__
 #define __WOCKY_META_PORTER_H__
diff --git a/wocky/wocky-muc.c b/wocky/wocky-muc.c
index 86a55cc..10c486e 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -22,11 +22,9 @@
 #include <time.h>
 
 #define DEBUG_FLAG DEBUG_MUC_CONNECTION
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #include "wocky-muc.h"
-#include "wocky-muc-enumtypes.h"
-#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 #include "wocky-signals-marshal.h"
diff --git a/wocky/wocky-muc.h b/wocky/wocky-muc.h
index d056df9..c5b348d 100644
--- a/wocky/wocky-muc.h
+++ b/wocky/wocky-muc.h
@@ -17,11 +17,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
+
 #ifndef __WOCKY_MUC_H__
 #define __WOCKY_MUC_H__
 
 #include <glib-object.h>
 
+#include "wocky-muc-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-porter.h"
 
diff --git a/wocky/wocky-namespaces.h b/wocky/wocky-namespaces.h
index 7af9b36..5ea47c6 100644
--- a/wocky/wocky-namespaces.h
+++ b/wocky/wocky-namespaces.h
@@ -1,3 +1,6 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_NAMESPACES_H__
 #define __WOCKY_NAMESPACES_H__
diff --git a/wocky/wocky-node-private.h b/wocky/wocky-node-private.h
index b1a82bb..6c4a64d 100644
--- a/wocky/wocky-node-private.h
+++ b/wocky/wocky-node-private.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_COMPILATION)
+# error "This is an internal header."
+#endif
 
 #ifndef __WOCKY__NODE_PRIVATE_H__
 #define __WOCKY__NODE_PRIVATE_H__
diff --git a/wocky/wocky-node-tree.c b/wocky/wocky-node-tree.c
index 3d727d1..5d42416 100644
--- a/wocky/wocky-node-tree.c
+++ b/wocky/wocky-node-tree.c
@@ -143,7 +143,7 @@ wocky_node_tree_finalize (GObject *object)
  * wocky_node_tree_new:
  * @name: The name of the toplevel node
  * @ns: The namespace of the toplevel node
- * @Varargs: the description of the node tree to build,
+ * @...: the description of the node tree to build,
  *  terminated with %NULL
  *
  * Build a node-tree from a list of arguments.
diff --git a/wocky/wocky-node-tree.h b/wocky/wocky-node-tree.h
index 8c8d62d..aadc949 100644
--- a/wocky/wocky-node-tree.h
+++ b/wocky/wocky-node-tree.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_NODE_TREE_H__
 #define __WOCKY_NODE_TREE_H__
diff --git a/wocky/wocky-node.c b/wocky/wocky-node.c
index ba11f39..073c161 100644
--- a/wocky/wocky-node.c
+++ b/wocky/wocky-node.c
@@ -362,7 +362,7 @@ wocky_node_set_attribute (WockyNode *node,
  * wocky_node_set_attributes:
  * @node: a #WockyNode
  * @key: the attribute name to set
- * @Varargs: pairs of keys and values, terminated by %NULL
+ * @...: pairs of keys and values, terminated by %NULL
  *
  * Sets attributes in a #WockyNode to specific values.
  */
@@ -1346,7 +1346,7 @@ wocky_node_iter_next (WockyNodeIter *iter,
 /**
  * wocky_node_add_build:
  * @node: The node under which to add a new subtree
- * @Varargs: the description of the stanza to build,
+ * @...: the description of the stanza to build,
  *  terminated with %NULL
  *
  * Add a node subtree to an existing parent node.
diff --git a/wocky/wocky-node.h b/wocky/wocky-node.h
index dd8b6d4..b8b2e5a 100644
--- a/wocky/wocky-node.h
+++ b/wocky/wocky-node.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY__NODE_H__
 #define __WOCKY__NODE_H__
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c
index 320af7a..1345891 100644
--- a/wocky/wocky-openssl.c
+++ b/wocky/wocky-openssl.c
@@ -61,8 +61,7 @@
 #define DEBUG_HANDSHAKE_LEVEL 5
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
-#include "wocky-debug.h"
-#include "wocky-tls-enumtypes.h"
+#include "wocky-debug-internal.h"
 #include "wocky-utils.h"
 
 #include <openssl/ssl.h>
diff --git a/wocky/wocky-pep-service.c b/wocky/wocky-pep-service.c
index 3e6193d..59bcda7 100644
--- a/wocky/wocky-pep-service.c
+++ b/wocky/wocky-pep-service.c
@@ -35,7 +35,7 @@
 #include "wocky-signals-marshal.h"
 
 #define DEBUG_FLAG DEBUG_PUBSUB
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyPepService, wocky_pep_service, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-pep-service.h b/wocky/wocky-pep-service.h
index ff508b3..cbedcae 100644
--- a/wocky/wocky-pep-service.h
+++ b/wocky/wocky-pep-service.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_PEP_SERVICE_H__
 #define __WOCKY_PEP_SERVICE_H__
diff --git a/wocky/wocky-ping.c b/wocky/wocky-ping.c
index 3ac34d4..1312251 100644
--- a/wocky/wocky-ping.c
+++ b/wocky/wocky-ping.c
@@ -33,7 +33,7 @@
 #include "wocky-stanza.h"
 
 #define DEBUG_FLAG DEBUG_PING
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyPing, wocky_ping, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-ping.h b/wocky/wocky-ping.h
index e9b2262..c0c4bb8 100644
--- a/wocky/wocky-ping.h
+++ b/wocky/wocky-ping.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_PING_H__
 #define __WOCKY_PING_H__
diff --git a/wocky/wocky-porter.c b/wocky/wocky-porter.c
index 9a65b43..8d8c53d 100644
--- a/wocky/wocky-porter.c
+++ b/wocky/wocky-porter.c
@@ -450,7 +450,7 @@ wocky_porter_register_handler_from_by_stanza (WockyPorter *self,
  *  the stanza (Wocky will continue to the next handler, if any), or %TRUE to
  *  stop further processing.
  * @user_data: Passed to @callback.
- * @Varargs: a wocky_stanza_build() specification. The handler
+ * @...: a wocky_stanza_build() specification. The handler
  *  will match a stanza only if the stanza received is a superset of the one
  *  passed to this function, as per wocky_node_is_superset().
  *
@@ -641,7 +641,7 @@ wocky_porter_register_handler_from_anyone_by_stanza (
  *  the stanza (Wocky will continue to the next handler, if any), or %TRUE to
  *  stop further processing.
  * @user_data: Passed to @callback.
- * @Varargs: a wocky_stanza_build() specification. The handler
+ * @...: a wocky_stanza_build() specification. The handler
  *  will match a stanza only if the stanza received is a superset of the one
  *  passed to this function, as per wocky_node_is_superset().
  *
@@ -843,7 +843,7 @@ wocky_porter_send_iq_finish (WockyPorter *self,
  * @porter: a #WockyPorter
  * @stanza: a stanza of type #WOCKY_STANZA_TYPE_IQ and sub-type either
  *          #WOCKY_STANZA_SUB_TYPE_SET or #WOCKY_STANZA_SUB_TYPE_GET
- * @Varargs: a wocky_stanza_build() specification; pass %NULL to include no
+ * @...: a wocky_stanza_build() specification; pass %NULL to include no
  *           body in the reply.
  *
  * Sends an acknowledgement for @stanza back to the sender, as a shorthand for
diff --git a/wocky/wocky-porter.h b/wocky/wocky-porter.h
index 6e09eca..6a852d2 100644
--- a/wocky/wocky-porter.h
+++ b/wocky/wocky-porter.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_PORTER_H__
 #define __WOCKY_PORTER_H__
diff --git a/wocky/wocky-pubsub-helpers.h b/wocky/wocky-pubsub-helpers.h
index bc83298..cbb5cf2 100644
--- a/wocky/wocky-pubsub-helpers.h
+++ b/wocky/wocky-pubsub-helpers.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef WOCKY_PUBSUB_HELPERS_H
 #define WOCKY_PUBSUB_HELPERS_H
diff --git a/wocky/wocky-pubsub-node-internal.h b/wocky/wocky-pubsub-node-internal.h
new file mode 100644
index 0000000..93d429e
--- /dev/null
+++ b/wocky/wocky-pubsub-node-internal.h
@@ -0,0 +1,44 @@
+/*
+ * wocky-pubsub-node-internal.h - internal methods on WockyPubsubNode
+ *                                used by WockyPubsubService
+ * Copyright © 2010 Collabora Ltd.
+ * Copyright © 2010 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#if !defined (WOCKY_COMPILATION)
+# error "This is an internal header."
+#endif
+
+#ifndef WOCKY_PUBSUB_NODE_INTERNAL_H
+#define WOCKY_PUBSUB_NODE_INTERNAL_H
+
+#include "wocky-pubsub-node.h"
+
+typedef void (*WockyPubsubNodeEventHandler) (
+    WockyPubsubNode *self,
+    WockyStanza *event_stanza,
+    WockyNode *event_node,
+    WockyNode *action_node);
+
+typedef struct {
+    const gchar *action;
+    WockyPubsubNodeEventHandler method;
+} WockyPubsubNodeEventMapping;
+
+const WockyPubsubNodeEventMapping *_wocky_pubsub_node_get_event_mappings (
+    guint *n_mappings);
+
+#endif /* WOCKY_PUBSUB_NODE_INTERNAL_H */
diff --git a/wocky/wocky-pubsub-node-protected.h b/wocky/wocky-pubsub-node-protected.h
index 8e7f65e..2d1b537 100644
--- a/wocky/wocky-pubsub-node-protected.h
+++ b/wocky/wocky-pubsub-node-protected.h
@@ -1,5 +1,5 @@
 /*
- * wocky-pubsub-node-internal.h - protected methods on WockyPubsubNode
+ * wocky-pubsub-node-protected.h - protected methods on WockyPubsubNode
  * Copyright © 2010 Collabora Ltd.
  * Copyright © 2010 Nokia Corporation
  *
@@ -17,30 +17,15 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef WOCKY_PUBSUB_NODE_PROTECTED_H
 #define WOCKY_PUBSUB_NODE_PROTECTED_H
 
 #include "wocky-pubsub-node.h"
 
-/* for use by WockyPubsubService */
-
-typedef void (*WockyPubsubNodeEventHandler) (
-    WockyPubsubNode *self,
-    WockyStanza *event_stanza,
-    WockyNode *event_node,
-    WockyNode *action_node);
-
-typedef struct {
-    const gchar *action;
-    WockyPubsubNodeEventHandler method;
-} WockyPubsubNodeEventMapping;
-
-const WockyPubsubNodeEventMapping *_wocky_pubsub_node_get_event_mappings (
-    guint *n_mappings);
-
-/* for use by subclasses */
-
 WockyPorter *wocky_pubsub_node_get_porter (WockyPubsubNode *self);
 
 WockyStanza *wocky_pubsub_node_make_subscribe_stanza (WockyPubsubNode *self,
diff --git a/wocky/wocky-pubsub-node.c b/wocky/wocky-pubsub-node.c
index 5228e14..f829f1b 100644
--- a/wocky/wocky-pubsub-node.c
+++ b/wocky/wocky-pubsub-node.c
@@ -19,7 +19,7 @@
 
 #include "wocky-pubsub-node.h"
 #include "wocky-pubsub-node-protected.h"
-#include "wocky-pubsub-node-enumtypes.h"
+#include "wocky-pubsub-node-internal.h"
 
 #include "wocky-namespaces.h"
 #include "wocky-porter.h"
@@ -29,7 +29,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_PUBSUB
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyPubsubNode, wocky_pubsub_node, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-pubsub-node.h b/wocky/wocky-pubsub-node.h
index 1444780..31e35cc 100644
--- a/wocky/wocky-pubsub-node.h
+++ b/wocky/wocky-pubsub-node.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_PUBSUB_NODE_H__
 #define __WOCKY_PUBSUB_NODE_H__
@@ -23,6 +26,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include "wocky-pubsub-node-enumtypes.h"
 #include "wocky-types.h"
 #include "wocky-session.h"
 #include "wocky-pubsub-service.h"
diff --git a/wocky/wocky-pubsub-service-protected.h b/wocky/wocky-pubsub-service-protected.h
index d18d3f4..7472765 100644
--- a/wocky/wocky-pubsub-service-protected.h
+++ b/wocky/wocky-pubsub-service-protected.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef WOCKY_PUBSUB_SERVICE_PROTECTED_H
 #define WOCKY_PUBSUB_SERVICE_PROTECTED_H
diff --git a/wocky/wocky-pubsub-service.c b/wocky/wocky-pubsub-service.c
index 869ae03..63964ac 100644
--- a/wocky/wocky-pubsub-service.c
+++ b/wocky/wocky-pubsub-service.c
@@ -18,7 +18,6 @@
  */
 
 #include "wocky-pubsub-service.h"
-#include "wocky-pubsub-service-enumtypes.h"
 #include "wocky-pubsub-service-protected.h"
 
 #include "wocky-porter.h"
@@ -26,11 +25,12 @@
 #include "wocky-pubsub-helpers.h"
 #include "wocky-pubsub-node.h"
 #include "wocky-pubsub-node-protected.h"
+#include "wocky-pubsub-node-internal.h"
 #include "wocky-namespaces.h"
 #include "wocky-signals-marshal.h"
 
 #define DEBUG_FLAG DEBUG_PUBSUB
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static gboolean pubsub_service_propagate_event (WockyPorter *porter,
     WockyStanza *event_stanza,
diff --git a/wocky/wocky-pubsub-service.h b/wocky/wocky-pubsub-service.h
index 0928ee5..676bc04 100644
--- a/wocky/wocky-pubsub-service.h
+++ b/wocky/wocky-pubsub-service.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_PUBSUB_SERVICE_H__
 #define __WOCKY_PUBSUB_SERVICE_H__
@@ -23,6 +26,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include "wocky-pubsub-service-enumtypes.h"
 #include "wocky-stanza.h"
 #include "wocky-session.h"
 #include "wocky-types.h"
diff --git a/wocky/wocky-resource-contact.c b/wocky/wocky-resource-contact.c
index 44b1c57..94bcf7d 100644
--- a/wocky/wocky-resource-contact.c
+++ b/wocky/wocky-resource-contact.c
@@ -46,7 +46,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_ROSTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE (WockyResourceContact, wocky_resource_contact, WOCKY_TYPE_CONTACT)
 
diff --git a/wocky/wocky-resource-contact.h b/wocky/wocky-resource-contact.h
index 0207b4b..e7749ff 100644
--- a/wocky/wocky-resource-contact.h
+++ b/wocky/wocky-resource-contact.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_RESOURCE_CONTACT_H__
 #define __WOCKY_RESOURCE_CONTACT_H__
diff --git a/wocky/wocky-roster.c b/wocky/wocky-roster.c
index 4c0180e..c91c477 100644
--- a/wocky/wocky-roster.c
+++ b/wocky/wocky-roster.c
@@ -43,7 +43,7 @@
 #include "wocky-session.h"
 
 #define DEBUG_FLAG DEBUG_ROSTER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #define GOOGLE_ROSTER_VERSION "2"
 
diff --git a/wocky/wocky-roster.h b/wocky/wocky-roster.h
index 971812e..6ca8d7a 100644
--- a/wocky/wocky-roster.h
+++ b/wocky/wocky-roster.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_ROSTER_H__
 #define __WOCKY_ROSTER_H__
diff --git a/wocky/wocky-sasl-auth.c b/wocky/wocky-sasl-auth.c
index 6528d15..c871e57 100644
--- a/wocky/wocky-sasl-auth.c
+++ b/wocky/wocky-sasl-auth.c
@@ -28,10 +28,9 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 G_DEFINE_TYPE(WockySaslAuth, wocky_sasl_auth, G_TYPE_OBJECT)
 
diff --git a/wocky/wocky-sasl-auth.h b/wocky/wocky-sasl-auth.h
index 27cc2cc..28efa8a 100644
--- a/wocky/wocky-sasl-auth.h
+++ b/wocky/wocky-sasl-auth.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_SASL_AUTH_H__
 #define __WOCKY_SASL_AUTH_H__
diff --git a/wocky/wocky-sasl-digest-md5.c b/wocky/wocky-sasl-digest-md5.c
index 6ad7dd0..ffc44ee 100644
--- a/wocky/wocky-sasl-digest-md5.c
+++ b/wocky/wocky-sasl-digest-md5.c
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 typedef enum {
   WOCKY_SASL_DIGEST_MD5_STATE_STARTED,
diff --git a/wocky/wocky-sasl-digest-md5.h b/wocky/wocky-sasl-digest-md5.h
index 6f39bbd..0d2fdf4 100644
--- a/wocky/wocky-sasl-digest-md5.h
+++ b/wocky/wocky-sasl-digest-md5.h
@@ -1,3 +1,7 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
+
 #ifndef _WOCKY_SASL_DIGEST_MD5_H
 #define _WOCKY_SASL_DIGEST_MD5_H
 
diff --git a/wocky/wocky-sasl-plain.c b/wocky/wocky-sasl-plain.c
index 6fa193a..8b8a7f7 100644
--- a/wocky/wocky-sasl-plain.c
+++ b/wocky/wocky-sasl-plain.c
@@ -4,7 +4,7 @@
 #include "wocky-auth-registry.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void
 auth_handler_iface_init (gpointer g_iface);
diff --git a/wocky/wocky-sasl-plain.h b/wocky/wocky-sasl-plain.h
index 19bb004..9546671 100644
--- a/wocky/wocky-sasl-plain.h
+++ b/wocky/wocky-sasl-plain.h
@@ -1,3 +1,7 @@
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
+
 #ifndef _WOCKY_SASL_PLAIN_H
 #define _WOCKY_SASL_PLAIN_H
 
diff --git a/wocky/wocky-sasl-scram.c b/wocky/wocky-sasl-scram.c
index 76052eb..c0fa59f 100644
--- a/wocky/wocky-sasl-scram.c
+++ b/wocky/wocky-sasl-scram.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #define DEBUG_FLAG DEBUG_AUTH
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 typedef enum {
   WOCKY_SASL_SCRAM_STATE_STARTED,
diff --git a/wocky/wocky-sasl-scram.h b/wocky/wocky-sasl-scram.h
index 1a35551..204053b 100644
--- a/wocky/wocky-sasl-scram.h
+++ b/wocky/wocky-sasl-scram.h
@@ -1,4 +1,3 @@
-#ifndef _WOCKY_SASL_SCRAM_H
 /*
  * wocky-sasl-scram.h - SCRAM-SHA1 implementation (to be RFC 5802)
  * Copyright (C) 2010 Sjoerd Simons <sjoerd@luon.net>
@@ -17,7 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
+#ifndef _WOCKY_SASL_SCRAM_H
 #define _WOCKY_SASL_SCRAM_H
 
 #include <glib-object.h>
diff --git a/wocky/wocky-session.h b/wocky/wocky-session.h
index fc3243b..95fde2f 100644
--- a/wocky/wocky-session.h
+++ b/wocky/wocky-session.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_SESSION_H__
 #define __WOCKY_SESSION_H__
diff --git a/wocky/wocky-stanza.c b/wocky/wocky-stanza.c
index d84e050..b52f832 100644
--- a/wocky/wocky-stanza.c
+++ b/wocky/wocky-stanza.c
@@ -26,7 +26,7 @@
 #include "wocky-stanza.h"
 #include "wocky-xmpp-error.h"
 #include "wocky-namespaces.h"
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #include "wocky-node-private.h"
 
@@ -293,7 +293,7 @@ wocky_stanza_new_with_sub_type (WockyStanzaType type,
  *           #WOCKY_STANZA_SUB_TYPE_SUBSCRIBED.)
  * @from: The sender's JID, or %NULL to leave it unspecified.
  * @to: The target's JID, or %NULL to leave it unspecified.
- * @Varargs: the description of the stanza to build,
+ * @...: the description of the stanza to build,
  *  terminated with %NULL
  *
  * Build a XMPP stanza from a list of arguments.
@@ -537,7 +537,7 @@ wocky_stanza_build_iq_result_va (
  * wocky_stanza_build_iq_error:
  * @iq: a stanza of type #WOCKY_STANZA_TYPE_IQ and sub-type either
  *      #WOCKY_STANZA_SUB_TYPE_SET or #WOCKY_STANZA_SUB_TYPE_GET
- * @Varargs: a wocky_stanza_build() specification
+ * @...: a wocky_stanza_build() specification
  *
  * Builds an error reply to @iq containing the given body. This function also
  * adds the child element of @iq to the reply, as recommended by <ulink
diff --git a/wocky/wocky-stanza.h b/wocky/wocky-stanza.h
index c637cb1..9a9c4b0 100644
--- a/wocky/wocky-stanza.h
+++ b/wocky/wocky-stanza.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_STANZA_H__
 #define __WOCKY_STANZA_H__
diff --git a/wocky/wocky-tls-connector.c b/wocky/wocky-tls-connector.c
index 9cb3bf7..3176e89 100644
--- a/wocky/wocky-tls-connector.c
+++ b/wocky/wocky-tls-connector.c
@@ -26,7 +26,7 @@
 #include "wocky-tls-connector.h"
 
 #define DEBUG_FLAG DEBUG_TLS
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #include "wocky-namespaces.h"
 #include "wocky-connector.h"
diff --git a/wocky/wocky-tls-connector.h b/wocky/wocky-tls-connector.h
index a1b8e38..db9d878 100644
--- a/wocky/wocky-tls-connector.h
+++ b/wocky/wocky-tls-connector.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_TLS_CONNECTOR_H__
 #define __WOCKY_TLS_CONNECTOR_H__
diff --git a/wocky/wocky-tls-handler.c b/wocky/wocky-tls-handler.c
index e55aa1b..177a0d5 100644
--- a/wocky/wocky-tls-handler.c
+++ b/wocky/wocky-tls-handler.c
@@ -25,7 +25,7 @@
 #include "wocky-utils.h"
 
 #define DEBUG_FLAG DEBUG_TLS
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 static void
 real_verify_async (WockyTLSHandler *self,
diff --git a/wocky/wocky-tls-handler.h b/wocky/wocky-tls-handler.h
index 1fb7f76..ee3ea0c 100644
--- a/wocky/wocky-tls-handler.h
+++ b/wocky/wocky-tls-handler.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_TLS_HANDLER_H__
 #define __WOCKY_TLS_HANDLER_H__
diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c
index 069551d..54065f0 100644
--- a/wocky/wocky-tls.c
+++ b/wocky/wocky-tls.c
@@ -89,8 +89,7 @@
                          GNUTLS_VERIFY_DISABLE_TIME_CHECKS      | \
                          GNUTLS_VERIFY_DISABLE_CA_SIGN          )
 
-#include "wocky-debug.h"
-#include "wocky-tls-enumtypes.h"
+#include "wocky-debug-internal.h"
 #include "wocky-utils.h"
 
 #include <gnutls/gnutls.h>
diff --git a/wocky/wocky-tls.h b/wocky/wocky-tls.h
index 9b08c8a..57ae27f 100644
--- a/wocky/wocky-tls.h
+++ b/wocky/wocky-tls.h
@@ -22,12 +22,17 @@
  * 'g' prefixes changes to 'wocky' and server-side TLS support added.
  *
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef _wocky_tls_h_
 #define _wocky_tls_h_
 
 #include <gio/gio.h>
 
+#include "wocky-tls-enumtypes.h"
+
 #define WOCKY_TYPE_TLS_CONNECTION (wocky_tls_connection_get_type ())
 #define WOCKY_TYPE_TLS_SESSION    (wocky_tls_session_get_type ())
 #define WOCKY_TLS_SESSION(inst)   (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
diff --git a/wocky/wocky-types.h b/wocky/wocky-types.h
index 8837268..ff22426 100644
--- a/wocky/wocky-types.h
+++ b/wocky/wocky-types.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_TYPES_H__
 #define __WOCKY_TYPES_H__
diff --git a/wocky/wocky-utils.h b/wocky/wocky-utils.h
index cc143be..652c038 100644
--- a/wocky/wocky-utils.h
+++ b/wocky/wocky-utils.h
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_UTILS_H__
 #define __WOCKY_UTILS_H__
diff --git a/wocky/wocky-xep-0115-capabilities.h b/wocky/wocky-xep-0115-capabilities.h
index 69cfe6e..5d65ce3 100644
--- a/wocky/wocky-xep-0115-capabilities.h
+++ b/wocky/wocky-xep-0115-capabilities.h
@@ -18,6 +18,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_XEP_0115_CAPABILITIES_H__
 #define __WOCKY_XEP_0115_CAPABILITIES_H__
diff --git a/wocky/wocky-xmpp-connection.h b/wocky/wocky-xmpp-connection.h
index d28c33d..edbd106 100644
--- a/wocky/wocky-xmpp-connection.h
+++ b/wocky/wocky-xmpp-connection.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_XMPP_CONNECTION_H__
 #define __WOCKY_XMPP_CONNECTION_H__
diff --git a/wocky/wocky-xmpp-error.c b/wocky/wocky-xmpp-error.c
index b8f076a..290e4f4 100644
--- a/wocky/wocky-xmpp-error.c
+++ b/wocky/wocky-xmpp-error.c
@@ -25,7 +25,6 @@
 
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 /* Definitions of XMPP core stanza errors, as per RFC 3920 §9.3; plus the
  * corresponding legacy error codes as described by XEP-0086.
diff --git a/wocky/wocky-xmpp-error.h b/wocky/wocky-xmpp-error.h
index 28b92d6..826efb2 100644
--- a/wocky/wocky-xmpp-error.h
+++ b/wocky/wocky-xmpp-error.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_XMPP_ERROR_H__
 #define __WOCKY_XMPP_ERROR_H__
@@ -24,6 +27,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-node.h"
 
 /**
diff --git a/wocky/wocky-xmpp-reader.c b/wocky/wocky-xmpp-reader.c
index 17cbbda..69f7e32 100644
--- a/wocky/wocky-xmpp-reader.c
+++ b/wocky/wocky-xmpp-reader.c
@@ -42,7 +42,7 @@
 #include "wocky-stanza.h"
 
 #define DEBUG_FLAG DEBUG_XMPP_READER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 /* properties */
 enum {
diff --git a/wocky/wocky-xmpp-reader.h b/wocky/wocky-xmpp-reader.h
index 8e0b518..fd8d63b 100644
--- a/wocky/wocky-xmpp-reader.h
+++ b/wocky/wocky-xmpp-reader.h
@@ -17,11 +17,15 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_XMPP_READER_H__
 #define __WOCKY_XMPP_READER_H__
 
 #include <glib-object.h>
+#include "wocky-xmpp-reader-enumtypes.h"
 #include "wocky-stanza.h"
 
 G_BEGIN_DECLS
diff --git a/wocky/wocky-xmpp-writer.c b/wocky/wocky-xmpp-writer.c
index 2bd2438..c7d26a2 100644
--- a/wocky/wocky-xmpp-writer.c
+++ b/wocky/wocky-xmpp-writer.c
@@ -39,7 +39,7 @@
 G_DEFINE_TYPE (WockyXmppWriter, wocky_xmpp_writer, G_TYPE_OBJECT)
 
 #define DEBUG_FLAG DEBUG_XMPP_WRITER
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 /* properties */
 enum {
diff --git a/wocky/wocky-xmpp-writer.h b/wocky/wocky-xmpp-writer.h
index 17de3df..07f58e1 100644
--- a/wocky/wocky-xmpp-writer.h
+++ b/wocky/wocky-xmpp-writer.h
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#if !defined (WOCKY_H_INSIDE) && !defined (WOCKY_COMPILATION)
+# error "Only <wocky/wocky.h> can be included directly."
+#endif
 
 #ifndef __WOCKY_XMPP_WRITER_H__
 #define __WOCKY_XMPP_WRITER_H__
diff --git a/wocky/wocky.h b/wocky/wocky.h
index 78fc704..8606f7e 100644
--- a/wocky/wocky.h
+++ b/wocky/wocky.h
@@ -23,6 +23,60 @@
 
 #include <glib.h>
 
+#define WOCKY_H_INSIDE
+#include "wocky-auth-handler.h"
+#include "wocky-auth-registry.h"
+#include "wocky-bare-contact.h"
+#include "wocky-c2s-porter.h"
+#include "wocky-caps-cache.h"
+#include "wocky-caps-hash.h"
+#include "wocky-connector.h"
+#include "wocky-contact-factory.h"
+#include "wocky-contact.h"
+#include "wocky-data-form.h"
+#include "wocky-debug.h"
+#include "wocky-disco-identity.h"
+#include "wocky-jabber-auth-digest.h"
+#include "wocky-jabber-auth.h"
+#include "wocky-jabber-auth-password.h"
+#include "wocky-ll-connection-factory.h"
+#include "wocky-ll-connector.h"
+#include "wocky-ll-contact.h"
+#include "wocky-loopback-stream.h"
+#include "wocky-meta-porter.h"
+#include "wocky-muc.h"
+#include "wocky-namespaces.h"
+#include "wocky-node.h"
+#include "wocky-node-tree.h"
+#include "wocky-pep-service.h"
+#include "wocky-ping.h"
+#include "wocky-porter.h"
+#include "wocky-pubsub-helpers.h"
+#include "wocky-pubsub-node.h"
+#include "wocky-pubsub-node-protected.h"
+#include "wocky-pubsub-service.h"
+#include "wocky-pubsub-service-protected.h"
+#include "wocky-resource-contact.h"
+#include "wocky-roster.h"
+#include "wocky-sasl-auth.h"
+#include "wocky-sasl-digest-md5.h"
+#include "wocky-sasl-plain.h"
+#include "wocky-sasl-scram.h"
+#include "wocky-sasl-utils.h"
+#include "wocky-session.h"
+#include "wocky-stanza.h"
+#include "wocky-tls-connector.h"
+#include "wocky-tls.h"
+#include "wocky-tls-handler.h"
+#include "wocky-types.h"
+#include "wocky-utils.h"
+#include "wocky-xep-0115-capabilities.h"
+#include "wocky-xmpp-connection.h"
+#include "wocky-xmpp-error.h"
+#include "wocky-xmpp-reader.h"
+#include "wocky-xmpp-writer.h"
+#undef WOCKY_H_INSIDE
+
 G_BEGIN_DECLS
 
 void wocky_init (void);