diff --git a/dabstar.pro b/dabstar.pro
index 146635a..235e78e 100644
--- a/dabstar.pro
+++ b/dabstar.pro
@@ -174,6 +174,7 @@ HEADERS += \
     src/scopes/carrier-display.h \
     src/scopes/spectrogramdata.h \
     src/scopes/audio-display.h \
+    src/scopes/cust_qwt_zoom_pan.h \
     src/spectrum-viewer/spectrum-viewer.h \
     src/spectrum-viewer/spectrum-scope.h \
     src/spectrum-viewer/waterfall-scope.h \
@@ -281,6 +282,7 @@ SOURCES += \
     src/scopes/carrier-display.cpp \
     src/scopes/audio-display.cpp \
     src/scopes/spectrogramdata.cpp \
+    src/scopes/cust_qwt_zoom_pan.cpp \
     src/spectrum-viewer/spectrum-viewer.cpp \
     src/spectrum-viewer/spectrum-scope.cpp \
     src/spectrum-viewer/waterfall-scope.cpp \
diff --git a/src/scopes/carrier-display.cpp b/src/scopes/carrier-display.cpp
index 80039cd..9782590 100644
--- a/src/scopes/carrier-display.cpp
+++ b/src/scopes/carrier-display.cpp
@@ -17,8 +17,6 @@
 #include "glob_defs.h"
 #include "carrier-display.h"
 #include <qwt_scale_div.h>
-#include <qwt_plot_zoomer.h>
-#include <qwt_picker_machine.h>
 #include <QPen>
 
 CarrierDisp::CarrierDisp(QwtPlot * ipPlot)
@@ -29,10 +27,6 @@ CarrierDisp::CarrierDisp(QwtPlot * ipPlot)
   mQwtPlotCurve.setOrientation(Qt::Vertical);
   mQwtPlotCurve.attach(mQwtPlot);
 
-  QwtPlotPicker * pLmPicker = new QwtPlotPicker(ipPlot->canvas());
-  QwtPickerMachine * pLPickerMachine = new QwtPickerClickPointMachine();
-  pLmPicker->setStateMachine(pLPickerMachine);
-  pLmPicker->setMousePattern(QwtPlotPicker::MouseSelect1, Qt::RightButton);
   select_plot_type(ECarrierPlotType::DEFAULT);
 }
 
diff --git a/src/scopes/cust_qwt_zoom_pan.cpp b/src/scopes/cust_qwt_zoom_pan.cpp
index 545d163..17bec29 100644
--- a/src/scopes/cust_qwt_zoom_pan.cpp
+++ b/src/scopes/cust_qwt_zoom_pan.cpp
@@ -14,7 +14,7 @@
 #include "cust_qwt_zoom_pan.h"
 #include <QWheelEvent>
 #include <QPoint>
-#include <QwtScaleDiv>
+#include <qwt_scale_div.h>
 #include <qwt_plot.h>
 
 CustQwtZoomPan::CustQwtZoomPan(QwtPlot * ipPlot, const int32_t ixMin, const int32_t ixMax, const int32_t iyMin, const int32_t iyMax)
diff --git a/src/spectrum-viewer/correlation-viewer.cpp b/src/spectrum-viewer/correlation-viewer.cpp
index e88fc6d..f7f83d7 100644
--- a/src/spectrum-viewer/correlation-viewer.cpp
+++ b/src/spectrum-viewer/correlation-viewer.cpp
@@ -33,10 +33,8 @@
 #include <QSettings>
 #include <QPen>
 #include <QLabel>
-#include <qwt_picker_machine.h>
 #include "glob_defs.h"
 #include "dab-constants.h"
-#include "qwt_plot_picker.h"
 
 CorrelationViewer::CorrelationViewer(QwtPlot * pPlot, QLabel * pLabel, QSettings * s, RingBuffer<float> * b)
   : mpSettings(s)
@@ -60,11 +58,6 @@ CorrelationViewer::CorrelationViewer(QwtPlot * pPlot, QLabel * pLabel, QSettings
   mQwtGrid.setMinorPen(QPen(mGridColor, 0, Qt::DotLine));
   mQwtGrid.attach(mpPlotGrid);
 
-  QwtPlotPicker * lm_picker = new QwtPlotPicker(mpPlotGrid->canvas());
-  QwtPickerMachine * lpickerMachine = new QwtPickerClickPointMachine();
-  lm_picker->setStateMachine(lpickerMachine);
-  lm_picker->setMousePattern(QwtPlotPicker::MouseSelect1, Qt::RightButton);
-
   mQwtPlotCurve.setPen(QPen(mCurveColor, 2.0));
   mQwtPlotCurve.setOrientation(Qt::Horizontal);
   mQwtPlotCurve.setBaseline(0);