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/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 a384f1e9c6888d8ace3f656f37b558d02124a0d2..fe0d05cb26f35fb49c1e37721c328d60e6b1d834 100644
--- a/qt/scientific_interfaces/General/MantidEV.h
+++ b/qt/scientific_interfaces/General/MantidEV.h
@@ -1,7 +1,6 @@
#ifndef MANTIDQTCUSTOMINTERFACES_MANTID_EV_H_
#define MANTIDQTCUSTOMINTERFACES_MANTID_EV_H_
-#include <QtCore>
#include <QWidget>
#include <QActionGroup>
#include <QRunnable>
@@ -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 a3273f601e2aecd7aa1ce0ccf3da4e4af1e4f1fe..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 <qvariant.h>
-#include <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 5a2b3595b5b0721756d8f536f6b8df6923bab595..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 <QMouseEvent>
#include <QWidget>
-#include <QtGui>
#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 10833d8a0d61b742ec47dce72cfb66213d70dede..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 <qstringlist.h>
-#include <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 0dd007b27ebe2447b3bfdcd65dcbebe05812db51..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 <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 8397e14d2f8fb8e7b6bd32406df5968fd4d89469..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 <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/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 d0b4a459d8c6d79c37109988326c96413bd56fc8..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 <qwidget.h>
-#include <qpushbutton.h>
-#include <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/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/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/QtPropertyBrowser/qttreepropertybrowser.cpp b/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
index 7ba3c19b5bafcbd52348af08915edb2d9a72a716..7aea531acf1779f5ff857333fcb71c2d25fb67ff 100644
--- a/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
+++ b/qt/widgets/common/src/QtPropertyBrowser/qttreepropertybrowser.cpp
@@ -97,8 +97,8 @@
#include <QFocusEvent>
#include <QStyle>
#include <QPalette>
-#include <qcheckbox.h>
-#include <qlineedit.h>
+#include <QCheckBox>
+#include <QLineEdit>
#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
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/test/GenericDialogDemo.cpp b/qt/widgets/common/test/GenericDialogDemo.cpp
deleted file mode 100644
index 60c1e9bd42484fbc0e44733308303a1df24337d8..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 <qstring.h>
-#include <QThread>
-#include <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 614e79bf68c2271076d4507dcaa8221bb47e05bd..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>
+#include <QPointer>
#include <QVector>
namespace MantidQt {
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 3df213755fad0f923aa8736592f07d588c1dfe96..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 <qvariant.h>
-#include <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 50a0c6258d7e3675c1bfa9ac4585c28d0aebd3f8..0cf0d8da87dd477efb7aba120b2c44cf7c62ab90 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
@@ -1,7 +1,6 @@
#ifndef REF_IV_CONNECTIONS_H
#define REF_IV_CONNECTIONS_H
-#include <QtCore>
#include <QWidget>
#include <QActionGroup>
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/LineOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
index 63e83920c680c3b841f34417e5088a9da7a0efd3..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>
-#include <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/NonOrthogonalOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
index c8a4e7e0a19b1af8372d552922deb22108572333..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>
-#include <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/PeakOverlayViewFactoryBase.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
index 67954e7ded5e420e31bc8b49f3f65355ed0d150a..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 <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/SliceViewerWindow.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
index 62bb3cd0fefef574d450ef1f0daf9bfeb6a005cc..c9392cab137a968023b5009b451b9bf105aacb44 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
@@ -9,8 +9,7 @@
#include "MantidQtWidgets/SliceViewer/PeaksViewer.h"
#include <QMainWindow>
#include <QSplitter>
-#include <qdialog.h>
-#include <qmainwindow.h>
+#include <QDialog>
#include <QShowEvent>
#include "DllOption.h"
#include "MantidKernel/VMD.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 f771d05333bdc1346208b28ed8f5ca528f7339c1..7540cb410f46655ced2b04d87135f4a49124c5e3 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
@@ -1,7 +1,6 @@
#ifndef SV_CONNECTIONS_H
#define SV_CONNECTIONS_H
-#include <QtCore>
#include <QWidget>
#include <QActionGroup>
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 {