diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h
index 5155db5287be7b6d7f5e1659d21ca98cb86fd558..069edc8a8c77a68520d654dcca892b4ebc82616d 100644
--- a/src/uas/QGCUASParamManager.h
+++ b/src/uas/QGCUASParamManager.h
@@ -42,7 +42,7 @@ public:
     virtual double getParamMin(const QString& param) = 0;
     virtual double getParamMax(const QString& param) = 0;
     virtual double getParamDefault(const QString& param) = 0;
-    virtual const QString& getParamInfo(const QString& param) = 0;
+    virtual QString getParamInfo(const QString& param) = 0;
 
     /** @brief Request an update for the parameter list */
     void requestParameterListUpdate(int component = 0);
diff --git a/src/ui/QGCParamWidget.h b/src/ui/QGCParamWidget.h
index 013c81335a40aeec27d9e9d3778ad21bfac2c5b9..8dc801e5778d77ed768abed00736714ae098fb7f 100644
--- a/src/ui/QGCParamWidget.h
+++ b/src/ui/QGCParamWidget.h
@@ -57,7 +57,7 @@ public:
     double getParamMin(const QString& param) { return paramMin.value(param, 0.0f); }
     double getParamMax(const QString& param) { return paramMax.value(param, 0.0f); }
     double getParamDefault(const QString& param) { return paramDefault.value(param, 0.0f); }
-    const QString& getParamInfo(const QString& param) { return paramToolTips.value(param, ""); }
+    QString getParamInfo(const QString& param) { return paramToolTips.value(param, ""); }
 
 signals:
     /** @brief A parameter was changed in the widget, NOT onboard */
diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.h b/src/ui/RadioCalibration/RadioCalibrationWindow.h
index 855540132b97aeb115e709c0b4ddd18ee23117c8..536a4993c1e211553915fdacb9437b3255923c6e 100644
--- a/src/ui/RadioCalibration/RadioCalibrationWindow.h
+++ b/src/ui/RadioCalibration/RadioCalibrationWindow.h
@@ -50,8 +50,6 @@ This file is part of the QGROUNDCONTROL project
 #include "SwitchCalibrator.h"
 #include "CurveCalibrator.h"
 
-#include "../../../mavlink/include/mavlink/v1.0/common/mavlink.h"
-#include "../../../mavlink/include/mavlink/v1.0/mavlink_types.h"
 #include "UAS.h"
 #include "UASManager.h"
 #include "RadioCalibrationData.h"