--- a/doc/doxygen.conf	Thu Feb 18 22:02:31 2010 -0800
+++ b/doc/doxygen.conf	Fri Feb 19 08:18:12 2010 +0100
@@ -1080,8 +1080,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = RUN_SELF_TESTS \
-                         NS3_ASSERT_ENABLE \
+PREDEFINED             = NS3_ASSERT_ENABLE \
                          NS3_LOG_ENABLE
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 

--- a/wscript	Thu Feb 18 22:02:31 2010 -0800
+++ b/wscript	Fri Feb 19 08:18:12 2010 +0100
@@ -279,8 +279,6 @@
     conf.setenv(variant_name)
     env = variant_env
 
-    env.append_value('CXXDEFINES', 'RUN_SELF_TESTS')
-    
     if env['COMPILER_CXX'] == 'g++' and 'CXXFLAGS' not in os.environ:
         if conf.check_compilation_flag('-Wno-error=deprecated-declarations'):
             env.append_value('CXXFLAGS', '-Wno-error=deprecated-declarations')