diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 2c50ce0bcda8a3965d826db5fda6b3c7adda48ce..a8033a3888b0ac6c7d854f6b3613ca6fdc7befea 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -141,6 +141,9 @@ INCLUDEPATH += $$MAVLINKPATH
 #
 contains(DEFINES, ENABLE_MAVGEN) {
 	warning("Including support for MAVLink generator GUI (caution: deprecated)")
+	# Rename the macro to be consistent with other QGC feature existance macros.
+	DEFINES -= ENABLE_MAVGEN
+	DEFINES += QGC_MAVGEN_ENABLED
 	DEPENDPATH += \
 		src/apps/mavlinkgen
 
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 734f293aedc6aa28ff7a30588077cc7ac0d307d9..51a0ea6f234154d8e93e8cafb86d47e5b2630fb8 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -70,10 +70,10 @@ This file is part of the QGROUNDCONTROL project
 #include <QGCConfigView.h>
 #include "SerialSettingsDialog.h"
 #include "terminalconsole.h"
-#include "menuactionhelper.h"
-
+#include "menuactionhelper.h"
+
 // Add support for the MAVLink generator UI if it's been requested.
-#ifdef ENABLE_MAVGEN
+#ifdef QGC_MAVGEN_ENABLED
 #include "XMLCommProtocolWidget.h"
 #endif
 
@@ -550,13 +550,13 @@ void MainWindow::buildCommonWidgets()
         engineeringView->setObjectName("VIEW_ENGINEER");
         engineeringView->setCentralWidget(new QGCDataPlot2D(this));
         addToCentralStackedWidget(engineeringView, VIEW_ENGINEER, tr("Logfile Plot"));
-    }
-
+    }
+
 // Add the MAVLink generator UI if it's been requested.
-#ifdef ENABLE_MAVGEN
-    if (!mavlinkView)
-    {
-        mavlinkView = new SubMainWindow(this);
+#ifdef QGC_MAVGEN_ENABLED
+    if (!mavlinkView)
+    {
+        mavlinkView = new SubMainWindow(this);
         mavlinkView->setObjectName("VIEW_MAVLINK");
         mavlinkView->setCentralWidget(new XMLCommProtocolWidget(this));
         addToCentralStackedWidget(mavlinkView, VIEW_MAVLINK, tr("Mavlink Generator"));