diff --git a/Tools/Replay/wscript b/Tools/Replay/wscript
index 936707364e..0e3b9c28ba 100644
--- a/Tools/Replay/wscript
+++ b/Tools/Replay/wscript
@@ -17,9 +17,6 @@ def build(bld):
         name=vehicle + '_libs',
         ap_vehicle=vehicle,
         ap_libraries=bld.ap_common_vehicle_libraries() + [
-            'AP_Beacon',
-            'AP_Arming',
-            'AP_RCMapper',
             'AP_OSD',
             'AP_Avoidance',
         ],
diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 8f17317b73..d20eef7e50 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -118,6 +118,9 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
     'AP_CheckFirmware',
     'AP_ExternalControl',
     'AP_JSON',
+    'AP_Beacon',
+    'AP_Arming',
+    'AP_RCMapper',
 ]
 
 def get_legacy_defines(sketch_name, bld):