diff --git a/src/AutoPilotPlugins/AutoPilotPlugin.cc b/src/AutoPilotPlugins/AutoPilotPlugin.cc
index c72b95c7e37e7eaf7f65132ab9be25e0b0fcd98c..142643a9f6ef95c9ef1c6bfc06c6bdc7b27d7595 100644
--- a/src/AutoPilotPlugins/AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/AutoPilotPlugin.cc
@@ -29,6 +29,7 @@
 #include "QGCMessageBox.h"
 #include "MainWindow.h"
 #include "ParameterLoader.h"
+#include "UAS.h"
 
 AutoPilotPlugin::AutoPilotPlugin(Vehicle* vehicle, QObject* parent)
     : QObject(parent)
diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
index eb682c82239be88bc903af7ddf73767bd6bd6925..2507d349226ee6778e29f803a07b816611ab2a16 100644
--- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
@@ -28,6 +28,7 @@
 #include "FlightModesComponentController.h"
 #include "AirframeComponentController.h"
 #include "QGCMessageBox.h"
+#include "UAS.h"
 
 /// @file
 ///     @brief This is the AutoPilotPlugin implementatin for the MAV_AUTOPILOT_PX4 type.
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.cc b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
index d9cd80fb04fa3100bc9eb939aa3a23984f0932a8..416caf928c2f18d8f2186ae518201c8849382038 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
@@ -27,6 +27,7 @@
 #include "PowerComponentController.h"
 #include "QGCMAVLink.h"
 #include "QGCMessageBox.h"
+#include "UAS.h"
 
 #include <QVariant>
 #include <QQmlProperty>
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
index 81c0f16f0915cef4b60f9f26259825aff44b12c5..77693e7c3734e568cce51c6f942ae688926f248f 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
@@ -27,6 +27,7 @@
 #include "SensorsComponentController.h"
 #include "QGCMAVLink.h"
 #include "QGCMessageBox.h"
+#include "UAS.h"
 
 #include <QVariant>
 #include <QQmlProperty>
diff --git a/src/FactSystem/FactControls/FactPanelController.cc b/src/FactSystem/FactControls/FactPanelController.cc
index 1d26c215988bec3f6d816697625202060642afd9..b828e0771c551896e2d2dd8ef0fb672865ca576e 100644
--- a/src/FactSystem/FactControls/FactPanelController.cc
+++ b/src/FactSystem/FactControls/FactPanelController.cc
@@ -24,6 +24,7 @@
 #include "FactPanelController.h"
 #include "MultiVehicleManager.h"
 #include "QGCMessageBox.h"
+#include "UAS.h"
 
 #include <QQmlEngine>
 
diff --git a/src/FactSystem/ParameterLoader.cc b/src/FactSystem/ParameterLoader.cc
index fa4c38122c3e5d997ae6f30255010bc5536a7e09..9fad146c4a6e3544ce0ee77260a521417fa30116 100644
--- a/src/FactSystem/ParameterLoader.cc
+++ b/src/FactSystem/ParameterLoader.cc
@@ -31,6 +31,7 @@
 #include "QGCMessageBox.h"
 #include "UASMessageHandler.h"
 #include "FirmwarePlugin.h"
+#include "UAS.h"
 
 #include <QFile>
 #include <QDebug>
diff --git a/src/QGCFileDialog.cc b/src/QGCFileDialog.cc
index effb91d7c8852042de544011bd02a1304522c9c8..ca28c1ef3e58c942a55759e18c7dccf28f809fd6 100644
--- a/src/QGCFileDialog.cc
+++ b/src/QGCFileDialog.cc
@@ -32,6 +32,7 @@
 
 #include <QRegularExpression>
 #include <QMessageBox>
+#include <QPushButton>
 
 QString QGCFileDialog::getExistingDirectory(
     QWidget* parent,
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 2cbf91a04b10a8b3f554c3a084080745b412765f..18c414c4cf85dcac3f596e5a45924ab33fb7dddb 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -57,6 +57,7 @@ This file is part of the QGROUNDCONTROL project
 #include "HomePositionManager.h"
 #include "MissionEditor.h"
 #include "LogCompressor.h"
+#include "UAS.h"
 
 #ifndef __mobile__
 #include "QGCUASFileViewMulti.h"
diff --git a/src/ui/linechart/Linecharts.cc b/src/ui/linechart/Linecharts.cc
index f4f69a62561efd24955a97a0fd50193819195627..9b8dc33d8f646955c24dd7064193e5d0b11e42c6 100644
--- a/src/ui/linechart/Linecharts.cc
+++ b/src/ui/linechart/Linecharts.cc
@@ -2,8 +2,8 @@
 
 #include "Linecharts.h"
 #include "MultiVehicleManager.h"
-
 #include "MainWindow.h"
+#include "UAS.h"
 
 Linecharts::Linecharts(QWidget *parent) :
     QStackedWidget(parent),
diff --git a/src/ui/toolbar/MainToolBar.cc b/src/ui/toolbar/MainToolBar.cc
index 6d8dea3d65790b88ee298d0dae194c749f3090d0..f837b64c351b5c5b0466e59d4578cef552a50aed 100644
--- a/src/ui/toolbar/MainToolBar.cc
+++ b/src/ui/toolbar/MainToolBar.cc
@@ -38,6 +38,7 @@ This file is part of the QGROUNDCONTROL project
 #include "FlightDisplayView.h"
 #include "QGCApplication.h"
 #include "MultiVehicleManager.h"
+#include "UAS.h"
 
 MainToolBar::MainToolBar(QWidget* parent)
     : QGCQmlWidgetHolder(parent)