diff --git a/conf/airframes/examples/funjet.xml b/conf/airframes/examples/funjet.xml
index 151f823b26..2cb5c2318b 100644
--- a/conf/airframes/examples/funjet.xml
+++ b/conf/airframes/examples/funjet.xml
@@ -18,10 +18,10 @@
     <define name="LOITER_TRIM"/>
 
     <subsystem name="radio_control" type="ppm"/>
-    <subsystem name="joystick"/>
 
     <!-- Communication -->
     <subsystem name="telemetry" 	type="transparent"/>
+    <define name="USE_JOYSTICK" value="TRUE"/>
 
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control"/>
diff --git a/conf/airframes/examples/funjet_cam.xml b/conf/airframes/examples/funjet_cam.xml
index df4f9fd492..b91d524560 100644
--- a/conf/airframes/examples/funjet_cam.xml
+++ b/conf/airframes/examples/funjet_cam.xml
@@ -18,10 +18,10 @@
     <define name="LOITER_TRIM"/>
 
     <subsystem name="radio_control" type="ppm"/>
-    <subsystem name="joystick"/>
 
     <!-- Communication -->
     <subsystem name="telemetry" 	type="transparent"/>
+    <define name="USE_JOYSTICK" value="TRUE"/>
 
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control"/>
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
index 21b49f2d4b..a5508b17cc 100644
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/twinjet_overo.xml
@@ -26,8 +26,8 @@
     <subsystem name="ahrs"          type="infrared"/>
     <subsystem name="gps"           type="ublox_hitl"/>
     <subsystem name="navigation"/>
-    <subsystem name="joystick"/>
     <subsystem name="ins"           type="gps_passthrough"/>
+    <define name="USE_JOYSTICK" value="TRUE"/>
   </firmware>
 
   <firmware name="setup">