diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 7762eabaf..78592dd66 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -497,7 +497,6 @@ INPUT                  = src \
                          doc/main.txt \
                          doc/trace-source-list.h \
                          doc/tracing.h \
-                         doc/default-value-list.h
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
diff --git a/utils/print-default-values.cc b/utils/print-default-values.cc
deleted file mode 100644
index c4fdfdc16..000000000
--- a/utils/print-default-values.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "ns3/default-value.h"
-
-using namespace ns3;
-
-static void
-PrintOne (DefaultValueBase *value, std::ostream &os)
-{
-  os << "///  <li> \\anchor DefaultValue" << value->GetName ()
-     << " " << value->GetName () << std::endl;
-  os << "///    <ul>" << std::endl;
-  os << "///         <li>Type: " << value->GetType () << "</td></tr>" << std::endl;
-  os << "///         <li>Default value: " << value->GetDefaultValue () << "</td></tr>" << std::endl;
-  os << "///         <li>Description: " << value->GetHelp () << "</td></tr>" << std::endl;
-  os << "///    </ul>" << std::endl;
-  os << "///  </li>" << std::endl;
-}
-
-int main (int argc, char *argv[])
-{
-  std::ostream &os = std::cout;
-  os << "/// \\page ListOfDefaultValues The list of default values" << std::endl;
-  os << "/// \\defgroup ListOfDefaultValuesGroup The list of default values" << std::endl;
-  os << "/// <ul>" << std::endl;
-  for (DefaultValueList::Iterator i = DefaultValueList::Begin ();
-       i != DefaultValueList::End (); i++)
-    {
-      if ((*i)->GetName () == "help")
-	{
-	  continue;
-	}
-      PrintOne (*i, os);
-    }
-  os << "/// </ul>" << std::endl;
-  return 0;
-}
diff --git a/utils/print-trace-sources.cc b/utils/print-trace-sources.cc
index dcfe559a1..ed9411535 100644
--- a/utils/print-trace-sources.cc
+++ b/utils/print-trace-sources.cc
@@ -6,6 +6,7 @@
 #include "ns3/csma-net-device.h"
 #include "ns3/queue.h"
 #include "ns3/mobility-model-notifier.h"
+#include "ns3/default-value.h"
 
 using namespace ns3;
 
@@ -35,7 +36,7 @@ PrintSimpleText (const TraceResolver::SourceCollection *sources, std::ostream &o
       os << std::endl;
     }
 }
-void
+static void
 PrintDoxygenText (const TraceResolver::SourceCollection *sources, std::ostream &os)
 {
   uint32_t z = 0;
@@ -81,6 +82,37 @@ PrintDoxygenText (const TraceResolver::SourceCollection *sources, std::ostream &
     }
 }
 
+static void
+PrintOneDefaultValue (DefaultValueBase *value, std::ostream &os)
+{
+  os << "///  <li> \\anchor DefaultValue" << value->GetName ()
+     << " " << value->GetName () << std::endl;
+  os << "///    <ul>" << std::endl;
+  os << "///         <li>Type: " << value->GetType () << "</td></tr>" << std::endl;
+  os << "///         <li>Default value: " << value->GetDefaultValue () << "</td></tr>" << std::endl;
+  os << "///         <li>Description: " << value->GetHelp () << "</td></tr>" << std::endl;
+  os << "///    </ul>" << std::endl;
+  os << "///  </li>" << std::endl;
+}
+
+static void
+PrintDefaultValuesDoxygen (std::ostream &os)
+{
+  os << "/// \\page ListOfDefaultValues The list of default values" << std::endl;
+  os << "/// \\defgroup ListOfDefaultValuesGroup The list of default values" << std::endl;
+  os << "/// <ul>" << std::endl;
+  for (DefaultValueList::Iterator i = DefaultValueList::Begin ();
+       i != DefaultValueList::End (); i++)
+    {
+      if ((*i)->GetName () == "help")
+	{
+	  continue;
+	}
+      PrintOneDefaultValue (*i, os);
+    }
+  os << "/// </ul>" << std::endl;
+}
+
 
 int main (int argc, char *argv[])
 {
@@ -96,5 +128,8 @@ int main (int argc, char *argv[])
   NodeList::GetTraceResolver ()->CollectSources ("", TraceContext (), &collection);
   PrintDoxygenText (&collection, std::cout);
 
+
+  PrintDefaultValuesDoxygen (std::cout);
+
   return 0;
 }
diff --git a/utils/wscript b/utils/wscript
index fb58c50bf..390508478 100644
--- a/utils/wscript
+++ b/utils/wscript
@@ -40,6 +40,3 @@ def build(bld):
         if os.path.basename(obj.env['CXX']).startswith("g++"):
             obj.env.append_value('CXXFLAGS', '-fno-strict-aliasing')
 
-    obj = bld.create_ns3_program('print-default-values',
-                                 ['core'])
-    obj.source = 'print-default-values.cc'