From 01748be434bdefcf95ed61a5265b6157e98913d8 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 8 Oct 2015 16:00:23 +0100
Subject: [PATCH] unnecessary include iostream/iomanip removed from cpp files,
re #13689
---
Framework/API/src/AlgorithmFactory.cpp | 1 -
Framework/API/src/Axis.cpp | 1 -
Framework/API/src/Column.cpp | 5 +++--
Framework/API/src/ColumnFactory.cpp | 1 -
Framework/API/src/CompositeFunction.cpp | 1 -
Framework/API/src/CostFunctionFactory.cpp | 1 -
Framework/API/src/Expression.cpp | 8 ++++----
Framework/API/src/FileProperty.cpp | 1 -
Framework/API/src/FunctionDomain1D.cpp | 1 -
Framework/API/src/FunctionValues.cpp | 1 -
Framework/API/src/GridDomain.cpp | 1 -
Framework/API/src/GridDomain1D.cpp | 1 -
Framework/API/src/IFunction.cpp | 1 -
Framework/API/src/IFunction1D.cpp | 1 -
Framework/API/src/IFunctionMD.cpp | 1 -
Framework/API/src/IFunctionMW.cpp | 1 -
Framework/API/src/LinearScale.cpp | 1 -
Framework/API/src/LogarithmScale.cpp | 1 -
Framework/API/src/ParamFunction.cpp | 1 -
Framework/API/src/PeakFunctionIntegrator.cpp | 1 -
Framework/API/src/SpectraAxis.cpp | 1 -
Framework/API/src/TempFunction.cpp | 1 -
Framework/Algorithms/src/ApplyDeadTimeCorr.cpp | 1 -
Framework/Algorithms/src/ApplyDetailedBalance.cpp | 1 -
Framework/Algorithms/src/ConvertUnits.cpp | 1 -
.../Algorithms/src/ConvertUnitsUsingDetectorTable.cpp | 1 -
Framework/Algorithms/src/CopyInstrumentParameters.cpp | 1 -
Framework/Algorithms/src/CreateCalFileByNames.cpp | 1 -
Framework/Algorithms/src/CreateDummyCalFile.cpp | 1 -
Framework/Algorithms/src/CreateLogTimeCorrection.cpp | 1 -
Framework/Algorithms/src/CropWorkspace.cpp | 1 -
.../Algorithms/src/DiffractionEventCalibrateDetectors.cpp | 1 -
Framework/Algorithms/src/ExtractSpectra.cpp | 1 -
Framework/Algorithms/src/FFTSmooth.cpp | 1 -
Framework/Algorithms/src/FFTSmooth2.cpp | 1 -
Framework/Algorithms/src/FindCenterOfMassPosition.cpp | 1 -
Framework/Algorithms/src/FindCenterOfMassPosition2.cpp | 1 -
Framework/Algorithms/src/FindPeaks.cpp | 1 -
Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp | 1 -
Framework/Algorithms/src/GetDetectorOffsets.cpp | 1 -
Framework/Algorithms/src/MaskDetectorsIf.cpp | 1 -
.../src/MultipleScatteringCylinderAbsorption.cpp | 1 -
Framework/Algorithms/src/NormaliseToMonitor.cpp | 1 -
Framework/Algorithms/src/Q1DTOF.cpp | 1 -
Framework/Algorithms/src/Q1DWeighted.cpp | 1 -
Framework/Algorithms/src/RealFFT.cpp | 1 -
Framework/Algorithms/src/Regroup.cpp | 1 -
Framework/Algorithms/src/SANSDirectBeamScaling.cpp | 1 -
Framework/Algorithms/src/SaveGSASInstrumentFile.cpp | 1 -
Framework/Algorithms/src/SolidAngle.cpp | 1 -
Framework/Algorithms/src/SpatialGrouping.cpp | 1 -
Framework/CurveFitting/src/BSpline.cpp | 1 -
Framework/CurveFitting/src/BivariateNormal.cpp | 1 -
Framework/CurveFitting/src/CostFuncLeastSquares.cpp | 1 -
Framework/CurveFitting/src/CostFuncRwp.cpp | 1 -
.../CurveFitting/src/CostFuncUnweightedLeastSquares.cpp | 1 -
Framework/CurveFitting/src/CubicSpline.cpp | 1 -
Framework/CurveFitting/src/FABADAMinimizer.cpp | 1 -
Framework/CurveFitting/src/Fit1D.cpp | 1 -
Framework/CurveFitting/src/FitPowderDiffPeaks.cpp | 1 -
Framework/CurveFitting/src/LeBailFit.cpp | 1 -
.../CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp | 1 -
.../CurveFitting/src/LevenbergMarquardtMinimizer.cpp | 1 -
Framework/CurveFitting/src/MultiBG.cpp | 1 -
Framework/CurveFitting/src/PlotPeakByLogValue.cpp | 1 -
.../CurveFitting/src/RefinePowderInstrumentParameters.cpp | 1 -
.../DataHandling/src/FilterEventsByLogValuePreNexus.cpp | 1 -
Framework/DataHandling/src/FindDetectorsPar.cpp | 1 -
Framework/DataHandling/src/ISISDataArchive.cpp | 1 -
Framework/DataHandling/src/LoadEventPreNexus.cpp | 1 -
Framework/DataHandling/src/LoadEventPreNexus2.cpp | 1 -
Framework/DataHandling/src/LoadGSS.cpp | 2 --
Framework/DataHandling/src/LoadILL.cpp | 1 -
Framework/DataHandling/src/LoadILLIndirect.cpp | 2 --
Framework/DataHandling/src/LoadILLReflectometry.cpp | 1 -
Framework/DataHandling/src/LoadInstrument.cpp | 1 -
Framework/DataHandling/src/LoadIsawDetCal.cpp | 1 -
Framework/DataHandling/src/LoadLLB.cpp | 1 -
Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp | 1 -
Framework/DataHandling/src/LoadMLZ.cpp | 1 -
Framework/DataHandling/src/LoadPreNexusMonitors.cpp | 1 -
Framework/DataHandling/src/LoadQKK.cpp | 2 --
Framework/DataHandling/src/LoadSINQFocus.cpp | 1 -
Framework/DataHandling/src/LoadSpice2D.cpp | 1 -
Framework/DataHandling/src/SNSDataArchive.cpp | 1 -
Framework/DataHandling/src/SaveCSV.cpp | 1 -
Framework/DataHandling/src/SaveFocusedXYE.cpp | 1 -
Framework/DataHandling/src/SaveFullprofResolution.cpp | 1 -
Framework/DataHandling/src/SaveGSS.cpp | 1 -
Framework/DataHandling/src/SaveNISTDAT.cpp | 1 -
Framework/DataHandling/src/SavePAR.cpp | 1 -
Framework/DataHandling/src/SavePDFGui.cpp | 1 -
Framework/DataHandling/src/SavePHX.cpp | 1 -
Framework/DataHandling/src/SaveRKH.cpp | 1 -
Framework/DataObjects/src/CoordTransformAffine.cpp | 1 -
Framework/DataObjects/src/EventList.cpp | 1 -
Framework/DataObjects/src/Events.cpp | 1 -
Framework/DataObjects/src/Histogram1D.cpp | 1 -
Framework/DataObjects/src/PeaksWorkspace.cpp | 1 -
Framework/DataObjects/src/RebinnedOutput.cpp | 1 -
Framework/DataObjects/src/TableWorkspace.cpp | 1 -
Framework/Geometry/src/Crystal/IndexingUtils.cpp | 1 -
Framework/Geometry/src/Crystal/NiggliCell.cpp | 1 -
Framework/Geometry/src/Crystal/PointGroup.cpp | 1 -
Framework/Geometry/src/Crystal/ScalarUtils.cpp | 1 -
Framework/Geometry/src/Math/BnId.cpp | 2 --
Framework/Geometry/src/Math/PolyBase.cpp | 1 -
Framework/Geometry/src/Math/PolygonIntersection.cpp | 1 -
Framework/Geometry/src/Math/RotCounter.cpp | 2 --
Framework/Geometry/src/Objects/RuleItems.cpp | 2 --
Framework/Geometry/src/Objects/Track.cpp | 1 -
.../Geometry/src/Rendering/vtkGeometryCacheReader.cpp | 1 -
.../Geometry/src/Rendering/vtkGeometryCacheWriter.cpp | 1 -
Framework/Geometry/src/Surfaces/Cone.cpp | 2 --
Framework/Geometry/src/Surfaces/Torus.cpp | 2 --
Framework/Kernel/src/Atom.cpp | 1 -
Framework/Kernel/src/DllOpen.cpp | 1 -
Framework/Kernel/src/Exception.cpp | 1 -
Framework/Kernel/src/FacilityInfo.cpp | 1 -
Framework/Kernel/src/LibraryManager.cpp | 1 -
Framework/Kernel/src/Memory.cpp | 2 --
Framework/Kernel/src/NetworkProxyOSX.cpp | 1 -
Framework/Kernel/src/NeutronAtom.cpp | 1 -
Framework/Kernel/src/ProxyInfo.cpp | 1 -
Framework/Kernel/src/Strings.cpp | 1 -
Framework/Kernel/src/ThreadSafeLogStream.cpp | 1 -
Framework/Kernel/src/V3D.cpp | 1 -
Framework/Kernel/src/VectorHelper.cpp | 1 -
Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp | 1 -
Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp | 1 -
Framework/MDAlgorithms/src/Integrate3DEvents.cpp | 1 -
Framework/MDAlgorithms/src/LoadILLAscii.cpp | 1 -
Framework/MDAlgorithms/src/LoadSQW.cpp | 1 -
Framework/SINQ/src/LoadFlexiNexus.cpp | 1 -
Framework/SINQ/src/MDHistoToWorkspace2D.cpp | 1 -
Framework/SINQ/src/SINQHMListener.cpp | 1 -
Framework/TestHelpers/src/LoggingCleaner.cpp | 1 -
MantidPlot/src/CanvasPicker.cpp | 1 -
MantidPlot/src/Graph.cpp | 1 -
MantidPlot/src/ImportASCIIDialog.cpp | 1 -
MantidPlot/src/LegendWidget.cpp | 1 -
MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp | 1 -
MantidPlot/src/Mantid/AlgorithmMonitor.cpp | 1 -
MantidPlot/src/Mantid/FitParameterTie.cpp | 1 -
MantidPlot/src/Mantid/InputHistory.cpp | 1 -
.../src/Mantid/InstrumentWidget/CollapsiblePanel.cpp | 1 -
.../src/Mantid/InstrumentWidget/GLActorCollection.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp | 1 -
.../src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp | 1 -
.../src/Mantid/InstrumentWidget/Shape2DCollection.cpp | 1 -
MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp | 1 -
MantidPlot/src/Mantid/MantidApplication.cpp | 1 -
MantidPlot/src/Mantid/MantidMatrix.cpp | 1 -
MantidPlot/src/Mantid/MantidSampleLogDialog.cpp | 1 -
MantidPlot/src/Mantid/MantidTable.cpp | 1 -
MantidPlot/src/Mantid/MantidUI.cpp | 1 -
MantidPlot/src/Mantid/PeakPickerTool.cpp | 1 -
MantidPlot/src/Mantid/UserFitFunctionDialog.cpp | 1 -
MantidPlot/src/PythonScript.cpp | 1 -
MantidPlot/src/Spectrogram.cpp | 1 -
MantidPlot/src/origin/OPJFile.cpp | 1 -
MantidPlot/src/pixmaps.cpp | 1 -
MantidQt/API/src/UserSubWindow.cpp | 2 --
MantidQt/MantidWidgets/src/MantidHelpWindow.cpp | 1 -
MantidQt/MantidWidgets/src/ScriptEditor.cpp | 1 -
MantidQt/MantidWidgets/src/StringDialogEditor.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefIVConnections.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefImageView.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp | 1 -
MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp | 1 -
MantidQt/SliceViewer/src/ColorBarWidget.cpp | 1 -
MantidQt/SliceViewer/src/CustomTools.cpp | 2 --
MantidQt/SliceViewer/src/DimensionSliceWidget.cpp | 2 --
MantidQt/SliceViewer/src/LineOverlay.cpp | 1 -
MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp | 1 -
MantidQt/SliceViewer/src/SliceViewer.cpp | 2 --
MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_LineViewerDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp | 1 -
MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp | 1 -
MantidQt/SpectrumViewer/src/ArrayDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/ColorMaps.cpp | 1 -
MantidQt/SpectrumViewer/src/DataArray.cpp | 1 -
MantidQt/SpectrumViewer/src/EModeHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/GraphDisplay.cpp | 1 -
MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp | 1 -
MantidQt/SpectrumViewer/src/RangeHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/SVConnections.cpp | 1 -
MantidQt/SpectrumViewer/src/SliderHandler.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp | 1 -
MantidQt/SpectrumViewer/src/SpectrumView.cpp | 1 -
QtPropertyBrowser/src/DoubleEditorFactory.cpp | 1 -
QtPropertyBrowser/src/qttreepropertybrowser.cpp | 1 -
Vates/VatesAPI/src/vtkNullStructuredGrid.cpp | 2 +-
Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp | 1 -
Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp | 1 -
.../ViewWidgets/src/ColorSelectionWidget.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp | 1 -
Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp | 3 ---
tools/DAEserv/DAEserv/isisds_command.cpp | 2 --
212 files changed, 8 insertions(+), 232 deletions(-)
diff --git a/Framework/API/src/AlgorithmFactory.cpp b/Framework/API/src/AlgorithmFactory.cpp
index b208e36ca73..c21455f2545 100644
--- a/Framework/API/src/AlgorithmFactory.cpp
+++ b/Framework/API/src/AlgorithmFactory.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <sstream>
#include "MantidAPI/AlgorithmFactory.h"
#include "MantidAPI/Algorithm.h"
diff --git a/Framework/API/src/Axis.cpp b/Framework/API/src/Axis.cpp
index 025e8fac19d..e8db95989d5 100644
--- a/Framework/API/src/Axis.cpp
+++ b/Framework/API/src/Axis.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/Column.cpp b/Framework/API/src/Column.cpp
index 2611772b535..1be47194e89 100644
--- a/Framework/API/src/Column.cpp
+++ b/Framework/API/src/Column.cpp
@@ -1,9 +1,10 @@
-#include "MantidAPI/Column.h"
-#include "MantidKernel/Logger.h"
#include <algorithm>
#include <iostream>
#include <stdexcept>
+#include "MantidAPI/Column.h"
+#include "MantidKernel/Logger.h"
+
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/ColumnFactory.cpp b/Framework/API/src/ColumnFactory.cpp
index 313dc12290c..0ccf9d87644 100644
--- a/Framework/API/src/ColumnFactory.cpp
+++ b/Framework/API/src/ColumnFactory.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidAPI/ColumnFactory.h"
#include "MantidAPI/Column.h"
diff --git a/Framework/API/src/CompositeFunction.cpp b/Framework/API/src/CompositeFunction.cpp
index 1f4481e9a01..cc2c652fffb 100644
--- a/Framework/API/src/CompositeFunction.cpp
+++ b/Framework/API/src/CompositeFunction.cpp
@@ -11,7 +11,6 @@
#include <boost/lexical_cast.hpp>
#include <boost/shared_array.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/CostFunctionFactory.cpp b/Framework/API/src/CostFunctionFactory.cpp
index 4037501fa47..ea0e131e3a0 100644
--- a/Framework/API/src/CostFunctionFactory.cpp
+++ b/Framework/API/src/CostFunctionFactory.cpp
@@ -1,7 +1,6 @@
#include "MantidAPI/CostFunctionFactory.h"
#include "MantidAPI/ICostFunction.h"
#include "MantidKernel/LibraryManager.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/Expression.cpp b/Framework/API/src/Expression.cpp
index 6343c714044..011dd6d1de3 100644
--- a/Framework/API/src/Expression.cpp
+++ b/Framework/API/src/Expression.cpp
@@ -1,11 +1,11 @@
+#include <iostream>
+#include <locale>
+#include <sstream>
+
#include "MantidAPI/Expression.h"
#include <Poco/StringTokenizer.h>
-#include <sstream>
-#include <iostream>
-#include <locale>
-
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/FileProperty.cpp b/Framework/API/src/FileProperty.cpp
index 064edc4553b..c7baf7b1e2c 100644
--- a/Framework/API/src/FileProperty.cpp
+++ b/Framework/API/src/FileProperty.cpp
@@ -13,7 +13,6 @@
#include <Poco/File.h>
#include <cctype>
#include <algorithm>
-#include <iostream>
namespace Mantid {
diff --git a/Framework/API/src/FunctionDomain1D.cpp b/Framework/API/src/FunctionDomain1D.cpp
index 30f8bf1d7d6..bf466655d6a 100644
--- a/Framework/API/src/FunctionDomain1D.cpp
+++ b/Framework/API/src/FunctionDomain1D.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/FunctionDomain1D.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/FunctionValues.cpp b/Framework/API/src/FunctionValues.cpp
index 0cc95afbdf7..ac8552df041 100644
--- a/Framework/API/src/FunctionValues.cpp
+++ b/Framework/API/src/FunctionValues.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/FunctionValues.h"
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/GridDomain.cpp b/Framework/API/src/GridDomain.cpp
index 05fafaaf9e6..0d8ed05ee4b 100644
--- a/Framework/API/src/GridDomain.cpp
+++ b/Framework/API/src/GridDomain.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <numeric>
#include <stdexcept>
diff --git a/Framework/API/src/GridDomain1D.cpp b/Framework/API/src/GridDomain1D.cpp
index 3c9422233f7..a85cf869325 100644
--- a/Framework/API/src/GridDomain1D.cpp
+++ b/Framework/API/src/GridDomain1D.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <numeric>
#include "MantidAPI/GridDomain1D.h"
diff --git a/Framework/API/src/IFunction.cpp b/Framework/API/src/IFunction.cpp
index 539b092f315..379ee94adba 100644
--- a/Framework/API/src/IFunction.cpp
+++ b/Framework/API/src/IFunction.cpp
@@ -28,7 +28,6 @@
#include <limits>
#include <sstream>
-#include <iostream>
#include <algorithm>
namespace Mantid {
diff --git a/Framework/API/src/IFunction1D.cpp b/Framework/API/src/IFunction1D.cpp
index bbab2dacced..17bf113464a 100644
--- a/Framework/API/src/IFunction1D.cpp
+++ b/Framework/API/src/IFunction1D.cpp
@@ -23,7 +23,6 @@
#include <boost/lexical_cast.hpp>
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/IFunctionMD.cpp b/Framework/API/src/IFunctionMD.cpp
index 83d2d3d433c..6eaacaedfe1 100644
--- a/Framework/API/src/IFunctionMD.cpp
+++ b/Framework/API/src/IFunctionMD.cpp
@@ -15,7 +15,6 @@
#include <boost/lambda/lambda.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
#include <functional>
#include <iterator>
diff --git a/Framework/API/src/IFunctionMW.cpp b/Framework/API/src/IFunctionMW.cpp
index a0c5793f76a..0d8f987a1e4 100644
--- a/Framework/API/src/IFunctionMW.cpp
+++ b/Framework/API/src/IFunctionMW.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/IFunctionMW.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/LinearScale.cpp b/Framework/API/src/LinearScale.cpp
index 4d11c0fb962..4c44e30a040 100644
--- a/Framework/API/src/LinearScale.cpp
+++ b/Framework/API/src/LinearScale.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include "MantidAPI/LinearScale.h"
#include "MantidAPI/TransformScaleFactory.h"
diff --git a/Framework/API/src/LogarithmScale.cpp b/Framework/API/src/LogarithmScale.cpp
index 1e4abfdd83c..a5eda36399e 100644
--- a/Framework/API/src/LogarithmScale.cpp
+++ b/Framework/API/src/LogarithmScale.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <cmath>
#include <stdexcept>
diff --git a/Framework/API/src/ParamFunction.cpp b/Framework/API/src/ParamFunction.cpp
index 8d58067639d..2d43466f5d7 100644
--- a/Framework/API/src/ParamFunction.cpp
+++ b/Framework/API/src/ParamFunction.cpp
@@ -11,7 +11,6 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <sstream>
-#include <iostream>
#include <limits>
namespace Mantid {
diff --git a/Framework/API/src/PeakFunctionIntegrator.cpp b/Framework/API/src/PeakFunctionIntegrator.cpp
index b36896423ff..c2dc90a12cb 100644
--- a/Framework/API/src/PeakFunctionIntegrator.cpp
+++ b/Framework/API/src/PeakFunctionIntegrator.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FunctionDomain1D.h"
#include "gsl/gsl_errno.h"
-#include <iostream>
#include <iomanip>
namespace Mantid {
diff --git a/Framework/API/src/SpectraAxis.cpp b/Framework/API/src/SpectraAxis.cpp
index ebd17d4b814..43db4d27829 100644
--- a/Framework/API/src/SpectraAxis.cpp
+++ b/Framework/API/src/SpectraAxis.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/Unit.h"
#include <boost/lexical_cast.hpp>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/API/src/TempFunction.cpp b/Framework/API/src/TempFunction.cpp
index 4f95ae8ecad..2e7e30e8f05 100644
--- a/Framework/API/src/TempFunction.cpp
+++ b/Framework/API/src/TempFunction.cpp
@@ -8,7 +8,6 @@
#include "MantidAPI/ParameterTie.h"
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace API {
diff --git a/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp b/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
index 965faf0ceef..dc16356c68a 100644
--- a/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
+++ b/Framework/Algorithms/src/ApplyDeadTimeCorr.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <cmath>
using std::string;
diff --git a/Framework/Algorithms/src/ApplyDetailedBalance.cpp b/Framework/Algorithms/src/ApplyDetailedBalance.cpp
index 2b90b823acd..c5fdf286546 100644
--- a/Framework/Algorithms/src/ApplyDetailedBalance.cpp
+++ b/Framework/Algorithms/src/ApplyDetailedBalance.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/PropertyWithValue.h"
#include "boost/lexical_cast.hpp"
-#include <iostream>
#include <cmath>
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidKernel/PhysicalConstants.h"
diff --git a/Framework/Algorithms/src/ConvertUnits.cpp b/Framework/Algorithms/src/ConvertUnits.cpp
index d2148cfe5d8..5a3012b50bf 100644
--- a/Framework/Algorithms/src/ConvertUnits.cpp
+++ b/Framework/Algorithms/src/ConvertUnits.cpp
@@ -12,7 +12,6 @@
#include <boost/bind.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <cfloat>
-#include <iostream>
#include <limits>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
index d358c6406bc..33c06ad4900 100644
--- a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+++ b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
@@ -20,7 +20,6 @@
#include <boost/bind.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <cfloat>
-#include <iostream>
#include <limits>
#include <vector>
#include <algorithm>
diff --git a/Framework/Algorithms/src/CopyInstrumentParameters.cpp b/Framework/Algorithms/src/CopyInstrumentParameters.cpp
index bef54b26b61..2eacc15ba85 100644
--- a/Framework/Algorithms/src/CopyInstrumentParameters.cpp
+++ b/Framework/Algorithms/src/CopyInstrumentParameters.cpp
@@ -3,7 +3,6 @@
//----------------------------------------------------------------------
#include "MantidAlgorithms/CopyInstrumentParameters.h"
#include "MantidAPI/WorkspaceValidators.h"
-#include <iostream>
#include "MantidAPI/MemoryManager.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
diff --git a/Framework/Algorithms/src/CreateCalFileByNames.cpp b/Framework/Algorithms/src/CreateCalFileByNames.cpp
index 2f4abb226ec..67e006535d1 100644
--- a/Framework/Algorithms/src/CreateCalFileByNames.cpp
+++ b/Framework/Algorithms/src/CreateCalFileByNames.cpp
@@ -11,7 +11,6 @@
#include <boost/algorithm/string/detail/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <queue>
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/CreateDummyCalFile.cpp b/Framework/Algorithms/src/CreateDummyCalFile.cpp
index f64c069ce29..d7c9020aaf9 100644
--- a/Framework/Algorithms/src/CreateDummyCalFile.cpp
+++ b/Framework/Algorithms/src/CreateDummyCalFile.cpp
@@ -10,7 +10,6 @@
#include <queue>
#include <fstream>
-#include <iomanip>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h>
diff --git a/Framework/Algorithms/src/CreateLogTimeCorrection.cpp b/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
index 7bab28c41c7..61264770e98 100644
--- a/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
+++ b/Framework/Algorithms/src/CreateLogTimeCorrection.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/CropWorkspace.cpp b/Framework/Algorithms/src/CropWorkspace.cpp
index c37de109ab2..3107951ca43 100644
--- a/Framework/Algorithms/src/CropWorkspace.cpp
+++ b/Framework/Algorithms/src/CropWorkspace.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/TextAxis.h"
#include "MantidKernel/VectorHelper.h"
-#include <iostream>
#include "MantidAPI/MemoryManager.h"
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
index e27473a81d6..050b93edf61 100644
--- a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
+++ b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
@@ -16,7 +16,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
#include <cmath>
-#include <iomanip>
#include <numeric>
#include <Poco/File.h>
#include <sstream>
diff --git a/Framework/Algorithms/src/ExtractSpectra.cpp b/Framework/Algorithms/src/ExtractSpectra.cpp
index d342b94ce3d..c797b9b7bcc 100644
--- a/Framework/Algorithms/src/ExtractSpectra.cpp
+++ b/Framework/Algorithms/src/ExtractSpectra.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include <algorithm>
-#include <iostream>
namespace {
/// The percentage 'fuzziness' to use when comparing to bin boundaries
diff --git a/Framework/Algorithms/src/FFTSmooth.cpp b/Framework/Algorithms/src/FFTSmooth.cpp
index 9069be1a52b..6f7291d1a20 100644
--- a/Framework/Algorithms/src/FFTSmooth.cpp
+++ b/Framework/Algorithms/src/FFTSmooth.cpp
@@ -4,7 +4,6 @@
#include "MantidAlgorithms/FFTSmooth.h"
#include "MantidKernel/Exception.h"
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/FFTSmooth2.cpp b/Framework/Algorithms/src/FFTSmooth2.cpp
index 745441a1a97..88c68e75e13 100644
--- a/Framework/Algorithms/src/FFTSmooth2.cpp
+++ b/Framework/Algorithms/src/FFTSmooth2.cpp
@@ -6,7 +6,6 @@
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/detail/classification.hpp>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/FindCenterOfMassPosition.cpp b/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
index 726ed0e305d..20964f31e5e 100644
--- a/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
+++ b/Framework/Algorithms/src/FindCenterOfMassPosition.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/NullValidator.h"
diff --git a/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp b/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
index 3a69693e049..76bb448c085 100644
--- a/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
+++ b/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
@@ -10,7 +10,6 @@
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
-#include <iostream>
#include <vector>
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/EventList.h"
diff --git a/Framework/Algorithms/src/FindPeaks.cpp b/Framework/Algorithms/src/FindPeaks.cpp
index d352b14d85d..5273c255ad5 100644
--- a/Framework/Algorithms/src/FindPeaks.cpp
+++ b/Framework/Algorithms/src/FindPeaks.cpp
@@ -15,7 +15,6 @@
#include "MantidKernel/VectorHelper.h"
#include <boost/algorithm/string.hpp>
-#include <iostream>
#include <numeric>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp b/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
index 871287bc800..07e9673ba21 100644
--- a/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
+++ b/Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
@@ -18,7 +18,6 @@
#include "MantidKernel/Statistics.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <fstream>
-#include <iomanip>
#include <ostream>
#include <sstream>
diff --git a/Framework/Algorithms/src/GetDetectorOffsets.cpp b/Framework/Algorithms/src/GetDetectorOffsets.cpp
index 0739b7dcb86..86b595c4c5f 100644
--- a/Framework/Algorithms/src/GetDetectorOffsets.cpp
+++ b/Framework/Algorithms/src/GetDetectorOffsets.cpp
@@ -9,7 +9,6 @@
#include "MantidDataObjects/MaskWorkspace.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <fstream>
-#include <iomanip>
#include <ostream>
#include <sstream>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/MaskDetectorsIf.cpp b/Framework/Algorithms/src/MaskDetectorsIf.cpp
index e1000af59a0..209f7a9873e 100644
--- a/Framework/Algorithms/src/MaskDetectorsIf.cpp
+++ b/Framework/Algorithms/src/MaskDetectorsIf.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream>
-#include <iomanip>
#include "MantidKernel/ListValidator.h"
namespace Mantid {
diff --git a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
index 8196bf18e08..5008df1b96e 100644
--- a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
+++ b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
@@ -7,7 +7,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/PhysicalConstants.h"
-#include <iostream>
#include <stdexcept>
namespace Mantid {
diff --git a/Framework/Algorithms/src/NormaliseToMonitor.cpp b/Framework/Algorithms/src/NormaliseToMonitor.cpp
index 82031ba8347..d870469b1b2 100644
--- a/Framework/Algorithms/src/NormaliseToMonitor.cpp
+++ b/Framework/Algorithms/src/NormaliseToMonitor.cpp
@@ -11,7 +11,6 @@
#include "MantidKernel/BoundedValidator.h"
#include <cfloat>
-#include <iomanip>
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/IPropertyManager.h"
diff --git a/Framework/Algorithms/src/Q1DTOF.cpp b/Framework/Algorithms/src/Q1DTOF.cpp
index 955a8a9fccf..50108eb2adb 100644
--- a/Framework/Algorithms/src/Q1DTOF.cpp
+++ b/Framework/Algorithms/src/Q1DTOF.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
namespace Mantid {
diff --git a/Framework/Algorithms/src/Q1DWeighted.cpp b/Framework/Algorithms/src/Q1DWeighted.cpp
index dcae515bf49..daa445af929 100644
--- a/Framework/Algorithms/src/Q1DWeighted.cpp
+++ b/Framework/Algorithms/src/Q1DWeighted.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/RealFFT.cpp b/Framework/Algorithms/src/RealFFT.cpp
index dd320924de1..db2466098cd 100644
--- a/Framework/Algorithms/src/RealFFT.cpp
+++ b/Framework/Algorithms/src/RealFFT.cpp
@@ -20,7 +20,6 @@
#include <functional>
#include <cmath>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ListValidator.h"
diff --git a/Framework/Algorithms/src/Regroup.cpp b/Framework/Algorithms/src/Regroup.cpp
index 6d966fdc523..9a218cf3604 100644
--- a/Framework/Algorithms/src/Regroup.cpp
+++ b/Framework/Algorithms/src/Regroup.cpp
@@ -12,7 +12,6 @@
#include <functional>
#include <cmath>
-#include <iostream>
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/src/SANSDirectBeamScaling.cpp b/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
index a9fb178f996..f603aaed91c 100644
--- a/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
+++ b/Framework/Algorithms/src/SANSDirectBeamScaling.cpp
@@ -9,7 +9,6 @@
#include "MantidKernel/VectorHelper.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Histogram1D.h"
-#include <iostream>
#include <vector>
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp b/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
index 4416295a73b..8fc922fe4b8 100644
--- a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
+++ b/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/TableRow.h"
#include <stdio.h>
-#include <iomanip>
using namespace Mantid;
using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/SolidAngle.cpp b/Framework/Algorithms/src/SolidAngle.cpp
index e5d33e7c4ea..43b76ee1ee8 100644
--- a/Framework/Algorithms/src/SolidAngle.cpp
+++ b/Framework/Algorithms/src/SolidAngle.cpp
@@ -6,7 +6,6 @@
#include "MantidAPI/AlgorithmFactory.h"
#include "MantidKernel/UnitFactory.h"
#include <cfloat>
-#include <iostream>
#include "MantidKernel/BoundedValidator.h"
namespace Mantid {
diff --git a/Framework/Algorithms/src/SpatialGrouping.cpp b/Framework/Algorithms/src/SpatialGrouping.cpp
index 4d53df62741..bfc5744a005 100644
--- a/Framework/Algorithms/src/SpatialGrouping.cpp
+++ b/Framework/Algorithms/src/SpatialGrouping.cpp
@@ -12,7 +12,6 @@
#include <map>
#include <fstream>
-#include <iostream>
#include <algorithm>
#include "MantidAPI/ISpectrum.h"
diff --git a/Framework/CurveFitting/src/BSpline.cpp b/Framework/CurveFitting/src/BSpline.cpp
index b174fdc184d..787672bc570 100644
--- a/Framework/CurveFitting/src/BSpline.cpp
+++ b/Framework/CurveFitting/src/BSpline.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/FunctionFactory.h"
#include <boost/lexical_cast.hpp>
-#include <iostream>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/BivariateNormal.cpp b/Framework/CurveFitting/src/BivariateNormal.cpp
index f9cae2a8038..d48ab8555ea 100644
--- a/Framework/CurveFitting/src/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/BivariateNormal.cpp
@@ -9,7 +9,6 @@
#include <fstream>
#include <algorithm>
#include <math.h>
-#include <iostream>
#include <sstream>
#include <string>
#include <cstdio>
diff --git a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
index e1fa52338bf..8a2c0d99007 100644
--- a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp
@@ -10,7 +10,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/MultiThreaded.h"
-#include <iomanip>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/CostFuncRwp.cpp b/Framework/CurveFitting/src/CostFuncRwp.cpp
index c72d9d3d4a1..0bd327fd7ea 100644
--- a/Framework/CurveFitting/src/CostFuncRwp.cpp
+++ b/Framework/CurveFitting/src/CostFuncRwp.cpp
@@ -9,7 +9,6 @@
#include "MantidAPI/FunctionValues.h"
#include <cmath>
-#include <iomanip>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
index da4e2bd1170..278e5c6b9bd 100644
--- a/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
+++ b/Framework/CurveFitting/src/CostFuncUnweightedLeastSquares.cpp
@@ -1,7 +1,6 @@
#include "MantidCurveFitting/CostFuncUnweightedLeastSquares.h"
#include "MantidKernel/Logger.h"
-#include <iomanip>
#include <cmath>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/CubicSpline.cpp b/Framework/CurveFitting/src/CubicSpline.cpp
index 6b0d2815989..b955d04215d 100644
--- a/Framework/CurveFitting/src/CubicSpline.cpp
+++ b/Framework/CurveFitting/src/CubicSpline.cpp
@@ -7,7 +7,6 @@
#include <algorithm>
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <stdexcept>
#include <vector>
diff --git a/Framework/CurveFitting/src/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FABADAMinimizer.cpp
index 8e8f7e3d708..f6c47ccff74 100644
--- a/Framework/CurveFitting/src/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FABADAMinimizer.cpp
@@ -26,7 +26,6 @@
#include <boost/version.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
-#include <iostream>
#include <ctime>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/Fit1D.cpp b/Framework/CurveFitting/src/Fit1D.cpp
index f4c054ddc09..d6db35e872a 100644
--- a/Framework/CurveFitting/src/Fit1D.cpp
+++ b/Framework/CurveFitting/src/Fit1D.cpp
@@ -5,7 +5,6 @@
#include <sstream>
#include <numeric>
#include <cmath>
-#include <iomanip>
#include "MantidKernel/Exception.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
diff --git a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
index b5ad39301dd..e24430a6d96 100644
--- a/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
+++ b/Framework/CurveFitting/src/FitPowderDiffPeaks.cpp
@@ -31,7 +31,6 @@
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <gsl/gsl_sf_erf.h>
#include <cmath>
diff --git a/Framework/CurveFitting/src/LeBailFit.cpp b/Framework/CurveFitting/src/LeBailFit.cpp
index 0ea5ae09288..9996f804985 100644
--- a/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/LeBailFit.cpp
@@ -17,7 +17,6 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <iomanip>
#include <fstream>
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
index 11793321b58..78c90dca7c8 100644
--- a/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/LevenbergMarquardtMDMinimizer.cpp
@@ -12,7 +12,6 @@
#include <boost/lexical_cast.hpp>
#include <gsl/gsl_blas.h>
-#include <iostream>
#include <cmath>
namespace Mantid {
diff --git a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
index 7e561468929..19bfbdc7c06 100644
--- a/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/LevenbergMarquardtMinimizer.cpp
@@ -13,7 +13,6 @@
#include <boost/lexical_cast.hpp>
#include <gsl/gsl_blas.h>
-#include <iostream>
namespace Mantid {
namespace CurveFitting {
diff --git a/Framework/CurveFitting/src/MultiBG.cpp b/Framework/CurveFitting/src/MultiBG.cpp
index 284b6ce3390..d0cc9705068 100644
--- a/Framework/CurveFitting/src/MultiBG.cpp
+++ b/Framework/CurveFitting/src/MultiBG.cpp
@@ -12,7 +12,6 @@
#include <boost/lexical_cast.hpp>
#include <sstream>
-#include <iostream>
#include <algorithm>
#include <iterator>
#include <float.h>
diff --git a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp b/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
index f380f15c43c..152331bab77 100644
--- a/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
+++ b/Framework/CurveFitting/src/PlotPeakByLogValue.cpp
@@ -3,7 +3,6 @@
//----------------------------------------------------------------------
#include <cmath>
#include <vector>
-#include <iostream>
#include <fstream>
#include <sstream>
#include <algorithm>
diff --git a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
index 56a400e3b11..f47bdf5eac1 100644
--- a/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/RefinePowderInstrumentParameters.cpp
@@ -26,7 +26,6 @@
#include <boost/algorithm/string/split.hpp>
#include <fstream>
-#include <iomanip>
#include <gsl/gsl_sf_erf.h>
diff --git a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
index 3684648d6bb..78f98e8ac21 100644
--- a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
+++ b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
@@ -3,7 +3,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/FindDetectorsPar.cpp b/Framework/DataHandling/src/FindDetectorsPar.cpp
index a47d89cc731..ebf13530cb1 100644
--- a/Framework/DataHandling/src/FindDetectorsPar.cpp
+++ b/Framework/DataHandling/src/FindDetectorsPar.cpp
@@ -13,7 +13,6 @@
#include <Poco/File.h>
#include <limits>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/ISISDataArchive.cpp b/Framework/DataHandling/src/ISISDataArchive.cpp
index cf814ef149f..033e7187378 100644
--- a/Framework/DataHandling/src/ISISDataArchive.cpp
+++ b/Framework/DataHandling/src/ISISDataArchive.cpp
@@ -12,7 +12,6 @@
#include <Poco/Exception.h>
#include <sstream>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Framework/DataHandling/src/LoadEventPreNexus.cpp
index 2024d53cfc9..43f73c8f10a 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus.cpp
@@ -26,7 +26,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/LoadEventPreNexus2.cpp b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
index e50dd9c66b0..0b441914762 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus2.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
@@ -3,7 +3,6 @@
#include <sstream>
#include <stdexcept>
#include <functional>
-#include <iostream>
#include <set>
#include <vector>
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/LoadGSS.cpp b/Framework/DataHandling/src/LoadGSS.cpp
index 9ddea8c26c2..deeaeab02cb 100644
--- a/Framework/DataHandling/src/LoadGSS.cpp
+++ b/Framework/DataHandling/src/LoadGSS.cpp
@@ -14,10 +14,8 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <Poco/File.h>
-#include <iostream>
#include <fstream>
#include <sstream>
-#include <iomanip>
using namespace Mantid::DataHandling;
using namespace Mantid::API;
diff --git a/Framework/DataHandling/src/LoadILL.cpp b/Framework/DataHandling/src/LoadILL.cpp
index 0f84c252a6f..402c72e9672 100644
--- a/Framework/DataHandling/src/LoadILL.cpp
+++ b/Framework/DataHandling/src/LoadILL.cpp
@@ -14,7 +14,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadILLIndirect.cpp b/Framework/DataHandling/src/LoadILLIndirect.cpp
index 30c647209df..269c04e8bb0 100644
--- a/Framework/DataHandling/src/LoadILLIndirect.cpp
+++ b/Framework/DataHandling/src/LoadILLIndirect.cpp
@@ -7,8 +7,6 @@
#include <boost/algorithm/string.hpp>
#include <nexus/napi.h>
-#include <iostream>
-#include <iomanip> // std::setw
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadILLReflectometry.cpp b/Framework/DataHandling/src/LoadILLReflectometry.cpp
index 2230840c96f..18a7f5888d6 100644
--- a/Framework/DataHandling/src/LoadILLReflectometry.cpp
+++ b/Framework/DataHandling/src/LoadILLReflectometry.cpp
@@ -13,7 +13,6 @@
#include <algorithm>
#include <nexus/napi.h>
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadInstrument.cpp b/Framework/DataHandling/src/LoadInstrument.cpp
index 595dd5d8b1c..6337801bb66 100644
--- a/Framework/DataHandling/src/LoadInstrument.cpp
+++ b/Framework/DataHandling/src/LoadInstrument.cpp
@@ -20,7 +20,6 @@
#include <Poco/Exception.h>
#include <sstream>
#include <fstream>
-#include <iostream>
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
using Poco::XML::DOMParser;
diff --git a/Framework/DataHandling/src/LoadIsawDetCal.cpp b/Framework/DataHandling/src/LoadIsawDetCal.cpp
index 99294d57ece..5a7ddf61096 100644
--- a/Framework/DataHandling/src/LoadIsawDetCal.cpp
+++ b/Framework/DataHandling/src/LoadIsawDetCal.cpp
@@ -21,7 +21,6 @@
#include <fstream>
#include <numeric>
#include <cmath>
-#include <iomanip>
#include "MantidAPI/WorkspaceValidators.h"
namespace Mantid {
diff --git a/Framework/DataHandling/src/LoadLLB.cpp b/Framework/DataHandling/src/LoadLLB.cpp
index 353f8ccc8b4..bc37e7062bc 100644
--- a/Framework/DataHandling/src/LoadLLB.cpp
+++ b/Framework/DataHandling/src/LoadLLB.cpp
@@ -7,7 +7,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp b/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
index 7327e048fb6..f6ec882919c 100644
--- a/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
+++ b/Framework/DataHandling/src/LoadLogsForSNSPulsedMagnet.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidKernel/ConfigService.h"
-#include <iostream>
#include <fstream>
#include <sys/stat.h>
#include <sstream>
diff --git a/Framework/DataHandling/src/LoadMLZ.cpp b/Framework/DataHandling/src/LoadMLZ.cpp
index 7d2b4b9c94d..7f516fd0b87 100644
--- a/Framework/DataHandling/src/LoadMLZ.cpp
+++ b/Framework/DataHandling/src/LoadMLZ.cpp
@@ -12,7 +12,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
//-----------------------------------------------------------------------
diff --git a/Framework/DataHandling/src/LoadPreNexusMonitors.cpp b/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
index af5cce8e457..2ab2dd8416b 100644
--- a/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
+++ b/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
@@ -1,7 +1,6 @@
#include <cmath>
#include <cstdlib>
#include <fstream>
-#include <iostream>
#include <iterator>
#include "MantidDataHandling/LoadPreNexusMonitors.h"
diff --git a/Framework/DataHandling/src/LoadQKK.cpp b/Framework/DataHandling/src/LoadQKK.cpp
index 859b592c087..316cffc185a 100644
--- a/Framework/DataHandling/src/LoadQKK.cpp
+++ b/Framework/DataHandling/src/LoadQKK.cpp
@@ -14,9 +14,7 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <Poco/File.h>
-#include <iostream>
#include <fstream>
-#include <iomanip>
using namespace Mantid::DataHandling;
using namespace Mantid::API;
diff --git a/Framework/DataHandling/src/LoadSINQFocus.cpp b/Framework/DataHandling/src/LoadSINQFocus.cpp
index 096ebd88e5a..59d15f805e8 100644
--- a/Framework/DataHandling/src/LoadSINQFocus.cpp
+++ b/Framework/DataHandling/src/LoadSINQFocus.cpp
@@ -7,7 +7,6 @@
#include <limits>
#include <algorithm>
-#include <iostream>
#include <vector>
#include <cmath>
diff --git a/Framework/DataHandling/src/LoadSpice2D.cpp b/Framework/DataHandling/src/LoadSpice2D.cpp
index d3c4216fa83..79219379943 100644
--- a/Framework/DataHandling/src/LoadSpice2D.cpp
+++ b/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -23,7 +23,6 @@
#include <Poco/DOM/Text.h>
#include <Poco/SAX/InputSource.h>
-#include <iostream>
//-----------------------------------------------------------------------
using Poco::XML::DOMParser;
diff --git a/Framework/DataHandling/src/SNSDataArchive.cpp b/Framework/DataHandling/src/SNSDataArchive.cpp
index 6045f308b66..028dcde170b 100644
--- a/Framework/DataHandling/src/SNSDataArchive.cpp
+++ b/Framework/DataHandling/src/SNSDataArchive.cpp
@@ -1,7 +1,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <iostream>
#include <sstream>
#include "MantidKernel/Logger.h"
diff --git a/Framework/DataHandling/src/SaveCSV.cpp b/Framework/DataHandling/src/SaveCSV.cpp
index 9cef6163fd7..d73643c8301 100644
--- a/Framework/DataHandling/src/SaveCSV.cpp
+++ b/Framework/DataHandling/src/SaveCSV.cpp
@@ -27,7 +27,6 @@
#include "MantidAPI/FileProperty.h"
#include <fstream> // used to get ofstream
-#include <iomanip> // setw() used below
/* @class SaveCSV
diff --git a/Framework/DataHandling/src/SaveFocusedXYE.cpp b/Framework/DataHandling/src/SaveFocusedXYE.cpp
index 6da1189b5b8..f6b917b15e2 100644
--- a/Framework/DataHandling/src/SaveFocusedXYE.cpp
+++ b/Framework/DataHandling/src/SaveFocusedXYE.cpp
@@ -8,7 +8,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
#include <fstream>
-#include <iomanip>
#include <cmath>
#include <exception>
diff --git a/Framework/DataHandling/src/SaveFullprofResolution.cpp b/Framework/DataHandling/src/SaveFullprofResolution.cpp
index 057694d26f3..5ef18d5b0db 100644
--- a/Framework/DataHandling/src/SaveFullprofResolution.cpp
+++ b/Framework/DataHandling/src/SaveFullprofResolution.cpp
@@ -8,7 +8,6 @@
#include <boost/algorithm/string.hpp>
#include <Poco/File.h>
-#include <iomanip>
#include <fstream>
using namespace Mantid;
diff --git a/Framework/DataHandling/src/SaveGSS.cpp b/Framework/DataHandling/src/SaveGSS.cpp
index d3e1cb6520f..460f326f800 100644
--- a/Framework/DataHandling/src/SaveGSS.cpp
+++ b/Framework/DataHandling/src/SaveGSS.cpp
@@ -11,7 +11,6 @@
#include <Poco/File.h>
#include <Poco/Path.h>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SaveNISTDAT.cpp b/Framework/DataHandling/src/SaveNISTDAT.cpp
index 38441e68e44..0b32dc7d6dc 100644
--- a/Framework/DataHandling/src/SaveNISTDAT.cpp
+++ b/Framework/DataHandling/src/SaveNISTDAT.cpp
@@ -5,7 +5,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/WorkspaceValidators.h"
#include <fstream> // used to get ofstream
-#include <iostream>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePAR.cpp b/Framework/DataHandling/src/SavePAR.cpp
index d318f94f549..bf4ea3d2395 100644
--- a/Framework/DataHandling/src/SavePAR.cpp
+++ b/Framework/DataHandling/src/SavePAR.cpp
@@ -8,7 +8,6 @@
#include <cstdio>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePDFGui.cpp b/Framework/DataHandling/src/SavePDFGui.cpp
index e6c1c2e622d..5afcbc2d76b 100644
--- a/Framework/DataHandling/src/SavePDFGui.cpp
+++ b/Framework/DataHandling/src/SavePDFGui.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FileProperty.h"
#include "MantidKernel/MantidVersion.h"
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SavePHX.cpp b/Framework/DataHandling/src/SavePHX.cpp
index 7c221896f8b..579ba691415 100644
--- a/Framework/DataHandling/src/SavePHX.cpp
+++ b/Framework/DataHandling/src/SavePHX.cpp
@@ -8,7 +8,6 @@
#include <cstdio>
#include <fstream>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SaveRKH.cpp b/Framework/DataHandling/src/SaveRKH.cpp
index 33316a700ba..915a33bf21f 100644
--- a/Framework/DataHandling/src/SaveRKH.cpp
+++ b/Framework/DataHandling/src/SaveRKH.cpp
@@ -7,7 +7,6 @@
#include <Poco/LocalDateTime.h>
#include <Poco/DateTimeFormatter.h>
-#include <iomanip>
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataObjects/src/CoordTransformAffine.cpp b/Framework/DataObjects/src/CoordTransformAffine.cpp
index e9e0f9a688b..8f9584d6061 100644
--- a/Framework/DataObjects/src/CoordTransformAffine.cpp
+++ b/Framework/DataObjects/src/CoordTransformAffine.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidAPI/CoordTransform.h"
#include "MantidDataObjects/CoordTransformAffine.h"
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 0e4260274c5..efb6e74c713 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -9,7 +9,6 @@
#include <cfloat>
#include <functional>
-#include <iostream>
#include <limits>
#include <math.h>
#include <Poco/ScopedLock.h>
diff --git a/Framework/DataObjects/src/Events.cpp b/Framework/DataObjects/src/Events.cpp
index ffb9e0c32be..c3483787091 100644
--- a/Framework/DataObjects/src/Events.cpp
+++ b/Framework/DataObjects/src/Events.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/DateAndTime.h"
#include <functional>
-#include <iostream>
#include <math.h>
using std::ostream;
diff --git a/Framework/DataObjects/src/Histogram1D.cpp b/Framework/DataObjects/src/Histogram1D.cpp
index da29de62522..077adc23d52 100644
--- a/Framework/DataObjects/src/Histogram1D.cpp
+++ b/Framework/DataObjects/src/Histogram1D.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidDataObjects/Histogram1D.h"
#include "MantidKernel/Exception.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 33bcd0d5000..083c66123c4 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -22,7 +22,6 @@
#include <boost/shared_ptr.hpp>
#include <exception>
#include <fstream>
-#include <iostream>
#include <math.h>
#include <ostream>
#include <stdio.h>
diff --git a/Framework/DataObjects/src/RebinnedOutput.cpp b/Framework/DataObjects/src/RebinnedOutput.cpp
index b6addfb0c0e..3be5eff9d10 100644
--- a/Framework/DataObjects/src/RebinnedOutput.cpp
+++ b/Framework/DataObjects/src/RebinnedOutput.cpp
@@ -3,7 +3,6 @@
#include "MantidAPI/WorkspaceFactory.h"
#include <algorithm>
-#include <iostream>
namespace Mantid {
namespace DataObjects {
diff --git a/Framework/DataObjects/src/TableWorkspace.cpp b/Framework/DataObjects/src/TableWorkspace.cpp
index 80290952df3..c352028bfd1 100644
--- a/Framework/DataObjects/src/TableWorkspace.cpp
+++ b/Framework/DataObjects/src/TableWorkspace.cpp
@@ -4,7 +4,6 @@
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include <iostream>
#include <queue>
namespace Mantid {
diff --git a/Framework/Geometry/src/Crystal/IndexingUtils.cpp b/Framework/Geometry/src/Crystal/IndexingUtils.cpp
index 65d194797e7..dbd81b746f3 100644
--- a/Framework/Geometry/src/Crystal/IndexingUtils.cpp
+++ b/Framework/Geometry/src/Crystal/IndexingUtils.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/Quat.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include "MantidGeometry/Crystal/OrientedLattice.h"
-#include <iostream>
#include <stdexcept>
#include <algorithm>
diff --git a/Framework/Geometry/src/Crystal/NiggliCell.cpp b/Framework/Geometry/src/Crystal/NiggliCell.cpp
index baf61f0b7e3..bb91bf01670 100644
--- a/Framework/Geometry/src/Crystal/NiggliCell.cpp
+++ b/Framework/Geometry/src/Crystal/NiggliCell.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/Quat.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include "MantidGeometry/Crystal/OrientedLattice.h"
-#include <iostream>
#include <stdexcept>
#include <algorithm>
diff --git a/Framework/Geometry/src/Crystal/PointGroup.cpp b/Framework/Geometry/src/Crystal/PointGroup.cpp
index e0805c6529c..85ff7e7dee1 100644
--- a/Framework/Geometry/src/Crystal/PointGroup.cpp
+++ b/Framework/Geometry/src/Crystal/PointGroup.cpp
@@ -4,7 +4,6 @@
#include <set>
#include <boost/make_shared.hpp>
#include <boost/algorithm/string.hpp>
-#include <iostream>
#include "MantidGeometry/Crystal/PointGroupFactory.h"
#include "MantidGeometry/Crystal/SymmetryOperationFactory.h"
diff --git a/Framework/Geometry/src/Crystal/ScalarUtils.cpp b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
index 7dda5e72a8a..096cbabf474 100644
--- a/Framework/Geometry/src/Crystal/ScalarUtils.cpp
+++ b/Framework/Geometry/src/Crystal/ScalarUtils.cpp
@@ -1,6 +1,5 @@
/* File: ScalarUtils.cpp */
-#include <iostream>
#include <stdexcept>
#include "MantidGeometry/Crystal/ScalarUtils.h"
#include "MantidGeometry/Crystal/ReducedCell.h"
diff --git a/Framework/Geometry/src/Math/BnId.cpp b/Framework/Geometry/src/Math/BnId.cpp
index 25a999388cb..556e536328f 100644
--- a/Framework/Geometry/src/Math/BnId.cpp
+++ b/Framework/Geometry/src/Math/BnId.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <cmath>
#include <vector>
#include <set>
diff --git a/Framework/Geometry/src/Math/PolyBase.cpp b/Framework/Geometry/src/Math/PolyBase.cpp
index eac6ba5b99a..b3738109c6f 100644
--- a/Framework/Geometry/src/Math/PolyBase.cpp
+++ b/Framework/Geometry/src/Math/PolyBase.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <cmath>
#include <complex>
#include <vector>
diff --git a/Framework/Geometry/src/Math/PolygonIntersection.cpp b/Framework/Geometry/src/Math/PolygonIntersection.cpp
index f18f0c27a41..26d2558d8e4 100644
--- a/Framework/Geometry/src/Math/PolygonIntersection.cpp
+++ b/Framework/Geometry/src/Math/PolygonIntersection.cpp
@@ -7,7 +7,6 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/V2D.h"
-#include <iostream>
using namespace Mantid::Kernel;
diff --git a/Framework/Geometry/src/Math/RotCounter.cpp b/Framework/Geometry/src/Math/RotCounter.cpp
index 7a56cae785b..387a1041f87 100644
--- a/Framework/Geometry/src/Math/RotCounter.cpp
+++ b/Framework/Geometry/src/Math/RotCounter.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <algorithm>
#include <iterator>
#include <vector>
diff --git a/Framework/Geometry/src/Objects/RuleItems.cpp b/Framework/Geometry/src/Objects/RuleItems.cpp
index ebac656d63d..505fda685ee 100644
--- a/Framework/Geometry/src/Objects/RuleItems.cpp
+++ b/Framework/Geometry/src/Objects/RuleItems.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <complex>
#include <cmath>
#include <vector>
diff --git a/Framework/Geometry/src/Objects/Track.cpp b/Framework/Geometry/src/Objects/Track.cpp
index 8bfb529d730..ccb4c9dca1a 100644
--- a/Framework/Geometry/src/Objects/Track.cpp
+++ b/Framework/Geometry/src/Objects/Track.cpp
@@ -6,7 +6,6 @@
#include <cmath>
#include <algorithm>
-#include <iostream>
namespace Mantid {
namespace Geometry {
diff --git a/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp b/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
index 76dd2da3ea2..ddfc5d61177 100644
--- a/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
+++ b/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
@@ -6,7 +6,6 @@
#include <Poco/SAX/InputSource.h>
#include <Poco/Exception.h>
#include <Poco/DOM/Element.h>
-#include <iostream>
using Poco::XML::DOMParser;
using Poco::XML::InputSource;
diff --git a/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp b/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
index 2054aaad089..91cd38f113b 100644
--- a/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
+++ b/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
@@ -1,5 +1,4 @@
#include <fstream>
-#include <iostream>
#include <sstream>
#include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
diff --git a/Framework/Geometry/src/Surfaces/Cone.cpp b/Framework/Geometry/src/Surfaces/Cone.cpp
index c40f71e018c..c584fe7daf6 100644
--- a/Framework/Geometry/src/Surfaces/Cone.cpp
+++ b/Framework/Geometry/src/Surfaces/Cone.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <sstream>
#include <cmath>
#include <complex>
diff --git a/Framework/Geometry/src/Surfaces/Torus.cpp b/Framework/Geometry/src/Surfaces/Torus.cpp
index 77cf5ea14f9..2f8ed1d860d 100644
--- a/Framework/Geometry/src/Surfaces/Torus.cpp
+++ b/Framework/Geometry/src/Surfaces/Torus.cpp
@@ -1,6 +1,4 @@
#include <fstream>
-#include <iomanip>
-#include <iostream>
#include <string>
#include <sstream>
#include <cmath>
diff --git a/Framework/Kernel/src/Atom.cpp b/Framework/Kernel/src/Atom.cpp
index 7a9e2551517..43452e3b8d6 100644
--- a/Framework/Kernel/src/Atom.cpp
+++ b/Framework/Kernel/src/Atom.cpp
@@ -1,5 +1,4 @@
#include <algorithm>
-#include <iostream> // REMOVE
#include <sstream>
#include <stdexcept>
#include "MantidKernel/Atom.h"
diff --git a/Framework/Kernel/src/DllOpen.cpp b/Framework/Kernel/src/DllOpen.cpp
index 927e518eac7..e66b0dced4b 100644
--- a/Framework/Kernel/src/DllOpen.cpp
+++ b/Framework/Kernel/src/DllOpen.cpp
@@ -1,5 +1,4 @@
#include <string>
-#include <iostream>
/*
If the OS is Windows then LoadLibrary, GetProcAddress and FreeLibrary are used.
diff --git a/Framework/Kernel/src/Exception.cpp b/Framework/Kernel/src/Exception.cpp
index ee12a3b5d95..26e6e194942 100644
--- a/Framework/Kernel/src/Exception.cpp
+++ b/Framework/Kernel/src/Exception.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidKernel/Exception.h"
diff --git a/Framework/Kernel/src/FacilityInfo.cpp b/Framework/Kernel/src/FacilityInfo.cpp
index b85fb675073..9a42c5a2083 100644
--- a/Framework/Kernel/src/FacilityInfo.cpp
+++ b/Framework/Kernel/src/FacilityInfo.cpp
@@ -2,7 +2,6 @@
// Includes
//----------------------------------------------------------------------
#include <algorithm>
-#include <iostream>
#include "MantidKernel/FacilityInfo.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/Kernel/src/LibraryManager.cpp b/Framework/Kernel/src/LibraryManager.cpp
index 438e55b9b1d..da72c1042cb 100644
--- a/Framework/Kernel/src/LibraryManager.cpp
+++ b/Framework/Kernel/src/LibraryManager.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/DllOpen.h"
diff --git a/Framework/Kernel/src/Memory.cpp b/Framework/Kernel/src/Memory.cpp
index a1f11272d0a..448b2276787 100644
--- a/Framework/Kernel/src/Memory.cpp
+++ b/Framework/Kernel/src/Memory.cpp
@@ -1,8 +1,6 @@
#include "MantidKernel/Memory.h"
#include "MantidKernel/Logger.h"
-#include <iostream>
-#include <iomanip>
#include <sstream>
#ifdef __linux__
diff --git a/Framework/Kernel/src/NetworkProxyOSX.cpp b/Framework/Kernel/src/NetworkProxyOSX.cpp
index b3dbeb96dbc..5bdae5c9c29 100644
--- a/Framework/Kernel/src/NetworkProxyOSX.cpp
+++ b/Framework/Kernel/src/NetworkProxyOSX.cpp
@@ -5,7 +5,6 @@
#include <SystemConfiguration/SystemConfiguration.h>
#include <CoreFoundation/CoreFoundation.h>
#include <CFNetwork/CFProxySupport.h>
-#include <iostream>
#include <sstream>
#include <string>
#include <vector>
diff --git a/Framework/Kernel/src/NeutronAtom.cpp b/Framework/Kernel/src/NeutronAtom.cpp
index 03874b20567..4469af38fb7 100644
--- a/Framework/Kernel/src/NeutronAtom.cpp
+++ b/Framework/Kernel/src/NeutronAtom.cpp
@@ -4,7 +4,6 @@
#include "MantidKernel/NeutronAtom.h"
#include "MantidKernel/PhysicalConstants.h"
#include <algorithm>
-#include <iostream> // REMOVE
#include <sstream>
#include <stdexcept>
#include <boost/math/special_functions/fpclassify.hpp>
diff --git a/Framework/Kernel/src/ProxyInfo.cpp b/Framework/Kernel/src/ProxyInfo.cpp
index 1299ff719d8..c34da7a9411 100644
--- a/Framework/Kernel/src/ProxyInfo.cpp
+++ b/Framework/Kernel/src/ProxyInfo.cpp
@@ -1,6 +1,5 @@
#include "MantidKernel/ProxyInfo.h"
#include <stdexcept>
-#include <iostream>
namespace Mantid {
namespace Kernel {
diff --git a/Framework/Kernel/src/Strings.cpp b/Framework/Kernel/src/Strings.cpp
index c396f0e02c9..c2bf98bd5ac 100644
--- a/Framework/Kernel/src/Strings.cpp
+++ b/Framework/Kernel/src/Strings.cpp
@@ -11,7 +11,6 @@
#include <cmath>
#include <fstream>
-#include <iomanip>
using std::size_t;
diff --git a/Framework/Kernel/src/ThreadSafeLogStream.cpp b/Framework/Kernel/src/ThreadSafeLogStream.cpp
index e487fe13169..23eceb0c53e 100644
--- a/Framework/Kernel/src/ThreadSafeLogStream.cpp
+++ b/Framework/Kernel/src/ThreadSafeLogStream.cpp
@@ -2,7 +2,6 @@
// Includes
//-----------------------------------------------
#include "MantidKernel/ThreadSafeLogStream.h"
-#include <iostream>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/src/V3D.cpp b/Framework/Kernel/src/V3D.cpp
index 0d504d14bec..fc9ef31b403 100644
--- a/Framework/Kernel/src/V3D.cpp
+++ b/Framework/Kernel/src/V3D.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <cmath>
#include <float.h>
#include <vector>
diff --git a/Framework/Kernel/src/VectorHelper.cpp b/Framework/Kernel/src/VectorHelper.cpp
index 71a917e2628..61aedadfc83 100644
--- a/Framework/Kernel/src/VectorHelper.cpp
+++ b/Framework/Kernel/src/VectorHelper.cpp
@@ -3,7 +3,6 @@
#include "MantidKernel/VectorHelper.h"
#include <algorithm>
-#include <iostream>
#include <numeric>
#include <sstream>
#include <boost/algorithm/string.hpp>
diff --git a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
index a4efd01bb0b..9bb7c6d1a17 100644
--- a/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ImportMDEventWorkspace.cpp
@@ -1,6 +1,5 @@
#include "MantidMDAlgorithms/ImportMDEventWorkspace.h"
-#include <iostream>
#include <fstream>
#include "MantidAPI/FileProperty.h"
diff --git a/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp b/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
index 15f5a9a509f..86c15fc3b05 100644
--- a/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ImportMDHistoWorkspace.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/FileProperty.h"
#include <deque>
-#include <iostream>
#include <fstream>
#include <iterator>
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index 8c1bf115599..f3db57b5fd7 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -1,5 +1,4 @@
#include <math.h>
-#include <iostream>
#include <fstream>
#include <boost/math/special_functions/round.hpp>
#include <boost/make_shared.hpp>
diff --git a/Framework/MDAlgorithms/src/LoadILLAscii.cpp b/Framework/MDAlgorithms/src/LoadILLAscii.cpp
index 835d1fe1868..86aaa741729 100644
--- a/Framework/MDAlgorithms/src/LoadILLAscii.cpp
+++ b/Framework/MDAlgorithms/src/LoadILLAscii.cpp
@@ -24,7 +24,6 @@
#include <algorithm>
#include <iterator> // std::distance
#include <sstream>
-#include <iostream>
#include <fstream>
#include <stdio.h>
#include <string.h>
diff --git a/Framework/MDAlgorithms/src/LoadSQW.cpp b/Framework/MDAlgorithms/src/LoadSQW.cpp
index 9df49767131..b3bc63d11e5 100644
--- a/Framework/MDAlgorithms/src/LoadSQW.cpp
+++ b/Framework/MDAlgorithms/src/LoadSQW.cpp
@@ -13,7 +13,6 @@
#include "MantidKernel/ThreadScheduler.h"
#include "MantidMDAlgorithms/LoadSQW.h"
#include "MantidAPI/RegisterFileLoader.h"
-#include <iostream>
#include <cfloat>
#include "MantidDataObjects/MDBox.h"
#include "MantidDataObjects/BoxControllerNeXusIO.h"
diff --git a/Framework/SINQ/src/LoadFlexiNexus.cpp b/Framework/SINQ/src/LoadFlexiNexus.cpp
index 2bb6ca7cd7c..d589ce89c86 100644
--- a/Framework/SINQ/src/LoadFlexiNexus.cpp
+++ b/Framework/SINQ/src/LoadFlexiNexus.cpp
@@ -5,7 +5,6 @@
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidKernel/Utils.h"
-#include <iostream>
#include <fstream>
#include <sstream>
#include <boost/algorithm/string.hpp>
diff --git a/Framework/SINQ/src/MDHistoToWorkspace2D.cpp b/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
index 25153f13116..2433e266d31 100644
--- a/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
+++ b/Framework/SINQ/src/MDHistoToWorkspace2D.cpp
@@ -13,7 +13,6 @@
#include "MantidAPI/IMDHistoWorkspace.h"
#include <cmath>
-#include <iostream>
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(MDHistoToWorkspace2D)
diff --git a/Framework/SINQ/src/SINQHMListener.cpp b/Framework/SINQ/src/SINQHMListener.cpp
index d8434b56b5c..fd449cb9648 100644
--- a/Framework/SINQ/src/SINQHMListener.cpp
+++ b/Framework/SINQ/src/SINQHMListener.cpp
@@ -4,7 +4,6 @@
* Created on: Nov 14, 2012
* Author: mark.koennecke@psi.ch
*/
-#include <iostream>
#include <sstream>
#include "MantidAPI/LiveListenerFactory.h"
diff --git a/Framework/TestHelpers/src/LoggingCleaner.cpp b/Framework/TestHelpers/src/LoggingCleaner.cpp
index 7e6bcdaef45..81b7cead7dc 100644
--- a/Framework/TestHelpers/src/LoggingCleaner.cpp
+++ b/Framework/TestHelpers/src/LoggingCleaner.cpp
@@ -1,5 +1,4 @@
#include "MantidKernel/Logger.h"
-#include <iostream>
class LoggingCleaner {
public:
diff --git a/MantidPlot/src/CanvasPicker.cpp b/MantidPlot/src/CanvasPicker.cpp
index 2e918d8e064..96b5f6f4f32 100644
--- a/MantidPlot/src/CanvasPicker.cpp
+++ b/MantidPlot/src/CanvasPicker.cpp
@@ -39,7 +39,6 @@
#include <QVector>
#include <qwt_text_label.h>
#include <qwt_plot_canvas.h>
-//#include <iostream>
CanvasPicker::CanvasPicker(Graph *graph):
QObject(graph)
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index 4896dda0ac8..db3b3e6fcd2 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -107,7 +107,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
-#include <iostream>
// We can safely ignore warnings about assuming signed overflow does not occur from qvector.h
// (They really should have implemented it with unsigned types!
diff --git a/MantidPlot/src/ImportASCIIDialog.cpp b/MantidPlot/src/ImportASCIIDialog.cpp
index c93828a2545..44c2ff0105b 100644
--- a/MantidPlot/src/ImportASCIIDialog.cpp
+++ b/MantidPlot/src/ImportASCIIDialog.cpp
@@ -46,7 +46,6 @@
#include <QHeaderView>
#include <gsl/gsl_math.h>
-#include<iostream>
ImportASCIIDialog::ImportASCIIDialog(bool new_windows_only, QWidget * parent, bool extended, Qt::WFlags flags )
: ExtensibleFileDialog(parent, extended, flags )
diff --git a/MantidPlot/src/LegendWidget.cpp b/MantidPlot/src/LegendWidget.cpp
index d17de386853..b11a10f70fd 100644
--- a/MantidPlot/src/LegendWidget.cpp
+++ b/MantidPlot/src/LegendWidget.cpp
@@ -45,7 +45,6 @@
#include <qwt_layout_metrics.h>
#include <qwt_symbol.h>
-#include <iostream>
LegendWidget::LegendWidget(Plot *plot):QWidget(plot),
d_plot(plot),
diff --git a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
index 3a3b77c8fd9..54bd5afaec5 100644
--- a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
+++ b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
@@ -19,7 +19,6 @@
#include <QDir>
#include <numeric>
-#include <iostream>
#include <fstream>
#include <stdio.h>
diff --git a/MantidPlot/src/Mantid/AlgorithmMonitor.cpp b/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
index 04364ef9d71..5b4ffee3981 100644
--- a/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
+++ b/MantidPlot/src/Mantid/AlgorithmMonitor.cpp
@@ -8,7 +8,6 @@
#include <QtGui>
#include <QThread>
-#include <iostream>
#include <algorithm>
using namespace std;
diff --git a/MantidPlot/src/Mantid/FitParameterTie.cpp b/MantidPlot/src/Mantid/FitParameterTie.cpp
index 928315ab13e..28bdb2c7bc4 100644
--- a/MantidPlot/src/Mantid/FitParameterTie.cpp
+++ b/MantidPlot/src/Mantid/FitParameterTie.cpp
@@ -2,7 +2,6 @@
#include "MantidAPI/CompositeFunction.h"
#include <QRegExp>
#include <stdexcept>
-#include <iostream>
/// Constructor
FitParameterTie::FitParameterTie(boost::shared_ptr<Mantid::API::CompositeFunction> cf)
diff --git a/MantidPlot/src/Mantid/InputHistory.cpp b/MantidPlot/src/Mantid/InputHistory.cpp
index 9487afac9e6..3b0da1e014e 100644
--- a/MantidPlot/src/Mantid/InputHistory.cpp
+++ b/MantidPlot/src/Mantid/InputHistory.cpp
@@ -3,7 +3,6 @@
#include <QSettings>
#include <vector>
-#include <iostream>
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
index 1aa71735f6e..6876cced0e8 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.cpp
@@ -6,7 +6,6 @@
#include <QPolygon>
#include <stdexcept>
-#include <iostream>
CaptionLabel::CaptionLabel(const QString& caption,QWidget* parent):QLabel(caption,parent),m_collapsed(false)
{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp b/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
index ad3abc03981..b023799998c 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLActorCollection.cpp
@@ -5,7 +5,6 @@
#include "MantidKernel/Exception.h"
#include <stdexcept>
-#include <iostream>
#include <functional>
#include <algorithm>
#include <float.h>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp b/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
index 87815c5cf41..f93d0d9e942 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLObject.cpp
@@ -5,7 +5,6 @@
#include "ObjCompAssemblyActor.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/System.h"
-#include <iostream>
int icount;
GLObject::GLObject(bool withDisplayList,const std::string& name):mName(name), mChanged(true)
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
index d725f608279..1b9cd0ce1ea 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
@@ -12,7 +12,6 @@
#include <QMessageBox>
#include <QString>
#include <cfloat>
-#include <iostream>
InstrumentTreeWidget::InstrumentTreeWidget(QWidget *w):QTreeView(w), m_instrActor(NULL), m_treeModel(NULL)
{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
index 9fea8e14de8..dcd5dfc856a 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.cpp
@@ -15,7 +15,6 @@
#include <map>
#include <string>
-#include <iostream>
#include <cfloat>
#include <typeinfo>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
index ea8e944da90..090cde16df1 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp
@@ -16,7 +16,6 @@
#include <QPainter>
#include <QFont>
-#include <iostream>
#include <cmath>
OneCurvePlot::OneCurvePlot(QWidget* parent):
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
index e8cea2ea006..8da241a02ea 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OpenGLError.cpp
@@ -1,5 +1,4 @@
#include "OpenGLError.h"
-#include <iostream>
#include <sstream>
#include "MantidKernel/Logger.h"
#include "MantidGeometry/Rendering/OpenGL_Headers.h"
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
index e7c5915aea5..99135d6c0b9 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/PeakMarker2D.cpp
@@ -7,7 +7,6 @@
#include <QMouseEvent>
#include <QWheelEvent>
-#include <iostream>
#include <algorithm>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
index d02948d9a19..688652c8c9e 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Projection3D.cpp
@@ -23,7 +23,6 @@
#include <map>
#include <string>
-#include <iostream>
#include <cfloat>
#include <algorithm>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
index 0a40a6ff188..bb5d301443a 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.cpp
@@ -8,7 +8,6 @@
#include <QLine>
#include <QMap>
-#include <iostream>
#include <algorithm>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
index dcbb04b15d4..f2c38011600 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
@@ -7,7 +7,6 @@
#include <QApplication>
#include <QStringList>
-#include <iostream>
#include <stdexcept>
#include <cmath>
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
index fe0de8deb05..1c1c1cce8e7 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Viewport.cpp
@@ -1,6 +1,5 @@
#include "Viewport.h"
#include <math.h>
-#include <iostream>
#include "MantidGeometry/Rendering/OpenGL_Headers.h"
#include "MantidKernel/V3D.h"
#include "OpenGLError.h"
diff --git a/MantidPlot/src/Mantid/MantidApplication.cpp b/MantidPlot/src/Mantid/MantidApplication.cpp
index 67a264b7b77..dead6d262b4 100644
--- a/MantidPlot/src/Mantid/MantidApplication.cpp
+++ b/MantidPlot/src/Mantid/MantidApplication.cpp
@@ -8,7 +8,6 @@
#include <QMessageBox>
#include <QPushButton>
-#include <iostream>
namespace
{
diff --git a/MantidPlot/src/Mantid/MantidMatrix.cpp b/MantidPlot/src/Mantid/MantidMatrix.cpp
index 1bfeabebe8f..0702315186a 100644
--- a/MantidPlot/src/Mantid/MantidMatrix.cpp
+++ b/MantidPlot/src/Mantid/MantidMatrix.cpp
@@ -49,7 +49,6 @@
#include <QTabWidget>
#include <stdlib.h>
-#include <iostream>
#include <algorithm>
#include <limits>
diff --git a/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp b/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
index 75d103842c8..7e5969971fe 100644
--- a/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
+++ b/MantidPlot/src/Mantid/MantidSampleLogDialog.cpp
@@ -20,7 +20,6 @@
#include <QRadioButton>
#include <QFileInfo>
#include <QMessageBox>
-#include <iostream>
#include <sstream>
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/MultipleExperimentInfos.h"
diff --git a/MantidPlot/src/Mantid/MantidTable.cpp b/MantidPlot/src/Mantid/MantidTable.cpp
index de0d7ddf842..722da9ddc35 100644
--- a/MantidPlot/src/Mantid/MantidTable.cpp
+++ b/MantidPlot/src/Mantid/MantidTable.cpp
@@ -10,7 +10,6 @@
#include <QMessageBox>
#include <QHash>
-#include <iostream>
#include <qfontmetrics.h>
using namespace MantidQt::API;
diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
index 57ff719e17b..d076bdf1574 100644
--- a/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -68,7 +68,6 @@
#include <locale>
#include <set>
#include <fstream>
-#include <iostream>
#include <sstream>
#include <boost/tokenizer.hpp>
diff --git a/MantidPlot/src/Mantid/PeakPickerTool.cpp b/MantidPlot/src/Mantid/PeakPickerTool.cpp
index 2b5f31ed2bc..0e071aa584d 100644
--- a/MantidPlot/src/Mantid/PeakPickerTool.cpp
+++ b/MantidPlot/src/Mantid/PeakPickerTool.cpp
@@ -22,7 +22,6 @@
#include <QInputDialog>
#include <QMessageBox>
-#include <iostream>
namespace
{
diff --git a/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp b/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
index eee79fa5b3a..0814da59551 100644
--- a/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
+++ b/MantidPlot/src/Mantid/UserFitFunctionDialog.cpp
@@ -7,7 +7,6 @@
#include <qcheckbox.h>
#include <qmessagebox.h>
#include <qheaderview.h>
-#include <iostream>
//---------------------------------------
// Public member functions
diff --git a/MantidPlot/src/PythonScript.cpp b/MantidPlot/src/PythonScript.cpp
index 23717ada1db..a83c5a096e4 100644
--- a/MantidPlot/src/PythonScript.cpp
+++ b/MantidPlot/src/PythonScript.cpp
@@ -39,7 +39,6 @@
#include <QVariant>
#include <QMessageBox>
-#include <iostream>
#include <stdexcept>
diff --git a/MantidPlot/src/Spectrogram.cpp b/MantidPlot/src/Spectrogram.cpp
index ece80d7b100..db3ab2aaa13 100644
--- a/MantidPlot/src/Spectrogram.cpp
+++ b/MantidPlot/src/Spectrogram.cpp
@@ -46,7 +46,6 @@
#include "TSVSerialiser.h"
-#include <iostream>
#include <numeric>
Spectrogram::Spectrogram():
diff --git a/MantidPlot/src/origin/OPJFile.cpp b/MantidPlot/src/origin/OPJFile.cpp
index 4a37431010c..c0eaf257564 100644
--- a/MantidPlot/src/origin/OPJFile.cpp
+++ b/MantidPlot/src/origin/OPJFile.cpp
@@ -51,7 +51,6 @@
#endif
#include <stdio.h>
-#include <iostream>
#include <stdlib.h>
#include <math.h>
#include <cstring>
diff --git a/MantidPlot/src/pixmaps.cpp b/MantidPlot/src/pixmaps.cpp
index ddb37192d96..75faddbc7ae 100644
--- a/MantidPlot/src/pixmaps.cpp
+++ b/MantidPlot/src/pixmaps.cpp
@@ -6,7 +6,6 @@
*/
#include "pixmaps.h"
-#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/MantidQt/API/src/UserSubWindow.cpp b/MantidQt/API/src/UserSubWindow.cpp
index 4c9354d8f67..6dace365d7f 100644
--- a/MantidQt/API/src/UserSubWindow.cpp
+++ b/MantidQt/API/src/UserSubWindow.cpp
@@ -12,8 +12,6 @@
#include <QTemporaryFile>
#include <QTextStream>
-#include <iostream>
-
using namespace MantidQt::API;
//------------------------------------------------------
diff --git a/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp b/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
index 110d04a7ce3..c599d37c08e 100644
--- a/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
+++ b/MantidQt/MantidWidgets/src/MantidHelpWindow.cpp
@@ -6,7 +6,6 @@
#include "MantidKernel/RegistrationHelper.h"
#include <boost/make_shared.hpp>
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <Poco/File.h>
#include <Poco/Path.h>
#include <QDesktopServices>
diff --git a/MantidQt/MantidWidgets/src/ScriptEditor.cpp b/MantidQt/MantidWidgets/src/ScriptEditor.cpp
index 5e4c2bdfdc1..c43f2cfbb1a 100644
--- a/MantidQt/MantidWidgets/src/ScriptEditor.cpp
+++ b/MantidQt/MantidWidgets/src/ScriptEditor.cpp
@@ -33,7 +33,6 @@
// std
#include <cmath>
-#include <iostream>
#include <stdexcept>
//***************************************************************************
diff --git a/MantidQt/MantidWidgets/src/StringDialogEditor.cpp b/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
index e84f62ba444..ade129f78b7 100644
--- a/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
+++ b/MantidQt/MantidWidgets/src/StringDialogEditor.cpp
@@ -8,7 +8,6 @@
#include <QDialog>
#include <QSettings>
-#include <iostream>
/**
* Do nothing to connect a manager.
diff --git a/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp b/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
index e2ea0e8b756..1b1e345cf84 100644
--- a/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefDetectorViewDemo.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <qapplication.h>
#include <QMainWindow>
diff --git a/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp b/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
index 42109cf39cb..fede037dfe0 100644
--- a/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefIVConnections.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include <qwt_plot_canvas.h>
diff --git a/MantidQt/RefDetectorViewer/src/RefImageView.cpp b/MantidQt/RefDetectorViewer/src/RefImageView.cpp
index d5385cb4dfa..6c35c6eca90 100644
--- a/MantidQt/RefDetectorViewer/src/RefImageView.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefImageView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtRefDetectorViewer/RefImageView.h"
#include "MantidQtSpectrumViewer/ColorMaps.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp b/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
index 91e32036086..f63397e1da6 100644
--- a/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefMatrixWSImageView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtRefDetectorViewer/RefMatrixWSImageView.h"
#include "MantidQtSpectrumViewer/ArrayDataSource.h"
#include "MantidQtRefDetectorViewer/RefIVConnections.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp b/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
index 437a3cc7efa..a2f7d1d8b70 100644
--- a/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefRangeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtRefDetectorViewer/RefRangeHandler.h"
diff --git a/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp b/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
index 2fc6a2faef4..e11b1cbf465 100644
--- a/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
+++ b/MantidQt/RefDetectorViewer/src/RefSliderHandler.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <QScrollBar>
#include "MantidQtRefDetectorViewer/RefSliderHandler.h"
diff --git a/MantidQt/SliceViewer/src/ColorBarWidget.cpp b/MantidQt/SliceViewer/src/ColorBarWidget.cpp
index 0f3c72044c8..0d07267f675 100644
--- a/MantidQt/SliceViewer/src/ColorBarWidget.cpp
+++ b/MantidQt/SliceViewer/src/ColorBarWidget.cpp
@@ -4,7 +4,6 @@
#include "qwt_scale_div.h"
#include "MantidQtAPI/PowerScaleEngine.h"
#include <iosfwd>
-#include <iostream>
#include <qwt_scale_map.h>
#include <qwt_scale_widget.h>
#include <QKeyEvent>
diff --git a/MantidQt/SliceViewer/src/CustomTools.cpp b/MantidQt/SliceViewer/src/CustomTools.cpp
index 34439d2e5dc..f0a8f6ca9a7 100644
--- a/MantidQt/SliceViewer/src/CustomTools.cpp
+++ b/MantidQt/SliceViewer/src/CustomTools.cpp
@@ -1,7 +1,5 @@
#include "MantidQtSliceViewer/CustomTools.h"
-#include <iomanip>
#include <iosfwd>
-#include <iostream>
namespace MantidQt
{
diff --git a/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp b/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
index 7d2892969e7..9572cd4842e 100644
--- a/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
+++ b/MantidQt/SliceViewer/src/DimensionSliceWidget.cpp
@@ -1,8 +1,6 @@
#include "MantidQtSliceViewer/DimensionSliceWidget.h"
#include "MantidKernel/UnitLabel.h"
#include <iosfwd>
-#include <iostream>
-#include <iomanip>
#include <qlayout.h>
namespace MantidQt
diff --git a/MantidQt/SliceViewer/src/LineOverlay.cpp b/MantidQt/SliceViewer/src/LineOverlay.cpp
index b68d0a89adb..4a172e3a2b9 100644
--- a/MantidQt/SliceViewer/src/LineOverlay.cpp
+++ b/MantidQt/SliceViewer/src/LineOverlay.cpp
@@ -1,7 +1,6 @@
#include "MantidQtSliceViewer/LineOverlay.h"
#include <qwt_plot.h>
#include <qwt_plot_canvas.h>
-#include <iostream>
#include <qpainter.h>
#include <QRect>
#include <QShowEvent>
diff --git a/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp b/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
index 1de3e15906e..bde8b1a41bd 100644
--- a/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
+++ b/MantidQt/SliceViewer/src/PeaksTableColumnsDialog.cpp
@@ -3,7 +3,6 @@
#include "ui_PeaksTableColumnsDialog.h"
// REMOVE
-#include <iostream>
namespace MantidQt
{
diff --git a/MantidQt/SliceViewer/src/SliceViewer.cpp b/MantidQt/SliceViewer/src/SliceViewer.cpp
index 003b774d559..f251baaf444 100644
--- a/MantidQt/SliceViewer/src/SliceViewer.cpp
+++ b/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -1,6 +1,4 @@
-#include <iomanip>
#include <iosfwd>
-#include <iostream>
#include <limits>
#include <sstream>
#include <vector>
diff --git a/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp b/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
index a0fb09e4c9b..e15a843addf 100644
--- a/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_ColorBarWidgetDemo.cpp
@@ -1,6 +1,5 @@
#include "MantidQtSliceViewer/ColorBarWidget.h"
#include "qmainwindow.h"
-#include <iostream>
#include <QApplication>
#include <QDir>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp b/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
index ab70ae54f02..cd15090523f 100644
--- a/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_LineViewerDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp b/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
index cb76eb2a00b..37ce5d6153d 100644
--- a/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_SliceViewerDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp b/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
index 0167bc47a4b..41db0d8e18d 100644
--- a/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
+++ b/MantidQt/SliceViewer/src/main_SliceViewerWindowDemo.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QApplication>
#include <QSplashScreen>
#include <QMessageBox>
diff --git a/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp b/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
index f07a4d1fff2..30953f04ffd 100644
--- a/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/ArrayDataSource.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/ColorMaps.cpp b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
index 9b09dc5da6f..b140b53c22b 100644
--- a/MantidQt/SpectrumViewer/src/ColorMaps.cpp
+++ b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
@@ -1,5 +1,4 @@
-#include <iostream>
#include <sstream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/DataArray.cpp b/MantidQt/SpectrumViewer/src/DataArray.cpp
index b18fa101558..e3c58c8b732 100644
--- a/MantidQt/SpectrumViewer/src/DataArray.cpp
+++ b/MantidQt/SpectrumViewer/src/DataArray.cpp
@@ -2,7 +2,6 @@
* File DataArray.cpp
*/
-#include <iostream>
#include <math.h>
#include "MantidQtSpectrumViewer/DataArray.h"
diff --git a/MantidQt/SpectrumViewer/src/EModeHandler.cpp b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
index 6176600a7cf..784ff1ce791 100644
--- a/MantidQt/SpectrumViewer/src/EModeHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/EModeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtSpectrumViewer/EModeHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
index 2cf6a0fdb43..fb458c40088 100644
--- a/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
+++ b/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QtGui>
#include <QVector>
#include <QString>
diff --git a/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp b/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
index 583079fd990..4992d41c67b 100644
--- a/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp
@@ -3,7 +3,6 @@
*/
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <sstream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp b/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
index a7622cd74bf..07f3aa6ea64 100644
--- a/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
+++ b/MantidQt/SpectrumViewer/src/MatrixWSSpectrumView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtSpectrumViewer/MatrixWSSpectrumView.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/MantidQt/SpectrumViewer/src/RangeHandler.cpp b/MantidQt/SpectrumViewer/src/RangeHandler.cpp
index 416b7f2a444..5f48eb56546 100644
--- a/MantidQt/SpectrumViewer/src/RangeHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/RangeHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QLineEdit>
#include "MantidQtSpectrumViewer/RangeHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/SVConnections.cpp b/MantidQt/SpectrumViewer/src/SVConnections.cpp
index ca5442b9f60..1d01bd13634 100644
--- a/MantidQt/SpectrumViewer/src/SVConnections.cpp
+++ b/MantidQt/SpectrumViewer/src/SVConnections.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <qwt_plot_canvas.h>
#include <QDesktopServices>
diff --git a/MantidQt/SpectrumViewer/src/SliderHandler.cpp b/MantidQt/SpectrumViewer/src/SliderHandler.cpp
index d5fec750d75..715029998ea 100644
--- a/MantidQt/SpectrumViewer/src/SliderHandler.cpp
+++ b/MantidQt/SpectrumViewer/src/SliderHandler.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QScrollBar>
#include "MantidQtSpectrumViewer/SliderHandler.h"
diff --git a/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp b/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
index 510b583f2d4..680ceb0a500 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumDataSource.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <math.h>
diff --git a/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp b/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
index f66bb0b012b..408c6d7f79c 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumDisplay.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include <cfloat>
diff --git a/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp b/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
index 1ae3028c5de..84b355b43ed 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumPlotItem.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <QThread>
#include "MantidQtSpectrumViewer/SpectrumPlotItem.h"
diff --git a/MantidQt/SpectrumViewer/src/SpectrumView.cpp b/MantidQt/SpectrumViewer/src/SpectrumView.cpp
index 9b01297abec..272a637544f 100644
--- a/MantidQt/SpectrumViewer/src/SpectrumView.cpp
+++ b/MantidQt/SpectrumViewer/src/SpectrumView.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include "MantidQtSpectrumViewer/SpectrumView.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/QtPropertyBrowser/src/DoubleEditorFactory.cpp b/QtPropertyBrowser/src/DoubleEditorFactory.cpp
index 666130ec533..6e93ddb27cc 100644
--- a/QtPropertyBrowser/src/DoubleEditorFactory.cpp
+++ b/QtPropertyBrowser/src/DoubleEditorFactory.cpp
@@ -4,7 +4,6 @@
#include <QDoubleValidator>
-#include <iostream>
#include <cfloat>
#include <sstream>
#include <cmath>
diff --git a/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/QtPropertyBrowser/src/qttreepropertybrowser.cpp
index 53f493d7bee..63b6b13a9ac 100644
--- a/QtPropertyBrowser/src/qttreepropertybrowser.cpp
+++ b/QtPropertyBrowser/src/qttreepropertybrowser.cpp
@@ -100,7 +100,6 @@
#include <QtGui/qcheckbox.h>
#include <QtGui/qlineedit.h>
-#include <iostream>
#if QT_VERSION >= 0x040400
QT_BEGIN_NAMESPACE
diff --git a/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp b/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
index a246ffbe36d..7947450b22d 100644
--- a/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
+++ b/Vates/VatesAPI/src/vtkNullStructuredGrid.cpp
@@ -7,7 +7,7 @@
#include <vtkFloatArray.h>
#include <vtkSmartPointer.h>
#include <vtkStructuredGrid.h>
-#include <iostream>
+
namespace Mantid {
namespace VATES {
diff --git a/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp b/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
index e8aa4715613..28f88d9e6f2 100644
--- a/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
+++ b/Vates/VatesSimpleGui/QtWidgets/src/GeometryParser.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <sstream>
#include "MantidVatesSimpleGuiQtWidgets/GeometryParser.h"
diff --git a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
index 93c1e5d511c..4e456176744 100644
--- a/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
+++ b/Vates/VatesSimpleGui/StandAloneExec/src/SimpleGuiApp.cpp
@@ -7,7 +7,6 @@
#include <QPushButton>
#include <exception>
-#include <iostream>
namespace
{
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
index 2a56dae5488..d215e3aaa53 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/ColorSelectionWidget.cpp
@@ -1,5 +1,4 @@
#include <cfloat>
-#include <iostream>
#include "MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
index d5cc40e9793..dbf6fd81743 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
#include <vector>
#include <set>
#include <string>
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
index 65311bdb14c..00e3995b05c 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -36,7 +36,6 @@
#include <QString>
-#include <iostream>
using namespace Mantid::Geometry;
using namespace MantidQt::SliceViewer;
diff --git a/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp b/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
index b56216a2207..962a116fc52 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
+++ b/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
@@ -27,9 +27,6 @@
#include <QMessageBox>
-#include <iostream>
-#include <string>
-
namespace Mantid
{
namespace Vates
diff --git a/tools/DAEserv/DAEserv/isisds_command.cpp b/tools/DAEserv/DAEserv/isisds_command.cpp
index 131c03ade6e..b354735c732 100644
--- a/tools/DAEserv/DAEserv/isisds_command.cpp
+++ b/tools/DAEserv/DAEserv/isisds_command.cpp
@@ -20,8 +20,6 @@
#include <stdio.h>
#include "isisds_command.h"
-#include <iostream>
-
using namespace std;
/*
--
GitLab