diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index ae573cc09d201657915ea6adff42051bbc86cb00..1c030579b069969f989a797cb2b67d276f73e53d 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -84,15 +84,16 @@ This file is part of the QGROUNDCONTROL project
 const char* MAIN_SETTINGS_GROUP = "QGC_MAINWINDOW";
 
 #ifndef __mobile__
-const char* MainWindow::_mavlinkDockWidgetName =            "MAVLink Inspector";
-const char* MainWindow::_customCommandWidgetName =          "Custom Command";
-const char* MainWindow::_filesDockWidgetName =              "Onboard Files";
-const char* MainWindow::_uasStatusDetailsDockWidgetName =   "Status Details";
-const char* MainWindow::_uasInfoViewDockWidgetName =        "Info View";
-const char* MainWindow::_hilDockWidgetName =                "HIL Config";
-const char* MainWindow::_analyzeDockWidgetName =            "Analyze";
-
-const char* MainWindow::_visibleWidgetsKey =                "VisibleWidgets";
+static const char* _mavlinkDockWidgetName = "MAVLink Inspector";
+static const char* _customCommandWidgetName = "Custom Command";
+static const char* _filesDockWidgetName = "Onboard Files";
+static const char* _uasStatusDetailsDockWidgetName = "Status Details";
+static const char* _pfdDockWidgetName = "Primary Flight Display";
+static const char* _uasInfoViewDockWidgetName = "Info View";
+static const char* _hilDockWidgetName = "HIL Config";
+static const char* _analyzeDockWidgetName = "Analyze";
+
+static const char* _visibleWidgetsKey = "VisibleWidgets";
 #endif
 
 static MainWindow* _instance = NULL;   ///< @brief MainWindow singleton
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 5f767decd36b4913bf51c8f390ae47d396b5757a..6f8c9cba95cfa7263675a3ff114daedee5551d7c 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -227,15 +227,6 @@ private:
     QPointer<QWidget> _missionEditorView;
 
 #ifndef __mobile__
-    // Dock widget names
-    static const char* _mavlinkDockWidgetName;
-    static const char* _customCommandWidgetName;
-    static const char* _filesDockWidgetName;
-    static const char* _uasStatusDetailsDockWidgetName;
-    static const char* _uasInfoViewDockWidgetName;
-    static const char* _hilDockWidgetName;
-    static const char* _analyzeDockWidgetName;
-
     QMap<QString, QGCDockWidget*>   _mapName2DockWidget;
     QMap<QString, QAction*>         _mapName2Action;
 #endif
@@ -250,8 +241,6 @@ private:
     void _showDockWidget(const QString &name, bool show);
     void _loadVisibleWidgetsSettings(void);
     void _storeVisibleWidgetsSettings(void);
-
-    static const char* _visibleWidgetsKey;
 #endif
 
     bool                    _autoReconnect;