diff --git a/build.py b/build.py
index 7cc97f100..ce5e7af2e 100755
--- a/build.py
+++ b/build.py
@@ -90,8 +90,8 @@
 
 # Some tools will be downloaded for the builds. These are the versions and
 # MD5s of the tool binaries currently in use.
-wafCurrentVersion = '2.0.24'
-wafMD5 = '698f382cca34a08323670f34830325c4'
+wafCurrentVersion = '2.1.2'
+wafMD5 = '8ff717c068819e488a337030ec8abf6c'
 
 doxygenCurrentVersion = '1.8.8'
 doxygenMD5 = {
diff --git a/wscript b/wscript
index e26dabbe9..79bdf3e15 100644
--- a/wscript
+++ b/wscript
@@ -91,13 +91,7 @@ def configure(conf):
         conf.env.PYTHON = conf.options.python
     conf.load('python')
     conf.check_python_version(minver=(3,7,0))
-    if isWindows:
-        # Search for the Python headers without doing some stuff that could
-        # incorrectly fail on Windows. See my_check_python_headers below.
-        # TODO: Check if it can/should be used on other platforms too.
-        conf.my_check_python_headers()
-    else:
-        conf.check_python_headers(features='pyext')
+    conf.check_python_headers(features='pyext')
 
     # fetch and save the debug options
     conf.env.debug = conf.options.debug