diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index f49d36c4d4aabb09592436e1eccce27909f190bd..8d0368c9b1b90850dba495124923d464315730f4 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1027,20 +1027,11 @@ void MainWindow::connectCommonWidgets()
                 infoDockWidget->widget(), SLOT(updateSendLoss(int, float)));
     }
 
-    if (mapWidget && waypointsDockWidget->widget())
-    {
-
-        //
-        connect(waypointsDockWidget->widget(), SIGNAL(changePointList()), mapWidget, SLOT(clearWaypoints()));
-    }
-
     //TODO temporaly debug
     if (slugsHilSimWidget && slugsHilSimWidget->widget()){
         connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)),
                 slugsHilSimWidget->widget(), SLOT(activeUasSet(UASInterface*)));
     }
-
-
 }
 
 void MainWindow::createCustomWidget()
diff --git a/src/ui/QGCMapWidget.cc b/src/ui/QGCMapWidget.cc
index 847de71089983e810a00841aaf05f55499ab233d..5fff281ca297429bf5c51de4d9522c5b4d9ab2bc 100644
--- a/src/ui/QGCMapWidget.cc
+++ b/src/ui/QGCMapWidget.cc
@@ -1,6 +1,6 @@
 #include "QGCMapWidget.h"
 
 QGCMapWidget::QGCMapWidget(QWidget *parent) :
-    OPMapWidget(parent)
+    mapcontrol::OPMapWidget(parent)
 {
 }
diff --git a/src/ui/QGCMapWidget.h b/src/ui/QGCMapWidget.h
index ee485c29d37d20c23b5ca4ead93eacd17b1a918a..799646e848ba1eaf60d346e19ed4e39bf314af0d 100644
--- a/src/ui/QGCMapWidget.h
+++ b/src/ui/QGCMapWidget.h
@@ -1,7 +1,9 @@
 #ifndef QGCMAPWIDGET_H
 #define QGCMAPWIDGET_H
 
-class QGCMapWidget : public OPMapWidget
+#include "opmapcontrol.h"
+
+class QGCMapWidget : public mapcontrol::OPMapWidget
 {
     Q_OBJECT
 public: