diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
index 72ac854854d513bcff5f3fa7d833aff3aa4dbe95..b4759e353acc0d71f82aaf9d6fce7a1af0f2c46e 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -34,6 +34,7 @@
 
 #include <QVariant>
 #include <QQmlProperty>
+#include <QStandardPaths>
 
 bool APMAirframeComponentController::_typesRegistered = false;
 
diff --git a/src/FactSystem/ParameterLoader.h b/src/FactSystem/ParameterLoader.h
index 48638d51a0dfec41dfe7efb9faa4e5b4a70c47f0..4c17cd0d2525708b67a995ae4d9a0a350e507f3c 100644
--- a/src/FactSystem/ParameterLoader.h
+++ b/src/FactSystem/ParameterLoader.h
@@ -29,6 +29,7 @@
 #include <QXmlStreamReader>
 #include <QLoggingCategory>
 #include <QMutex>
+#include <QDir>
 
 #include "FactSystem.h"
 #include "MAVLinkProtocol.h"
diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
index be7fc932cd3900a1ebb5f71f675ab719c928b45d..2ad3c75bd16ad2f8d36a903a900f86bac9e86c52 100644
--- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc
+++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
@@ -32,6 +32,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
+#include <QStack>
 
 QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "APMParameterMetaDataLog")
 QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "APMParameterMetaDataVerboseLog")
diff --git a/src/QmlControls/ParameterEditorController.cc b/src/QmlControls/ParameterEditorController.cc
index 58824d49fac1f337dda62673e16b3721fbd76856..31f8652a39f809e11dfba16eca86c9a6ef8d2e6e 100644
--- a/src/QmlControls/ParameterEditorController.cc
+++ b/src/QmlControls/ParameterEditorController.cc
@@ -34,6 +34,8 @@
 #include "MainWindow.h"
 #endif
 
+#include <QStandardPaths>
+
 /// @Brief Constructs a new ParameterEditorController Widget. This widget is used within the PX4VehicleConfig set of screens.
 ParameterEditorController::ParameterEditorController(void)
 {
diff --git a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
index e506dcb42eb3ddeaef669014e79d9ce7f1e2662f..a9579a0363c9f29fbf7696b0313eda480f0eac45 100644
--- a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
+++ b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
@@ -26,12 +26,15 @@
 
 #include "QGCMapEngineManager.h"
 #include "QGCApplication.h"
-#include <QSettings>
 #include "QGCMapTileSet.h"
 #include "QGCMapUrlEngine.h"
-#include <QStorageInfo>
+
 #include <stdio.h>
 
+#include <QQmlEngine>
+#include <QSettings>
+#include <QStorageInfo>
+
 QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog")
 
 static const char* kQmlOfflineMapKeyName = "QGCOfflineMap";
diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index 29b8331a6fdfa5f48b5299641a2eecc30105f529..3e324d599d9a2b2d6f416deff45aef29f2251c47 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -30,6 +30,8 @@
 #include "UAS.h"
 #include "QGCApplication.h"
 
+#include <QQmlEngine>
+
 QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
 
 const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled";
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index b44d3e78cf0a656874e88608967da5cb8f8e8ba7..49aef16b6c5540e2df7ed388f60227a681790f25 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -33,7 +33,6 @@
 #include "FactGroup.h"
 #include "LinkInterface.h"
 #include "QGCMAVLink.h"
-#include "MissionItem.h"
 #include "QmlObjectListModel.h"
 #include "MAVLinkProtocol.h"
 #include "UASMessageHandler.h"
diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index a2cba8654357b970589507db93f502425f281098..c8267358dee7a45cc65477d237ef2170d5fa468f 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -31,6 +31,9 @@
 #include "QGCApplication.h"
 #include "QGCFileDownload.h"
 
+#include <QStandardPaths>
+#include <QRegularExpression>
+
 struct FirmwareToUrlElement_t {
     FirmwareUpgradeController::AutoPilotStackType_t    stackType;
     FirmwareUpgradeController::FirmwareType_t          firmwareType;
diff --git a/src/ViewWidgets/LogDownloadController.cc b/src/ViewWidgets/LogDownloadController.cc
index db1f8afae354a4edb3c686064ff03476c71c2afe..891ad4c6d9b7bd2ffb2a35e90b61dcfabc2a4d71 100644
--- a/src/ViewWidgets/LogDownloadController.cc
+++ b/src/ViewWidgets/LogDownloadController.cc
@@ -34,6 +34,8 @@
 #include <QDebug>
 #include <QSettings>
 #include <QUrl>
+#include <QBitArray>
+#include <QtCore/qmath.h>
 
 #define kTimeOutMilliseconds 500
 #define kGUIRateMilliseconds 17