diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index edd79d67e04cee859a0c1e6a70fe1761c1f2ca95..c485e931443ad68b0cdd99240f3b6b5490855b74 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -20,7 +20,6 @@
 #include "GroupItem.h"
 #include "ParameterDistribution.h"
 #include "Units.h"
-#include <QDebug>
 
 const QString BeamDistributionItem::P_DISTRIBUTION = "Distribution";
 
diff --git a/GUI/coregui/Models/BeamItem.cpp b/GUI/coregui/Models/BeamItem.cpp
index bbfe5e1d9c8f1e80cd5e323ef5b8067fe4b71bb3..110732c4f2ff64de16bb9b72c96dc1b54159e23a 100644
--- a/GUI/coregui/Models/BeamItem.cpp
+++ b/GUI/coregui/Models/BeamItem.cpp
@@ -20,7 +20,6 @@
 #include "ScientificDoubleProperty.h"
 #include "BeamWavelengthItem.h"
 #include "BeamAngleItems.h"
-#include <QDebug>
 
 const QString BeamItem::P_INTENSITY = QString::fromStdString(BornAgain::Intensity);
 const QString BeamItem::P_WAVELENGTH = QString::fromStdString(BornAgain::Wavelength);
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 6e85e67763494eb7256ab664e09e29da9f5a3655..a9bc2b8dd469fcdbe8b59a46b77af72842476d78 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -51,7 +51,6 @@
 #include "TransformationItem.h"
 #include "Units.h"
 #include "VectorItem.h"
-#include <QDebug>
 
 GUIObjectBuilder::GUIObjectBuilder()
     : m_sampleModel(0)
diff --git a/GUI/coregui/Models/GroupProperty.cpp b/GUI/coregui/Models/GroupProperty.cpp
index 98fadaceb100342ae7890f2294ab0bc80f696341..e642c71b69cecacf2edb9ac3a74adb407a56f645 100644
--- a/GUI/coregui/Models/GroupProperty.cpp
+++ b/GUI/coregui/Models/GroupProperty.cpp
@@ -16,8 +16,6 @@
 
 #include "GroupProperty.h"
 #include "ItemFactory.h"
-#include <QDebug>
-
 
 GroupProperty::GroupProperty(QString group_name)
     : m_group_name(std::move(group_name))
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 59c8f1baa1634ed278fba6fcf62cb96c9122e7b6..04ee92bf5a53a0b57f4b0170a8bd8ab3e3d8afd0 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -54,7 +54,6 @@
 #include "TransformationItem.h"
 #include "VectorItem.h"
 #include "LinkInstrumentItem.h"
