diff --git a/ground/gcs/src/plugins/config/calibration/levelcalibrationmodel.cpp b/ground/gcs/src/plugins/config/calibration/levelcalibrationmodel.cpp
index 51d652afb..0d2b31cab 100644
--- a/ground/gcs/src/plugins/config/calibration/levelcalibrationmodel.cpp
+++ b/ground/gcs/src/plugins/config/calibration/levelcalibrationmodel.cpp
@@ -28,6 +28,7 @@
 #include "levelcalibrationmodel.h"
 #include "extensionsystem/pluginmanager.h"
 #include "calibration/calibrationuiutils.h"
+#include "uavobjectmanager.h"
 
 #include <attitudestate.h>
 #include <attitudesettings.h>
diff --git a/ground/gcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp b/ground/gcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
index 276362643..ce13a8039 100644
--- a/ground/gcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
+++ b/ground/gcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
@@ -28,6 +28,7 @@
 #include "sixpointcalibrationmodel.h"
 #include "extensionsystem/pluginmanager.h"
 #include "calibration/calibrationuiutils.h"
+#include "uavobjectmanager.h"
 
 #include <math.h>
 #include <QThread>
diff --git a/ground/gcs/src/plugins/opmap/modeluavoproxy.cpp b/ground/gcs/src/plugins/opmap/modeluavoproxy.cpp
index f85cf72c1..a9a13528a 100644
--- a/ground/gcs/src/plugins/opmap/modeluavoproxy.cpp
+++ b/ground/gcs/src/plugins/opmap/modeluavoproxy.cpp
@@ -27,6 +27,7 @@
 #include "modeluavoproxy.h"
 #include "extensionsystem/pluginmanager.h"
 #include "uavobjecthelper.h"
+#include "uavobjectmanager.h"
 
 #include <QProgressDialog>
 #include <math.h>
diff --git a/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.cpp b/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.cpp
index bddce34bb..f09b29c97 100644
--- a/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.cpp
@@ -25,6 +25,10 @@
  */
 #include "pathactioneditorgadgetwidget.h"
 #include "ui_pathactioneditor.h"
+#include "extensionsystem/pluginmanager.h"
+#include "uavobjectmanager.h"
+
+#include "browseritemdelegate.h"
 
 #include <QDebug>
 #include <QString>
@@ -33,9 +37,6 @@
 #include <QTextEdit>
 #include <QVBoxLayout>
 #include <QPushButton>
-#include "browseritemdelegate.h"
-
-#include "extensionsystem/pluginmanager.h"
 
 PathActionEditorGadgetWidget::PathActionEditorGadgetWidget(QWidget *parent) : QLabel(parent)
 {
diff --git a/ground/gcs/src/plugins/uavobjects/uavobject.cpp.template b/ground/gcs/src/plugins/uavobjects/uavobject.cpp.template
index e5216e4cf..8b775e895 100644
--- a/ground/gcs/src/plugins/uavobjects/uavobject.cpp.template
+++ b/ground/gcs/src/plugins/uavobjects/uavobject.cpp.template
@@ -33,6 +33,7 @@
 
 #include "$(NAMELC).h"
 #include "uavobjectfield.h"
+#include "uavobjectmanager.h"
 
 #include <QtQml>
 
diff --git a/ground/gcs/src/plugins/uavobjects/uavobject.h.template b/ground/gcs/src/plugins/uavobjects/uavobject.h.template
index fea9587d3..e931e3eab 100644
--- a/ground/gcs/src/plugins/uavobjects/uavobject.h.template
+++ b/ground/gcs/src/plugins/uavobjects/uavobject.h.template
@@ -34,7 +34,6 @@
 #define $(NAMEUC)_H
 
 #include "uavdataobject.h"
-#include "uavobjectmanager.h"
 
 class UAVObjectManager;