Namespace debug flags.

For better or worse, we expose these to applications, so we should
namespace them. (This isn't purely theoretical: the names clash with the
same ones in Gibber within Salut.)

38 files changed, 89 insertions, 89 deletions

diff --git a/tests/wocky-test-connector-server.c b/tests/wocky-test-connector-server.c
index 5ca5bd1..9919f9e 100644
--- a/tests/wocky-test-connector-server.c
+++ b/tests/wocky-test-connector-server.c
@@ -35,7 +35,7 @@
 /* We're being a bit naughty here by including wocky-debug.h, but we're
  * internal *enough*.
  */
-#define DEBUG_FLAG DEBUG_CONNECTOR
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_CONNECTOR
 #define WOCKY_COMPILATION
 #include <wocky/wocky-debug-internal.h>
 #undef WOCKY_COMPILATION
diff --git a/wocky/wocky-auth-registry.c b/wocky/wocky-auth-registry.c
index 9b027bc..9dc1268 100644
--- a/wocky/wocky-auth-registry.c
+++ b/wocky/wocky-auth-registry.c
@@ -9,7 +9,7 @@
 #include "wocky-jabber-auth-digest.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #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 fc9a190..4431260 100644
--- a/wocky/wocky-bare-contact.c
+++ b/wocky/wocky-bare-contact.c
@@ -47,7 +47,7 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_ROSTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_ROSTER
 #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 944c183..ec89c4b 100644
--- a/wocky/wocky-c2s-porter.c
+++ b/wocky/wocky-c2s-porter.c
@@ -49,7 +49,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-contact-factory.h"
 
-#define DEBUG_FLAG DEBUG_PORTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PORTER
 #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 5ce4ef9..810f748 100644
--- a/wocky/wocky-caps-cache.c
+++ b/wocky/wocky-caps-cache.c
@@ -35,7 +35,7 @@
 #include "wocky-xmpp-reader.h"
 #include "wocky-xmpp-writer.h"
 
-#define DEBUG_FLAG DEBUG_PRESENCE
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PRESENCE
 #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 867fb80..1c18293 100644
--- a/wocky/wocky-caps-hash.c
+++ b/wocky/wocky-caps-hash.c
@@ -39,7 +39,7 @@
 #include "wocky-data-form.h"
 #include "wocky-namespaces.h"
 
-#define DEBUG_FLAG DEBUG_PRESENCE
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PRESENCE
 #include "wocky-debug-internal.h"
 
 static gint
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c
index ebc3419..a9094cc 100644
--- a/wocky/wocky-connector.c
+++ b/wocky/wocky-connector.c
@@ -98,7 +98,7 @@
 
 #include <gio/gio.h>
 
-#define DEBUG_FLAG DEBUG_CONNECTOR
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_CONNECTOR
 #include "wocky-debug-internal.h"
 
 #include "wocky-http-proxy.h"
diff --git a/wocky/wocky-contact-factory.c b/wocky/wocky-contact-factory.c
index 58521ca..48794a3 100644
--- a/wocky/wocky-contact-factory.c
+++ b/wocky/wocky-contact-factory.c
@@ -48,7 +48,7 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_ROSTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_ROSTER
 #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 eb38fa2..c63dd96 100644
--- a/wocky/wocky-contact.c
+++ b/wocky/wocky-contact.c
@@ -45,7 +45,7 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_ROSTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_ROSTER
 #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 f151b32..02d5a9d 100644
--- a/wocky/wocky-data-form.c
+++ b/wocky/wocky-data-form.c
@@ -35,7 +35,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_DATA_FORM
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_DATA_FORM
 #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
index 3880519..b9c261b 100644
--- a/wocky/wocky-debug-internal.h
+++ b/wocky/wocky-debug-internal.h
@@ -31,27 +31,27 @@ void wocky_debug_node_tree (WockyDebugFlags flag, WockyNodeTree *tree,
     const gchar *format, ...)
     G_GNUC_PRINTF (3, 4);
 
