diff --git a/qt/paraview_ext/PVPlugins/Widgets/QtWidgets/SimpleBinInputWidget.cpp b/qt/paraview_ext/PVPlugins/Widgets/QtWidgets/SimpleBinInputWidget.cpp
index 52fc68982d83610e850e774cc70bfc89514000b5..b59dda6e67d5890e7328e026822baa46d399c463 100644
--- a/qt/paraview_ext/PVPlugins/Widgets/QtWidgets/SimpleBinInputWidget.cpp
+++ b/qt/paraview_ext/PVPlugins/Widgets/QtWidgets/SimpleBinInputWidget.cpp
@@ -41,7 +41,7 @@ Getter for the current entry.
 @return current entry value
 */
 int SimpleBinInputWidget::getEntry(double, double) const {
-  return std::stoi(std::string(m_nBinsBox->text().toAscii()));
+  return std::stoi(std::string(m_nBinsBox->text().toLatin1()));
 }
 
 /// Destructor
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/AutoScaleRangeGenerator.h b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/AutoScaleRangeGenerator.h
index 305806816bad7a71c02d78e3da1c1f01890bf129..75240f1cff0099bd1876ed84e18799d8c61b1336 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/AutoScaleRangeGenerator.h
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/AutoScaleRangeGenerator.h
@@ -33,7 +33,7 @@
 #include "MantidVatesSimpleGuiViewWidgets/WidgetDllOption.h"
 #include "MantidQtWidgets/Common/MdConstants.h"
 #include "MantidQtWidgets/Common/MdSettings.h"
-#include <qlist.h>
+#include <QList>
 
 class pqPipelineSource;
 class pqDataRepresentation;
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h
index 341c70c79960c3678736e2a5dd5aeae8b68ca415..8595c5a1ec88b7ff254729946e2c05e4c34a578a 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/PeaksTableControllerVsi.h
@@ -12,7 +12,7 @@
 
 #include <map>
 #include <QWidget>
