diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index 5506d64d52a8400d37ed2d1083094323b9b4e204..70dc54c7def17de7123de75e5002569a391df7ed 100644
--- a/MantidPlot/CMakeLists.txt
+++ b/MantidPlot/CMakeLists.txt
@@ -792,6 +792,7 @@ add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp
 target_link_libraries ( MantidPlot LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
             ${CORE_MANTIDLIBS}
             MantidQtWidgetsCommonQt4
+            MantidQtWidgetsLegacyQwtQt4
             MantidQtWidgetsFactoryQt4
             MantidQtWidgetsInstrumentViewQt4
             MantidQtWidgetsSliceViewerQt4
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index a8db3a39f7faa42e6cc6006e856b4a644d53aa15..4791eed4607689dba282fbf4d35407ec5db4e412 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -79,7 +79,7 @@
 #include "Folder.h"
 #include "FindDialog.h"
 #include "ScaleDraw.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include "ScriptingLangDialog.h"
 #include "ScriptingWindow.h"
 #include "ScriptFileInterpreter.h"
diff --git a/MantidPlot/src/AxesDialog.cpp b/MantidPlot/src/AxesDialog.cpp
index 98b5fced059f3de562f5fb154401516eacfa4a86..a0eed425560eb71890906807c6125af4ef3b80ff 100644
--- a/MantidPlot/src/AxesDialog.cpp
+++ b/MantidPlot/src/AxesDialog.cpp
@@ -33,7 +33,7 @@ Description          : General plot options dialog
 #include "Graph.h"
 #include "Grid.h"
 #include "MantidQtWidgets/Common/DoubleSpinBox.h"
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
 #include "MyParser.h"
 #include "Plot.h"
 #include "ScaleDraw.h"
@@ -65,7 +65,7 @@ Description          : General plot options dialog
 
 #include <qwt_plot.h>
 #include <qwt_scale_widget.h>
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 
 /* XPM */
 static const char *bottom_scl_xpm[] = {
diff --git a/MantidPlot/src/AxisDetails.cpp b/MantidPlot/src/AxisDetails.cpp
index 27bebc1e1f5523a973e490b1ef532ae30ada3010..d1691319f5a064d8bcf3a4e9e685f2210884e35c 100644
--- a/MantidPlot/src/AxisDetails.cpp
+++ b/MantidPlot/src/AxisDetails.cpp
@@ -6,11 +6,10 @@
 #include "ApplicationWindow.h"
 #include "MantidQtWidgets/Common/DoubleSpinBox.h"
 #include <qwt_scale_widget.h>
-//#include <qwt_plot.h>
-#include "MantidQtWidgets/Common/qwt_compat.h"
 #include "MyParser.h"
 #include "Plot.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 
 #include <QWidget>
 #include <QSpinBox>
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index 387e491227cde16614c833e8305c1e2933abff6e..9da2e1b1611f8244e17117b468f08c8b1a09e42d 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -28,7 +28,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include <QVarLengthArray>
 
 #include "ApplicationWindow.h"
@@ -41,7 +42,6 @@
 #include "Grid.h"
 #include "ImageMarker.h"
 #include "LegendWidget.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
 #include "PatternBox.h"
 #include "PlotCurve.h"
 #include "QwtBarCurve.h"
@@ -65,8 +65,8 @@
 #include "MantidKernel/Strings.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidQtWidgets/Common/PlotAxis.h"
-#include "MantidQtWidgets/Common/QwtRasterDataMD.h"
-#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
+#include "MantidQtWidgets/LegacyQwt/QwtRasterDataMD.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceSpectrumData.h"
 
 #include "MantidQtWidgets/Common/TSVSerialiser.h"
 
diff --git a/MantidPlot/src/Graph.h b/MantidPlot/src/Graph.h
index 628e0879ad7a83d5b4f29a9ee2a0b72f9593fd04..9931dd06984b9125dbb39b24c3e479f433fa7920 100644
--- a/MantidPlot/src/Graph.h
+++ b/MantidPlot/src/Graph.h
@@ -49,7 +49,7 @@
 #endif
 #include "AxesDialog.h"
 #include "MantidQtWidgets/Common/GraphOptions.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include "MultiLayer.h"
 #include "Plot.h"
 #include "PlotToolInterface.h"
diff --git a/MantidPlot/src/GridDetails.cpp b/MantidPlot/src/GridDetails.cpp
index abe404cba06be33a4b3cca33787f8c413202e798..6f88d5608d8d7044c712f907b0d99b5b7554bffd 100644
--- a/MantidPlot/src/GridDetails.cpp
+++ b/MantidPlot/src/GridDetails.cpp
@@ -6,9 +6,9 @@
 #include "ApplicationWindow.h"
 #include <qwt_scale_widget.h>
 //#include <qwt_plot.h>
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
 #include "Plot.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include "MantidQtWidgets/Common/DoubleSpinBox.h"
 
 #include <QWidget>
diff --git a/MantidPlot/src/Mantid/MantidCurve.cpp b/MantidPlot/src/Mantid/MantidCurve.cpp
index e8519d882c99bf3f2296e3fc0608455a1b8c0b4b..95bfbbea64360f23a423b3e20fa252dff2af0586 100644
--- a/MantidPlot/src/Mantid/MantidCurve.cpp
+++ b/MantidPlot/src/Mantid/MantidCurve.cpp
@@ -4,7 +4,7 @@
 #include <qwt_symbol.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidQtWidgets/Common/MantidQwtWorkspaceData.h"
+#include "MantidQtWidgets/LegacyQwt/MantidQwtWorkspaceData.h"
 
 #include "../ApplicationWindow.h"
 #include "../Graph.h"
diff --git a/MantidPlot/src/Mantid/MantidCurve.h b/MantidPlot/src/Mantid/MantidCurve.h
index 070e08952e9ae388870adff33f168ec76a13cbaf..52bea4c4910f0d0f9510c2467f2024cae36cc2da 100644
--- a/MantidPlot/src/Mantid/MantidCurve.h
+++ b/MantidPlot/src/Mantid/MantidCurve.h
@@ -3,7 +3,7 @@
 
 #include "../PlotCurve.h"
 #include "MantidAPI/Workspace_fwd.h"
-#include "MantidQtWidgets/Common/MantidQwtWorkspaceData.h"
+#include "MantidQtWidgets/LegacyQwt/MantidQwtWorkspaceData.h"
 #include "MantidQtWidgets/Common/WorkspaceObserver.h"
 
 class Graph;
diff --git a/MantidPlot/src/Mantid/MantidMDCurve.h b/MantidPlot/src/Mantid/MantidMDCurve.h
index 48e4ffcf3b9370ed626637812e9af3e476fd9973..0e50b63804e486a5104dba53b4a258ba3302c7d0 100644
--- a/MantidPlot/src/Mantid/MantidMDCurve.h
+++ b/MantidPlot/src/Mantid/MantidMDCurve.h
@@ -3,7 +3,7 @@
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidCurve.h"
-#include "MantidQtWidgets/Common/MantidQwtIMDWorkspaceData.h"
+#include "MantidQtWidgets/LegacyQwt/MantidQwtIMDWorkspaceData.h"
 #include <boost/shared_ptr.hpp>
 
 // Forward definitions
diff --git a/MantidPlot/src/Mantid/MantidMatrixCurve.cpp b/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
index 7460bf9303cc1a1e6f86daafe80ed4561e9dee51..526583a2cece1c974e2c605c5ddcc571e6414906 100644
--- a/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
+++ b/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
@@ -7,8 +7,8 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/MatrixWorkspace.h"
 
-#include "MantidQtWidgets/Common/QwtWorkspaceBinData.h"
-#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceBinData.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceSpectrumData.h"
 
 #include "../ApplicationWindow.h"
 #include "../Graph.h"
diff --git a/MantidPlot/src/Mantid/MantidUI.h b/MantidPlot/src/Mantid/MantidUI.h
index dc50a4ad94075492cd06cf1ed7be522b38b286fd..00b9aed5554ac1509fe3e42d244167e6772b97fb 100644
--- a/MantidPlot/src/Mantid/MantidUI.h
+++ b/MantidPlot/src/Mantid/MantidUI.h
@@ -22,7 +22,7 @@
 
 #include "MantidQtWidgets/Common/AlgorithmDialog.h"
 #include "MantidQtWidgets/Common/MantidAlgorithmMetatype.h"
-#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceSpectrumData.h"
 
 #include "MantidPlotUtilities.h"
 
diff --git a/MantidPlot/src/Plot.cpp b/MantidPlot/src/Plot.cpp
index c82c7f9de0a9b0f76dd2e9163feb2223b145c631..a5847175b1ffa643d253606bd2f85fa9b88b3272 100644
--- a/MantidPlot/src/Plot.cpp
+++ b/MantidPlot/src/Plot.cpp
@@ -31,8 +31,8 @@
 #include "Graph.h"
 #include "Grid.h"
 #include "LegendWidget.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
 #include "PlotCurve.h"
 #include "ScaleDraw.h"
 #include "Spectrogram.h"
diff --git a/MantidPlot/src/Plot3DDialog.cpp b/MantidPlot/src/Plot3DDialog.cpp
index 72ea6a73259597a475b5df0503336032b405b32b..9abc823cf9ad38e090f7162f951789a4f0b2d515 100644
--- a/MantidPlot/src/Plot3DDialog.cpp
+++ b/MantidPlot/src/Plot3DDialog.cpp
@@ -53,7 +53,7 @@
 
 #include <qwt3d_color.h>
 #include "MantidKernel/ConfigService.h"
-#include "MantidQtWidgets/Common/MantidColorMap.h"
+#include "MantidQtWidgets/LegacyQwt/MantidColorMap.h"
 
 using Mantid::Kernel::ConfigService;
 
diff --git a/MantidPlot/src/PlotCurve.cpp b/MantidPlot/src/PlotCurve.cpp
index d00b70a2f6839379b4cb5a69357a3357b377544d..bcae3c9eb1b443833525bc6785b3202b17039714 100644
--- a/MantidPlot/src/PlotCurve.cpp
+++ b/MantidPlot/src/PlotCurve.cpp
@@ -32,9 +32,9 @@
 #include "Mantid/ErrorBarSettings.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtWidgets/Common/QwtWorkspaceBinData.h"
-#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceBinData.h"
+#include "MantidQtWidgets/LegacyQwt/QwtWorkspaceSpectrumData.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include "PatternBox.h"
 #include "ScaleDraw.h"
 #include "SymbolBox.h"
diff --git a/MantidPlot/src/PlotDialog.cpp b/MantidPlot/src/PlotDialog.cpp
index 936179b21d4f6b6ad50b6aab35b2552525b09e6d..c49ce21b4bb9dedacafbfa5398e5915e3ffe007b 100644
--- a/MantidPlot/src/PlotDialog.cpp
+++ b/MantidPlot/src/PlotDialog.cpp
@@ -49,7 +49,7 @@
 #include <MantidQtWidgets/Common/pixmaps.h>
 
 #include "MantidKernel/ConfigService.h"
-#include "MantidQtWidgets/Common/MantidColorMap.h"
+#include "MantidQtWidgets/LegacyQwt/MantidColorMap.h"
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDateTime>
diff --git a/MantidPlot/src/ScaleDetails.cpp b/MantidPlot/src/ScaleDetails.cpp
index e7d3f9472876c5dd63474389b940d02733b42365..89831368068d0ba55b55c806b12b626ed8b5e523 100644
--- a/MantidPlot/src/ScaleDetails.cpp
+++ b/MantidPlot/src/ScaleDetails.cpp
@@ -6,9 +6,9 @@
 #include "ApplicationWindow.h"
 #include "MantidQtWidgets/Common/DoubleSpinBox.h"
 
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
 #include "Plot.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 
 #include "MantidKernel/Logger.h"
 
diff --git a/MantidPlot/src/ScaleDraw.cpp b/MantidPlot/src/ScaleDraw.cpp
index 19b81c0a5b2afd685d8ec60700c09da7dae8b603..f38da9ffabecfb3c6ba6a7349d47e3f8b63cf686 100644
--- a/MantidPlot/src/ScaleDraw.cpp
+++ b/MantidPlot/src/ScaleDraw.cpp
@@ -28,7 +28,7 @@
  ***************************************************************************/
 #include "ScaleDraw.h"
 #include "MyParser.h"
-#include "MantidQtWidgets/Common/ScaleEngine.h"
+#include "MantidQtWidgets/LegacyQwt/ScaleEngine.h"
 #include "Graph.h"
 
 #include <QPainter>
diff --git a/MantidPlot/src/Spectrogram.cpp b/MantidPlot/src/Spectrogram.cpp
index f21fa9e9129b473382ce93b9eb92f89e18304df0..949e75e1703cd11dd1db418f9051b4d2efe7e6fe 100644
--- a/MantidPlot/src/Spectrogram.cpp
+++ b/MantidPlot/src/Spectrogram.cpp
@@ -26,7 +26,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "Spectrogram.h"
-#include "MantidQtWidgets/Common/qwt_compat.h"
+#include "MantidQtWidgets/LegacyQwt/qwt_compat.h"
 #include <QColor>
 #include <QPainter>
 #include <QPen>
@@ -43,8 +43,8 @@
 #include "MantidKernel/Strings.h"
 #include "MantidKernel/make_unique.h"
 #include "MantidQtWidgets/Common/PlotAxis.h"
-#include "MantidQtWidgets/Common/QwtRasterDataMD.h"
-#include "MantidQtWidgets/Common/SignalRange.h"
+#include "MantidQtWidgets/LegacyQwt/QwtRasterDataMD.h"
+#include "MantidQtWidgets/LegacyQwt/SignalRange.h"
 
 #include "MantidQtWidgets/Common/TSVSerialiser.h"
 
diff --git a/MantidPlot/src/Spectrogram.h b/MantidPlot/src/Spectrogram.h
index d76b365914fc2aaebaa0e5a9412d2a060805f788..292714129dcd103e458a5d7631a3a510c2793b21 100644
--- a/MantidPlot/src/Spectrogram.h
+++ b/MantidPlot/src/Spectrogram.h
@@ -40,7 +40,7 @@
 #include "PlotCurve.h"
 
 #include "MantidAPI/IMDWorkspace.h"
-#include "MantidQtWidgets/Common/MantidColorMap.h"
+#include "MantidQtWidgets/LegacyQwt/MantidColorMap.h"
 #include "MantidQtWidgets/Common/WorkspaceObserver.h"
 #include "MantidQtWidgets/InstrumentView/InstrumentWidget.h"
 
diff --git a/qt/scientific_interfaces/DynamicPDF/DisplayCurveFitTest.cpp b/qt/scientific_interfaces/DynamicPDF/DisplayCurveFitTest.cpp
index 8f09028f8a9f14fbc6c7aa3c1f7382c923cc4163..542dab3e167a3f8fab629c0850e4be8ed9d8709e 100644
--- a/qt/scientific_interfaces/DynamicPDF/DisplayCurveFitTest.cpp
+++ b/qt/scientific_interfaces/DynamicPDF/DisplayCurveFitTest.cpp
@@ -1,11 +1,10 @@
+#include "DisplayCurveFitTest.h"
 // includes for workspace handling
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
 // includes for interface functionality
-#include "DisplayCurveFitTest.h"
-#include "MantidQtWidgets/Common/DisplayCurveFit.h"
-#include "DisplayCurveFitTest.h"
-#include "MantidQtWidgets/Common/RangeSelector.h"
+#include "MantidQtWidgets/LegacyQwt/DisplayCurveFit.h"
+#include "MantidQtWidgets/LegacyQwt/RangeSelector.h"
 
 namespace {
 Mantid::Kernel::Logger g_log("DynamicPDF");
diff --git a/qt/scientific_interfaces/DynamicPDF/SliceSelector.ui b/qt/scientific_interfaces/DynamicPDF/SliceSelector.ui
index 672349e2dd527fec552efa460abafd42f85d272f..87bee7b41bec781bfb18b5c7349e75085b326769 100644
--- a/qt/scientific_interfaces/DynamicPDF/SliceSelector.ui
+++ b/qt/scientific_interfaces/DynamicPDF/SliceSelector.ui
@@ -234,7 +234,7 @@
   <customwidget>
    <class>MantidQt::MantidWidgets::DataSelector</class>
    <extends>QWidget</extends>
-   <header>MantidQtWidgets/LegacyQwt/DataSelector.h</header>
+   <header>MantidQtWidgets/Common/DataSelector.h</header>
   </customwidget>
   <customwidget>
    <class>MantidQt::MantidWidgets::PreviewPlot</class>
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 69513829b70dc5f9dd8fb14fbb72e74abb3cf938..9df031d9e26d0fd8f8cd793a5918b57a392dfc12 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -387,6 +387,19 @@ set ( UI_FILES
   inc/MantidQtWidgets/Common/pqHelpWindow.ui
 )
 
+# Temporary workaround to remove stale ui_* header files after they
+# were moved to a separate library. They cause build problems if they're not
+# deleted
+set ( OLD_UI_HEDAERS
+  ${CMAKE_CURRENT_BINARY_DIR}/Qt4/ui_ColorBarWidget.h
+  ${CMAKE_CURRENT_BINARY_DIR}/Qt4/ui_DisplayCurveFit.h
+  ${CMAKE_CURRENT_BINARY_DIR}/Qt4/ui_MWView.h
+  ${CMAKE_CURRENT_BINARY_DIR}/Qt4/ui_PreviewPlot.h
+)
+foreach (_header ${OLD_UI_HEADERS})
+  file (REMOVE ${_heaader})
+endforeach()
+
 # Python unit tests
 set ( TEST_PY_FILES
   test/MWRunFilesTest.py
diff --git a/qt/widgets/legacyqwt/CMakeLists.txt b/qt/widgets/legacyqwt/CMakeLists.txt
index ecbcd1b33db1b86c75b251796981b302aebe727f..3a8844dcfed68ae5bcd78d0e612b99b0e1995f64 100644
--- a/qt/widgets/legacyqwt/CMakeLists.txt
+++ b/qt/widgets/legacyqwt/CMakeLists.txt
@@ -27,6 +27,7 @@ set ( MOC_FILES
   inc/MantidQtWidgets/LegacyQwt/PeakPicker.h
   inc/MantidQtWidgets/LegacyQwt/DisplayCurveFit.h
   inc/MantidQtWidgets/LegacyQwt/PreviewPlot.h
+  inc/MantidQtWidgets/LegacyQwt/SafeQwtPlot.h
 )
 
 # Include files aren't required, but this makes them appear in Visual Studio
diff --git a/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/MWView.h b/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/MWView.h
index 4679e4f9a327b5aae7cf1992da5f4c34daa5d805..65cab433467537df1a1bfe6cb0758e7ef557b5a8 100644
--- a/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/MWView.h
+++ b/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/MWView.h
@@ -5,8 +5,8 @@
 #include <QWidget>
 #include <qwt_plot_spectrogram.h>
 #include "ui_MWView.h"
+#include "DllOption.h"
 #include "MantidQtWidgets/Common/MdSettings.h"
-#include "MantidQtWidgets/Common/DllOption.h"
 // includes for workspace handling
 #include "MantidQtWidgets/Common/WorkspaceObserver.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -66,7 +66,7 @@ using MWDimension_const_sptr =
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class EXPORT_OPT_MANTIDQT_COMMON MWView
+class EXPORT_OPT_MANTIDQT_LEGACYQWT MWView
     : public QWidget,
       public MantidQt::API::WorkspaceObserver {
   Q_OBJECT
diff --git a/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/SignalRange.h b/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/SignalRange.h
index af21e6890725dc30f178da7b857a663c78224631..a505acc0a8638b5676210ca8c54c6e05f9b81a6e 100644
--- a/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/SignalRange.h
+++ b/qt/widgets/legacyqwt/inc/MantidQtWidgets/LegacyQwt/SignalRange.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQT_API_SIGNALRANGE_H_
 #define MANTIDQT_API_SIGNALRANGE_H_
 
-#include "MantidQtWidgets/Common/DllOption.h"
+#include "MantidQtWidgets/LegacyQwt/DllOption.h"
 #include "MantidAPI/IMDWorkspace.h"
 
 #include <qwt_double_interval.h>
@@ -32,7 +32,7 @@ namespace API {
  File change history is stored at: <https://github.com/mantidproject/mantid>.
  Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class EXPORT_OPT_MANTIDQT_COMMON SignalRange {
+class EXPORT_OPT_MANTIDQT_LEGACYQWT SignalRange {
 public:
   SignalRange(const Mantid::API::IMDWorkspace &workspace,
               const Mantid::API::MDNormalization normalization =