diff --git a/APMrover2/wscript b/APMrover2/wscript
index 119d6be607..ab334221a1 100644
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@@ -1,15 +1,12 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
     vehicle = bld.path.name
-    ardupilotwaf.ap_stlib(
-        bld,
+    bld.ap_stlib(
         name=vehicle + '_libs',
         vehicle=vehicle,
-        libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [
+        libraries=bld.common_vehicle_libraries() + [
             'APM_Control',
             'AP_Arming',
             'AP_Camera',
@@ -27,8 +24,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         program_name='ardurover',
         use=vehicle + '_libs',
     )
diff --git a/AntennaTracker/wscript b/AntennaTracker/wscript
index 7c48826bd4..090cf60235 100644
--- a/AntennaTracker/wscript
+++ b/AntennaTracker/wscript
@@ -1,22 +1,18 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
     vehicle = bld.path.name
-    ardupilotwaf.ap_stlib(
-        bld,
+    bld.ap_stlib(
         name=vehicle + '_libs',
         vehicle=vehicle,
-        libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [
+        libraries=bld.common_vehicle_libraries() + [
             'PID',
         ],
         use='mavlink',
     )
 
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         program_name='antennatracker',
         use=vehicle + '_libs',
     )
diff --git a/ArduCopter/wscript b/ArduCopter/wscript
index e9b634c46d..e024c719ba 100644
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@@ -1,15 +1,12 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
     vehicle = bld.path.name
-    ardupilotwaf.ap_stlib(
-        bld,
+    bld.ap_stlib(
         name=vehicle + '_libs',
         vehicle=vehicle,
-        libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [
+        libraries=bld.common_vehicle_libraries() + [
             'AP_ADSB',
             'AC_AttitudeControl',
             'AC_Fence',
@@ -36,8 +33,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         program_name='arducopter',
         use=vehicle + '_libs',
     )
diff --git a/ArduPlane/wscript b/ArduPlane/wscript
index c5f4c18361..ddfc19b7f3 100644
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@@ -1,15 +1,12 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
     vehicle = bld.path.name
-    ardupilotwaf.ap_stlib(
-        bld,
+    bld.ap_stlib(
         name=vehicle + '_libs',
         vehicle=vehicle,
-        libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [
+        libraries=bld.common_vehicle_libraries() + [
             'APM_Control',
             'APM_OBC',
             'AP_ADSB',
@@ -37,8 +34,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.ap_program(
-        bld,
+    bld.ap_program(
         program_name='arduplane',
         use=vehicle + '_libs',
     )