-#include <qcolor.h>
+#include <QColor>
 #include <QPointer>
 #include <boost/shared_ptr.hpp>
 
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
index 31e893f7f6df05f6e2ec1b2327027cbdd9bc9479..9723fe01b3b269fd9f804912296192bb6a6c00eb 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
@@ -207,7 +207,7 @@ void ColorSelectionWidget::loadPreset() {
   preset.setCustomizableUsePresetRange(false, false);
   preset.setCustomizableLoadAnnotations(false, false);
   preset.setCurrentPreset(
-      m_mdSettings.getLastSessionColorMap().toAscii().constData());
+      m_mdSettings.getLastSessionColorMap().toLatin1().constData());
   this->connect(&preset, SIGNAL(applyPreset(const Json::Value &)), this,
                 SLOT(onApplyPreset(const Json::Value &)));
   preset.exec();
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
index b610173d51e7caf23c1b7a934f30a2624132e9f3..ebe24e848db63681701d0a855e6d2a91bd3228d5 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -294,7 +294,7 @@ void MultiSliceView::showCutInSliceViewer(int axisIndex,
 
     std::vector<double> scaling =
         vtkSMPropertyHelper(src2->getProxy(),
-                            scalingProperty.toAscii().constData(),
+                            scalingProperty.toLatin1().constData(),
                             true).GetDoubleArray();
 
     if (!scaling.empty()) {
@@ -334,7 +334,7 @@ void MultiSliceView::showCutInSliceViewer(int axisIndex,
         "The slice could not be shown because of the following error:\n" +
         QString(e.what());
     QMessageBox::warning(this, tr("MantidPlot"),
-                         tr(message.toAscii().constData()), QMessageBox::Ok,
+                         tr(message.toLatin1().constData()), QMessageBox::Ok,
                          QMessageBox::Ok);
     delete w;
   }
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp
index c3880dfa57ef147b4cd216ea5f8233a02624e4a8..eb08004098bde04c3af56a3aa9097899d7549dec 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp
@@ -269,7 +269,7 @@ void SplatterPlotView::checkPeaksCoordinates() {
         vtkSMPropertyHelper(
             this->origSrc->getProxy(),
             MantidQt::API::MdConstants::MantidParaViewSpecialCoordinates
-                .toAscii()
+                .toLatin1()
                 .constData()).GetAsInt();
     // Make commensurate with vtkPeakMarkerFactory
     peakViewCoords--;
@@ -277,7 +277,7 @@ void SplatterPlotView::checkPeaksCoordinates() {
     foreach (pqPipelineSource *src, this->m_peaksSource) {
       vtkSMPropertyHelper(
           src->getProxy(),
-          MantidQt::API::MdConstants::PeakDimensions.toAscii().constData())
+          MantidQt::API::MdConstants::PeakDimensions.toLatin1().constData())
           .Set(peakViewCoords);
       src->getProxy()->UpdateVTKObjects();
     }
@@ -367,7 +367,7 @@ void SplatterPlotView::readAndSendCoordinates() {
         vtkSMPropertyHelper(
             this->origSrc->getProxy(),
             MantidQt::API::MdConstants::MantidParaViewSpecialCoordinates
-                .toAscii()
+                .toLatin1()
                 .constData()).GetAsInt();
     // Make commensurate with vtkPeakMarkerFactory
     peakViewCoords--;
@@ -555,12 +555,13 @@ void SplatterPlotView::setPeakSourceFrame(pqPipelineSource *source) {
   int peakViewCoords =
       vtkSMPropertyHelper(
           this->origSrc->getProxy(),
-          MantidQt::API::MdConstants::MantidParaViewSpecialCoordinates.toAscii()
+          MantidQt::API::MdConstants::MantidParaViewSpecialCoordinates
+              .toLatin1()
               .constData()).GetAsInt();
   peakViewCoords--;
   vtkSMPropertyHelper(
       source->getProxy(),
-      MantidQt::API::MdConstants::PeakDimensions.toAscii().constData())
+      MantidQt::API::MdConstants::PeakDimensions.toLatin1().constData())
       .Set(peakViewCoords);
 }
 
@@ -573,14 +574,14 @@ bool SplatterPlotView::checkIfPeaksWorkspaceIsAlreadyBeingTracked(
   std::string sourceName(
       vtkSMPropertyHelper(
           source->getProxy(),
-          MantidQt::API::MdConstants::WorkspaceName.toAscii().constData())
+          MantidQt::API::MdConstants::WorkspaceName.toLatin1().constData())
           .GetAsString());
   for (QList<QPointer<pqPipelineSource>>::Iterator it = m_peaksSource.begin();
        it != m_peaksSource.end(); ++it) {
     std::string trackedName(
         vtkSMPropertyHelper(
             (*it)->getProxy(),
-            MantidQt::API::MdConstants::WorkspaceName.toAscii().constData())
+            MantidQt::API::MdConstants::WorkspaceName.toLatin1().constData())
             .GetAsString());
     if ((*it == source) || (sourceName == trackedName)) {
       isContained = true;
@@ -615,11 +616,11 @@ void SplatterPlotView::updatePeaksFilter(pqPipelineSource *filter) {
 
     vtkSMPropertyHelper(
         filter->getProxy(),
-        MantidQt::API::MdConstants::PeaksWorkspace.toAscii().constData())
+        MantidQt::API::MdConstants::PeaksWorkspace.toLatin1().constData())
         .Set(0, workspaceNamesConcatentated.c_str());
     vtkSMPropertyHelper(
         filter->getProxy(),
-        MantidQt::API::MdConstants::PeaksWorkspace.toAscii().constData())
+        MantidQt::API::MdConstants::PeaksWorkspace.toLatin1().constData())
         .Set(1, m_peaksWorkspaceNameDelimiter.c_str());
     emit this->triggerAccept();
     filter->updatePipeline();
diff --git a/qt/scientific_interfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp b/qt/scientific_interfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp
index e12f734c115a8da5a193face2a856eb1ef9928bf..cbc80ccddbfcf22698de5944818881014e362057 100644
--- a/qt/scientific_interfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp
+++ b/qt/scientific_interfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp
@@ -14,10 +14,11 @@
 
 #include <Poco/Path.h>
 
+#include <QEvent>
 #include <QFileDialog>
+#include <QHelpEvent>
 #include <QSettings>
 
-#include <qevent.h>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_zoomer.h>
 #include <qwt_symbol.h>
diff --git a/qt/scientific_interfaces/General/MantidEV.cpp b/qt/scientific_interfaces/General/MantidEV.cpp
index b69da57d69f4891509ec45997d8ec17dcad8e56e..38970194f64c7b56424e4b218a57f7ba8b292b28 100644
--- a/qt/scientific_interfaces/General/MantidEV.cpp
+++ b/qt/scientific_interfaces/General/MantidEV.cpp
@@ -3,6 +3,7 @@
 #include <QFileDialog>
 #include <QSettings>
 #include <QDesktopWidget>
+#include <QThreadPool>
 #include <Poco/Path.h>
 
 #include "MantidEV.h"
diff --git a/qt/scientific_interfaces/General/MantidEV.h b/qt/scientific_interfaces/General/MantidEV.h
index 5e0b36108c5c4b403a4c05cd6a246082663dec0c..fe0d05cb26f35fb49c1e37721c328d60e6b1d834 100644
--- a/qt/scientific_interfaces/General/MantidEV.h
+++ b/qt/scientific_interfaces/General/MantidEV.h
@@ -1,8 +1,7 @@
 #ifndef MANTIDQTCUSTOMINTERFACES_MANTID_EV_H_
 #define MANTIDQTCUSTOMINTERFACES_MANTID_EV_H_
 
-#include <QtCore/QtCore>
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QActionGroup>
 #include <QRunnable>
 #include <Poco/NObserver.h>
@@ -14,6 +13,9 @@
 #include "MantidQtWidgets/Common/UserSubWindow.h"
 #include "MantidQtWidgets/Common/SelectionNotificationService.h"
 
+class QSettings;
+class QThreadPool;
+
 namespace MantidQt {
 namespace CustomInterfaces {
 
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
index c505013423fd24fe0b50c8e8d722e21c4eb2aaed..5261dde7123760a42f3f1251e7ff8f5c3c2c2fa4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflMainWindowView.cpp
@@ -5,7 +5,7 @@
 #include "QtReflSettingsTabView.h"
 #include "ReflMainWindowPresenter.h"
 
-#include <qmessagebox.h>
+#include <QMessageBox>
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
index 96820e2f23c375e86f5a87d4413da6e9dc2857a4..c73169ccb288d91e01f77982e604e52e92abb0cd 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
@@ -8,10 +8,12 @@
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
-#include <qgridlayout.h>
-#include <QtCore/qvariant.h>
-#include <QtGui/qwidget.h>
-#include <QtGui>
+#include <QGridLayout>
+#include <QVariant>
+#include <QWidget>
+
+class QGroupBox;
+class QScrollArea;
 
 namespace MantidQt {
 namespace API {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
index 80062be8a8ec2a1751c294132a5b8d525d965e0f..924fbb8f1d021ed9ad1e1bbb4f935c79db43c305 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
@@ -5,13 +5,19 @@
 #include "MantidAPI/AlgorithmFactory.h"
 #include "DllOption.h"
 
+#include <QComboBox>
+#include <QPoint>
+#include <QString>
+#include <QTreeWidget>
+
 #include <vector>
 #include <Poco/NObserver.h>
 
-#include <QtGui>
 //------------------------------------------------------------------------------
 // Forward declaration
 //------------------------------------------------------------------------------
+class QPushButton;
+
 namespace Mantid {
 namespace API {
 struct Algorithm_descriptor;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
index 01b2cfae5d8932bc8886769ff918129147533322..4b7e31c2fa3f191b3b419d2061354e97cedaf3a1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
@@ -4,7 +4,7 @@
 #include "MantidKernel/System.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
-#include <qcheckbox.h>
+#include <QCheckBox>
 
 namespace MantidQt {
 namespace API {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ColorBarWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ColorBarWidget.h
index c719792aeb47a73c41734cbba078d830732f2f7c..12e47fa35bdb91f925ade83c5250dbd86f922553 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ColorBarWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ColorBarWidget.h
@@ -4,8 +4,8 @@
 #include "MantidQtWidgets/Common/MantidColorMap.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "ui_ColorBarWidget.h"
-#include <QtGui/QWidget>
-#include <QtGui>
+#include <QMouseEvent>
+#include <QWidget>
 #include <qwt_scale_widget.h>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
index ade6a2051d5415faf406bc1cf5d61928816eaa54..e9b53acf4c60054f6d0a752d0c4493571cc78150 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
@@ -5,9 +5,9 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QObject>
+#include <QMenu>
+#include <QToolBar>
 #include <memory>
-#include <qmenu.h>
-#include <qtoolbar.h>
 #include <vector>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
index 34046a855e31193814886e9a731e8ebe9823fcb1..437e706f62f9ec896802d2fa70df26fbdce0534e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
@@ -3,11 +3,11 @@
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/TextPropertyWidget.h"
-#include <QtCore/qstringlist.h>
-#include <QtCore/qstring.h>
+#include <QStringList>
+#include <QString>
 #include "MantidAPI/MultipleFileProperty.h"
 #include "MantidAPI/FileProperty.h"
-#include <qpushbutton.h>
+#include <QPushButton>
 
 namespace MantidQt {
 namespace API {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
index 2f8d29fb7f50aaeda27cfa844dc2978c6f53cef6..e598f6dd5398744d6cbc9cc9271f9458140eb073 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
@@ -7,7 +7,7 @@
 #include "AlgorithmDialog.h"
 
 #include <QHash>
-#include <QtCore/qvariant.h>
+#include <QVariant>
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/Property.h"
 #include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
index 88564573557f0c5da143facc8a5eb20306297a17..9f36d636a57b76d7375a3c5994780e198db33dc5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
@@ -5,13 +5,16 @@
 #include "MantidAPI/AlgorithmFactory.h"
 #include "DllOption.h"
 
+#include <QLineEdit>
+
 #include <map>
-#include <QtGui>
 #include <string>
 
 //------------------------------------------------------------------------------
 // Forward declaration
 //------------------------------------------------------------------------------
+class QLabel;
+
 namespace MantidQt {
 namespace MantidWidgets {
 /** HintingLineEdit : A QLineEdit widget providing autocompletion.
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
index 1a33ed71ea1574170b6f87e00126a8e499c3b2b2..fcf8ea86fdc70570eb6e5883ddfd2505ae83e6a9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
@@ -4,7 +4,7 @@
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
-#include <qlistwidget.h>
+#include <QListWidget>
 #include <QLabel>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
index c07626a5931ebe0441d9ad9ce1e686cb630a7755..c7922e4a21ca89444f4fd48e2b2694a8dd63a8ac 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
@@ -4,7 +4,7 @@
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
-#include <qcombobox.h>
+#include <QComboBox>
 #include <QLabel>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PeriodicTableWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PeriodicTableWidget.h
index cfaeb4e803942490d5d7dceb5b039d04ec9ca7b2..18ec5dee7de6d6118029a39787e17cb5f440f6c8 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PeriodicTableWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PeriodicTableWidget.h
@@ -2,7 +2,7 @@
 #define MANTID_MANTIDWIDGETS_PERIODICTABLEWIDGET_H_
 
 #include "MantidQtWidgets/Common/DllOption.h"
-#include <qvector.h>
+#include <QVector>
 #include <QWidget>
 #include "ui_PeriodicTableWidget.h"
 
@@ -114,4 +114,4 @@ private:
   void ColourElements();
 };
 
-#endif // !MANTID_MANTIDWIDGETS_PERIODICTABLE_H_
\ No newline at end of file
+#endif // !MANTID_MANTIDWIDGETS_PERIODICTABLE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
index 8702000f7a4e5568444b30028f0046866f1dc163..a92664e29ae0b9a1545dc31a4ef14aff56c5bb8f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
@@ -3,8 +3,8 @@
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Property.h"
-#include <QtGui/qwidget.h>
-#include <qgridlayout.h>
+#include <QWidget>
+#include <QGridLayout>
 #include "MantidQtWidgets/Common/PropertyWidget.h"
 
 namespace MantidQt {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
index c11b3bf86019376b53398f38d2c617e9e8ed6d9b..b285841e36d50097e5e5b3ef39ff3c3cf97a3541 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
@@ -3,12 +3,12 @@
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QDoubleValidator>
-#include <QtGui/QLineEdit>
-#include <QtCore/QVariant>
-#include <QtCore/QDebug>
-#include <QtCore/QString>
+#include <QDoubleSpinBox>
+#include <QDoubleValidator>
+#include <QLineEdit>
+#include <QVariant>
+#include <QDebug>
+#include <QString>
 
 namespace MantidQt {
 namespace API {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
index 8d716430bfa6f3675029a23bcd0b1dd7edda2dcd..21f1442091a5b8685d0513260d5a78328ab6f9b2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
@@ -89,7 +89,7 @@
 #define QTBUTTONPROPERTYBROWSER_H
 
 #include "qtpropertybrowser.h"
-#include <QtCore/QMap>
+#include <QMap>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
index 31e04bd5500e5ca5b2ecde51286452ef3ec346da..8c4c2e8ebbddb242cb78bdee69fefa15ac00aed4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
@@ -89,7 +89,7 @@
 #define QTGROUPBOXPROPERTYBROWSER_H
 
 #include "qtpropertybrowser.h"
-#include <QtCore/QMap>
+#include <QMap>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
index 9bf2cbd934cdacbfc12045ad27fa0404024629b9..8cb8d4125d72b85317c372003871dfc21c642280 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
@@ -89,9 +89,9 @@
 #define QTPROPERTYBROWSER_H
 
 #include "MantidQtWidgets/Common/DllOption.h"
-#include <QtGui/QWidget>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
+#include <QWidget>
+#include <QMap>
+#include <QSet>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
index 88ca7069a55fe95777cd7af002788ae4ff3899c7..b53b0f345aaf0ca2ba12e917fbfc37ad3d62ed48 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
@@ -99,10 +99,10 @@
 #ifndef QTPROPERTYBROWSERUTILS_H
 #define QTPROPERTYBROWSERUTILS_H
 
-#include <QtCore/QMap>
-#include <QtGui/QIcon>
-#include <QtGui/QWidget>
-#include <QtCore/QStringList>
+#include <QMap>
+#include <QIcon>
+#include <QWidget>
+#include <QStringList>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
index 5d94ce57b7d606f8eb82b47e2323d68672925670..8ea12176eae39d826fb1cf9803b5d3908468031f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
@@ -89,8 +89,8 @@
 #define QTVARIANTPROPERTY_H
 
 #include "qtpropertybrowser.h"
-#include <QtCore/QVariant>
-#include <QtGui/QIcon>
+#include <QVariant>
+#include <QIcon>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SafeQwtPlot.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SafeQwtPlot.h
index 41eda8ee92c4bd602fc2181c5266504957bb84ea..cfc2ccf44e523de3b2cde7a158a308028731a37f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SafeQwtPlot.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SafeQwtPlot.h
@@ -3,7 +3,7 @@
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <qwt_plot.h>
-#include <qpainter.h>
+#include <QPainter>
 #include "qwt_text.h"
 #include "MantidAPI/Workspace_fwd.h"
 #include "DllOption.h"
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
index 1792f898c486a33f0d188cd9ec663f4a07b9f65b..11f64938f1693ac154f09b2e3eb8cd0671f2213c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
@@ -3,9 +3,9 @@
 
 #include "MantidKernel/System.h"
 #include "DllOption.h"
-#include <QtGui/qwidget.h>
-#include <qpushbutton.h>
-#include <QtGui/qaction.h>
+#include <QAction>
+#include <QPushButton>
+#include <QWidget>
 
 namespace MantidQt {
 namespace API {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
index ed65733340d36ee5042981180e96944d4fec2289..e5fbd563467aec98cdaa0e6da0e6fdcb0870affc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
-#include <qlineedit.h>
+#include <QLineEdit>
 #include <QLabel>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/src/AlgorithmDialog.cpp b/qt/widgets/common/src/AlgorithmDialog.cpp
index 6909d5f8804aecf1d5cbbfaeab0b01e9768c0202..d527bccf319af76cf6aa94f2884b59a81187a88c 100644
--- a/qt/widgets/common/src/AlgorithmDialog.cpp
+++ b/qt/widgets/common/src/AlgorithmDialog.cpp
@@ -12,14 +12,15 @@
 #include "MantidQtWidgets/Common/MantidWidget.h"
 
 #include <QCheckBox>
+#include <QCloseEvent>
 #include <QComboBox>
+#include <QDateTimeEdit>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QtGui>
 
 #include <Poco/ActiveResult.h>
 
diff --git a/qt/widgets/common/src/AlgorithmPropertiesWidget.cpp b/qt/widgets/common/src/AlgorithmPropertiesWidget.cpp
index 914e86c179c1c185a0ba4112997191006c3d8e08..8813b65b599e70ac2cac9fdb94756b7a3b59ffe8 100644
--- a/qt/widgets/common/src/AlgorithmPropertiesWidget.cpp
+++ b/qt/widgets/common/src/AlgorithmPropertiesWidget.cpp
@@ -2,7 +2,6 @@
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
-#include <QtGui>
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidQtWidgets/Common/PropertyWidgetFactory.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
@@ -11,8 +10,13 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/AlgorithmProxy.h"
-#include <vector>
+
+#include <QCoreApplication>
+#include <QGroupBox>
+#include <QScrollArea>
+
 #include <algorithm>
+#include <vector>
 
 using namespace Mantid::Kernel;
 using Mantid::API::IWorkspaceProperty;
diff --git a/qt/widgets/common/src/AlgorithmSelectorWidget.cpp b/qt/widgets/common/src/AlgorithmSelectorWidget.cpp
index 59297206a6a624b9e2b4bb24f71d6b1243e97376..a4ce54c4760cfb6f9818657255a94289cfb8dae7 100644
--- a/qt/widgets/common/src/AlgorithmSelectorWidget.cpp
+++ b/qt/widgets/common/src/AlgorithmSelectorWidget.cpp
@@ -4,6 +4,12 @@
 
 #include "boost/algorithm/string.hpp"
 
+#include <QApplication>
+#include <QCompleter>
+#include <QHBoxLayout>
+#include <QMouseEvent>
+#include <QPushButton>
+
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
 
diff --git a/qt/widgets/common/src/ColorBarWidget.cpp b/qt/widgets/common/src/ColorBarWidget.cpp
index 83c0a1e4259383246eaaca73fcd7c7e4bcaa2a8d..1658b518d30349465ed21a23c304f07561abdd98 100644
--- a/qt/widgets/common/src/ColorBarWidget.cpp
+++ b/qt/widgets/common/src/ColorBarWidget.cpp
@@ -4,6 +4,7 @@
 #include "MantidQtWidgets/Common/QScienceSpinBox.h"
 #include "MantidQtWidgets/Common/TSVSerialiser.h"
 #include <QKeyEvent>
+#include <QToolTip>
 #include <qwt_scale_engine.h>
 #include <qwt_scale_map.h>
 #include <qwt_scale_widget.h>
diff --git a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
index 6f7d05820ed892f39d11af8bf251e0a4393e1374..1e1ca4a5facc40ad47aded27247f4e2c17a1a32c 100644
--- a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
@@ -5,9 +5,13 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/HintingLineEditFactory.h"
 
+#include <QClipboard>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QSettings>
+#include <QWhatsThis>
 #include <QWidget>
-#include <qinputdialog.h>
-#include <qmessagebox.h>
 
 namespace {
 const QString DataProcessorSettingsGroup =
diff --git a/qt/widgets/common/src/DataProcessorUI/QtDataProcessorOptionsDialog.cpp b/qt/widgets/common/src/DataProcessorUI/QtDataProcessorOptionsDialog.cpp
index e95e51ac3865084f2d5ff861aba29146ffedb849..70acdf0abaf402599a7f3bde17db2b4230cdc048 100644
--- a/qt/widgets/common/src/DataProcessorUI/QtDataProcessorOptionsDialog.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QtDataProcessorOptionsDialog.cpp
@@ -1,7 +1,7 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h"
-#include <qpushbutton.h>
+#include <QPushButton>
 
 namespace MantidQt {
 namespace MantidWidgets {
diff --git a/qt/widgets/common/src/DoubleSpinBox.cpp b/qt/widgets/common/src/DoubleSpinBox.cpp
index 295e076e4bd632e05e67353d6dd19b765ef08847..9ca670a83b4d82cb4fcee72886de3bdf0852007f 100644
--- a/qt/widgets/common/src/DoubleSpinBox.cpp
+++ b/qt/widgets/common/src/DoubleSpinBox.cpp
@@ -131,7 +131,7 @@ void DoubleSpinBox::interpretText(bool notify) {
   //    parser.addGSLConstants();
   //    try
   //    {
-  //      parser.SetExpr(s.toAscii().constData());
+  //      parser.SetExpr(s.toLatin1().constData());
   //      value = parser.Eval();
   //    } catch (mu::ParserError &e)
   //    {
diff --git a/qt/widgets/common/src/FlowLayout.cpp b/qt/widgets/common/src/FlowLayout.cpp
index 1b0ee47493cf31aa1cad6f813f139a8a571e36b0..0e37cdf3eca7bc5cd9af0106e153e13a97199ff3 100644
--- a/qt/widgets/common/src/FlowLayout.cpp
+++ b/qt/widgets/common/src/FlowLayout.cpp
@@ -38,9 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "MantidQtWidgets/Common/FlowLayout.h"
+#include <QWidget>
 
 namespace MantidQt {
 namespace API {
@@ -162,4 +161,4 @@ int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const {
   }
 }
 }
-}
\ No newline at end of file
+}
diff --git a/qt/widgets/common/src/GenericDialog.cpp b/qt/widgets/common/src/GenericDialog.cpp
index 2972110ff8a3e7880beb18304386727f10f6e93c..adf7965ff300a3993df2f83b9d7a37f775b5342c 100644
--- a/qt/widgets/common/src/GenericDialog.cpp
+++ b/qt/widgets/common/src/GenericDialog.cpp
@@ -10,21 +10,23 @@
 #include "MantidKernel/MaskedProperty.h"
 
 #include <QApplication>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDesktopWidget>
-#include <QScrollArea>
+#include <QDir>
+#include <QFileInfo>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
 #include <QLabel>
-#include <QPalette>
-#include <QCheckBox>
-#include <QComboBox>
 #include <QLineEdit>
+#include <QMessageBox>
+#include <QPalette>
+#include <QPushButton>
+#include <QScrollArea>
 #include <QSignalMapper>
-#include <QFileInfo>
-#include <QDir>
-#include <QGroupBox>
+#include <QVBoxLayout>
+
 #include <climits>
 #include "MantidQtWidgets/Common/PropertyWidgetFactory.h"
 #include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
diff --git a/qt/widgets/common/src/HintingLineEdit.cpp b/qt/widgets/common/src/HintingLineEdit.cpp
index 32b53ad96b891a23d5304e6e459b5bbb036c365d..a085a2f56797f97cc7b7473e29ccfc900dc01797 100644
--- a/qt/widgets/common/src/HintingLineEdit.cpp
+++ b/qt/widgets/common/src/HintingLineEdit.cpp
@@ -1,6 +1,9 @@
 #include "MantidQtWidgets/Common/HintingLineEdit.h"
 
 #include <boost/algorithm/string.hpp>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QStyle>
 #include <QToolTip>
 
 namespace MantidQt {
diff --git a/qt/widgets/common/src/ListPropertyWidget.cpp b/qt/widgets/common/src/ListPropertyWidget.cpp
index e3bfe64c8d91d63b196bacd5b9d30f2a873301d6..8c81afa137cc17d8ef6922c7d140cb42d4eab6c0 100644
--- a/qt/widgets/common/src/ListPropertyWidget.cpp
+++ b/qt/widgets/common/src/ListPropertyWidget.cpp
@@ -1,6 +1,5 @@
 #include "MantidQtWidgets/Common/ListPropertyWidget.h"
 #include "MantidKernel/System.h"
-#include <QtGui>
 #include <QLabel>
 #include "MantidAPI/IWorkspaceProperty.h"
 #include "MantidKernel/ConfigService.h"
diff --git a/qt/widgets/common/src/MWView.cpp b/qt/widgets/common/src/MWView.cpp
index 7764e4303a92f8aedaed20b14daf727b94d555c1..de6f54576859711f69fd5f7fb6d7c0becec92225 100644
--- a/qt/widgets/common/src/MWView.cpp
+++ b/qt/widgets/common/src/MWView.cpp
@@ -12,6 +12,7 @@
 // includes for interface development
 #include "MantidQtWidgets/Common/QwtRasterDataMD.h"
 #include "MantidQtWidgets/Common/MantidColorMap.h"
+#include <QSettings>
 #include <qwt_color_map.h>
 #include <qwt_double_rect.h>
 // system includes
diff --git a/qt/widgets/common/src/ManageUserDirectories.cpp b/qt/widgets/common/src/ManageUserDirectories.cpp
index 3497a9cfbe31c898fa1cd5925d739703b898c5c3..4919388c1d366ee550a3111aa98a1c1e8d9b6df1 100644
--- a/qt/widgets/common/src/ManageUserDirectories.cpp
+++ b/qt/widgets/common/src/ManageUserDirectories.cpp
@@ -1,8 +1,10 @@
 #include "MantidQtWidgets/Common/ManageUserDirectories.h"
 #include "MantidQtWidgets/Common/MantidDesktopServices.h"
 #include "MantidKernel/ConfigService.h"
-#include <QtGui>
 #include <QDir>
+#include <QFileDialog>
+#include <QSettings>
+#include <QUrl>
 
 using namespace MantidQt::API;
 
diff --git a/qt/widgets/common/src/MantidColorMap.cpp b/qt/widgets/common/src/MantidColorMap.cpp
index 888b14bc94f50759c3b03fab477a382cdbe64b9f..e75d3fcf4d67a31f4226f4ab65ef7b423602bc64 100644
--- a/qt/widgets/common/src/MantidColorMap.cpp
+++ b/qt/widgets/common/src/MantidColorMap.cpp
@@ -9,12 +9,11 @@
 #include <string>
 #include <cmath>
 
-#include <iostream>
 #include <QRgb>
 #include <limits>
 
 #include "MantidKernel/ConfigService.h"
-#include <qfiledialog.h>
+#include <QFileDialog>
 
 using Mantid::Kernel::ConfigService;
 
diff --git a/qt/widgets/common/src/MantidWSIndexDialog.cpp b/qt/widgets/common/src/MantidWSIndexDialog.cpp
index b403700ab9bbd89e6d3240b62be9b10c987b9bf3..20d44498ad0c95770f2cd3bace42350cdd5b225a 100644
--- a/qt/widgets/common/src/MantidWSIndexDialog.cpp
+++ b/qt/widgets/common/src/MantidWSIndexDialog.cpp
@@ -457,7 +457,7 @@ void MantidWSIndexWidget::initWorkspaceBox() {
   m_wsBox = new QVBoxLayout;
   const QString wsIndices = m_wsIndexIntervals.toQString();
   const QString label = "Enter Workspace Indices: " + wsIndices;
-  m_wsMessage = new QLabel(tr(label.toAscii().constData()));
+  m_wsMessage = new QLabel(tr(label.toLatin1().constData()));
   m_wsField = new QLineEditWithErrorMark();
 
   m_wsField->lineEdit()->setValidator(
@@ -481,7 +481,7 @@ void MantidWSIndexWidget::initSpectraBox() {
   m_spectraBox = new QVBoxLayout;
   const QString spectraNumbers = m_spectraNumIntervals.toQString();
   const QString label = "Enter Spectra Numbers: " + spectraNumbers;
-  m_spectraMessage = new QLabel(tr(label.toAscii().constData()));
+  m_spectraMessage = new QLabel(tr(label.toLatin1().constData()));
   m_spectraField = new QLineEditWithErrorMark();
   m_orMessage = new QLabel(tr("<br>Or"));
 
diff --git a/qt/widgets/common/src/OptionsPropertyWidget.cpp b/qt/widgets/common/src/OptionsPropertyWidget.cpp
index 0f8e84efe5622b85657d7d7deabeac375db76f6d..8aef5a58ee043ed234285d3837bb7cd97f87674b 100644
--- a/qt/widgets/common/src/OptionsPropertyWidget.cpp
+++ b/qt/widgets/common/src/OptionsPropertyWidget.cpp
@@ -1,10 +1,9 @@
 #include "MantidQtWidgets/Common/OptionsPropertyWidget.h"
 #include "MantidKernel/System.h"
-#include <QtGui>
-#include <QLabel>
 #include "MantidAPI/IWorkspaceProperty.h"
 #include "MantidKernel/ConfigService.h"
-#include <qcombobox.h>
+#include <QComboBox>
+#include <QLabel>
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/qt/widgets/common/src/ProcessingAlgoWidget.cpp b/qt/widgets/common/src/ProcessingAlgoWidget.cpp
index 09b01dd794fc743add8af87d5d712a0508f9c5e4..6eb455d2d1098186f47780d66381df5e6894908c 100644
--- a/qt/widgets/common/src/ProcessingAlgoWidget.cpp
+++ b/qt/widgets/common/src/ProcessingAlgoWidget.cpp
@@ -4,7 +4,10 @@
 #include "MantidAPI/AlgorithmManager.h"
 #include <iosfwd>
 #include <fstream>
+#include <QFileDialog>
 #include <QFileInfo>
+#include <QMessageBox>
+#include <QSettings>
 
 using Mantid::API::Algorithm_sptr;
 using Mantid::API::AlgorithmManager;
diff --git a/qt/widgets/common/src/PythonRunner.cpp b/qt/widgets/common/src/PythonRunner.cpp
index 624bbb44c8322004160d2a79fbc516cfcd3a3ab7..ac4d8218c8707a7355fbed8eb40f03d414932401 100644
--- a/qt/widgets/common/src/PythonRunner.cpp
+++ b/qt/widgets/common/src/PythonRunner.cpp
@@ -26,7 +26,7 @@ QString PythonRunner::runPythonCode(const QString &code, bool no_output) {
   using Mantid::Kernel::Logger;
 
   if (g_log.is(Logger::Priority::PRIO_DEBUG))
-    g_log.debug() << "Running Python code:\n" << code.toAscii().data() << "\n";
+    g_log.debug() << "Running Python code:\n" << code.toLatin1().data() << "\n";
 
   if (no_output) {
     emit runAsPythonScript(code, true);
@@ -64,7 +64,7 @@ QString PythonRunner::runPythonCode(const QString &code, bool no_output) {
   // with clang
   if (g_log.is(Logger::Priority::PRIO_DEBUG))
     g_log.debug() << "Raw output from execution:\n"
-                  << tmpstring.toAscii().data() << "\n";
+                  << tmpstring.toLatin1().data() << "\n";
   return tmpstring;
 }
 /** This Python helper function converts a list of strings into one
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtbuttonpropertybrowser.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtbuttonpropertybrowser.cpp
index 127e6f8da7e2ee59e7be4c7bd5e178aa2d76961c..ed63f5a1828e2066f7bb51844d5da4591ff872be 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtbuttonpropertybrowser.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtbuttonpropertybrowser.cpp
@@ -86,12 +86,12 @@
 ****************************************************************************/
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h"
-#include <QtCore/QSet>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtCore/QTimer>
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
+#include <QSet>
+#include <QGridLayout>
+#include <QLabel>
+#include <QTimer>
+#include <QToolButton>
+#include <QStyle>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qteditorfactory.cpp b/qt/widgets/common/src/QtPropertyBrowser/qteditorfactory.cpp
index 4011dbfa1d4fdaa563c0a363a77a659ee97b2868..8df905952a4a586c26837e7b29f82d2b99f143f9 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qteditorfactory.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qteditorfactory.cpp
@@ -87,22 +87,22 @@
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h"
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h"
-#include <QtGui/QSpinBox>
-#include <QtGui/QScrollBar>
-#include <QtGui/QComboBox>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QLineEdit>
-#include <QtGui/QDateTimeEdit>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
-#include <QtGui/QColorDialog>
-#include <QtGui/QFontDialog>
-#include <QtGui/QSpacerItem>
-#include <QtCore/QMap>
+#include <QSpinBox>
+#include <QScrollBar>
+#include <QComboBox>
+#include <QAbstractItemView>
+#include <QLineEdit>
+#include <QDateTimeEdit>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QKeyEvent>
+#include <QApplication>
+#include <QLabel>
+#include <QToolButton>
+#include <QColorDialog>
+#include <QFontDialog>
+#include <QSpacerItem>
+#include <QMap>
 
 #if defined(Q_CC_MSVC)
 #pragma warning(                                                               \
@@ -153,7 +153,7 @@ Editor *EditorFactoryPrivate<Editor>::createEditor(QtProperty *property,
 template <class Editor>
 void EditorFactoryPrivate<Editor>::initializeEditor(QtProperty *property,
                                                     Editor *editor) {
-  Q_TYPENAME PropertyToEditorListMap::iterator it =
+  typename PropertyToEditorListMap::iterator it =
       m_createdEditors.find(property);
   if (it == m_createdEditors.end())
     it = m_createdEditors.insert(property, EditorList());
@@ -163,15 +163,14 @@ void EditorFactoryPrivate<Editor>::initializeEditor(QtProperty *property,
 
 template <class Editor>
 void EditorFactoryPrivate<Editor>::slotEditorDestroyed(QObject *object) {
-  const Q_TYPENAME EditorToPropertyMap::iterator ecend =
-      m_editorToProperty.end();
-  for (Q_TYPENAME EditorToPropertyMap::iterator itEditor =
+  const typename EditorToPropertyMap::iterator ecend = m_editorToProperty.end();
+  for (typename EditorToPropertyMap::iterator itEditor =
            m_editorToProperty.begin();
        itEditor != ecend; ++itEditor) {
     if (itEditor.key() == object) {
       Editor *editor = itEditor.key();
       QtProperty *property = itEditor.value();
-      const Q_TYPENAME PropertyToEditorListMap::iterator pit =
+      const typename PropertyToEditorListMap::iterator pit =
           m_createdEditors.find(property);
       if (pit != m_createdEditors.end()) {
         pit.value().removeAll(editor);
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtgroupboxpropertybrowser.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtgroupboxpropertybrowser.cpp
index 5dfb2bdaa392ce500508ad1273f629b1da89870b..589baccb38b5e8def59c68e565ac6bd0b26446d9 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtgroupboxpropertybrowser.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtgroupboxpropertybrowser.cpp
@@ -86,11 +86,11 @@
 ****************************************************************************/
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h"
-#include <QtCore/QSet>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QGroupBox>
-#include <QtCore/QTimer>
+#include <QSet>
+#include <QGridLayout>
+#include <QLabel>
+#include <QGroupBox>
+#include <QTimer>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowser.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowser.cpp
index 6dc16eaf598944a0ce67124f5f9d1015743d8e8a..ce5d0bb953d736514f6205f50d236e6677a0f321 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowser.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowser.cpp
@@ -86,8 +86,8 @@
 ****************************************************************************/
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h"
-#include <QtCore/QSet>
-#include <QtGui/QIcon>
+#include <QSet>
+#include <QIcon>
 
 #if defined(Q_CC_MSVC)
 #pragma warning(                                                               \
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowserutils.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowserutils.cpp
index dcb269cb31b8ec60d17b345c0d75f8f924ec979f..075b2f9b9b9ca6cc08c38b8c1e086ddf0d3be9f2 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowserutils.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtpropertybrowserutils.cpp
@@ -86,13 +86,13 @@
 ****************************************************************************/
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h"
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QCheckBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMenu>
+#include <QApplication>
+#include <QPainter>
+#include <QHBoxLayout>
+#include <QMouseEvent>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QMenu>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtpropertymanager.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtpropertymanager.cpp
index 807314d4253a466994eb56746a317761e96d39f7..88d1090f2cc7fb682b8894856fd0e1f9a3ce1272 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtpropertymanager.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtpropertymanager.cpp
@@ -87,18 +87,18 @@
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QLocale>
-#include <QtCore/QMap>
-#include <QtCore/QTimer>
-#include <QtGui/QIcon>
-#include <QtCore/QMetaEnum>
-#include <QtGui/QFontDatabase>
-#include <QtGui/QStyleOption>
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QLabel>
+#include <QDateTime>
+#include <QLocale>
+#include <QMap>
+#include <QTimer>
+#include <QIcon>
+#include <QMetaEnum>
+#include <QFontDatabase>
+#include <QStyleOption>
+#include <QStyle>
+#include <QApplication>
+#include <QPainter>
+#include <QLabel>
 
 #include <cfloat>
 #include <climits>
@@ -227,7 +227,7 @@ static Value getData(const QMap<const QtProperty *, PrivateData> &propertyMap,
                      Value PrivateData::*data, const QtProperty *property,
                      const Value &defaultValue = Value()) {
   typedef QMap<const QtProperty *, PrivateData> PropertyToData;
-  typedef Q_TYPENAME PropertyToData::const_iterator PropertyToDataConstIterator;
+  typedef typename PropertyToData::const_iterator PropertyToDataConstIterator;
   const PropertyToDataConstIterator it = propertyMap.constFind(property);
   if (it == propertyMap.constEnd())
     return defaultValue;
@@ -265,7 +265,7 @@ static void setSimpleValue(
                                                 ValueChangeParameter),
     QtProperty *property, const Value &val) {
   typedef QMap<const QtProperty *, Value> PropertyToData;
-  typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+  typedef typename PropertyToData::iterator PropertyToDataIterator;
   const PropertyToDataIterator it = propertyMap.find(property);
   if (it == propertyMap.end())
     return;
@@ -289,9 +289,9 @@ static void setValueInRange(
     QtProperty *property, const Value &val,
     void (PropertyManagerPrivate::*setSubPropertyValue)(QtProperty *,
                                                         ValueChangeParameter)) {
-  typedef Q_TYPENAME PropertyManagerPrivate::Data PrivateData;
+  typedef typename PropertyManagerPrivate::Data PrivateData;
   typedef QMap<const QtProperty *, PrivateData> PropertyToData;
-  typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+  typedef typename PropertyToData::iterator PropertyToDataIterator;
   const PropertyToDataIterator it = managerPrivate->m_values.find(property);
   if (it == managerPrivate->m_values.end())
     return;
@@ -330,9 +330,9 @@ static void setBorderValues(
                                                         ValueChangeParameter,
                                                         ValueChangeParameter,
                                                         ValueChangeParameter)) {
-  typedef Q_TYPENAME PropertyManagerPrivate::Data PrivateData;
+  typedef typename PropertyManagerPrivate::Data PrivateData;
   typedef QMap<const QtProperty *, PrivateData> PropertyToData;
-  typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+  typedef typename PropertyToData::iterator PropertyToDataIterator;
   const PropertyToDataIterator it = managerPrivate->m_values.find(property);
   if (it == managerPrivate->m_values.end())
     return;
@@ -382,7 +382,7 @@ static void setBorderValue(
                                                         ValueChangeParameter,
                                                         ValueChangeParameter)) {
   typedef QMap<const QtProperty *, PrivateData> PropertyToData;
-  typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+  typedef typename PropertyToData::iterator PropertyToDataIterator;
   const PropertyToDataIterator it = managerPrivate->m_values.find(property);
   if (it == managerPrivate->m_values.end())
     return;
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp b/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
index 7cc4c311fa453427dce4d3062070d3a85b0d9e05..7aea531acf1779f5ff857333fcb71c2d25fb67ff 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
@@ -86,19 +86,19 @@
 ****************************************************************************/
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h"
-#include <QtCore/QSet>
-#include <QtGui/QIcon>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPainter>
-#include <QtGui/QApplication>
-#include <QtGui/QFocusEvent>
-#include <QtGui/QStyle>
-#include <QtGui/QPalette>
-#include <QtGui/qcheckbox.h>
-#include <QtGui/qlineedit.h>
+#include <QSet>
+#include <QIcon>
+#include <QTreeWidget>
+#include <QItemDelegate>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QPainter>
+#include <QApplication>
+#include <QFocusEvent>
+#include <QStyle>
+#include <QPalette>
+#include <QCheckBox>
+#include <QLineEdit>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
diff --git a/qt/widgets/common/src/QtPropertyBrowser/qtvariantproperty.cpp b/qt/widgets/common/src/QtPropertyBrowser/qtvariantproperty.cpp
index 837ce0caaa811e03670426d332e2cf334e5af921..421489b651e9a4ef86a565ce93a6c7b4baa36b8a 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qtvariantproperty.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qtvariantproperty.cpp
@@ -88,10 +88,10 @@
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h"
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h"
-#include <QtCore/QVariant>
-#include <QtGui/QIcon>
-#include <QtCore/QDate>
-#include <QtCore/QLocale>
+#include <QVariant>
+#include <QIcon>
+#include <QDate>
+#include <QLocale>
 
 #if defined(Q_CC_MSVC)
 #pragma warning(                                                               \
diff --git a/qt/widgets/common/src/RepoModel.cpp b/qt/widgets/common/src/RepoModel.cpp
index 2ddd13066cd69b4cc47ddf468f54457786d91848..a812a20326bf377d9d35d01ea37164a41a088f78 100644
--- a/qt/widgets/common/src/RepoModel.cpp
+++ b/qt/widgets/common/src/RepoModel.cpp
@@ -1,4 +1,3 @@
-#include <QtGui>
 #include "MantidQtWidgets/Common/RepoModel.h"
 
 #include "MantidAPI/ScriptRepositoryFactory.h"
@@ -8,12 +7,11 @@
 #include "MantidKernel/Logger.h"
 #include <QIcon>
 #include <QPixmap>
-using namespace MantidQt::API;
-using Mantid::Kernel::ConfigServiceImpl;
-using Mantid::Kernel::ConfigService;
+
 #include <QDebug>
 #include <stdexcept>
 #include <QCheckBox>
+#include <QLabel>
 #include <QLineEdit>
 #include <QVBoxLayout>
 #include <QFormLayout>
@@ -21,8 +19,14 @@ using Mantid::Kernel::ConfigService;
 #include <QGroupBox>
 #include <QDialogButtonBox>
 #include <QtConcurrentRun>
+#include <QSettings>
+#include <QTextEdit>
 #include <QTextStream>
 
+using namespace MantidQt::API;
+using Mantid::Kernel::ConfigServiceImpl;
+using Mantid::Kernel::ConfigService;
+
 namespace {
 /// static logger
 Mantid::Kernel::Logger g_log("RepoModel");
diff --git a/qt/widgets/common/src/ScriptEditor.cpp b/qt/widgets/common/src/ScriptEditor.cpp
index 5accd2bc719e01fdaf2c6cc558cd7e6dbb6327da..06c62924ff90183cb15c716126294513ea2a98d2 100644
--- a/qt/widgets/common/src/ScriptEditor.cpp
+++ b/qt/widgets/common/src/ScriptEditor.cpp
@@ -294,7 +294,7 @@ void ScriptEditor::saveScript(const QString &filename) {
   if (!file.open(QIODevice::WriteOnly)) {
     QString msg =
         QString("Could not open file \"%1\" for writing.").arg(filename);
-    throw std::runtime_error(msg.toAscii().data());
+    throw std::runtime_error(msg.toLatin1().data());
   }
 
   m_filename = filename;
diff --git a/qt/widgets/common/test/GenericDialogDemo.cpp b/qt/widgets/common/test/GenericDialogDemo.cpp
deleted file mode 100644
index 5b3e468131bade990c125e3607b5e1ef94d3d112..0000000000000000000000000000000000000000
--- a/qt/widgets/common/test/GenericDialogDemo.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "MantidAPI/Algorithm.h"
-#include "MantidAPI/AlgorithmFactory.h"
-#include "MantidAPI/AlgorithmManager.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/MultipleFileProperty.h"
-#include "MantidAPI/WorkspaceProperty.h"
-#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/Logger.h"
-#include "MantidKernel/MantidVersion.h"
-#include "MantidKernel/PropertyWithValue.h"
-#include "MantidQtAPI/BoolPropertyWidget.h"
-#include "MantidQtAPI/GenericDialog.h"
-#include "MantidQtAPI/PropertyWidgetFactory.h"
-#include "MantidQtAPI/TextPropertyWidget.h"
-#include "qmainwindow.h"
-#include <iostream>
-#include <QApplication>
-#include <QDir>
-#include <QFrame>
-#include <qlayout.h>
-#include <QMessageBox>
-#include <QSplashScreen>
-#include <QtCore/qstring.h>
-#include <QThread>
-#include <QtCore/qstringlist.h>
-#include "qapplication.h"
-
-using namespace Mantid::Kernel;
-using namespace Mantid::API;
-using namespace MantidQt::API;
-
-void showAlgo(IAlgorithm_sptr alg, QStringList enabled, QStringList disabled,
-              QApplication &app) {
-  GenericDialog *dlg = new GenericDialog(NULL);
-
-  // Set the content
-  dlg->setAlgorithm(alg.get());
-  // dlg->setPresetValues(preset_values);
-  // dlg->isForScript(forScript);
-  dlg->setOptionalMessage(QString::fromStdString(alg->getOptionalMessage()));
-
-  dlg->addEnabledAndDisableLists(enabled, disabled);
-
-  // Setup the layout
-  dlg->initializeLayout();
-
-  // Show dialog
-  dlg->show();
-  app.exec();
-  dlg->close();
-  delete dlg;
-}
-
-/** This application will be used for debugging and testing the
- * GenericDialog and the AlgorithmPropertiesWidget.
- */
-int main(int argc, char **argv) {
-  QApplication app(argc, argv);
-  app.setApplicationName("PropertyWidgets demo");
-
-  FrameworkManager::Instance();
-
-  QStringList enabled;
-  if (argc > 2)
-    enabled = QStringList::split(",", argv[2], false);
-  QStringList disabled;
-  if (argc > 3)
-    disabled = QStringList::split(",", argv[3], false);
-
-  // Create the algorithm using the argument, with a default
-  std::string algo = "LoadEventNexus";
-  if (argc > 1)
-    algo = std::string(argv[1]);
-  if (algo == "ALL") {
-    std::vector<std::string> names = AlgorithmFactory::Instance().getKeys();
-    std::cout << names.size() << " algos.\n";
-    for (auto it = names.begin(); it != names.end(); it++) {
-      std::pair<std::string, int> decoded =
-          AlgorithmFactory::Instance().decodeName(*it);
-      std::string name = decoded.first;
-      std::cout << name << std::endl;
-      IAlgorithm_sptr alg = AlgorithmManager::Instance().create(name);
-      showAlgo(alg, enabled, disabled, app);
-    }
-  } else {
-    IAlgorithm_sptr alg = AlgorithmManager::Instance().create(algo);
-    showAlgo(alg, enabled, disabled, app);
-  }
-
-  return 0;
-}
diff --git a/qt/widgets/common/test/main_PropertyWidgetsDemo.cpp b/qt/widgets/common/test/main_PropertyWidgetsDemo.cpp
deleted file mode 100644
index 9500627a6c0798a20143b67a388a5aa93aa7f96b..0000000000000000000000000000000000000000
--- a/qt/widgets/common/test/main_PropertyWidgetsDemo.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-
-#include "MantidKernel/Logger.h"
-#include "MantidKernel/MantidVersion.h"
-#include "MantidKernel/PropertyWithValue.h"
-#include "qmainwindow.h"
-#include <iostream>
-#include <QApplication>
-#include <QDir>
-#include <QFrame>
-#include <qlayout.h>
-#include <QMessageBox>
-#include <QSplashScreen>
-#include <QThread>
-#include "MantidQtAPI/BoolPropertyWidget.h"
-#include "MantidQtAPI/TextPropertyWidget.h"
-#include "MantidQtAPI/PropertyWidgetFactory.h"
-#include "MantidKernel/ListValidator.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidAPI/MultipleFileProperty.h"
-#include "MantidAPI/WorkspaceProperty.h"
-
-using namespace Mantid::Kernel;
-using namespace MantidQt::API;
-using Mantid::API::FileProperty;
-using Mantid::API::MultipleFileProperty;
-using Mantid::API::WorkspaceProperty;
-
-/** Main application
- *
- * @param argc :: ignored
- * @param argv :: ignored
- * @return return code
- */
-int main(int argc, char **argv) {
-  QApplication app(argc, argv);
-  app.setApplicationName("PropertyWidgets demo");
-  QMainWindow *mainWin = new QMainWindow();
-
-  QFrame *frame = new QFrame(mainWin);
-  mainWin->setCentralWidget(frame);
-
-  QHBoxLayout *layout = new QHBoxLayout(frame);
-  frame->setLayout(layout);
-
-  QFrame *frame1 = new QFrame(mainWin);
-  frame1->setFrameStyle(QFrame::Box);
-  QFrame *frame2 = new QFrame(mainWin);
-  frame2->setFrameStyle(QFrame::Box);
-
-  layout->addWidget(frame1);
-  layout->addWidget(frame2);
-
-  QVBoxLayout *layout1 = new QVBoxLayout(frame1);
-  QGridLayout *grid = new QGridLayout(frame2);
-
-  std::vector<Property *> props;
-  props.push_back(new PropertyWithValue<bool>("BooleanProp", true));
-  props.push_back(
-      new PropertyWithValue<std::string>("StringProperty", "default value"));
-
-  std::vector<std::string> exts;
-  exts.push_back(".txt");
-  exts.push_back(".nxs");
-  props.push_back(new FileProperty("SaveFileProperty", "default.file.txt",
-                                   FileProperty::Save, exts));
-  props.push_back(new FileProperty("LoadFileProperty", "default.file.txt",
-                                   FileProperty::Load, exts));
-  props.push_back(new FileProperty("DirectoryFileProperty", "default.file.txt",
-                                   FileProperty::Directory, exts));
-  props.push_back(new MultipleFileProperty("MultipleFileProperty", exts));
-  props.push_back(
-      new WorkspaceProperty<>("InputWorkspaceProp", "", Direction::Input));
-  props.push_back(
-      new WorkspaceProperty<>("InOutWorkspaceProp", "", Direction::InOut));
-  props.push_back(
-      new WorkspaceProperty<>("OutputWorkspaceProp", "", Direction::Output));
-  props.push_back(
-      new WorkspaceProperty<>("OutputWorkspaceProp2", "", Direction::Output));
-
-  std::vector<std::string> propOptions;
-  propOptions.push_back("OptionA");
-  propOptions.push_back("OptionTwo");
-  propOptions.push_back("Yet Another Option");
-  props.push_back(new PropertyWithValue<std::string>(
-      "OptionsProperty", "OptionTwo", new ListValidator(propOptions)));
-
-  for (size_t i = 0; i < props.size(); i++) {
-    props[i]->setDocumentation("Tooltip for " + props[i]->name());
-    PropertyWidget *widget1 =
-        PropertyWidgetFactory::createWidget(props[i], frame1, NULL);
-    layout1->addWidget(widget1);
-    PropertyWidget *widget2 =
-        PropertyWidgetFactory::createWidget(props[i], frame2, grid, int(i));
-    UNUSED_ARG(widget2);
-  }
-
-  mainWin->move(100, 100);
-  mainWin->resize(700, 700);
-  mainWin->show();
-
-  app.exec();
-
-  mainWin->close();
-  delete mainWin;
-  return 0;
-}
diff --git a/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h b/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
index 17e4aa6de87aca4ac82b3360caded147672088f7..fac761448b3af90ebaf185f5fa58c202974e03b4 100644
--- a/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
+++ b/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
@@ -6,9 +6,8 @@
 #include "MantidKernel/SingletonHolder.h"
 #include "MantidQtWidgets/SliceViewer/SliceViewer.h"
 #include "MantidQtWidgets/SliceViewer/SliceViewerWindow.h"
-#include "qapplication.h"
 #include <Qsci/qscilexer.h>
-#include <QtCore/QtCore>
+#include <QPointer>
 #include <QVector>
 
 namespace MantidQt {
diff --git a/qt/widgets/instrumentview/src/InstrumentWidget.cpp b/qt/widgets/instrumentview/src/InstrumentWidget.cpp
index 887cbc21aa4ae263a12bc72f0fbe6147f63b9abe..a7f95ce00e731a280b2fc77054eeca320ca5ef9e 100644
--- a/qt/widgets/instrumentview/src/InstrumentWidget.cpp
+++ b/qt/widgets/instrumentview/src/InstrumentWidget.cpp
@@ -669,7 +669,7 @@ void InstrumentWidget::saveImage(QString filename) {
     filename += defaultExt;
     ext = QFileInfo(filename).completeSuffix();
   } else {
-    if (!formats.contains(ext.toAscii())) {
+    if (!formats.contains(ext.toLatin1())) {
       QString msg("Unsupported file extension. Choose one of the following: ");
       QListIterator<QByteArray> itr(formats);
       while (itr.hasNext()) {
diff --git a/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
index 0fb79b5b564c17eca266339f6fba2fc46bbe8719..ed34e89a249dd1d4523d15c86191286f5e4e283c 100644
--- a/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
@@ -4,9 +4,13 @@
 #include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h"
 #include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
 
-#include <QValidator>
-#include <QtGui>
+#include <QComboBox>
+#include <QDir>
 #include <QFileInfo>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QValidator>
 
 namespace MantidQt {
 namespace CustomDialogs {
diff --git a/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
index a62a6d498518df94328f688443cbe129dc9abe91..25524d457fc3263fd9855005dbf7c0065bb7a6f9 100644
--- a/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
@@ -4,9 +4,10 @@
 #include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h"
 #include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
 
+#include <QFileDialog>
+#include <QLabel>
+#include <QLineEdit>
 #include <QValidator>
-#include <QtGui>
-#include <qfiledialog.h>
 
 namespace MantidQt {
 namespace CustomDialogs {
diff --git a/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
index 78e03e91f1a4b25aa52d39a71b1d707884d4c3af..ef606c80896c7301bdf4a67d81f82f40fd0294ec 100644
--- a/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
@@ -3,6 +3,8 @@
 #include "MantidGeometry/Instrument.h"
 #include "MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h"
 
+#include <QGroupBox>
+
 using namespace Mantid::API;
 using namespace Mantid::Geometry;
 using namespace MantidQt::API;
diff --git a/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
index 4d05902cdb8a4b75047425ede1d93d984bdbcf6f..596a517fadb05453d6bdd4feb549bbb5558ed009 100644
--- a/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
@@ -6,8 +6,8 @@
 #include "MantidQtWidgets/Common/PropertyWidgetFactory.h"
 #include "qboxlayout.h"
 #include "MantidAPI/AlgorithmManager.h"
-#include <QtCore/qvariant.h>
-#include <QtCore/qstringlist.h>
+#include <QVariant>
+#include <QStringList>
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidKernel/DateAndTime.h"
@@ -15,7 +15,6 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/InstrumentInfo.h"
 #include "MantidKernel/LiveListenerInfo.h"
-#include <QtGui>
 #include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
 
 using namespace MantidQt::CustomDialogs;
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
index 8d80e87d1d7a270c40b416aac4661a573062fab8..0cf0d8da87dd477efb7aba120b2c44cf7c62ab90 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
@@ -1,8 +1,7 @@
 #ifndef REF_IV_CONNECTIONS_H
 #define REF_IV_CONNECTIONS_H
 
-#include <QtCore/QtCore>
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QActionGroup>
 
 #include "ui_RefImageView.h"
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
index a6f67fbdabbe5596848de8be546f0778aa15dcc5..7073e715574246ea23e30ec236b722b81ed0bdae 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
@@ -2,7 +2,6 @@
 #define REF_IMAGE_VIEW_H
 
 #include <QMainWindow>
-#include <QtGui>
 
 #include "MantidQtWidgets/SpectrumViewer/GraphDisplay.h"
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h"
diff --git a/qt/widgets/refdetectorview/src/RefDetectorViewDemo.cpp b/qt/widgets/refdetectorview/src/RefDetectorViewDemo.cpp
index 02080de42ad588a2b7870592b893a2569cc5651a..ecadf8225d35c94a49774c9bad097dda4ace16c2 100644
--- a/qt/widgets/refdetectorview/src/RefDetectorViewDemo.cpp
+++ b/qt/widgets/refdetectorview/src/RefDetectorViewDemo.cpp
@@ -1,8 +1,7 @@
 
 
-#include <qapplication.h>
+#include <QApplication>
 #include <QMainWindow>
-#include <QtGui>
 
 #include "MantidQtWidgets/SpectrumViewer/SVUtils.h"
 #include "MantidQtWidgets/RefDetectorView/RefImageView.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
index 91f50ecd96b0dadc3e8c1dc72aa2e1363a77363b..3a75f85c709772aa8a19ef19ebeb17fad3b5d709 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
@@ -1,7 +1,7 @@
 #ifndef DIMENSIONSLICEWIDGET_H
 #define DIMENSIONSLICEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "ui_DimensionSliceWidget.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "DllOption.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
index 0fe78cf644c7837fb200a3079fc31b12b3c16a46..ed997fd234a1783c3fe028f5d9d30bb7c8813561 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
@@ -3,10 +3,9 @@
 
 #include "DllOption.h"
 #include "MantidKernel/System.h"
-#include <QtCore/QtCore>
-#include <QtGui/qwidget.h>
+#include <QWidget>
+#include <QPainter>
 #include <qwt_plot.h>
-#include <qpainter.h>
 
 namespace MantidQt {
 namespace SliceViewer {
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
index f64dfcc5ff40d735ba1ea6af3692eea1574cffbd..ceb59bebfbb704823e17dddb8a3dcf7efd6b2f40 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
@@ -1,7 +1,7 @@
 #ifndef LINEPLOTOPTIONS_H
 #define LINEPLOTOPTIONS_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "ui_LinePlotOptions.h"
 #include "MantidQtWidgets/Common/MantidQwtIMDWorkspaceData.h"
 #include "MantidAPI/IMDWorkspace.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
index aa9ec522de18ebd92f45a2b73bbcf06ec7e5d568..01d0b668c5674a6e780e166b8cd1ce86044dbf61 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
@@ -5,7 +5,7 @@
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidKernel/VMD.h"
 #include "ui_LineViewer.h"
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <qwt_plot_curve.h>
 #include <qwt_plot.h>
 #include <qwt_painter.h>
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
index c6b656be934c582861e287ff14be63a0cda2b659..dba03b9910920a491155aaa1f5e532b2b84eb763 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
@@ -2,11 +2,10 @@
 #define MANTID_SLICEVIEWER_NONORTHOGONALOVERLAY_H_
 
 #include "DllOption.h"
-#include <QtCore/QtCore>
-#include <QtGui/qwidget.h>
+#include <QWidget>
 #include <qwt_plot.h>
 #include <qwt_valuelist.h>
-#include <qpainter.h>
+#include <QPainter>
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/QwtRasterDataMD.h"
 #include "MantidQtWidgets/Common/QwtRasterDataMDNonOrthogonal.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
index d34512bcc5cfd972d972c4fc5dbaa0777bd5e93e..a014c22ac0a120e7c89888ed22e1ebed65c6d2e0 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
@@ -3,8 +3,8 @@
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SliceViewer/PeakOverlayView.h"
-#include <QtGui/QWidget>
-#include <QtGui/QCursor>
+#include <QWidget>
+#include <QCursor>
 
 // Forward dec
 class QwtPlot;
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
index 11fdd7a7bc350249a371daf9af7663d8b1b5be6a..fd21a8b4c46fdd4bbb96667f88f958097283a3ff 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
@@ -3,9 +3,9 @@
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h"
-#include <QtGui/qwidget.h>
+#include <QColor>
+#include <QWidget>
 #include <qwt_plot.h>
-#include <qcolor.h>
 
 namespace MantidQt {
 namespace SliceViewer {
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
index a3f13bc79c9382ed78ef558e2a40cb3f5948a1a5..06d6ba48f1ec39428d33430406b94243665c967d 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
@@ -1,7 +1,7 @@
 #ifndef PEAKSVIEWER_H
 #define PEAKSVIEWER_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "DllOption.h"
 #include <boost/shared_ptr.hpp>
 #include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
index 010bf0c7227a2fe1d7821f227080102b73ad5bc5..0855fc60c8416722c3f3d887661c6905b14f28e5 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
@@ -1,7 +1,7 @@
 #ifndef PEAKSWORKSPACEWIDGET_H
 #define PEAKSWORKSPACEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "MantidQtWidgets/SliceViewer/PeakViewColor.h"
 #include "DllOption.h"
 #include "MantidAPI/IPeaksWorkspace_fwd.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
index fd3d58999456c95f1b940383c7476cf5995dab95..c9392cab137a968023b5009b451b9bf105aacb44 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
@@ -7,10 +7,9 @@
 #include "MantidQtWidgets/SliceViewer/LineViewer.h"
 #include "MantidQtWidgets/SliceViewer/SliceViewer.h"
 #include "MantidQtWidgets/SliceViewer/PeaksViewer.h"
-#include <QtGui/QMainWindow>
-#include <QtGui/QSplitter>
-#include <QtGui/qdialog.h>
-#include <qmainwindow.h>
+#include <QMainWindow>
+#include <QSplitter>
+#include <QDialog>
 #include <QShowEvent>
 #include "DllOption.h"
 #include "MantidKernel/VMD.h"
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
index 076c250d84cd959e1aa3a94d5657896f4a280cf3..b35da97e7bb0ebcdd3e5a5957a9a043e684f9933 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
@@ -1,7 +1,7 @@
 #ifndef SNAPTOGRIDDIALOG_H
 #define SNAPTOGRIDDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 #include "ui_SnapToGridDialog.h"
 #include "DllOption.h"
 
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
index 4227e17d8c614748abdb4e8d46f6b1565712b8dd..62b84b048ed901b875a620b9f2e06b644a6cd56e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
@@ -1,7 +1,7 @@
 #ifndef XYLIMITSDIALOG_H
 #define XYLIMITSDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 #include "ui_XYLimitsDialog.h"
 #include "DllOption.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
diff --git a/qt/widgets/sliceviewer/src/DimensionSliceWidget.cpp b/qt/widgets/sliceviewer/src/DimensionSliceWidget.cpp
index 0ee0f690a1a8e862b521891bc4a98eec20ab0726..646f93bc2d2f64d62a70ae4a114e23cbd5443902 100644
--- a/qt/widgets/sliceviewer/src/DimensionSliceWidget.cpp
+++ b/qt/widgets/sliceviewer/src/DimensionSliceWidget.cpp
@@ -1,7 +1,7 @@
 #include "MantidQtWidgets/SliceViewer/DimensionSliceWidget.h"
 #include "MantidKernel/UnitLabel.h"
 #include <iosfwd>
-#include <qlayout.h>
+#include <QLayout>
 
 namespace MantidQt {
 namespace SliceViewer {
diff --git a/qt/widgets/sliceviewer/src/LineOverlay.cpp b/qt/widgets/sliceviewer/src/LineOverlay.cpp
index 157eaea5ea945c6f2e252beaf7b7830993d2c72f..5af575c6f041ab79c38e3dcc2d660d4735f79d18 100644
--- a/qt/widgets/sliceviewer/src/LineOverlay.cpp
+++ b/qt/widgets/sliceviewer/src/LineOverlay.cpp
@@ -3,7 +3,7 @@
 #include "MantidQtWidgets/Common/TSVSerialiser.h"
 #include <QRect>
 #include <QShowEvent>
-#include <qpainter.h>
+#include <QPainter>
 #include <qwt_plot.h>
 #include <qwt_plot_canvas.h>
 
diff --git a/qt/widgets/sliceviewer/src/NonOrthogonalOverlay.cpp b/qt/widgets/sliceviewer/src/NonOrthogonalOverlay.cpp
index 119c4f24b3794f0c69289c379a5834056b7911ca..59f29a48a261764f30d8fbec453d3f37d6181848 100644
--- a/qt/widgets/sliceviewer/src/NonOrthogonalOverlay.cpp
+++ b/qt/widgets/sliceviewer/src/NonOrthogonalOverlay.cpp
@@ -1,7 +1,7 @@
 #include "MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h"
 #include <qwt_plot.h>
 #include <qwt_plot_canvas.h>
-#include <qpainter.h>
+#include <QPainter>
 #include <QRect>
 #include <QShowEvent>
 #include <qwt_scale_div.h>
diff --git a/qt/widgets/sliceviewer/src/QwtScaleDrawNonOrthogonal.cpp b/qt/widgets/sliceviewer/src/QwtScaleDrawNonOrthogonal.cpp
index 320f4bb78aaf31d1be198906b22a7bf8d5e0d049..8648abf5db77f9152415f5bd224d6be61963b15e 100644
--- a/qt/widgets/sliceviewer/src/QwtScaleDrawNonOrthogonal.cpp
+++ b/qt/widgets/sliceviewer/src/QwtScaleDrawNonOrthogonal.cpp
@@ -1,6 +1,7 @@
 #include "MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h"
 
 #include "MantidQtWidgets/Common/NonOrthogonal.h"
+#include <QMatrix>
 #include <QPainter>
 #include <QPalette>
 #include "qwt_layout_metrics.h"
@@ -9,9 +10,6 @@
 #include "qwt_scale_engine.h"
 #include "qwt_plot_canvas.h"
 
-#include <qmatrix.h>
-#define QwtMatrix QMatrix
-
 QwtScaleDrawNonOrthogonal::QwtScaleDrawNonOrthogonal(
     QwtPlot *plot, ScreenDimension screenDimension,
     Mantid::API::IMDWorkspace_sptr workspace, size_t dimX, size_t dimY,
@@ -174,7 +172,7 @@ void QwtScaleDrawNonOrthogonal::drawLabelNonOrthogonal(QPainter *painter,
   labelSize = metricsMap.layoutToDevice(labelSize);
   pos = metricsMap.layoutToDevice(pos);
 
-  const QwtMatrix m = labelMatrix(pos, labelSize);
+  const QMatrix m = labelMatrix(pos, labelSize);
 
   painter->save();
   painter->setMatrix(m, true);
diff --git a/qt/widgets/sliceviewer/src/SliceViewer.cpp b/qt/widgets/sliceviewer/src/SliceViewer.cpp
index 880e3e869981585df9ab2d36a234555d9e1b42ab..a947a746e9f7ac2092ae292b7ca72f009b91259a 100644
--- a/qt/widgets/sliceviewer/src/SliceViewer.cpp
+++ b/qt/widgets/sliceviewer/src/SliceViewer.cpp
@@ -45,6 +45,15 @@
 #include "MantidQtWidgets/SliceViewer/SliceViewerFunctions.h"
 #include "MantidQtWidgets/Common/SelectWorkspacesDialog.h"
 
+#include <QClipboard>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QSettings>
+#include <QToolTip>
+#include <QUrl>
 #include <qwt_plot_panner.h>
 #include <qwt_plot_rescaler.h>
 #include <Poco/AutoPtr.h>
diff --git a/qt/widgets/sliceviewer/src/SliceViewerWindow.cpp b/qt/widgets/sliceviewer/src/SliceViewerWindow.cpp
index a6d4aacf78ac02537c9ce11ffa3a4f7be5fffec0..663f732963037d16f1335b493b7be5f7ede8c7fa 100644
--- a/qt/widgets/sliceviewer/src/SliceViewerWindow.cpp
+++ b/qt/widgets/sliceviewer/src/SliceViewerWindow.cpp
@@ -8,9 +8,10 @@
 #include "MantidQtWidgets/SliceViewer/LineViewer.h"
 #include "MantidQtWidgets/SliceViewer/SliceViewer.h"
 #include "MantidQtWidgets/SliceViewer/SliceViewerWindow.h"
-#include <qboxlayout.h>
-#include <qmainwindow.h>
-#include <qlayout.h>
+#include <QBoxLayout>
+#include <QMainWindow>
+#include <QLayout>
+#include <QTimer>
 
 using namespace Mantid;
 using namespace Mantid::Kernel;
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
index 2d10263bc2c5b6d9d1ca9e605f3e63106b63f539..7540cb410f46655ced2b04d87135f4a49124c5e3 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
@@ -1,8 +1,7 @@
 #ifndef SV_CONNECTIONS_H
 #define SV_CONNECTIONS_H
 
-#include <QtCore/QtCore>
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QActionGroup>
 
 #include "ui_SpectrumView.h"
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
index 6138f9a20206bf627f8dd0d345be771ef003b857..efc3857055b1a611e063322e25c2f7106f44ce7e 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
@@ -3,7 +3,6 @@
 
 #include <QMainWindow>
 #include <QMdiSubWindow>
-#include <QtGui>
 #include <QList>
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
diff --git a/qt/widgets/spectrumviewer/src/GraphDisplay.cpp b/qt/widgets/spectrumviewer/src/GraphDisplay.cpp
index 5ae22e32903cc8ac17b0119910afb6f2713ce391..0be711c11c489145b23ecb73820f5fff72ca7a0c 100644
--- a/qt/widgets/spectrumviewer/src/GraphDisplay.cpp
+++ b/qt/widgets/spectrumviewer/src/GraphDisplay.cpp
@@ -4,9 +4,9 @@
 #include "MantidQtWidgets/SpectrumViewer/SVUtils.h"
 
 #include <boost/algorithm/clamp.hpp>
-#include <QtGui>
-#include <QVector>
+#include <QHeaderView>
 #include <QString>
+#include <QVector>
 #include <qwt_scale_engine.h>
 
 namespace MantidQt {
diff --git a/qt/widgets/spectrumviewer/src/SVConnections.cpp b/qt/widgets/spectrumviewer/src/SVConnections.cpp
index 14319203f61bde82de4413d1dbb9b7ad1df37242..1864cd85a51382950faaff68ef61f792d089f188 100644
--- a/qt/widgets/spectrumviewer/src/SVConnections.cpp
+++ b/qt/widgets/spectrumviewer/src/SVConnections.cpp
@@ -5,6 +5,8 @@
 
 #include "MantidQtWidgets/SpectrumViewer/SVConnections.h"
 
+#include <QWheelEvent>
+
 namespace MantidQt {
 namespace SpectrumView {
 
diff --git a/qt/widgets/spectrumviewer/src/SpectrumDisplay.cpp b/qt/widgets/spectrumviewer/src/SpectrumDisplay.cpp
index 079d763278bb0925b964fefcb3bc39ed2c45048e..fdedd0b299ea33aeee48648f1e1b461280e7d5bd 100644
--- a/qt/widgets/spectrumviewer/src/SpectrumDisplay.cpp
+++ b/qt/widgets/spectrumviewer/src/SpectrumDisplay.cpp
@@ -1,10 +1,9 @@
 #include <sstream>
 #include <cfloat>
 
-#include <QtGui>
 #include <QVector>
 #include <QString>
-#include <qimage.h>
+#include <QImage>
 #include <qwt_scale_engine.h>
 
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h"
diff --git a/qt/widgets/spectrumviewer/src/SpectrumView.cpp b/qt/widgets/spectrumviewer/src/SpectrumView.cpp
index 85a2bc01625a6c87b0a6c676135c44b555945644..11dfaf8efa26c7e22c983dc0b7465f0ad8350b11 100644
--- a/qt/widgets/spectrumviewer/src/SpectrumView.cpp
+++ b/qt/widgets/spectrumviewer/src/SpectrumView.cpp
@@ -11,6 +11,8 @@
 #include "MantidQtWidgets/SpectrumViewer/EModeHandler.h"
 #include "MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h"
 
+#include <QDropEvent>
+#include <QSettings>
 #include <boost/make_shared.hpp>
 
 namespace MantidQt {