diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index f1c8a2645ec7c2e818ea40c5f9fc3ae22acfeed1..2aafbf5d5fcae9cea48626d259b8f159e45f4e93 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -54,6 +54,8 @@ contains (CONFIG, QGC_DISABLE_APM_MAVLINK) {
     message("Disable APM MAVLink support")
     DEFINES += NO_ARDUPILOT_DIALECT
     CONFIG  += ArdupilotDisabled
+} else {
+    CONFIG  += ArdupilotEnabled
 }
 
 # First we select the dialect, checking for valid user selection
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index c7cbd88b6a6a848d34bfb2e0968afd1587e64a13..96ce62994814572e367e03455a68adcddc23ba08 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -961,16 +961,18 @@ SOURCES += \
         src/VehicleSetup/PX4FirmwareUpgradeThread.cc \
 }}
 
-# ArduPilot FirmwarePlugin
+# ArduPilot Specific
 
-!ArdupilotDisabled {
-    INCLUDEPATH += \
+ArdupilotEnabled {
+    HEADERS += \
         src/Settings/APMMavlinkStreamRateSettings.h \
 
     SOURCES += \
         src/Settings/APMMavlinkStreamRateSettings.cc \
 }
 
+# ArduPilot FirmwarePlugin
+
 APMFirmwarePlugin {
     RESOURCES *= src/FirmwarePlugin/APM/APMResources.qrc