-#include <QDebug>
 
 namespace {
 template<typename T> SessionItem *createInstance() { return new T; }
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 1a35dc7b0a36b665de49ba33f7ff5f87ce7a534e..3523b832b2571a9876e4bb4c3943a8bde80943fa 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -27,7 +27,6 @@
 #include "SimulationOptionsItem.h"
 #include "IntensityDataItem.h"
 #include "JobItemFunctions.h"
-#include <QDebug>
 
 namespace {
     QVariant createStatusVariant() {
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 5e6ab5545b6a9055b3505d3c51c8864f6366629a..35ac17460fc562ec51bb3e977814137fa95c7ac6 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -29,8 +29,6 @@
 #include "SimulationOptionsItem.h"
 #include "JobModelFunctions.h"
 #include "ImportDataAssistant.h"
-#include <QDebug>
-
 
 JobModel::JobModel(QObject *parent)
     : SessionModel(SessionXML::JobModelTag, parent)
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 6d6d8d83f09a5f9428a9f27f1149bb73f9a34c32..f4dccc411e534cdc84a3a822f190cd3d76ded569 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -31,7 +31,6 @@
 #include "JobItemHelper.h"
 #include "IDetector2D.h"
 #include "JobItemFunctions.h"
-#include <QDebug>
 
 namespace JobModelFunctions {
 void copyRealDataItem(JobItem *jobItem, const RealDataItem *realDataItem);
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index b5a1ed5a77d5bcbc886b1fabca26ee4a55fe1342..63912d0076347f4a114eb46654758b086325c32e 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -21,7 +21,6 @@
 #include "JobItem.h"
 #include "JobModel.h"
 #include "JobWorker.h"
-#include <QDebug>
 #include <QThread>
 
 JobQueueData::JobQueueData(JobModel *jobModel)
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/coregui/Models/JobWorker.cpp
index baa5793f1e3dc0185539e1cb725e7590b38b2909..1d47d46e310ba337c34d90f3fca6d40aae3f6d64 100644
--- a/GUI/coregui/Models/JobWorker.cpp
+++ b/GUI/coregui/Models/JobWorker.cpp
@@ -18,7 +18,6 @@
 #include "GISASSimulation.h"
 #include "item_constants.h"
 #include <QDateTime>
-#include <QDebug>
 #include <memory>
 
 JobWorker::JobWorker(QString identifier, GISASSimulation *simulation)
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index a9d080ad5c9bc4aa2dd65f0cc771a822ddcb74cf..9fdb320e636fb0c4a6f9d3f26c5ea4514c5dd8a3 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -19,7 +19,6 @@
 #include "MaterialUtils.h"
 #include "RefractiveIndexItem.h"
 #include "GUIHelpers.h"
-#include <QDebug>
 
 MaterialModel::MaterialModel(QObject *parent)
     : SessionModel(SessionXML::MaterialModelTag, parent)
diff --git a/GUI/coregui/Models/ParameterTranslators.cpp b/GUI/coregui/Models/ParameterTranslators.cpp
index 23e38d05e33627257df24a225283bcde9e636ba0..1e29c1afb873b0ac49be3f25f259874483aa4f62 100644
--- a/GUI/coregui/Models/ParameterTranslators.cpp
+++ b/GUI/coregui/Models/ParameterTranslators.cpp
@@ -21,7 +21,6 @@
 #include "VectorItem.h"
 #include "InterferenceFunctionItems.h"
 #include "Lattice2DItems.h"
-#include <QDebug>
 
 QStringList IParameterTranslator::split(const QString &par_name) const
 {
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index c2de0031c9ca7bf5073ff62d0e37b3830cbc4518..fc39e28b7180ed9f3ce233f90bfee35b6b4042a1 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -18,7 +18,6 @@
 #include "FitParameterHelper.h"
 #include "ParameterTreeItems.h"
 #include "SessionModel.h"
-#include <QDebug>
 #include <QMimeData>
 
 ParameterTuningModel::ParameterTuningModel(QObject *parent)
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 79f09a0558dce6728a456e0a6953be54c5db2ff3..b6126ff213e0e701af86ef30a2c2168f6a7b72fa 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -24,7 +24,6 @@
 #include "ParticleItem.h"
 #include "TransformFromDomain.h"
 #include "TransformToDomain.h"
-#include <QDebug>
 
 const QString ParticleDistributionItem::P_DISTRIBUTED_PARAMETER = "Distributed parameter";
 const QString ParticleDistributionItem::P_DISTRIBUTION = "Distribution";
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 2ecc3e6ce77d9e4af7dc8d1f8ae58f681f3e2723..9684a4fbf85fab37d7a7e70fa878466a9d88d952 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -24,7 +24,6 @@
 #include "ImportDataAssistant.h"
 #include "MaskUnitsConverter.h"
 #include "JobItemFunctions.h"
-#include <QDebug>
 
 const QString RealDataItem::P_INSTRUMENT_ID = "Instrument Id";
 const QString RealDataItem::P_INSTRUMENT_NAME = "Instrument";
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index a4d8d79ec96e8d873f44e1ff51db556369cb61bc..75cca66cf138187bc84c076e5afd546d611c52ca 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -21,7 +21,6 @@
 #include "RectangularDetector.h"
 #include "ResolutionFunctionItems.h"
 #include "VectorItem.h"
-#include <QDebug>
 
 namespace {
 const double default_detector_width = 20.0;
diff --git a/GUI/coregui/Models/SampleModel.cpp b/GUI/coregui/Models/SampleModel.cpp
index c41644c8d19479ce5bce43c8771d3cff65fbc8c0..18e0dfc6ba834fb08ba91d3ef9d5b0f0a82dfdf8 100644
--- a/GUI/coregui/Models/SampleModel.cpp
+++ b/GUI/coregui/Models/SampleModel.cpp
@@ -21,8 +21,6 @@
 #include "MaterialProperty.h"
 #include "MaterialSvc.h"
 #include "MaterialUtils.h"
-#include <QDebug>
-
 
 SampleModel::SampleModel(QObject *parent)
     : SessionModel(SessionXML::SampleModelTag, parent)
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index f3600732ac142eb28b1df1ecc9494559e17a73d9..a533f14b5f94ae83d97618a5871b67462ef0a10a 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -19,7 +19,6 @@
 #include "GroupPropertyRegistry.h"
 #include "ItemFactory.h"
 #include "SessionModel.h"
-#include <QDebug>
 
 class SessionItemData
 {
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index a6700e23d58c37816b04aab6266f43f324e25078..264561ae6fd5ae59ffae7a70dff4c99c30bda69c 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -18,7 +18,6 @@
 #include "GUIHelpers.h"
 #include "IconProvider.h"
 #include "ItemFactory.h"
-#include <QDebug>
 #include <QFile>
 #include <QMimeData>
 
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index 616c6b6c69b73f5482c820d1bcbb848901d95f21..78073ec224260d295cbd8d98ed390f42304042ca 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -24,7 +24,6 @@
 #include "ScientificDoubleProperty.h"
 #include "SessionModel.h"
 #include "WarningMessageService.h"
-#include <QDebug>
 
 namespace
 {
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index f4dd81330e6793259d252bed7e21e079bca2a1ec..d1583e4871a61ef22805f12906c642bcfdac86f3 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -53,7 +53,6 @@
 #include "SphericalDetector.h"
 #include "Units.h"
 #include "VectorItem.h"
-#include <QDebug>
 #include <limits>
 
 void SetPDF1D(SessionItem* item, const IFTDistribution1D* pdf, QString group_name);
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
index 82481304f474208c01ad2a045b2e7a34b7baacdd..a8ceb0b6206ab257d2ce872b372fa73b7fe49b87 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
@@ -31,6 +31,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "AccordionWidget.h"
+#include <QDebug>
 
 
 AccordionWidget::AccordionWidget(QWidget *parent) : QWidget(parent)
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index 7ee4e93f8e67264e52c5d333f6cdc2904afddeec..85c6688b80af7c3e0abae21b786eaca6bcb0e552 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -36,7 +36,6 @@
 #include "ClickableFrame.h"
 #include "ContentPane.h"
 #include "WinDllMacros.h"
-#include <QDebug>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QPainter>
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
index 111483503e2d76a0a4369590801da48cd3e9023e..32ec42064683ac4376890f0804e60065c715f44c 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
@@ -31,7 +31,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ClickableFrame.h"
-#include <QDebug>
 #include <QStyleOption>
 
 ClickableFrame::ClickableFrame(QString header, QWidget *parent,
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
index d3bc2579e77c4b777790232417f176e0bd3f2b85..01ec7b0f8811f7291a7a8350a010aa7824dae1b3 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
@@ -17,7 +17,6 @@
 #include "InfoPanel.h"
 #include "InfoPanelToolBar.h"
 #include <QBoxLayout>
-#include <QDebug>
 #include <QResizeEvent>
 #include <QStackedWidget>
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index 277b949d13656cba1f4a30bbc0b5731610f56405..6d8cc07fb5835a341ab488df60bbff65cf9109b8 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -19,7 +19,6 @@
 #include "SessionItemWidget.h"
 #include "GUIHelpers.h"
 #include <QComboBox>
-#include <QDebug>
 #include <QEvent>
 #include <QStackedWidget>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index 940ba058d20bf775781be976afa63899687223b6..66a754893ea814e6210d95435940bc6e22e5bbc3 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -18,7 +18,6 @@
 #include "SessionItem.h"
 #include "SessionModel.h"
 #include "mainwindow_constants.h"
-#include <QDebug>
 #include <QListView>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index 2c3f459e4900a5bc3a66e817accde84cc9251340..b60f2a62e538b0c3cc2571018015573b28f2f999 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -18,7 +18,6 @@
 #define ITEMSTACKPRESENTER_H
 
 #include "ItemStackWidget.h"
-#include <QDebug>
 #include <QMap>
 #include <QStackedWidget>
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 2675aba90ea5ee7b6ae0df0ff5fd6d9f3228ecbb..8a30474010e8761395c1f1a53854d654c44745c6 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -17,7 +17,6 @@
 #include "ItemStackWidget.h"
 #include "GUIHelpers.h"
 #include "SessionModel.h"
-#include <QDebug>
 #include <QStackedWidget>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
index bec300b9c2455482825fcfc688b5f8325f702a94..ef272be386665b4d0a84651f9fb9008fc4f7f498 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
@@ -16,7 +16,6 @@
 
 #include "StatusLabel.h"
 #include <QColor>
-#include <QDebug>
 #include <QFont>
 #include <QPainter>
 
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
index d2d9d3ac97b17baf6552eadce683c8b862272859..aaf6b79ccef0626c6f5be176daea358c5bea7e0b 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
@@ -15,7 +15,6 @@
 // ************************************************************************** //
 
 #include "UpdateTimer.h"
-#include <QDebug>
 #include <QTimer>
 
 namespace {
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index 3745ba48d6b605d5c854c7608c937238639ab559..6b12a68b481c620444fdcbc212fe69409b806fa4 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -25,7 +25,6 @@
 #include "RealDataItem.h"
 #include "SessionModel.h"
 #include <QAction>
-#include <QDebug>
 #include <QGridLayout>
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
index 066d72764601f9a85220b4afc71b94fff7aec5d6..ea35477ba170e4c094da2cef12f3a3466d1b5a4d 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
@@ -17,7 +17,6 @@
 #include "FitFlowWidget.h"
 #include "FitSuiteItem.h"
 #include "HistogramPlot.h"
-#include <QDebug>
 #include <QVBoxLayout>
 
 FitFlowWidget::FitFlowWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index d5ecdfaef3333bf77e760fd1b4f4d54ec78a6d58..1ef4c24184a93fb0fc8df8f2c89d4180ecae5ba2 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -29,7 +29,6 @@
 #include "SessionModelDelegate.h"
 #include "mainwindow_constants.h"
 #include <QAction>
-#include <QDebug>
 #include <QMenu>
 #include <QSignalMapper>
 #include <QTreeView>
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index a16369faee1c7841d112156c692a03c6e12dbac5..6441ed1232e927f113aa5504bfdbf004a4f543ff 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -32,7 +32,6 @@
 #include "ParameterTreeItems.h"
 #include "RunFitManager.h"
 #include "mainwindow_constants.h"
-#include <QDebug>
 #include <QMessageBox>
 #include <QTabWidget>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
index 4ae4e209ffb57f0ffe37f600ecce3c3533f67c9b..05673ecfb003ddad3fea48eefc14c5c5147cc46b 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
@@ -17,7 +17,6 @@
 #include "FittingWorker.h"
 #include "FitSuite.h"
 #include <QDateTime>
-#include <QDebug>
 
 void FittingWorker::startFit()
 {
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index a62f13f73112c494f8c41833bdc8d2894e848b3f..ef5341891936b80ecaf620025643ec291b0841e7 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -22,9 +22,8 @@
 #include "GUIHelpers.h"
 #include "IntensityDataItem.h"
 #include "MinimizerUtils.h"
-#include <QDebug>
 #include <QVector>
-
+#include <QDebug>
 
 GUIFitObserver::GUIFitObserver(QObject *parent)
     : QObject(parent)
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 12dc5f04107c4d225598aa47f4c8a3137ab1c593..1fb53f3f03ecb6ffc73a4536413431022d8803f7 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -19,7 +19,6 @@
 #include "FitSuiteItem.h"
 #include "JobItem.h"
 #include "MinimizerItem.h"
-#include <QDebug>
 #include <QPushButton>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index d07b245073b17774d168bfcbdc840ca7b0d5f2bb..fc49959cb1fd9ec3c1d5889700727b1db97199e9 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -21,7 +21,6 @@
 #include "JobMessagePanel.h"
 #include "WarningSignWidget.h"
 #include "mainwindow_constants.h"
-#include <QDebug>
 #include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
index 4ad26f81c6eab7691ad6d21194d8e2853e86acaa..a2071529284d9faabc927848e9bd75a6d485c3f9 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
@@ -17,7 +17,6 @@
 #include "RunFitManager.h"
 #include "FitSuite.h"
 #include "FittingWorker.h"
-#include <QDebug>
 #include <QThread>
 #include <memory>
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index d8f93efe99a673631d9a171eabf6f03d81c55fa8..944eddcc63187b7e5fdfe377a7d0a7a5dc04918a 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -25,7 +25,6 @@
 #include "InstrumentItem.h"
 #include "AxesItems.h"
 #include "DetectorItems.h"
-#include <QDebug>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
index 62ff7b8290b4aa47809eab744e2443c82b641204..efc7abcfd872ef5596026c60a0eb868fe928e535 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
@@ -31,7 +31,6 @@
 #include "SessionItem.h"
 #include "SphericalDetectorItem.h"
 #include <QAction>
-#include <QDebug>
 #include <QItemSelectionModel>
 
 ImportDataToolBar::ImportDataToolBar(QWidget *parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index b6a841c53a8ad7c38019f31e5435ccfdc4f75f44..25057c55e349fd85ea4fc9a92ff25a1237882140 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -25,7 +25,6 @@
 #include "MaskItems.h"
 #include <QMessageBox>
 #include <QPushButton>
-#include <QDebug>
 
 namespace {
 const QString undefinedInstrumentName = "Undefined";
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
index c5250cf06ebbec309a332f6b0d207e191990e2a6..8e34bb3f64c0208c5be147e0e9f62f8c046d3462 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
@@ -22,7 +22,6 @@
 #include "SessionItem.h"
 #include <QAction>
 #include <QBoxLayout>
-#include <QDebug>
 
 RealDataEditorWidget::RealDataEditorWidget(QWidget *parent)
     : SessionItemWidget(parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index 593f8ee6b7217897dbfe713d62cdac93070f0115..5810224f2cda596aa15271215fd90e306a10ccb4 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -25,7 +25,6 @@
 #include "SessionModel.h"
 #include <QAction>
 #include <QBoxLayout>
-#include <QDebug>
 
 RealDataMaskWidget::RealDataMaskWidget(QWidget *parent)
     : SessionItemWidget(parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index ef5298488df14587245c921f4960faf0143191f1..ca8242ae69235610f1af9c5cca8b0c4042bcca3a 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -24,7 +24,6 @@
 #include <QComboBox>
 #include <QDataWidgetMapper>
 #include <QLabel>
-#include <QDebug>
 
 namespace {
 const QString instrumentNameTooltip = "Name of real data";
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index ab92a61f7ab614a543fff788460dba24a57d3d29..bc4b039f75727b96714f6519189fc99842ed11dc 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -24,7 +24,6 @@
 #include "GroupItem.h"
 #include "SessionItem.h"
 #include "qcustomplot.h"
-#include <QDebug>
 #include <QVBoxLayout>
 
 namespace
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
index 95b2df59818b2267ae11070163fc4e033978b4f9..745a327aec681554a8db209b5e2bc42beac4b5ac 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
@@ -17,7 +17,6 @@
 #include "GroupInfoBox.h"
 #include "hostosinfo.h"
 #include <QApplication>
-#include <QDebug>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPixmap>
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index b7156342fccf0fe9188efd84a0004eaec1db7140..c607d0a5aadd8673efbd2c1ad5144be7cb3551cb 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -17,7 +17,6 @@
 #include "InfoWidget.h"
 #include "InfoToolBar.h"
 #include "PySampleWidget.h"
-#include <QDebug>
 #include <QResizeEvent>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
index c85d924ba7af88ca3469b8d1554fee0ea215ee24..faff9859f1676d62f6a689df524a911affa4935d 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
@@ -17,7 +17,6 @@
 #include "OverlayLabelController.h"
 #include "OverlayLabelWidget.h"
 #include <QAbstractScrollArea>
-#include <QDebug>
 #include <QEvent>
 #include <QRect>
 
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
index 34bb7347c71ceefc4d5d2bd0c6f5dd45b32b051f..3b65d3a19fa8a97973e2b26dddded1084824af85 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
@@ -22,7 +22,6 @@
 #include "SessionModel.h"
 #include "WarningMessageService.h"
 #include <QBoxLayout>
-#include <QDebug>
 #include <QFrame>
 #include <QGridLayout>
 #include <QHeaderView>
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index 95d2c29ebccf95586a00b7ddf54fe297a9817e4d..4d55a338802d0a16b1c08d18559589e3271107b3 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -23,7 +23,6 @@
 #include "PythonSyntaxHighlighter.h"
 #include "SampleModel.h"
 #include "WarningSignWidget.h"
-#include <QDebug>
 #include <QFile>
 #include <QModelIndex>
 #include <QPainter>
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 4489a0eafe2f3544830faf132da8eb3b5ee43b4c..a527b794bb40edc83d4907d7a479ea09a2de0478 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -23,8 +23,6 @@
 #include "mainwindow.h"
 #include <QAction> // need detected by TeamCity
 #include <QBoxLayout>
-#include <QDebug>
-#include <QDebug>
 #include <QListView>
 #include <QStackedWidget>
 #include <QToolButton>
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
index c551de19d03370c610fb16b217b3ce4182567032..c93bc473885d7a8087df1458ea43e70f7261e0cf 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
@@ -24,7 +24,6 @@
 #include "GroupInfoBox.h"
 #include "LayerItem.h"
 #include <QComboBox>
-#include <QDebug>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
index 71a5519caf85d55d6e8e33bdf77e528aea39835e..310744e4d44c28e4944ed93e30512513f8a52307 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
@@ -18,7 +18,6 @@
 #include "GUIHelpers.h"
 #include <QBoxLayout>
 #include <QComboBox>
-#include <QDebug>
 #include <QDoubleSpinBox>
 #include <QGridLayout>
 #include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 949b79aa97f95a3d7c196bbdcc87ae913eedb061..3826ea3aeb674e0d965eabe1dd3ed80a4d80a460 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -24,7 +24,6 @@
 #include "RectangularDetectorWidget.h"
 #include "SphericalDetectorWidget.h"
 #include "columnresizer.h"
-#include <QDebug>
 #include <QGroupBox>
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index ffa8009c9a161e240f41b925cd364f1c473fcfaf..026d6a0ae7c2e5b67813f8e51c433a315f986130 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -25,7 +25,6 @@
 #include "MaskItems.h"
 #include "MaskModel.h"
 #include "OutputData.h"
-#include <QDebug>
 
 DetectorMaskDelegate::DetectorMaskDelegate(QObject *parent)
     : QObject(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index af76c25000890867e8c729d758d55c806561f49e..83dd9952347aafaa9f27ac6d1f4e6e60bc8a85cc 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -20,7 +20,6 @@
 #include "MaskEditor.h"
 #include "MaskModel.h"
 #include "mainwindow_constants.h"
-#include <QDebug>
 #include <QKeyEvent>
 #include <QModelIndex>
 #include <QPushButton>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index 2bbba296e2a7afb92ebd6a8655e001e0a2a3dfa8..aec9b0f98a16fdd3e4ff84a4e94d32aa03b00b08 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -18,7 +18,6 @@
 #include "BeamEditorWidget.h"
 #include "DetectorEditorWidget.h"
 #include "columnresizer.h"
-#include <QDebug>
 #include <QVBoxLayout>
 
 InstrumentComponentsWidget::InstrumentComponentsWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index 0b1288369fe83fc449658473ab6c465747ae279e..c3ac17189ba2247265bfb710cb22aa36e0f85c05 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -24,7 +24,6 @@
 #include "SessionItem.h"
 #include <QBoxLayout>
 #include <QComboBox>
-#include <QDebug>
 #include <QEvent>
 #include <QGroupBox>
 #include <QLineEdit>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index ea005c1ac9ea46f09561d4fc3a8a409e50b1bd49..4e57bcb578b25213cb93a5a1c7d005343fa908eb 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -18,7 +18,6 @@
 #include "InstrumentModel.h"
 #include "SessionItem.h"
 #include <QAction>
-#include <QDebug>
 #include <QListView>
 #include <QMenu>
 #include <QPushButton>
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index cebd1b66be4235ff631118bd1c5fac58d977be8e..9a9e7915273bf50965eaed3ed776d35dfeda984d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -22,7 +22,6 @@
 #include "ExtendedDetectorDialog.h"
 #include "GroupInfoBox.h"
 #include "columnresizer.h"
-#include <QDebug>
 #include <QGroupBox>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 6bb1508fc754ba52220c3384025f33640de2a621..4fd8b726a8f56b6c2e8a6bba79edd1a624db4fa0 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -20,7 +20,6 @@
 #include "ExtendedDetectorDialog.h"
 #include "GroupInfoBox.h"
 #include "columnresizer.h"
-#include <QDebug>
 #include <QGroupBox>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
index 0d9d3858f861778d85479e9fffe8e65c291ae4f7..5daf8e2304582fa8ed83d5bc736202d5bb442d5c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
@@ -20,12 +20,12 @@
  */
 #include "columnresizer.h"
 
-#include <QDebug>
 #include <QEvent>
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QTimer>
 #include <QWidget>
+#include <QDebug>
 
 class FormLayoutWidgetItem : public QWidgetItem
 {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index b063a4116e71bb850733f257a3e1d34e6b809d79..bfe01de4d0235ec497d9017ab1eb699bb968ad82 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -23,7 +23,6 @@
 #include "MathConstants.h"
 #include "UpdateTimer.h"
 #include "plot_constants.h"
-#include <QDebug>
 
 namespace {
 const int replot_update_interval = 10;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index e2df1f928c249e8bcc271aa54bf229753cc1ffd5..83816432fecaa6f7a0e6df728cc213cd996bfa8a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -20,7 +20,6 @@
 #include "ColorMapLabel.h"
 #include "IntensityDataItem.h"
 #include "StatusLabel.h"
-#include <QDebug>
 #include <QLabel>
 #include <QVBoxLayout>
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
index d1620ae549c303c65a50a336fb22b70fe1660ffd..dcd2c57745e7c24ddee09da685bfa013317572a8 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
@@ -18,7 +18,6 @@
 #include "ColorMap.h"
 #include "ColorMapCanvas.h"
 #include "qcustomplot.h"
-#include <QDebug>
 #include <QLabel>
 #include <QRect>
 #include <QResizeEvent>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
index 56460f17d96ce77700ddc622cfd8f2875a684136..eef01ca674c15187aad1a597891e05dae671f2a7 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
@@ -16,7 +16,6 @@
 
 #include "ColorMapEvent.h"
 #include "ColorMap.h"
-#include <QDebug>
 #include <QMouseEvent>
 
 ColorMapEvent::ColorMapEvent(ColorMap *colorMap)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
index 34dd508134cb3ddc19511cf6c5447e41f1b174df..f8e6aea3ab8a3ebf67f13323e5a42bff985531d8 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
@@ -21,7 +21,6 @@
 #include "IntensityDataItem.h"
 #include "MathConstants.h"
 #include "UpdateTimer.h"
-#include <QDebug>
 
 namespace {
 const int replot_update_interval = 10;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index 6ee3a7ab888db002df07ad3e3977708202b44ff1..3e9190e4af6498e615b8df442b3d5ae8a29988bf 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -19,7 +19,6 @@
 #include "IntensityDataItem.h"
 #include "JobModel.h"
 #include <QAction>
-#include <QDebug>
 #include <QVBoxLayout>
 
 IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
index 19e8214b3a755fbca7ff1834696bd4ac994b41ec..eed1aa3c12bfe9dc035ff70f932efe0f8f6d3207 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
@@ -21,7 +21,6 @@
 #include "SavePlotAssistant.h"
 #include "VerticalSlicePlot.h"
 #include "qcustomplot.h"
-#include <QDebug>
 #include <QLabel>
 #include <QSplitter>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
index a04de4a3e5927d335ba5db31f4486e5d0a0d23eb..323cb2da3f3a06134577850f249ee91c9b9455fb 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
@@ -23,7 +23,6 @@
 #include "ObsoleteIntensityDataPlotWidget.h"
 #include "ObsoleteIntensityDataWidgetActions.h"
 #include "projectmanager.h"
-#include <QDebug>
 #include <QVBoxLayout>
 
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index 55390f61c214158a7d849b512eb5a73ce9e9ba29..840fb6f54b618fee2580fb5251b1fe9383f2d13c 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -18,7 +18,6 @@
 #include "ColorMapPlot.h"
 #include "IntensityDataIOFactory.h"
 #include "IntensityDataItem.h"
-#include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index f74249b50efc83b9a113bf53696140b418e2df55..7ae5eba516857bad6b1622d7f2b1f1480fd84e5a 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -20,7 +20,6 @@
 #include "hostosinfo.h"
 #include "progressbar.h"
 #include <QApplication>
-#include <QDebug>
 #include <QMouseEvent>
 #include <QPaintDevice>
 #include <QPainter>
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index a08daf4536d2d6335ed5b88d7466af7606d1310e..837fc07619a724de0ff3ecf6654e565342dee510 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -19,7 +19,6 @@
 #include "JobModel.h"
 #include "StyledToolBar.h"
 #include <QAction>
-#include <QDebug>
 #include <QItemSelectionModel>
 #include <QMenu>
 
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index 201828f83853a1f75d6212eeb03aa187719758c8..588e212ce95a19329a81f3f221623cda5f90f8e7 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -22,7 +22,6 @@
 #include "SessionModel.h"
 #include <QAbstractItemModel>
 #include <QApplication>
-#include <QDebug>
 #include <QDoubleSpinBox>
 #include <QHBoxLayout>
 #include <QItemSelectionModel>
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 02814d310a6d59fd1d514d086394e800e57b020f..4d19f2cf84093dbce0e137976a1fc7594fed9340 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -30,7 +30,6 @@
 #include "SliderSettingsWidget.h"
 #include "WarningSignWidget.h"
 #include <QApplication>
-#include <QDebug>
 #include <QItemSelectionModel>
 #include <QKeyEvent>
 #include <QLabel>
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
index 2ef5f7dc66b5425c8dc7c6c99f0efd9c4a5dd390..501af14f1ef4d0ed8f5b25d9086f8f5d14e4566f 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
@@ -16,7 +16,6 @@
 
 #include "SliderSettingsWidget.h"
 #include <QCheckBox>
-#include <QDebug>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index 3349d205e1010362f4e0f6312a8c1b0a471014e2..69ae939ebdbd482eba90dac565c8babfee28e1ce 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -16,7 +16,6 @@
 
 #include "ColorMapSceneAdaptor.h"
 #include "ColorMap.h"
-#include <QDebug>
 
 ColorMapSceneAdaptor::ColorMapSceneAdaptor()
     : m_plot(0)
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
index 631b2ee4c2102e46b4abfa6ea810394bb1296608..9bf5389f115fd112af7f8ad087f044ad162a23e0 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
@@ -19,7 +19,6 @@
 #include "MaskItems.h"
 #include "SessionItem.h"
 #include <QAction>
-#include <QDebug>
 #include <QGraphicsSceneContextMenuEvent>
 #include <QMenu>
 #include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index dc4c1c599bfa4234c5fbe73c1fe00a818595f088..06188c92197709fa02cbc3a37eb3d6eaf263dfa5 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -17,7 +17,6 @@
 #include "IntensityDataView.h"
 #include "ISceneAdaptor.h"
 #include <QBrush>
-#include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index e82285bdc4c8e81ecccc7f26bc0078d8e2aae00c..dd5966c02f45a18470e0ca3f774917563f7e9cb7 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -19,7 +19,6 @@
 #include "MaskEditorHelper.h"
 #include "MaskItems.h"
 #include <QCursor>
-#include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index 080cea859f424a431cd8bf52486faac8a9c5faac..06cc98045698a6935ddf8541fd16af1bbc3416bd 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -19,7 +19,6 @@
 #include "MaskEditorHelper.h"
 #include "MaskItems.h"
 #include <QBrush>
-#include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
index edb06c73ecf43575b41c2438dc6c038336c7de52..161d27be1bcf4653b104004b88ab91f0429971db 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
@@ -17,7 +17,6 @@
 #include "MaskContainerView.h"
 #include "ISceneAdaptor.h"
 #include <QBrush>
-#include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index 1916ef003e5cd9e0f1e20ad57ab01522ed967f6a..3810c0c83298c182b987b211472c42f50cf2dc17 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -16,7 +16,6 @@
 
 #include "MaskDrawingContext.h"
 #include "item_constants.h"
-#include <QDebug>
 
 MaskDrawingContext::MaskDrawingContext()
     : m_current_activity(MaskEditorFlags::PAN_ZOOM_MODE)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
index 21d4649e066fc5903458519eb5cc6a23043e33fb..688d76494c9a8813c16013bc614a492ddd260ed3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
@@ -32,7 +32,6 @@
 #include "minisplitter.h"
 #include <QBoxLayout>
 #include <QContextMenuEvent>
-#include <QDebug>
 #include <QMenu>
 
 MaskEditor::MaskEditor(QWidget* parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
index 27427def2ec3758f3800ffc89e1a5a64a53744e4..a547eb338ae8bc0630c17e56f53f140de78f0694 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
@@ -18,7 +18,6 @@
 #include "MaskItems.h"
 #include "SessionModel.h"
 #include <QAction>
-#include <QDebug>
 #include <QItemSelectionModel>
 #include <QMenu>
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index a2c90a92342e231ab4af0aac7e11935dc5be0f4c..ddc887a94a3cdde406e8ba4b4dcd69833c21cceb 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -27,7 +27,6 @@
 #include "ColorMap.h"
 #include "IntensityDataItem.h"
 #include "MaskItems.h"
-#include <QDebug>
 #include <QGraphicsRectItem>
 #include <QModelIndex>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 8dd51f60ab396f0c8fb98906f551d873b3a31f1c..dc9e8f2e94f054cfb38ee02fd0a9a95d387c8419 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -22,7 +22,6 @@
 #include "MaskEditorFlags.h"
 #include "SessionModel.h"
 #include <QButtonGroup>
-#include <QDebug>
 #include <QGridLayout>
 #include <QItemSelection>
 #include <QLabel>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
index 9c531ac88a93ce67b06678198499f48c5fdceb36..f53ef40b92f96e0b76375c3bff787ba852566522 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -17,7 +17,6 @@
 #include "MaskEditorToolBar.h"
 #include "MaskEditorActions.h"
 #include <QButtonGroup>
-#include <QDebug>
 #include <QLabel>
 #include <QRadioButton>
 #include <QStyle>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index ae3250e2770e8d0ff15707e3f012b69dc28e455d..c10c1c5bf6baf084854160b6e28a0f79ad9cb7e2 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -19,7 +19,6 @@
 #include "ColorMap.h"
 #include "IntensityDataItem.h"
 #include <QGraphicsSceneMouseEvent>
-#include <QDebug>
 
 MaskGraphicsProxy::MaskGraphicsProxy()
     : m_colorMap(new ColorMap)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index fdcf7f0c6d452c32685868491bfdd5b41f052c4d..cb4e2f9798aa1d4f390a88b474f863a687d0901a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -33,7 +33,6 @@
 #include <QLineF>
 #include <QGraphicsSceneMoveEvent>
 #include <QPainter>
-#include <QDebug>
 
 namespace {
 const QRectF default_scene_rect(0, 0, 800, 600);
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index a628aa9a67a81e8d4cbe1fccea30b5d6073c342c..6c63acadf88625ee1b56dabdfadcc447f186af4f 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -17,7 +17,6 @@
 #include "MaskGraphicsView.h"
 #include "MaskGraphicsProxy.h"
 #include "MaskGraphicsScene.h"
-#include <QDebug>
 #include <QGraphicsScene>
 #include <QScrollBar>
 #include <QTransform>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index cdd488d5c5a5fe678722cdc8e6c61f87e81abd71..fa09f38560793382fe15cec22ac017e10de5d650 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -22,7 +22,6 @@
 #include "OutputData.h"
 #include "SessionModel.h"
 #include "RegionOfInterest.h"
-#include <QDebug>
 #include <QVBoxLayout>
 
 MaskResultsPresenter::MaskResultsPresenter(QWidget *parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
index c36d707bf7378253da9c71a732906fb7245626ba..b519f1d7d563a012ca877423e0d03d0cb33fabf3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
@@ -20,7 +20,6 @@
 #include "BornAgainNamespace.h"
 #include "IntensityDataFunctions.h"
 #include "GUIHelpers.h"
-#include <QDebug>
 
 MaskUnitsConverter::MaskUnitsConverter()
     : mp_data(0)
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
index 68a20e7e3a74beffc15289c5967b16c25f790038..4cb77165b2f0a5640aaaeba6c9ecc5ada38f55a8 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
@@ -19,7 +19,6 @@
 #include "MaskEditorHelper.h"
 #include "MaskItems.h"
 #include <QCursor>
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index cecdc6060f2c38a173e2ae7a097366f5d5fad173..145ce5e1be3f2716f636053157ad3989c75040da 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -20,7 +20,6 @@
 #include "MaskItems.h"
 #include "PolygonPointView.h"
 #include <QCursor>
-#include <QDebug>
 #include <QGraphicsItem>
 #include <QGraphicsPolygonItem>
 #include <QGraphicsSceneMouseEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
index cb260dee6bcec1ea97647f4ba7200574169f0f91..2ed649e9193057d179d17c88c5c4cb1f9b94ed0d 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
@@ -19,7 +19,6 @@
 #include "MaskEditorHelper.h"
 #include "MaskItems.h"
 #include "SizeHandleElement.h"
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QMarginsF>
 #include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
index 100081ae8345aa8cbfcebec0208201dbfea2957c..b21ff41c376a5d4759c8c1b28b506f70b219d593 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
@@ -16,7 +16,6 @@
 
 #include "RectangleView.h"
 #include "MaskItems.h"
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 96a88dae3864f5a0160dabb637b8174ba5ecef9b..8dda20be7fa14df5a9e18947e9d3c76e1b4cae42 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -17,7 +17,6 @@
 #include "SizeHandleElement.h"
 #include "ISceneAdaptor.h"
 #include "MaskEditorHelper.h"
-#include <QDebug>
 #include <QGraphicsSceneHoverEvent>
 #include <QPainter>
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 76185e28f53a6a06a1248e54b1249618fb5ae795..d7494f681f9c6a68632ac3e2cdb717fbb435a7be 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,7 +20,6 @@
 #include "MaterialUtils.h"
 #include "mainwindow_constants.h"
 #include <QAction>
-#include <QDebug>
 #include <QPushButton>
 #include <QSettings>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
index e28ca3f73ca87b7928c84ecfb07f4331e61a763d..7f083300f8746f44d783bb0309f3ddbc26ff79d9 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
@@ -18,7 +18,6 @@
 #include "MaterialItem.h"
 #include "MaterialModel.h"
 #include <QAction>
-#include <QDebug>
 #include <QItemSelectionModel>
 #include <QListView>
 #include <QMenu>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index 58419eaa992ae564bb2e5f48c8b7dd31587c62ee..b71c05fbc28220eaaa58c86d6a24c9efe3a017cf 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -20,7 +20,6 @@
 #include "MaterialModel.h"
 #include "MaterialUtils.h"
 #include "SessionModel.h"
-#include <QDebug>
 
 MaterialSvc *MaterialSvc::m_instance = 0;
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
index 5f6d702ae9d692a89149e08567b54b592a1e85dd..579fe5e25a25db3453b7ccc9959ea81a345cdf9b 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
@@ -26,7 +26,6 @@
 #include "RefractiveIndexItem.h"
 #include "ParticleItem.h"
 #include "LayerItem.h"
-#include <QDebug>
 
 
 QColor MaterialUtils::suggestMaterialColor(const QString &name)
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
index abb834562d9041d9f106e878c6ab2f33d65c3544..4d49c5160b80823e201aecbf7c9192a7a97f04cc 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
@@ -18,7 +18,6 @@
 #include "CustomEventFilters.h"
 #include "GUIHelpers.h"
 #include <QComboBox>
-#include <QDebug>
 #include <QString>
 #include <cmath>
 
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
index 0d593c7af563cdb3326c253a6359dd328d23ffda..b5d254cc6c9d496a7cea0f08787e251e147e3c2a 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
@@ -19,7 +19,6 @@
 #include "MaterialSvc.h"
 #include <QColorDialog>
 #include <QComboBox>
-#include <QDebug>
 #include <QDoubleValidator>
 #include <QFileDialog>
 #include <QFocusEvent>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
index a1e9e08339aef201eb8c230e57969146b214f2af..faa1765c9b8e50eaa2893ae9af3812519cc3a6db 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
@@ -17,8 +17,6 @@
 #include "PropertyVariantFactory.h"
 #include "PropertyBrowserUtils.h"
 #include "PropertyVariantManager.h"
-#include <QDebug>
-
 
 PropertyVariantFactory::~PropertyVariantFactory()
 {
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
index 4dab552531e203147dc263e965e13cd4da82d277..2e1ab11f40f4d179a14d16a2ae067b266295ebcd 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
@@ -17,7 +17,6 @@
 #include "PropertyVariantManager.h"
 #include "DesignerHelper.h"
 #include "SessionItem.h"
-#include <QDebug>
 
 PropertyVariantManager::PropertyVariantManager(QObject *parent)
     : QtVariantPropertyManager(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index 1da67014f354ccc4027ccd7a22b975b2f840de86..345410a54be91e2e7bdb75d9190450cdeac341ac 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -20,7 +20,6 @@
 #include "NodeEditorConnection.h"
 #include "NodeEditorPort.h"
 #include "SessionItem.h"
-#include <QDebug>
 #include <QObject>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index a1043f394936873f12a9cecac7a4769d2f0bac0d..bc106548b78e146a91bb1fd494c4d64db80c93e8 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -16,7 +16,6 @@
 
 #include "DesignerHelper.h"
 #include "item_constants.h"
-#include <QDebug>
 #include <QPainter>
 #include <QtGlobal>
 #include <cmath>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 785806c020a54d613834d27da1881fb827c09e7f..b09fd14326a767b83dba780844730c6d8d46536f 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -35,7 +35,6 @@
 #include "SampleViewAligner.h"
 #include "SampleViewFactory.h"
 #include "SessionGraphicsItem.h"
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QItemSelection>
 #include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index b7d9fd3a085b91e8edcd0d452b3883f268a47ce0..00da5b6492772240de463b90509cd78d6b968994 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -19,7 +19,6 @@
 #include "DesignerMimeData.h"
 #include "DesignerScene.h"
 #include "GUIHelpers.h"
-#include <QDebug>
 #include <QDragEnterEvent>
 #include <QGraphicsScene>
 #include <QGraphicsView>
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 5a883d7870e86d10c53230146eadf1fb8ef0ff13..0153f0673bb3ff75d02d1be1d4d4e570828b1be3 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -23,7 +23,6 @@
 #include "MultiLayerView.h"
 #include "SampleModel.h"
 #include "SessionItem.h"
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 
 QLineF MultiLayerCandidate::getInterfaceToScene()
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/coregui/Views/SampleDesigner/IView.cpp
index e457c6acba75492dd5479f38c1506c1f9d8aab42..55482b0acdf786ad5e530ede078e0a5bd92ace97 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/IView.cpp
@@ -17,7 +17,6 @@
 #include "IView.h"
 #include "ModelMapper.h"
 #include "SessionGraphicsItem.h"
-#include <QDebug>
 #include <QString>
 
 IView::IView(QGraphicsItem *parent) : QGraphicsObject(parent), m_item(0)
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index 3b4b07a709c137e7991c77dbb03f2eefcadfe987..5596e284977b4f6902b0cf10aff842f39ea529bf 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -21,7 +21,6 @@
 #include "ParticleLayoutView.h"
 #include "SessionItem.h"
 #include "tooltipdatabase.h"
-#include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 545f70aeb845a0d0eddfc2bbe601ff64cfbbe155..e287cd1173f34c99a10c9533540c8b47c9975188 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -21,7 +21,6 @@
 #include "LayerView.h"
 #include "SampleModel.h"
 #include "SessionItem.h"
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index ed904af862ebdef563d294e2a50b8df7592d293d..c5c563ab4a2124e4976897b6ecff025f5691f841 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -18,7 +18,6 @@
 #include "ConnectableView.h"
 #include "NodeEditorPort.h"
 #include <QBrush>
-#include <QDebug>
 #include <QGraphicsScene>
 #include <QPainter>
 #include <QPen>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index d90c87194fd576a2f0b209625f825d063d550708..04d0bdd34d197a087f8b7ea5c68e5e1e3f226ac5 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -16,7 +16,6 @@
 
 #include "NodeEditorPort.h"
 #include "NodeEditorConnection.h"
-#include <QDebug>
 #include <QFontMetrics>
 #include <QGraphicsScene>
 #include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 82200fa804dd584ac822053579feb537263b8ddb..bf4dd806811a80f0ae329fd9d9f4542986d1009a 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -18,7 +18,6 @@
 #include "ParticleCompositionItem.h"
 #include "ParticleItem.h"
 #include "SessionItem.h"
-#include <QDebug>
 
 ParticleCompositionView::ParticleCompositionView(QGraphicsItem *parent) : ConnectableView(parent)
 {
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 733c28a099c1e58d91f590f6388149d5fbfdf058..b0ebee00fcc54ebfcac3357da659d06e155f1a22 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -17,8 +17,6 @@
 #include "ParticleCoreShellView.h"
 #include "ParticleCoreShellItem.h"
 #include "SessionItem.h"
-#include <QDebug>
-
 
 ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem *parent)
     : ConnectableView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index d105426fc47866f1fe1ff554e512ce6b62108926..c86e074a25a7040533c2a3ff51c6402771f69064 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -16,8 +16,6 @@
 
 #include "ParticleDistributionView.h"
 #include "SessionItem.h"
-#include <QDebug>
-
 
 ParticleDistributionView::ParticleDistributionView(QGraphicsItem *parent)
     : ConnectableView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 33722f1a4614e96b7ade3360e6e3f765d19ffba4..c7e82d5ab8d7d2d7fb94919df2095fe7ab5929a6 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -19,8 +19,6 @@
 #include "GUIHelpers.h"
 #include "ParticleView.h"
 #include "SessionItem.h"
-#include <QDebug>
-
 
 ParticleLayoutView::ParticleLayoutView(QGraphicsItem *parent)
     : ConnectableView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index 614552a28bdf7eebe7eee7255fb870bb1ca035ff..2e08f39738c8e52e8ed5444d50c3f0ba8ddba332 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -19,7 +19,6 @@
 #include "GroupItem.h"
 #include "GroupProperty.h"
 #include "ParticleItem.h"
-#include <QDebug>
 #include <QObject>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index 59d0f8da89a65d398661463b9b87f3a78c2736f5..eefc8982d7bf18510cec94f9cf96c048ed28e160 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -20,7 +20,6 @@
 #include "FilterPropertyProxy.h"
 #include "ISample.h"
 #include "MultiLayerView.h"
-#include <QDebug>
 
 SampleDesigner::SampleDesigner(QWidget *parent)
     : SampleDesignerInterface(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 4e99bb9255d194d7c3e1fc3a88cf9c0a07692341..b1c1ae5244a3a0506951ffcc87bc568f19056a1e 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -17,7 +17,6 @@
 #include "SamplePropertyWidget.h"
 #include "ComponentEditor.h"
 #include "SessionItem.h"
-#include <QDebug>
 #include <QItemSelection>
 #include <QModelIndexList>
 #include <QSortFilterProxyModel>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 0b37371b1cba9bc2a19c607b67490ef6ebeecda8..e3a2c48274e119a8d036aa9b09ea66842673a0ea 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -21,7 +21,6 @@
 #include <QAction>
 #include <QButtonGroup>
 #include <QComboBox>
-#include <QDebug>
 #include <QIcon>
 #include <QLabel>
 #include <QMenu>
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index 186d5c0603075e3d0c59164d941abc0191301268..29e090d75fb753cdde8b598372ba95178b2ad41b 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -18,7 +18,6 @@
 #include "DesignerScene.h"
 #include "IView.h"
 #include "SampleModel.h"
-#include <QDebug>
 #include <QModelIndex>
 
 SampleViewAligner::SampleViewAligner(DesignerScene *scene)
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index 6050ddea35bdd7d8e9fec594b9511e8742c7d64c..fd6a085f598885f1463f81f8841e3383d94fdb95 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -26,8 +26,6 @@
 #include "ParticleView.h"
 #include "TransformationView.h"
 #include "item_constants.h"
-#include <QDebug>
-
 
 QStringList SampleViewFactory::m_valid_item_names  = QStringList()
         << Constants::MultiLayerType
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 1ac102e9ab9c9d3a9358085d60f35e49d517fb12..520ed2fac3104691abccac72baf8d471a86d4dad 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -23,7 +23,6 @@
 #include "SampleToolBar.h"
 #include "SampleViewComponents.h"
 #include "mainwindow.h"
-#include <QDebug>
 #include <QDockWidget>
 #include <QMenu>
 #include <QTimer>
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index 46598cd1d1e46fc8628178688c40a43c9bb6e5cf..50215f638c7663d44a1eaea4975c3f15e62e65a1 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -26,7 +26,6 @@
 #include "WarningSignWidget.h"
 #include "projectdocument.h"
 #include "projectmanager.h"
-#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QFileDialog>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index 3c7d7553c36089e8967f324a33212c95909b62a8..45aaf8dbc1e9e7ed851b0454323f7f4e2e194624 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -23,7 +23,6 @@
 #include "RealDataModel.h"
 #include "SampleModel.h"
 #include <QComboBox>
-#include <QDebug>
 #include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
index b858126fce630516f2cd661677405a829618b29f..475a0106a0db794588fb3f401afdc7ce7f0eff08 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
@@ -17,7 +17,6 @@
 #include "SimulationSetupAssistant.h"
 #include "SampleValidator.h"
 #include "ImportDataAssistant.h"
-#include <QDebug>
 #include <QMessageBox>
 
 //! Returns true if given setup is valid for submitting the job
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index 1505895ef1cd0e8e1399eec5ea96cf7d98211339..661fb887b4001b306e6f8669abef52419264bd4d 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -25,7 +25,6 @@
 #include "SimulationOptionsWidget.h"
 #include "SimulationSetupAssistant.h"
 #include "projectmanager.h"
-#include <QDebug>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index 9808f9da86806addec38a8893c02a7de37c67726..8964bc707d232dc93a5e2532ad9ce1f979081c23 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -23,7 +23,6 @@
 #include "projectmanager.h"
 #include "qstringutils.h"
 #include <QCommandLinkButton>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QSignalMapper>
 #include <QUrl>
diff --git a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
index af76398bca58d0b2ebf5c1c6eb4cbe215fb371b0..cf61adaf32720ef642445db9715b6765c3159455 100644
--- a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
+++ b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
@@ -62,7 +62,6 @@
 #include <QtCore/QList>
 #include <QtCore/QTextStream>
 #include <QtCore/QRegExp>
-#include <QDebug>
 #include <QXmlStreamReader>
 
 static const char *widgetElementC = "widget";
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index 10897e8b987a7f76e7d5e2c0f112edbbfe705c8d..fc5a3891e3d3647ddbed10e28c52e7d3cca3210e 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -21,7 +21,6 @@
 #include "mainwindow_constants.h"
 #include "projectmanager.h"
 #include "qstringutils.h"
-#include <QDebug>
 #include <QDir>
 #include <QMenuBar>
 #include <QSettings>
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index ec7c87a0df9a2a9af3a3a8b142ca10483c3249b4..671a1c0426001fb95c153f681e0e0447405c8586 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -18,7 +18,6 @@
 #include "ApplicationModels.h"
 #include "GUIHelpers.h"
 #include "WarningMessageService.h"
-#include <QDebug>
 #include <QDir>
 #include <QXmlStreamReader>
 
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index 73094ba92d4e32a0b4806b78f91d91582040ab4f..a14c79a8777ceeefb8d3092413897ccc068ef631 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -24,7 +24,6 @@
 #include "mainwindow_constants.h"
 #include "newprojectdialog.h"
 #include "projectdocument.h"
-#include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QSettings>
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index 9967c49dc85484b4aa4f8ea958f2056096ad6d5e..9c6323b72634ebab69ec7ce644cb33942a44acb6 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -17,7 +17,6 @@
 #include "tooltipdatabase.h"
 #include "GUIHelpers.h"
 #include "item_constants.h"
-#include <QDebug>
 #include <QFile>
 #include <QXmlStreamReader>
 
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/coregui/mainwindow/tooltipdatabase.h
index a0a38438b78bf365973d25c733fbbc88fc63658a..9d48582ae56a96a2fb220c55a2ef6f63c0401396 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.h
+++ b/GUI/coregui/mainwindow/tooltipdatabase.h
@@ -19,6 +19,7 @@
 
 #include "WinDllMacros.h"
 #include <QObject>
+#include <QMap>
 
 namespace ToolTipsXML {
 const QString modelTag = "ToolTipsData";
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index 0b8a99e4f00b23d543ae0bd22585da25970d820d..6e7b4af7e6c58429a3bd4bed35bd56fa2a0ffa55 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -20,7 +20,6 @@
 #include "mainwindow.h"
 #include "ComboProperty.h"
 #include <QApplication>
-#include <QDebug>
 #include <QLocale>
 #include <QMetaType>
 #include <QTime>
diff --git a/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp b/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
index 156cc81ad9699c2655352b62f304afccc1036df5..0dfb8c18342ecdd660e017268f40bba5528d819d 100644
--- a/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
@@ -31,8 +31,6 @@
 #include "GUIHelpers.h"
 #include "StringUtils.h"
 #include <QStack>
-#include <QDebug>
-
 
 GUITranslationTest::GUITranslationTest(const std::string &simName, const std::string &sampleName)
     : m_models(new ApplicationModels(0))
diff --git a/Tests/UnitTests/GUI/TestComboProperty.h b/Tests/UnitTests/GUI/TestComboProperty.h
index 3c9e80bbc1d5c818380ceca02647d854c1a0d6ff..fa5b156368e0da36d146def3f15db106f62ca97c 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.h
+++ b/Tests/UnitTests/GUI/TestComboProperty.h
@@ -1,6 +1,5 @@
 #include <QtTest>
 #include "ComboProperty.h"
-#include <QDebug>
 
 class TestComboProperty : public QObject {
     Q_OBJECT
diff --git a/Tests/UnitTests/GUI/TestGUI.cpp b/Tests/UnitTests/GUI/TestGUI.cpp
index 1a89d4be7e754693529b8a29a08dcb94c0f4bf25..b46531a95f8879f8be50f84669c6bbe97f7646e5 100644
--- a/Tests/UnitTests/GUI/TestGUI.cpp
+++ b/Tests/UnitTests/GUI/TestGUI.cpp
@@ -1,6 +1,5 @@
 #include <QtTest>
 #include <QString>
-#include <QDebug>
 #include <QCoreApplication>
 #include "TestMapperCases.h"
 #include "TestFormFactorItems.h"
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.h b/Tests/UnitTests/GUI/TestParticleDistributionItem.h
index 46eb6292801e9d26f2dea9ae122b901fc22543fc..39bee853bc5faf6e509226d53c02c4d184c5930e 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.h
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.h
@@ -2,7 +2,6 @@
 #include "SampleModel.h"
 #include "ParticleDistributionItem.h"
 #include "ComboProperty.h"
-#include <QDebug>
 
 class TestParticleDistributionItem : public QObject {
     Q_OBJECT
diff --git a/ThirdParty/GUI/qt-manhattan-style/extensions/tabwidget.cpp b/ThirdParty/GUI/qt-manhattan-style/extensions/tabwidget.cpp
index c84c21f143f8b8f2cb8e5f207d25e59dd324c4bf..21d62bc7f534511cc528ee951682f82b5e68a099 100644
--- a/ThirdParty/GUI/qt-manhattan-style/extensions/tabwidget.cpp
+++ b/ThirdParty/GUI/qt-manhattan-style/extensions/tabwidget.cpp
@@ -9,7 +9,6 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 #include <QStackedWidget>
-#include <QDebug>
 
 using namespace Manhattan;
 
diff --git a/ThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp b/ThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp
index d3fd5d4d68054cf3306c94279687851c844b3e1f..7bb7d611008dc68c74c2cf7e01d3082d7674e1cb 100644
--- a/ThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp
+++ b/ThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp
@@ -47,7 +47,6 @@
 #include <QEvent>
 #include <QAnimationGroup>
 #include <QPropertyAnimation>
-#include <QDebug>
 
 using namespace Manhattan;
 
diff --git a/ThirdParty/GUI/qt-manhattan-style/fancylineedit.cpp b/ThirdParty/GUI/qt-manhattan-style/fancylineedit.cpp
index 473c34981d8a6ff00907e842ecf87e4ca5cb39ae..076981daba93883a9b23766ccfde70caf561df4c 100644
--- a/ThirdParty/GUI/qt-manhattan-style/fancylineedit.cpp
+++ b/ThirdParty/GUI/qt-manhattan-style/fancylineedit.cpp
@@ -32,7 +32,6 @@
 #include "qtcassert.h"
 
 #include <QEvent>
-#include <QDebug>
 #include <QString>
 #include <QPropertyAnimation>
 #include <QApplication>
diff --git a/ThirdParty/GUI/qt-manhattan-style/fancytabwidget.cpp b/ThirdParty/GUI/qt-manhattan-style/fancytabwidget.cpp
index 6187d0520e3171f5b5522925858d7f2c51aeb644..7e3b564b121f5ca1c7063a05d32db9f4a55c6576 100644
--- a/ThirdParty/GUI/qt-manhattan-style/fancytabwidget.cpp
+++ b/ThirdParty/GUI/qt-manhattan-style/fancytabwidget.cpp
@@ -30,9 +30,6 @@
 #include "fancytabwidget.h"
 #include "stylehelper.h"
 #include "styledbar.h"
-
-#include <QDebug>
-
 #include <QColorDialog>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
diff --git a/ThirdParty/GUI/qt-manhattan-style/manhattanstyle.cpp b/ThirdParty/GUI/qt-manhattan-style/manhattanstyle.cpp
index 0d3baec3baec11fc63302c64d13d5ad5bbbd875b..849d44dddd3413abe783598b3ab282ede5359ae7 100644
--- a/ThirdParty/GUI/qt-manhattan-style/manhattanstyle.cpp
+++ b/ThirdParty/GUI/qt-manhattan-style/manhattanstyle.cpp
@@ -60,7 +60,6 @@
 #include <QTreeView>
 #include <QToolButton>
 #include <QAbstractItemView>
-#include <QDebug>
 
 using namespace Manhattan;
 
@@ -283,8 +282,6 @@ QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false)
     return pal;
 }
 
-#include <QDebug>
-
 void ManhattanStyle::polish(QWidget *widget)
 {
     QProxyStyle::polish(widget);