diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/gpsitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/gpsitem.cpp
index cf6f656e2..2e3e1a36c 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/gpsitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/gpsitem.cpp
@@ -26,6 +26,7 @@
  */
 #include "../internals/pureprojection.h"
 #include "gpsitem.h"
+#include <QGraphicsSceneMouseEvent>
 namespace mapcontrol {
 GPSItem::GPSItem(MapGraphicItem *map, OPMapWidget *parent, QString uavPic) : map(map), mapwidget(parent), showtrail(true), showtrailline(true), trailtime(1), traildistance(2), autosetreached(true)
     , autosetdistance(100)
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
index 311ac4b50..5aa809b7e 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
@@ -25,6 +25,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #include "homeitem.h"
+#include <QGraphicsSceneMouseEvent>
 namespace mapcontrol {
 HomeItem::HomeItem(MapGraphicItem *map, OPMapWidget *parent) : safe(true), map(map), mapwidget(parent),
     showsafearea(true), toggleRefresh(true), safearea(1000), altitude(0), isDragging(false)
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
index c4ff05c69..8544a67a5 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
@@ -28,6 +28,7 @@
 #include "gpsitem.h"
 #include "homeitem.h"
 #include "mapgraphicitem.h"
+#include <QGraphicsSceneMouseEvent>
 
 namespace mapcontrol {
 MapGraphicItem::MapGraphicItem(internals::Core *core, Configuration *configuration) : core(core), config(configuration), MapRenderTransform(1), maxZoom(17), minZoom(2), zoomReal(0), isSelected(false), rotation(0), zoomDigi(0)
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
index f9ede780e..b7b9c634c 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
@@ -224,7 +224,7 @@ internals::PointLatLng OPMapWidget::currentMousePosition()
 void OPMapWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QGraphicsView::mouseMoveEvent(event);
-    QPointF p = event->posF();
+    QPointF p = event->pos();
 
     p = map->mapFromParent(p);
     currentmouseposition = map->FromLocalToLatLng(p.x(), p.y());
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
index f427a560c..51700eab5 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
@@ -37,6 +37,7 @@
 #include <QtOpenGL/QGLWidget>
 #include "waypointitem.h"
 #include "QtSvg/QGraphicsSvgItem"
+#include "QGraphicsView"
 #include "uavitem.h"
 #include "gpsitem.h"
 #include "homeitem.h"
@@ -219,7 +220,7 @@ class OPMapWidget : public QGraphicsView {
     Q_PROPERTY(double Zoom READ ZoomTotal WRITE SetZoom)
     Q_PROPERTY(qreal Rotate READ Rotate WRITE SetRotate)
     Q_ENUMS(internals::MouseWheelZoomType::Types)
-    Q_ENUMS(internals::GeoCoderStatusCode::Types)
+    Q_ENUMS(core::GeoCoderStatusCode::Types)
 
 public:
     QSize sizeHint() const;
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
index 59c2ecb25..c0dc61fdf 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
@@ -26,6 +26,7 @@
  */
 #include "waypointitem.h"
 #include "homeitem.h"
+#include <QGraphicsSceneMouseEvent>
 
 namespace mapcontrol {
 WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & altitude, MapGraphicItem *map, wptype type) : coord(coord), reached(false), description(""), shownumber(true), isDragging(false), altitude(altitude), map(map), myType(type)