diff --git a/bindings/python/wscript b/bindings/python/wscript
index cf42345f5..027a17c2f 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -133,14 +133,6 @@ def configure(conf):
         conf.report_optional_feature("python", "Python Bindings", False, str(ex))
         return
 
-    # Fix a bug with WAF and g++ 4.3.2 (it does not include "(GCC") in
-    # the output of g++ --version, so the WAF python detection fails
-    # to recognize it is gcc)
-    gcc_version = os.popen("%s --version" % conf.env['CXX']).readline()
-    if '(GCC)' in gcc_version or 'g++' in gcc_version:
-        conf.env.append_value('CXXFLAGS_PYEMBED','-fno-strict-aliasing')
-        conf.env.append_value('CXXFLAGS_PYEXT','-fno-strict-aliasing')
-
     ## Check for pybindgen
 
     no_net = False
@@ -508,7 +500,7 @@ def build(bld):
         pymod.target = 'ns3/_ns3'
         pymod.name = 'ns3module'
         pymod.uselib_local = "ns3"
-        pymod.env.append_value('CXXDEFINES', ['NS_DEPRECATED=""', 'NS3_DEPRECATED_H'])
+        pymod.env.append_value('CXXDEFINES', ['NS_DEPRECATED=', 'NS3_DEPRECATED_H'])
 
         # copy the __init__.py file to the build dir. waf can't handle
         # this, it's against waf's principles to have build dir files
diff --git a/waf b/waf
index d39436405..886a0e7f8 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index b0167472a..0146d5351 100644
--- a/wscript
+++ b/wscript
@@ -12,7 +12,10 @@ import pproc as subprocess
 import Options
 import Logs
 import TaskGen
+
 import ccroot
+ccroot.USE_TOP_LEVEL = True
+
 import Task
 import Utils
 import Build