Move most of debug.h to debug-internal.h

Gabble uses a couple of bits of this API to turn on a little bit of
Wocky's debug output for the purposes of the D-Bus debugging interface,
so making debug.h internal-only is not going to fly. However, most of it
really is internal-only.

40 files changed, 124 insertions, 101 deletions

diff --git a/tests/wocky-test-connector-server.c b/tests/wocky-test-connector-server.c
index 45c3f28..5ca5bd1 100644
--- a/tests/wocky-test-connector-server.c
+++ b/tests/wocky-test-connector-server.c
@@ -37,7 +37,7 @@
  */
 #define DEBUG_FLAG DEBUG_CONNECTOR
 #define WOCKY_COMPILATION
-#include <wocky/wocky-debug.h>
+#include <wocky/wocky-debug-internal.h>
 #undef WOCKY_COMPILATION
 
 G_DEFINE_TYPE (TestConnectorServer, test_connector_server, G_TYPE_OBJECT);
diff --git a/wocky/Makefile.am b/wocky/Makefile.am
index 5a801b9..11bee8c 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 \
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-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-c2s-porter.c b/wocky/wocky-c2s-porter.c
index ace7739..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);
 
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-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-connector.c b/wocky/wocky-connector.c
index f2f5aa5..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"
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.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-data-form.c b/wocky/wocky-data-form.c
index 5b4fe65..f151b32 100644
--- a/wocky/wocky-data-form.c
+++ b/wocky/wocky-data-form.c
@@ -36,7 +36,7 @@
 #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-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..4d833aa 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
 
diff --git a/wocky/wocky-debug.h b/wocky/wocky-debug.h
index ac5f812..19a8f75 100644
--- a/wocky/wocky-debug.h
+++ b/wocky/wocky-debug.h
@@ -7,10 +7,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
-#include "wocky-stanza.h"
-
 G_BEGIN_DECLS
 
 #ifdef ENABLE_DEBUG
@@ -43,70 +39,10 @@ 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-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-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-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.c b/wocky/wocky-jabber-auth.c
index 6af74f4..acce5e2 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -29,7 +29,7 @@
 #include "wocky-utils.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-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-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-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-muc.c b/wocky/wocky-muc.c
index e6a187c..10c486e 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -22,7 +22,7 @@
 #include <time.h>
 
 #define DEBUG_FLAG DEBUG_MUC_CONNECTION
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 
 #include "wocky-muc.h"
 #include "wocky-namespaces.h"
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c
index c89c92a..1345891 100644
--- a/wocky/wocky-openssl.c
+++ b/wocky/wocky-openssl.c
@@ -61,7 +61,7 @@
 #define DEBUG_HANDSHAKE_LEVEL 5
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
-#include "wocky-debug.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-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-pubsub-node.c b/wocky/wocky-pubsub-node.c
index 50bda12..a5d1810 100644
--- a/wocky/wocky-pubsub-node.c
+++ b/wocky/wocky-pubsub-node.c
@@ -28,7 +28,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-service.c b/wocky/wocky-pubsub-service.c
index 92f7f10..ce92329 100644
--- a/wocky/wocky-pubsub-service.c
+++ b/wocky/wocky-pubsub-service.c
@@ -29,7 +29,7 @@
 #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-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-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-sasl-auth.c b/wocky/wocky-sasl-auth.c
index 3acf7e1..c871e57 100644
--- a/wocky/wocky-sasl-auth.c
+++ b/wocky/wocky-sasl-auth.c
@@ -30,7 +30,7 @@
 #include "wocky-utils.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-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-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-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-stanza.c b/wocky/wocky-stanza.c
index 5b7852d..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"
 
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-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.c b/wocky/wocky-tls.c
index 8d837ed..54065f0 100644
--- a/wocky/wocky-tls.c
+++ b/wocky/wocky-tls.c
@@ -89,7 +89,7 @@
                          GNUTLS_VERIFY_DISABLE_TIME_CHECKS      | \
                          GNUTLS_VERIFY_DISABLE_CA_SIGN          )
 
-#include "wocky-debug.h"
+#include "wocky-debug-internal.h"
 #include "wocky-utils.h"
 
 #include <gnutls/gnutls.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-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 {