diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index a6e07ecaf8b5ff08e0dc559c5183fcf70e5f5c03..2cbf91a04b10a8b3f554c3a084080745b412765f 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -33,11 +33,11 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QHostInfo>
 #include <QSplashScreen>
-
 #include <QQuickView>
 #include <QDesktopWidget>
 #include <QScreen>
 #include <QDesktopServices>
+#include <QDockWidget>
 
 #include "QGC.h"
 #include "MAVLinkProtocol.h"
@@ -46,26 +46,27 @@ This file is part of the QGROUNDCONTROL project
 #include "QGCMAVLinkLogPlayer.h"
 #include "SettingsDialog.h"
 #include "MAVLinkDecoder.h"
-#include "UASQuickView.h"
 #include "QGCDataPlot2D.h"
 #include "Linecharts.h"
-#include "QGCTabbedInfoView.h"
-#include "UASRawStatusView.h"
 #include "FlightDisplayView.h"
-#include "FlightDisplayWidget.h"
 #include "SetupView.h"
-#include "QGCUASFileViewMulti.h"
 #include "QGCApplication.h"
 #include "QGCFileDialog.h"
 #include "QGCMessageBox.h"
-#include "QGCDockWidget.h"
 #include "MultiVehicleManager.h"
-#include "CustomCommandWidget.h"
 #include "HomePositionManager.h"
 #include "MissionEditor.h"
 #include "LogCompressor.h"
 
 #ifndef __mobile__
+#include "QGCUASFileViewMulti.h"
+#include "UASQuickView.h"
+#include "QGCTabbedInfoView.h"
+#include "UASRawStatusView.h"
+#include "CustomCommandWidget.h"
+#include "QGCDockWidget.h"
+#include "FlightDisplayWidget.h"
+#include "UASInfoWidget.h"
 #include "HILDockWidget.h"
 #endif
 
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index dc880fcc97e03ba21b6c6a8f52cc4b81572e3a7b..2c3017ce27ad073455bdd5bcb66442905532a37f 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -41,7 +41,6 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkManager.h"
 #include "LinkInterface.h"
 #include "UASInterface.h"
-#include "UASInfoWidget.h"
 #include "CameraView.h"
 #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
 #include "Mouse6dofInput.h"