diff --git a/src/contrib/wscript b/src/contrib/wscript
index 067e36e8e..806e433c3 100644
--- a/src/contrib/wscript
+++ b/src/contrib/wscript
@@ -16,7 +16,7 @@ def configure(conf):
                                  "library 'libxml-2.0 >= 2.7' not found")
     conf.sub_config('stats')
 
-    conf.write_config_header('ns3/contrib-config.h')
+    conf.write_config_header('ns3/contrib-config.h', project_root_relative=True)
 
 def build(bld):
     module = bld.create_ns3_module('contrib', ['simulator', 'common'])
diff --git a/src/core/wscript b/src/core/wscript
index faa028cdc..60a63aff5 100644
--- a/src/core/wscript
+++ b/src/core/wscript
@@ -41,7 +41,7 @@ int main ()
                                  conf.env['ENABLE_THREADING'],
                                  "<pthread.h> include not detected")
 
-    conf.write_config_header('ns3/core-config.h')
+    conf.write_config_header('ns3/core-config.h', project_root_relative=True)
 
 def build(bld):
     core = bld.create_ns3_module('core')
diff --git a/src/simulator/wscript b/src/simulator/wscript
index e4ae5c0b8..a14cf2480 100644
--- a/src/simulator/wscript
+++ b/src/simulator/wscript
@@ -31,7 +31,7 @@ def configure(conf):
 
     conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
 
-    conf.write_config_header('ns3/simulator-config.h')
+    conf.write_config_header('ns3/simulator-config.h', project_root_relative=True)
 
     if not conf.check(lib='rt', uselib='RT', define_name='HAVE_RT'):
         conf.report_optional_feature("RealTime", "Real Time Simulator",
diff --git a/src/wscript b/src/wscript
index b9192858a..166d9eaa2 100644
--- a/src/wscript
+++ b/src/wscript
@@ -67,7 +67,7 @@ def configure(conf):
 
 
 def create_ns3_module(bld, name, dependencies=()):
-    module = bld.new_task_gen('cxx', 'objects')
+    module = bld.new_task_gen('cxx')
     module.name = 'ns3-' + name
     module.target = module.name
     module.add_objects = ['ns3-' + dep for dep in dependencies]
diff --git a/waf b/waf
index 25ac3fc18..fc98af278 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 5135eaa99..163ee4fbd 100644
--- a/wscript
+++ b/wscript
@@ -499,7 +499,7 @@ def check(bld):
     "run the NS-3 unit tests"
     Scripting.build(bld)
     ## generate the trace sources list docs
-    env = bld.env
+    env = wutils.bld.env
     proc_env = wutils.get_proc_env()
     try:
         program_obj = wutils.find_program('print-introspected-doxygen', env)