-#ifdef DEBUG_FLAG
+#ifdef WOCKY_DEBUG_FLAG
 
 #define DEBUG(format, ...) \
-  wocky_debug (DEBUG_FLAG, "%s: %s: " format, G_STRFUNC, G_STRLOC, \
+  wocky_debug (WOCKY_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,\
+  wocky_debug_stanza (WOCKY_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,\
+  wocky_debug_node_tree (WOCKY_DEBUG_FLAG, tree, "%s: " format, G_STRFUNC,\
       ##__VA_ARGS__)
 
-#define DEBUGGING wocky_debug_flag_is_set(DEBUG_FLAG)
+#define DEBUGGING wocky_debug_flag_is_set(WOCKY_DEBUG_FLAG)
 
-#endif /* DEBUG_FLAG */
+#endif /* WOCKY_DEBUG_FLAG */
 
 #else /* ENABLE_DEBUG */
 
-#ifdef DEBUG_FLAG
+#ifdef WOCKY_DEBUG_FLAG
 
 static inline void
 DEBUG (
@@ -77,7 +77,7 @@ DEBUG_NODE_TREE (WockyNodeTree *tree,
 
 #define DEBUGGING 0
 
-#endif /* DEBUG_FLAG */
+#endif /* WOCKY_DEBUG_FLAG */
 
 #endif /* ENABLE_DEBUG */
 
diff --git a/wocky/wocky-debug.c b/wocky/wocky-debug.c
index 0af0a32..ecbb5a0 100644
--- a/wocky/wocky-debug.c
+++ b/wocky/wocky-debug.c
@@ -11,28 +11,28 @@ static WockyDebugFlags flags = 0;
 static gboolean initialized = FALSE;
 
 static GDebugKey keys[] = {
-  { "transport",         DEBUG_TRANSPORT         },
-  { "net",               DEBUG_NET               },
-  { "xmpp",              DEBUG_XMPP              },
-  { "xmpp-reader",       DEBUG_XMPP_READER       },
-  { "xmpp-writer",       DEBUG_XMPP_WRITER       },
-  { "auth",              DEBUG_AUTH              },
-  { "ssl",               DEBUG_SSL               },
-  { "rmulticast",        DEBUG_RMULTICAST        },
-  { "rmulticast-sender", DEBUG_RMULTICAST_SENDER },
-  { "muc-connection",    DEBUG_MUC_CONNECTION    },
-  { "bytestream",        DEBUG_BYTESTREAM        },
-  { "ft",                DEBUG_FILE_TRANSFER     },
-  { "porter",            DEBUG_PORTER            },
-  { "connector",         DEBUG_CONNECTOR         },
-  { "roster",            DEBUG_ROSTER            },
-  { "tls",               DEBUG_TLS               },
-  { "pubsub",            DEBUG_PUBSUB            },
-  { "dataform",          DEBUG_DATA_FORM         },
-  { "ping",              DEBUG_PING              },
-  { "heartbeat",         DEBUG_HEARTBEAT         },
-  { "presence",          DEBUG_PRESENCE          },
-  { "connection-factory",DEBUG_CONNECTION_FACTORY},
+  { "transport",         WOCKY_DEBUG_TRANSPORT         },
+  { "net",               WOCKY_DEBUG_NET               },
+  { "xmpp",              WOCKY_DEBUG_XMPP              },
+  { "xmpp-reader",       WOCKY_DEBUG_XMPP_READER       },
+  { "xmpp-writer",       WOCKY_DEBUG_XMPP_WRITER       },
+  { "auth",              WOCKY_DEBUG_AUTH              },
+  { "ssl",               WOCKY_DEBUG_SSL               },
+  { "rmulticast",        WOCKY_DEBUG_RMULTICAST        },
+  { "rmulticast-sender", WOCKY_DEBUG_RMULTICAST_SENDER },
+  { "muc-connection",    WOCKY_DEBUG_MUC_CONNECTION    },
+  { "bytestream",        WOCKY_DEBUG_BYTESTREAM        },
+  { "ft",                WOCKY_DEBUG_FILE_TRANSFER     },
+  { "porter",            WOCKY_DEBUG_PORTER            },
+  { "connector",         WOCKY_DEBUG_CONNECTOR         },
+  { "roster",            WOCKY_DEBUG_ROSTER            },
+  { "tls",               WOCKY_DEBUG_TLS               },
+  { "pubsub",            WOCKY_DEBUG_PUBSUB            },
+  { "dataform",          WOCKY_DEBUG_DATA_FORM         },
+  { "ping",              WOCKY_DEBUG_PING              },
+  { "heartbeat",         WOCKY_DEBUG_HEARTBEAT         },
+  { "presence",          WOCKY_DEBUG_PRESENCE          },
+  { "connection-factory",WOCKY_DEBUG_CONNECTION_FACTORY},
   { 0, },
 };
 
diff --git a/wocky/wocky-debug.h b/wocky/wocky-debug.h
index f3f5324..ba8e4bc 100644
--- a/wocky/wocky-debug.h
+++ b/wocky/wocky-debug.h
@@ -10,30 +10,30 @@ G_BEGIN_DECLS
 typedef enum
 {
   /*< private > */
-  DEBUG_TRANSPORT         = 1 << 0,
-  DEBUG_NET               = 1 << 1,
-  DEBUG_XMPP_READER       = 1 << 2,
-  DEBUG_XMPP_WRITER       = 1 << 3,
-  DEBUG_AUTH              = 1 << 4,
-  DEBUG_SSL               = 1 << 5,
-  DEBUG_RMULTICAST        = 1 << 6,
-  DEBUG_RMULTICAST_SENDER = 1 << 7,
-  DEBUG_MUC_CONNECTION    = 1 << 8,
-  DEBUG_BYTESTREAM        = 1 << 9,
-  DEBUG_FILE_TRANSFER     = 1 << 10,
-  DEBUG_PORTER            = 1 << 11,
-  DEBUG_CONNECTOR         = 1 << 12,
-  DEBUG_ROSTER            = 1 << 13,
-  DEBUG_TLS               = 1 << 14,
-  DEBUG_PUBSUB            = 1 << 15,
-  DEBUG_DATA_FORM         = 1 << 16,
-  DEBUG_PING              = 1 << 17,
-  DEBUG_HEARTBEAT         = 1 << 18,
-  DEBUG_PRESENCE          = 1 << 19,
-  DEBUG_CONNECTION_FACTORY= 1 << 20,
+  WOCKY_DEBUG_TRANSPORT         = 1 << 0,
+  WOCKY_DEBUG_NET               = 1 << 1,
+  WOCKY_DEBUG_XMPP_READER       = 1 << 2,
+  WOCKY_DEBUG_XMPP_WRITER       = 1 << 3,
+  WOCKY_DEBUG_AUTH              = 1 << 4,
+  WOCKY_DEBUG_SSL               = 1 << 5,
+  WOCKY_DEBUG_RMULTICAST        = 1 << 6,
+  WOCKY_DEBUG_RMULTICAST_SENDER = 1 << 7,
+  WOCKY_DEBUG_MUC_CONNECTION    = 1 << 8,
+  WOCKY_DEBUG_BYTESTREAM        = 1 << 9,
+  WOCKY_DEBUG_FILE_TRANSFER     = 1 << 10,
+  WOCKY_DEBUG_PORTER            = 1 << 11,
+  WOCKY_DEBUG_CONNECTOR         = 1 << 12,
+  WOCKY_DEBUG_ROSTER            = 1 << 13,
+  WOCKY_DEBUG_TLS               = 1 << 14,
+  WOCKY_DEBUG_PUBSUB            = 1 << 15,
+  WOCKY_DEBUG_DATA_FORM         = 1 << 16,
+  WOCKY_DEBUG_PING              = 1 << 17,
+  WOCKY_DEBUG_HEARTBEAT         = 1 << 18,
+  WOCKY_DEBUG_PRESENCE          = 1 << 19,
+  WOCKY_DEBUG_CONNECTION_FACTORY= 1 << 20,
 } WockyDebugFlags;
 
-#define DEBUG_XMPP (DEBUG_XMPP_READER | DEBUG_XMPP_WRITER)
+#define WOCKY_DEBUG_XMPP (WOCKY_DEBUG_XMPP_READER | WOCKY_DEBUG_XMPP_WRITER)
 
 void wocky_debug_set_flags (WockyDebugFlags flags);
 
diff --git a/wocky/wocky-disco-identity.c b/wocky/wocky-disco-identity.c
index 70316ac..9da159b 100644
--- a/wocky/wocky-disco-identity.c
+++ b/wocky/wocky-disco-identity.c
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#define DEBUG_FLAG DEBUG_PRESENCE
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PRESENCE
 #include "wocky-debug-internal.h"
 
 G_DEFINE_BOXED_TYPE (WockyDiscoIdentity, wocky_disco_identity,
diff --git a/wocky/wocky-heartbeat-source.c b/wocky/wocky-heartbeat-source.c
index d0ae396..9c8f8c7 100644
--- a/wocky/wocky-heartbeat-source.c
+++ b/wocky/wocky-heartbeat-source.c
@@ -23,7 +23,7 @@
 
 #include <errno.h>
 
-#define DEBUG_FLAG DEBUG_HEARTBEAT
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_HEARTBEAT
 #include "wocky-debug-internal.h"
 
 #ifdef HAVE_IPHB
diff --git a/wocky/wocky-jabber-auth-digest.c b/wocky/wocky-jabber-auth-digest.c
index 42f9854..021b5aa 100644
--- a/wocky/wocky-jabber-auth-digest.c
+++ b/wocky/wocky-jabber-auth-digest.c
@@ -2,7 +2,7 @@
 #include "wocky-jabber-auth-digest.h"
 
 #include "wocky-auth-registry.h"
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #include "wocky-debug-internal.h"
 
 static void
diff --git a/wocky/wocky-jabber-auth-password.c b/wocky/wocky-jabber-auth-password.c
index a2b4ecf..61e8b3b 100644
--- a/wocky/wocky-jabber-auth-password.c
+++ b/wocky/wocky-jabber-auth-password.c
@@ -2,7 +2,7 @@
 #include "wocky-jabber-auth-password.h"
 
 #include "wocky-auth-registry.h"
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #include "wocky-debug-internal.h"
 
 static void
diff --git a/wocky/wocky-jabber-auth.c b/wocky/wocky-jabber-auth.c
index acce5e2..937ac2b 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -28,7 +28,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #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 9f0f4bd..998fe12 100644
--- a/wocky/wocky-ll-connection-factory.c
+++ b/wocky/wocky-ll-connection-factory.c
@@ -25,7 +25,7 @@
 
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_CONNECTION_FACTORY
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_CONNECTION_FACTORY
 #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 e66a97d..fdf7d3a 100644
--- a/wocky/wocky-ll-connector.c
+++ b/wocky/wocky-ll-connector.c
@@ -28,7 +28,7 @@
 #include "wocky-utils.h"
 #include "wocky-namespaces.h"
 
-#define DEBUG_FLAG DEBUG_CONNECTOR
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_CONNECTOR
 #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 ec90dbe..8749bdb 100644
--- a/wocky/wocky-meta-porter.c
+++ b/wocky/wocky-meta-porter.c
@@ -42,7 +42,7 @@ typedef uint16_t u_int16_t;
 #include "wocky-ll-connector.h"
 #include "wocky-loopback-stream.h"
 
-#define DEBUG_FLAG DEBUG_PORTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PORTER
 #include "wocky-debug-internal.h"
 
 static void wocky_porter_iface_init (gpointer g_iface,
diff --git a/wocky/wocky-muc.c b/wocky/wocky-muc.c
index 10c486e..6105c97 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <time.h>
 
-#define DEBUG_FLAG DEBUG_MUC_CONNECTION
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_MUC_CONNECTION
 #include "wocky-debug-internal.h"
 
 #include "wocky-muc.h"
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c
index 1345891..c9fd71f 100644
--- a/wocky/wocky-openssl.c
+++ b/wocky/wocky-openssl.c
@@ -57,7 +57,7 @@
 #include <openssl/engine.h>
 #include <openssl/x509v3.h>
 
-#define DEBUG_FLAG DEBUG_TLS
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_TLS
 #define DEBUG_HANDSHAKE_LEVEL 5
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
diff --git a/wocky/wocky-pep-service.c b/wocky/wocky-pep-service.c
index 59bcda7..5bf80f6 100644
--- a/wocky/wocky-pep-service.c
+++ b/wocky/wocky-pep-service.c
@@ -34,7 +34,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-signals-marshal.h"
 
-#define DEBUG_FLAG DEBUG_PUBSUB
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PUBSUB
 #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 1312251..b1ff290 100644
--- a/wocky/wocky-ping.c
+++ b/wocky/wocky-ping.c
@@ -32,7 +32,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-stanza.h"
 
-#define DEBUG_FLAG DEBUG_PING
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PING
 #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 f829f1b..5b3bdc8 100644
--- a/wocky/wocky-pubsub-node.c
+++ b/wocky/wocky-pubsub-node.c
@@ -28,7 +28,7 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_PUBSUB
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PUBSUB
 #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 63964ac..c360f92 100644
--- a/wocky/wocky-pubsub-service.c
+++ b/wocky/wocky-pubsub-service.c
@@ -29,7 +29,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-signals-marshal.h"
 
-#define DEBUG_FLAG DEBUG_PUBSUB
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_PUBSUB
 #include "wocky-debug-internal.h"
 
 static gboolean pubsub_service_propagate_event (WockyPorter *porter,
diff --git a/wocky/wocky-resource-contact.c b/wocky/wocky-resource-contact.c
index 94bcf7d..67b207a 100644
--- a/wocky/wocky-resource-contact.c
+++ b/wocky/wocky-resource-contact.c
@@ -45,7 +45,7 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_ROSTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_ROSTER
 #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 c91c477..a03f04d 100644
--- a/wocky/wocky-roster.c
+++ b/wocky/wocky-roster.c
@@ -42,7 +42,7 @@
 #include "wocky-porter.h"
 #include "wocky-session.h"
 
-#define DEBUG_FLAG DEBUG_ROSTER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_ROSTER
 #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 c871e57..a9d67ea 100644
--- a/wocky/wocky-sasl-auth.c
+++ b/wocky/wocky-sasl-auth.c
@@ -29,7 +29,7 @@
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #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 ffc44ee..f2e42c7 100644
--- a/wocky/wocky-sasl-digest-md5.c
+++ b/wocky/wocky-sasl-digest-md5.c
@@ -5,7 +5,7 @@
 
 #include <string.h>
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #include "wocky-debug-internal.h"
 
 typedef enum {
diff --git a/wocky/wocky-sasl-plain.c b/wocky/wocky-sasl-plain.c
index 8b8a7f7..3063372 100644
--- a/wocky/wocky-sasl-plain.c
+++ b/wocky/wocky-sasl-plain.c
@@ -3,7 +3,7 @@
 
 #include "wocky-auth-registry.h"
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #include "wocky-debug-internal.h"
 
 static void
diff --git a/wocky/wocky-sasl-scram.c b/wocky/wocky-sasl-scram.c
index c0fa59f..26a4037 100644
--- a/wocky/wocky-sasl-scram.c
+++ b/wocky/wocky-sasl-scram.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#define DEBUG_FLAG DEBUG_AUTH
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_AUTH
 #include "wocky-debug-internal.h"
 
 typedef enum {
diff --git a/wocky/wocky-tls-connector.c b/wocky/wocky-tls-connector.c
index 3176e89..e824e5f 100644
--- a/wocky/wocky-tls-connector.c
+++ b/wocky/wocky-tls-connector.c
@@ -25,7 +25,7 @@
 
 #include "wocky-tls-connector.h"
 
-#define DEBUG_FLAG DEBUG_TLS
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_TLS
 #include "wocky-debug-internal.h"
 
 #include "wocky-namespaces.h"
diff --git a/wocky/wocky-tls-handler.c b/wocky/wocky-tls-handler.c
index 177a0d5..95494fd 100644
--- a/wocky/wocky-tls-handler.c
+++ b/wocky/wocky-tls-handler.c
@@ -24,7 +24,7 @@
 #include "wocky-tls-handler.h"
 #include "wocky-utils.h"
 
-#define DEBUG_FLAG DEBUG_TLS
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_TLS
 #include "wocky-debug-internal.h"
 
 static void
diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c
index 54065f0..609688b 100644
--- a/wocky/wocky-tls.c
+++ b/wocky/wocky-tls.c
@@ -76,7 +76,7 @@
   "+COMP-NULL"     /* fall back to null */
 #endif
 
-#define DEBUG_FLAG DEBUG_TLS
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_TLS
 #define DEBUG_HANDSHAKE_LEVEL 5
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
diff --git a/wocky/wocky-xmpp-reader.c b/wocky/wocky-xmpp-reader.c
index 69f7e32..7e2a452 100644
--- a/wocky/wocky-xmpp-reader.c
+++ b/wocky/wocky-xmpp-reader.c
@@ -41,7 +41,7 @@
 
 #include "wocky-stanza.h"
 
-#define DEBUG_FLAG DEBUG_XMPP_READER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_XMPP_READER
 #include "wocky-debug-internal.h"
 
 /* properties */
@@ -686,7 +686,7 @@ wocky_xmpp_reader_push (WockyXmppReader *reader, const guint8 *data,
   g_return_if_fail (priv->state < WOCKY_XMPP_READER_STATE_CLOSED);
 
 #ifdef ENABLE_DEBUG
-  wocky_debug (DEBUG_NET, "Parsing chunk: %.*s", (int)length, data);
+  wocky_debug (WOCKY_DEBUG_NET, "Parsing chunk: %.*s", (int)length, data);
 #endif
 
   parser = priv->parser;
diff --git a/wocky/wocky-xmpp-writer.c b/wocky/wocky-xmpp-writer.c
index c7d26a2..67a95ac 100644
--- a/wocky/wocky-xmpp-writer.c
+++ b/wocky/wocky-xmpp-writer.c
@@ -38,7 +38,7 @@
 
 G_DEFINE_TYPE (WockyXmppWriter, wocky_xmpp_writer, G_TYPE_OBJECT)
 
-#define DEBUG_FLAG DEBUG_XMPP_WRITER
+#define WOCKY_DEBUG_FLAG WOCKY_DEBUG_XMPP_WRITER
 #include "wocky-debug-internal.h"
 
 /* properties */
@@ -450,7 +450,7 @@ _write_node_tree (WockyXmppWriter *writer,
   *length  = priv->buffer->use;
 
 #ifdef ENABLE_DEBUG
-  wocky_debug (DEBUG_NET, "Writing xml: %.*s", (int)*length, *data);
+  wocky_debug (WOCKY_DEBUG_NET, "Writing xml: %.*s", (int)*length, *data);
 #endif
 }