diff --git a/Tools/CPUInfo/wscript b/Tools/CPUInfo/wscript
index 58048cebd7..914f3ea59e 100644
--- a/Tools/CPUInfo/wscript
+++ b/Tools/CPUInfo/wscript
@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         use='ap',
         blddestdir='tools',
     )
diff --git a/Tools/Replay/wscript b/Tools/Replay/wscript
index 58048cebd7..914f3ea59e 100644
--- a/Tools/Replay/wscript
+++ b/Tools/Replay/wscript
@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         use='ap',
         blddestdir='tools',
     )
diff --git a/libraries/AP_HAL_Linux/benchmarks/wscript b/libraries/AP_HAL_Linux/benchmarks/wscript
index 37a6f3f1f8..edffe3938d 100644
--- a/libraries/AP_HAL_Linux/benchmarks/wscript
+++ b/libraries/AP_HAL_Linux/benchmarks/wscript
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_benchmarks(
-        bld,
+    bld.find_benchmarks(
         use='ap',
     )
diff --git a/libraries/AP_Math/benchmarks/wscript b/libraries/AP_Math/benchmarks/wscript
index 37a6f3f1f8..edffe3938d 100644
--- a/libraries/AP_Math/benchmarks/wscript
+++ b/libraries/AP_Math/benchmarks/wscript
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_benchmarks(
-        bld,
+    bld.find_benchmarks(
         use='ap',
     )
diff --git a/libraries/AP_Math/tests/wscript b/libraries/AP_Math/tests/wscript
index e4d42f80d0..17479ab441 100644
--- a/libraries/AP_Math/tests/wscript
+++ b/libraries/AP_Math/tests/wscript
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
-    ardupilotwaf.find_tests(
-        bld,
+    bld.find_tests(
         use='ap',
     )