diff --git a/APMrover2/make.inc b/APMrover2/make.inc
index 80d4bbe691..652457e7a2 100644
--- a/APMrover2/make.inc
+++ b/APMrover2/make.inc
@@ -22,8 +22,6 @@ LIBRARIES += Butter
 LIBRARIES += AP_Buffer
 LIBRARIES += ModeFilter
 LIBRARIES += AverageFilter
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Camera
 LIBRARIES += GCS_MAVLink
diff --git a/APMrover2/wscript b/APMrover2/wscript
index 708087e4e4..3b273519b7 100644
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@@ -16,8 +16,6 @@ def build(bld):
             'AP_Navigation',
             'AP_RCMapper',
             'AP_RSSI',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
             'PID',
             'AP_Stats',
             'AP_Beacon',
diff --git a/ArduCopter/make.inc b/ArduCopter/make.inc
index df7d7d8b25..131a503bc9 100644
--- a/ArduCopter/make.inc
+++ b/ArduCopter/make.inc
@@ -32,8 +32,6 @@ LIBRARIES += AP_OpticalFlow
 LIBRARIES += AP_RSSI
 LIBRARIES += Filter
 LIBRARIES += AP_Buffer
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Vehicle
diff --git a/ArduCopter/wscript b/ArduCopter/wscript
index 208282b229..3428e068c2 100644
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@@ -24,8 +24,6 @@ def build(bld):
             'AP_Motors',
             'AP_Parachute',
             'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
             'AP_Avoidance',
             'AP_AdvancedFailsafe',
             'AP_Proximity',
diff --git a/ArduPlane/make.inc b/ArduPlane/make.inc
index 69c550c16b..2c6bf68d43 100644
--- a/ArduPlane/make.inc
+++ b/ArduPlane/make.inc
@@ -13,7 +13,6 @@ LIBRARIES += RC_Channel
 LIBRARIES += AP_RangeFinder
 LIBRARIES += Filter
 LIBRARIES += AP_Buffer
-LIBRARIES += AP_Relay
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Terrain
 LIBRARIES += AP_AdvancedFailsafe
@@ -40,7 +39,6 @@ LIBRARIES += AP_BattMonitor
 LIBRARIES += AP_Arming
 LIBRARIES += AP_BoardConfig
 LIBRARIES += AP_Frsky_Telem
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Rally
 LIBRARIES += AP_OpticalFlow
 LIBRARIES += AP_RSSI
diff --git a/ArduPlane/wscript b/ArduPlane/wscript
index c712653948..5f2bd3fb7d 100644
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@@ -18,8 +18,6 @@ def build(bld):
             'AP_Navigation',
             'AP_Parachute',
             'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
             'AP_SpdHgtControl',
             'AP_TECS',
             'AP_InertialNav',
diff --git a/ArduSub/make.inc b/ArduSub/make.inc
index d3dc16abb4..1582fcbdf5 100644
--- a/ArduSub/make.inc
+++ b/ArduSub/make.inc
@@ -26,8 +26,6 @@ LIBRARIES += AP_Motors
 LIBRARIES += AP_RangeFinder
 LIBRARIES += AP_OpticalFlow
 LIBRARIES += Filter
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Vehicle
diff --git a/ArduSub/wscript b/ArduSub/wscript
index 812420b5b6..5def0964df 100644
--- a/ArduSub/wscript
+++ b/ArduSub/wscript
@@ -18,8 +18,6 @@ def build(bld):
             'AP_LeakDetector',
             'AP_Motors',
             'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
             'AP_Proximity',
             'AP_Gripper',
             'AP_Beacon',
diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 8ffad488ec..effa6c3916 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -60,6 +60,8 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
     'AP_ICEngine',
     'AP_Frsky_Telem',
     'AP_FlashStorage',
+    'AP_Relay',
+    'AP_ServoRelayEvents',
 ]
 
 def get_legacy_defines(sketch_name):
diff --git a/mk/make.inc b/mk/make.inc
index 291be51cfd..171bfe1011 100644
--- a/mk/make.inc
+++ b/mk/make.inc
@@ -7,4 +7,5 @@ LIBRARIES += SRV_Channel
 LIBRARIES += AP_UAVCAN
 LIBRARIES += AP_ADC
 LIBRARIES += AP_Airspeed
-
+LIBRARIES += AP_Relay
+LIBRARIES += AP_ServoRelayEvents