diff --git a/src/common/trace-writer.cc b/src/common/trace-writer.cc
index 397ad0ade..b7e11add5 100644
--- a/src/common/trace-writer.cc
+++ b/src/common/trace-writer.cc
@@ -24,13 +24,11 @@
 #include "ns3/debug.h"
 #include "trace-writer.h"
 
+NS_DEBUG_COMPONENT_DEFINE ("TraceWriter");
+
 namespace ns3 {
 
-namespace {
-  int twDebug = 0;
-}
-
-  void
+void
 TraceWriter::Init (const char *filename)
 {
   NS_DEBUG("TraceWriter()::Init(" << filename << ")")
diff --git a/src/node/drop-tail.cc b/src/node/drop-tail.cc
index 9f6ecd653..f4a597faf 100644
--- a/src/node/drop-tail.cc
+++ b/src/node/drop-tail.cc
@@ -20,11 +20,9 @@
 #include "ns3/debug.h"
 #include "drop-tail.h"
 
-namespace ns3 {
+NS_DEBUG_COMPONENT_DEFINE ("DropTailQueue");
 
-namespace {
-  int dtqDebug = 0;
-}
+namespace ns3 {
 
 DropTailQueue::DropTailQueue () :
     m_packets (),
diff --git a/src/node/queue.cc b/src/node/queue.cc
index 00cbcd0b8..546a173bc 100644
--- a/src/node/queue.cc
+++ b/src/node/queue.cc
@@ -20,11 +20,9 @@
 #include "ns3/debug.h"
 #include "queue.h"
 
-namespace ns3 {
+NS_DEBUG_COMPONENT_DEFINE ("Queue");
 
-namespace {
-  int qDebug = 0;
-}
+namespace ns3 {
 
 Queue::Queue() : 
   m_nBytes(0),