diff --git a/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h b/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
index 3b97b9db3fc53c3c848207f85b92e4a5ef1ef0ae..6800ed62b758b685cc1dbcc4fb70663192c900f5 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
@@ -1,9 +1,9 @@
 #ifndef MANTID_KERNEL_ARRAYLENGTHVALIDATOR_H_
 #define MANTID_KERNEL_ARRAYLENGTHVALIDATOR_H_
 
-#include "MantidKernel/DllConfig.h"   
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/TypedValidator.h"
-#include "MantidKernel/IValidator.h"  
+#include "MantidKernel/IValidator.h"
 
 #include <string>
 #include <vector>
diff --git a/Framework/Kernel/inc/MantidKernel/ArrayOrderedPairsValidator.h b/Framework/Kernel/inc/MantidKernel/ArrayOrderedPairsValidator.h
index f0d26832590ee5ec91d5edb56879ccace3bfa119..ee98b53668f49832adb694112bff1e33d4fc55e5 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayOrderedPairsValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayOrderedPairsValidator.h
@@ -1,11 +1,11 @@
 #ifndef MANTID_KERNEL_ARRAYORDEREDPAIRSVALIDATOR_H_
 #define MANTID_KERNEL_ARRAYORDEREDPAIRSVALIDATOR_H_
 
-#include "MantidKernel/DllConfig.h"      
-#include "MantidKernel/IValidator.h"     
-#include "MantidKernel/TypedValidator.h" 
-#include <string>                        
-#include <vector>                        
+#include "MantidKernel/DllConfig.h"
+#include "MantidKernel/IValidator.h"
+#include "MantidKernel/TypedValidator.h"
+#include <string>
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/ArrayProperty.h b/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
index 84f2c3dbe13dd0b367973ce7c7353b97b6eeb08e..8c72a43ae7abc2fa19f85795c0991c38652b57b2 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
@@ -2,11 +2,11 @@
 #define MANTID_KERNEL_ARRAYPROPERTY_H_
 
 #include "PropertyWithValue.h"
-#include "MantidKernel/IValidator.h"                
-#include "MantidKernel/NullValidator.h"             
-#include "MantidKernel/Property.h"                  
-#include <string>                                   
-#include <vector>                                   
+#include "MantidKernel/IValidator.h"
+#include "MantidKernel/NullValidator.h"
+#include "MantidKernel/Property.h"
+#include <string>
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/CPUTimer.h b/Framework/Kernel/inc/MantidKernel/CPUTimer.h
index c8e3620c24682212a34ea950b8d6d7964ddfdb9d..60192e98beec3b8e506728bb828684c5df0950f3 100644
--- a/Framework/Kernel/inc/MantidKernel/CPUTimer.h
+++ b/Framework/Kernel/inc/MantidKernel/CPUTimer.h
@@ -4,8 +4,8 @@
 #include "MantidKernel/DllConfig.h"
 #include "MantidKernel/Timer.h"
 #include <ctime>
-#include <iosfwd> 
-#include <string> 
+#include <iosfwd>
+#include <string>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/CompositeValidator.h b/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
index 503c43f4b86d25af5e8ab64a3c98ea61e803d3b9..188109b7769c98d0efff0ad6c7acce0de3957e80 100644
--- a/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
@@ -2,13 +2,13 @@
 #define MANTID_KERNEL_COMPOSITEVALIDATOR_H_
 
 #include "MantidKernel/IValidator.h"
-#include "MantidKernel/System.h" 
+#include "MantidKernel/System.h"
 
 #include <boost/make_shared.hpp>
 
 #include <list>
-#include <string>                
-#include <vector>                
+#include <string>
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/ComputeResourceInfo.h b/Framework/Kernel/inc/MantidKernel/ComputeResourceInfo.h
index 4b7a3f1bbb226856b65e9c425547477277151da6..c16102693056ce1718061d0ed5a548195d64483c 100644
--- a/Framework/Kernel/inc/MantidKernel/ComputeResourceInfo.h
+++ b/Framework/Kernel/inc/MantidKernel/ComputeResourceInfo.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/DllConfig.h"
 
-#include <iosfwd> 
+#include <iosfwd>
 #include <string>
 
 namespace Poco {
diff --git a/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h b/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
index 962eb87c5d3869124c8a6e55354dc409a0d1767d..012555f6c24d4886c01f59d86dcd31112e43fc9f 100644
--- a/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
@@ -1,10 +1,10 @@
 #ifndef MANTID_KERNEL_DATETIMEVALIDATOR_H_
 #define MANTID_KERNEL_DATETIMEVALIDATOR_H_
 
-#include "MantidKernel/DllConfig.h"               
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/TypedValidator.h"
-#include "MantidKernel/IValidator.h"          
-#include <string>                            
+#include "MantidKernel/IValidator.h"
+#include <string>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h b/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
index 7894e7709a31b5df1e7599cd0e0590e76d023fc2..0be5dd35f00cfd128b72a876ab542c09e4cae253 100644
--- a/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
@@ -5,9 +5,9 @@
 // Includes
 //----------------------------------------------------------------------
 #include "IValidator.h"
-#include "MantidKernel/DllConfig.h" 
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/FileValidator.h"
-#include <string>                   
+#include <string>
 #include <vector>
 
 namespace Mantid {
diff --git a/Framework/Kernel/inc/MantidKernel/DiskBuffer.h b/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
index 2bef851153d6f28d2368d8aa8aa018c266847cbe..638fcaebc9bebb56ea63d656fe4a51a125b88d6c 100644
--- a/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
+++ b/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
@@ -14,14 +14,14 @@
 #include <limits>
 #include <list>
 #include <mutex>
-#include <string>  
+#include <string>
 #include <vector>
 
 namespace Mantid {
 namespace Kernel {
 
 // Forward declare
-	class ISaveable;
+class ISaveable;
 
 /** Buffer objects that need to be written out to disk
   so as to optimize writing operations.
diff --git a/Framework/Kernel/inc/MantidKernel/EmptyValues.h b/Framework/Kernel/inc/MantidKernel/EmptyValues.h
index 87f904c270de136a0b154d27f48528425da07a07..ab90ba717a46c9a867296010817fa43d39d054e0 100644
--- a/Framework/Kernel/inc/MantidKernel/EmptyValues.h
+++ b/Framework/Kernel/inc/MantidKernel/EmptyValues.h
@@ -28,7 +28,7 @@
     Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 #include "MantidKernel/DllConfig.h"
-#include "MantidKernel/System.h" 
+#include "MantidKernel/System.h"
 
 namespace Mantid {
 
diff --git a/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h b/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
index 8a240241e6aab9d783fe009b591b2b2434e835b4..d22d50bde9a240a2913e04ef81e68fc7d2ab1c3d 100644
--- a/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
@@ -4,7 +4,7 @@
 #include "MantidKernel/System.h"
 #include "MantidKernel/IPropertySettings.h"
 #include <memory>
-#include <string>   
+#include <string>
 
 namespace Mantid {
 namespace Kernel {
@@ -65,8 +65,8 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 
 // Forward decelerations
-	class IPropertyManager;
-	class Property;
+class IPropertyManager;
+class Property;
 
 // Forward deceleration of structs defined at end of header
 
diff --git a/Framework/Kernel/inc/MantidKernel/Exception.h b/Framework/Kernel/inc/MantidKernel/Exception.h
index d352716661b2200658a62d5997c59c8b02915e6c..d8f94074af49e19f264c8fc731b06596343c388a 100644
--- a/Framework/Kernel/inc/MantidKernel/Exception.h
+++ b/Framework/Kernel/inc/MantidKernel/Exception.h
@@ -5,7 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidKernel/DllConfig.h"
-#include <exception> 
+#include <exception>
 #include <stdexcept>
 #include <string>
 
diff --git a/Framework/Kernel/inc/MantidKernel/FilterChannel.h b/Framework/Kernel/inc/MantidKernel/FilterChannel.h
index af59772270d75c4e1e09e59a1bbee0d01073fc1e..fc17c9ebe814359e39d073e3428dbf67601e9878 100644
--- a/Framework/Kernel/inc/MantidKernel/FilterChannel.h
+++ b/Framework/Kernel/inc/MantidKernel/FilterChannel.h
@@ -35,12 +35,12 @@
 
 #include "MantidKernel/DllConfig.h"
 #include <Poco/Channel.h>
-#include <string> 
+#include <string>
 #include <mutex>
 
 namespace Poco {
-	// Forward declare
-	class Message;
+// Forward declare
+class Message;
 
 /// This channel sends a message to multiple
 /// channels simultaneously.
diff --git a/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
index 8f6e3f1cbc71c1ed76b4effda720539b818ff700..c49d25c683520870a809ad786e4aff1ae5dd18ee 100644
--- a/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
@@ -24,7 +24,7 @@
 */
 #include "MantidKernel/ClassMacros.h"
 #include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/System.h"   
+#include "MantidKernel/System.h"
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/Glob.h b/Framework/Kernel/inc/MantidKernel/Glob.h
index b0ec1e285574e5bf38a65e340ad9b8826925eede..e68937ef9eb0bbd75bb4cdfbfa8f79523fefba38 100644
--- a/Framework/Kernel/inc/MantidKernel/Glob.h
+++ b/Framework/Kernel/inc/MantidKernel/Glob.h
@@ -8,7 +8,7 @@
 #include <Poco/Glob.h>
 #include <Poco/Path.h>
 
-#include <set>   
+#include <set>
 #include <string>
 
 namespace Mantid {
diff --git a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
index 7001e4fe7482c785b6e64077bc600dfd09af7131..b3ef080e2a4ecc4fdd4def50d56c636e66abf3b1 100644
--- a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
@@ -4,21 +4,21 @@
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/make_unique.h"
-#include "MantidKernel/DllConfig.h"       
-#include "MantidKernel/IValidator.h"      
-#include "MantidKernel/NullValidator.h"   
-#include "MantidKernel/Property.h"        
-#include "MantidKernel/System.h"          
+#include "MantidKernel/DllConfig.h"
+#include "MantidKernel/IValidator.h"
+#include "MantidKernel/NullValidator.h"
+#include "MantidKernel/Property.h"
+#include "MantidKernel/System.h"
 
 #ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
 #include <boost/type_traits.hpp>
 #endif
 
-#include <cstdint>                        
-#include <memory>                         
-#include <stdexcept>                      
-#include <string>   
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+#include <string>
 #include <unordered_set>
 #include <vector>
 
diff --git a/Framework/Kernel/inc/MantidKernel/InternetHelper.h b/Framework/Kernel/inc/MantidKernel/InternetHelper.h
index 475e92eb82f2aae7bad77eb459c0d92c70b5752d..7f6902353e39a7100f3dd7fadde4f282ab773bdb 100644
--- a/Framework/Kernel/inc/MantidKernel/InternetHelper.h
+++ b/Framework/Kernel/inc/MantidKernel/InternetHelper.h
@@ -6,7 +6,7 @@
 
 #include <ios>
 #include <map>
-#include <string>  
+#include <string>
 
 namespace Poco {
 // forward declaration
diff --git a/Framework/Kernel/inc/MantidKernel/LogFilter.h b/Framework/Kernel/inc/MantidKernel/LogFilter.h
index 277ba9e5b6dc5ac56dfd7df6c274abfa4581f26c..1aa0e83f06af66b8baae41938aec0f7b440a0fb5 100644
--- a/Framework/Kernel/inc/MantidKernel/LogFilter.h
+++ b/Framework/Kernel/inc/MantidKernel/LogFilter.h
@@ -11,7 +11,7 @@
 #include <boost/scoped_ptr.hpp>
 #endif
 
-#include <vector>                           
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/MDAxisValidator.h b/Framework/Kernel/inc/MantidKernel/MDAxisValidator.h
index 1e9cc983d57fc2de6c8eceedde4d5e4001a65f63..4631d48784492db4674c9c51e84f51a66965792d 100644
--- a/Framework/Kernel/inc/MantidKernel/MDAxisValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/MDAxisValidator.h
@@ -5,11 +5,11 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidKernel/DllConfig.h"
-#include <algorithm> 
+#include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
-#include <utility>   
+#include <utility>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/MagneticFormFactorTable.h b/Framework/Kernel/inc/MantidKernel/MagneticFormFactorTable.h
index f66807118f2083e3d1b32eb43c765aa4bc755046..f864c468819cdf44666448945a94b7944275ba6d 100644
--- a/Framework/Kernel/inc/MantidKernel/MagneticFormFactorTable.h
+++ b/Framework/Kernel/inc/MantidKernel/MagneticFormFactorTable.h
@@ -9,8 +9,8 @@
 namespace Mantid {
 namespace PhysicalConstants {
 
-	// Forward declare
-	struct MagneticIon;
+// Forward declare
+struct MagneticIon;
 
 /**
   Implements a cached lookup table for a magnetic form factor. The table is
diff --git a/Framework/Kernel/inc/MantidKernel/Material.h b/Framework/Kernel/inc/MantidKernel/Material.h
index 4c262a99e6bae7b943c531af86e85c3b4f6d8f3f..286d986ddcaa0375c3a2e61b5177420c1458a855 100644
--- a/Framework/Kernel/inc/MantidKernel/Material.h
+++ b/Framework/Kernel/inc/MantidKernel/Material.h
@@ -8,10 +8,9 @@
 #include "MantidKernel/PhysicalConstants.h"
 #include <boost/shared_ptr.hpp>
 
-
 // Forward Declares
 namespace NeXus {
-       class File;
+class File;
 }
 
 namespace Mantid {
diff --git a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
index 7a4e006437525cc5b47f324fc22d42e42b526dd8..52746165bacfe50f6d565dfea93f8d7dae5a421b 100644
--- a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
+++ b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
@@ -7,8 +7,6 @@
 #include <string>
 #include <tuple>
 
-
-
 namespace Mantid {
 // Forward declare
 namespace PhysicalConstants {
diff --git a/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h b/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
index cbec4edc0ed972bfb7c0188c1e0e987d6be71c66..51e8c9ba4623f43f0f8e093bbcad149ccfa258c6 100644
--- a/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
+++ b/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/ClassMacros.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h" 
+#include "MantidKernel/System.h"
 
 #include <vector>
 
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyHistory.h b/Framework/Kernel/inc/MantidKernel/PropertyHistory.h
index b5378096ed6618c07ce30da91c206d78252eb10e..822073a13c54a871e2b769dc47f5f7a83c705e78 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyHistory.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyHistory.h
@@ -4,7 +4,7 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidKernel/DllConfig.h"    
+#include "MantidKernel/DllConfig.h"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index 7f8d728db38a161c58c873a01dc921376e16f0aa..f516aec4ccac37d43dd1d9bc1c94205a5986c03c 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -2,15 +2,15 @@
 #define MANTID_KERNEL_PROPERTYMANAGERDATASERVICE_
 
 #include "MantidKernel/DataService.h"
-#include "MantidKernel/DllConfig.h" 
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/SingletonHolder.h"
 
 #include <iosfwd>
 
 namespace Mantid {
 namespace Kernel {
-	// Forward declare
-	class PropertyManager;
+// Forward declare
+class PropertyManager;
 
 /**
 PropertyManagerDataService Class. Derived from DataService.
diff --git a/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h b/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
index d6a02992906689bd1beb68014889104799567395..f304081fb0c5a941ee39988672e56faa2e209448 100644
--- a/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
@@ -1,12 +1,12 @@
 #ifndef MANTID_KERNEL_STARTSWITHVALIDATOR_H_
 #define MANTID_KERNEL_STARTSWITHVALIDATOR_H_
 
-#include "MantidKernel/IValidator.h"     
-#include "MantidKernel/ListValidator.h"  
-#include "MantidKernel/System.h"         
-#include <set>                           
-#include <string>                        
-#include <vector>                        
+#include "MantidKernel/IValidator.h"
+#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/System.h"
+#include <set>
+#include <string>
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadPool.h b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
index 76d07499ed7bd284698f501c7745c798c8b9754e..a971de07f59ac6177d6c7c0672441606584499e5 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadPool.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
@@ -8,14 +8,14 @@
 // Forward declares
 
 namespace Poco {
-	class Thread;
+class Thread;
 }
 
 namespace Mantid {
 namespace Kernel {
-	class ProgressBase;
-	class Task;
-	class ThreadPoolRunnable;
+class ProgressBase;
+class Task;
+class ThreadPoolRunnable;
 
 /** A Thread Pool implementation that keeps a certain number of
  * threads running (normally, equal to the number of hardware cores available)
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h b/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
index 143aa20f820e9ccf76b3c1fc4e1cbd02d2b8ea1e..985384219094a9b327a986a085a0d01895b725c3 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
@@ -6,9 +6,9 @@
 
 namespace Mantid {
 namespace Kernel {
-	// Forward declares
-	class ProgressBase;
-	class ThreadScheduler;
+// Forward declares
+class ProgressBase;
+class ThreadScheduler;
 
 /** ThreadPoolRunnable : Class used by thread pool (and POCO) to
  * run inside a thread.
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h b/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
index f53fdae5636bdd9960a61b45903498c8cf839bbb..a815257705fed966129f235a551e0c3f37e6647b 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
@@ -7,7 +7,7 @@
 #include "MantidKernel/DllConfig.h"
 
 #include <Poco/LogStream.h>
-#include <Poco/Message.h> 
+#include <Poco/Message.h>
 #include <Poco/Thread.h>
 
 #include <map>
@@ -17,7 +17,7 @@
 
 // Forward Declare
 namespace Poco {
-	class Logger;
+class Logger;
 }
 
 namespace Mantid {
diff --git a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
index e13e033d859dc510d3ead11e0d8a61fafa88071c..0c8a0b62125812a0905046f8b2fb77d668b9195c 100644
--- a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
@@ -14,13 +14,13 @@
 
 // Forward declare
 namespace NeXus {
-	class File;
+class File;
 }
 
 namespace Mantid {
 namespace Kernel {
-	class DataItem;
-	class SplittingInterval;
+class DataItem;
+class SplittingInterval;
 
 enum TimeSeriesSortStatus { TSUNKNOWN, TSUNSORTED, TSSORTED };
 
diff --git a/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h b/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h
index 01f73ab921690afe72a8cccea5222337341087fd..7351af3d4db808511a10ba01117b248f44a302e9 100644
--- a/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h
+++ b/Framework/Kernel/inc/MantidKernel/UnitLabelTypes.h
@@ -28,8 +28,8 @@
 
 namespace Mantid {
 namespace Kernel {
-	// Forward declare
-	class UnitLabel;
+// Forward declare
+class UnitLabel;
 namespace Units {
 /**
  * A simple class containing common symbol types
diff --git a/Framework/Kernel/inc/MantidKernel/UserStringParser.h b/Framework/Kernel/inc/MantidKernel/UserStringParser.h
index 968c48bb9503a4e7662b18302022895b6f621b81..022432f917ec01dff8fb2adc443d04e9e4315bc4 100644
--- a/Framework/Kernel/inc/MantidKernel/UserStringParser.h
+++ b/Framework/Kernel/inc/MantidKernel/UserStringParser.h
@@ -6,8 +6,8 @@
 //----------------------------------------------------------------------
 
 #include "MantidKernel/DllConfig.h"
-#include <string>                    
-#include <vector>                    
+#include <string>
+#include <vector>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/Atom.cpp b/Framework/Kernel/src/Atom.cpp
index 8e0ace510490af5bee999f8d117cd41180331ec8..b1aed77e56268566a3d62210e6c3647482f3a120 100644
--- a/Framework/Kernel/src/Atom.cpp
+++ b/Framework/Kernel/src/Atom.cpp
@@ -1,5 +1,5 @@
 #include "MantidKernel/Atom.h"
-#include "MantidKernel/NeutronAtom.h"   
+#include "MantidKernel/NeutronAtom.h"
 #include "MantidKernel/PhysicalConstants.h"
 
 #include <algorithm>
diff --git a/Framework/Kernel/src/BinFinder.cpp b/Framework/Kernel/src/BinFinder.cpp
index db49e4630d1010814b0a9581fd1b901b627094fd..ffaad90e2e6245a56f3e18417bdbf3d78bdf75b0 100644
--- a/Framework/Kernel/src/BinFinder.cpp
+++ b/Framework/Kernel/src/BinFinder.cpp
@@ -1,6 +1,6 @@
 #include "MantidKernel/BinFinder.h"
-#include <cmath>    
-#include <cstddef>  
+#include <cmath>
+#include <cstddef>
 #include <stdexcept>
 
 using std::size_t;
diff --git a/Framework/Kernel/src/BinaryStreamReader.cpp b/Framework/Kernel/src/BinaryStreamReader.cpp
index 68cb29684c63fd45b9cd17d60c99f5cedfd4755c..cd9f421719787a792c253a126864a2bb9a8340f0 100644
--- a/Framework/Kernel/src/BinaryStreamReader.cpp
+++ b/Framework/Kernel/src/BinaryStreamReader.cpp
@@ -6,7 +6,7 @@
 
 #include <cassert>
 #include <istream>
-#include <stdexcept> 
+#include <stdexcept>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/CPUTimer.cpp b/Framework/Kernel/src/CPUTimer.cpp
index aafa2dc05c379b5ab00f28995b2f908f4e267b98..9d499903f31ae09e12fb74e4fd8f7a2290fae1aa 100644
--- a/Framework/Kernel/src/CPUTimer.cpp
+++ b/Framework/Kernel/src/CPUTimer.cpp
@@ -3,7 +3,6 @@
 #include <sstream>
 #include <iomanip>
 
-
 namespace Mantid {
 namespace Kernel {
 
diff --git a/Framework/Kernel/src/CatalogInfo.cpp b/Framework/Kernel/src/CatalogInfo.cpp
index df96c07e7b3925af2b5f30a5cd9b6bd77fcc4cb5..9a50386a0ea1640d16f57ec08d514ef23b186f14 100644
--- a/Framework/Kernel/src/CatalogInfo.cpp
+++ b/Framework/Kernel/src/CatalogInfo.cpp
@@ -5,7 +5,7 @@
 
 #include <Poco/AutoPtr.h>
 #include <Poco/DOM/Element.h>
-#include <Poco/DOM/Node.h>     
+#include <Poco/DOM/Node.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/XML/XMLString.h>
 
diff --git a/Framework/Kernel/src/ComputeResourceInfo.cpp b/Framework/Kernel/src/ComputeResourceInfo.cpp
index 5626b3bbe68902b650d4d0a7e13cef21bfe7a7f0..8b97535bc070ace4b9b975d46c78fb578c41b36a 100644
--- a/Framework/Kernel/src/ComputeResourceInfo.cpp
+++ b/Framework/Kernel/src/ComputeResourceInfo.cpp
@@ -3,7 +3,7 @@
 
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/Element.h>
-#include <Poco/DOM/Node.h>      
+#include <Poco/DOM/Node.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/Text.h>
 
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index adebb99a45c3f68ea3f106405f5b0be248a7a85c..5a4b441ae6135d67fc78bdfcad5282ba72e0387c 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -9,7 +9,7 @@
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/FilterChannel.h"
 #include "MantidKernel/StdoutChannel.h"
-#include "MantidKernel/System.h"  
+#include "MantidKernel/System.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/NetworkProxy.h"
@@ -28,15 +28,15 @@
 #include <Poco/Process.h>
 #include <Poco/URI.h>
 
-#include <Poco/AutoPtr.h>                         
-#include <Poco/Channel.h>                         
-#include <Poco/DOM/Element.h>                     
-#include <Poco/DOM/Node.h>                        
-#include <Poco/Exception.h>                       
-#include <Poco/Instantiator.h>                    
-#include <Poco/Pipe.h>                            
-#include <Poco/Platform.h>                        
-#include <Poco/String.h>                          
+#include <Poco/AutoPtr.h>
+#include <Poco/Channel.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Node.h>
+#include <Poco/Exception.h>
+#include <Poco/Instantiator.h>
+#include <Poco/Pipe.h>
+#include <Poco/Platform.h>
+#include <Poco/String.h>
 #include <Poco/Logger.h>
 #include <Poco/LoggingRegistry.h>
 #include <Poco/PipeStream.h>
@@ -46,13 +46,13 @@
 #include <boost/regex.hpp>
 
 #include <algorithm>
-#include <exception>              
+#include <exception>
 #include <fstream>
-#include <functional>             
-#include <iostream>               
-#include <stdexcept>              
-#include <utility>                
-#include <ctype.h>   
+#include <functional>
+#include <iostream>
+#include <stdexcept>
+#include <utility>
+#include <ctype.h>
 
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
diff --git a/Framework/Kernel/src/DateAndTime.cpp b/Framework/Kernel/src/DateAndTime.cpp
index 6af458ca152625f8893dd6622adec856415a0598..904d19ebfdc3e829e4601b7778aa4cfe2163b58d 100644
--- a/Framework/Kernel/src/DateAndTime.cpp
+++ b/Framework/Kernel/src/DateAndTime.cpp
@@ -6,7 +6,7 @@
 #include <Poco/DateTimeParser.h>
 
 #include <boost/lexical_cast.hpp>
-#include <boost/date_time/time.hpp> 
+#include <boost/date_time/time.hpp>
 #include <boost/date_time/date.hpp>
 
 #include <math.h>
diff --git a/Framework/Kernel/src/DateTimeValidator.cpp b/Framework/Kernel/src/DateTimeValidator.cpp
index 19584ae26d71cd59381080615242fce0c4ad6b04..3f96d941300f27ead237eab71a15306704ec2d1f 100644
--- a/Framework/Kernel/src/DateTimeValidator.cpp
+++ b/Framework/Kernel/src/DateTimeValidator.cpp
@@ -1,9 +1,9 @@
 #include "MantidKernel/DateTimeValidator.h"
 #include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/System.h"   
+#include "MantidKernel/System.h"
 
 #include <boost/make_shared.hpp>
-#include <stdexcept> 
+#include <stdexcept>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/DirectoryValidator.cpp b/Framework/Kernel/src/DirectoryValidator.cpp
index 827c7adb65ae577ee59d9d63bbc9a27aeb708314..ac151afd108e4378b647c1c2feab9f71361555d7 100644
--- a/Framework/Kernel/src/DirectoryValidator.cpp
+++ b/Framework/Kernel/src/DirectoryValidator.cpp
@@ -1,5 +1,5 @@
 #include "MantidKernel/DirectoryValidator.h"
-#include "MantidKernel/IValidator.h"   
+#include "MantidKernel/IValidator.h"
 #include <Poco/Exception.h>
 #include <Poco/File.h>
 #include <Poco/Path.h>
diff --git a/Framework/Kernel/src/DiskBuffer.cpp b/Framework/Kernel/src/DiskBuffer.cpp
index 5b3eebe1806b1c7a84ebfd89ba3ac3500e35efac..28f338f6b3d9fcd7324d6d40387d21ad51666d50 100644
--- a/Framework/Kernel/src/DiskBuffer.cpp
+++ b/Framework/Kernel/src/DiskBuffer.cpp
@@ -1,7 +1,7 @@
 #include "MantidKernel/DiskBuffer.h"
-#include "MantidKernel/ISaveable.h"      
+#include "MantidKernel/ISaveable.h"
 #include <sstream>
-#include <utility>                       
+#include <utility>
 
 using namespace Mantid::Kernel;
 
diff --git a/Framework/Kernel/src/EnabledWhenProperty.cpp b/Framework/Kernel/src/EnabledWhenProperty.cpp
index 138a712b7f9104bced7019716200fe30614a0710..11d5c8b70ee314c562065b502553bb474562d6c8 100644
--- a/Framework/Kernel/src/EnabledWhenProperty.cpp
+++ b/Framework/Kernel/src/EnabledWhenProperty.cpp
@@ -1,14 +1,14 @@
 #include "MantidKernel/EnabledWhenProperty.h"
 
-#include "MantidKernel/Exception.h"        
-#include "MantidKernel/IPropertyManager.h" 
-#include "MantidKernel/Property.h"         
+#include "MantidKernel/Exception.h"
+#include "MantidKernel/IPropertyManager.h"
+#include "MantidKernel/Property.h"
 
 #include <boost/lexical_cast.hpp>
 
 #include <exception>
 #include <memory>
-#include <stdexcept>                      
+#include <stdexcept>
 
 using namespace Mantid::Kernel;
 
diff --git a/Framework/Kernel/src/FileDescriptor.cpp b/Framework/Kernel/src/FileDescriptor.cpp
index f675a29aff580cd391eb37c41cc6afaee51e396d..4bd37b77e8966137dead289164dc522bc1d86f68 100644
--- a/Framework/Kernel/src/FileDescriptor.cpp
+++ b/Framework/Kernel/src/FileDescriptor.cpp
@@ -3,7 +3,7 @@
 #include <Poco/File.h>
 #include <Poco/Path.h>
 
-#include <stdexcept>  
+#include <stdexcept>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/FilterChannel.cpp b/Framework/Kernel/src/FilterChannel.cpp
index 149779444f687b221e0f830c395af218a2787c0f..420b5fb0abfd838b6bd19e652f9b04bc7c0f4c63 100644
--- a/Framework/Kernel/src/FilterChannel.cpp
+++ b/Framework/Kernel/src/FilterChannel.cpp
@@ -5,7 +5,7 @@
 #include <Poco/LoggingRegistry.h>
 #include <Poco/Message.h>
 
-#include <algorithm> 
+#include <algorithm>
 
 namespace Poco {
 
diff --git a/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp b/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
index 6ffb8cce916456b76b777ae6ac3c1934e01dfa45..5827873856393dbea7e20b8cc2dd2fd42d36a715 100644
--- a/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
+++ b/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
@@ -1,6 +1,6 @@
-#include "MantidKernel/DllConfig.h" 
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/FilteredTimeSeriesProperty.h"
-#include <string>                   
+#include <string>
 
 using namespace Mantid::Kernel;
 
diff --git a/Framework/Kernel/src/FloatingPointComparison.cpp b/Framework/Kernel/src/FloatingPointComparison.cpp
index c6351867ff5c9958c6f3fb61e83360673c83952a..ca8d44e1a8b1050f8d13dfa16414b8412c4deb53 100644
--- a/Framework/Kernel/src/FloatingPointComparison.cpp
+++ b/Framework/Kernel/src/FloatingPointComparison.cpp
@@ -2,7 +2,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "MantidKernel/FloatingPointComparison.h"
-#include "MantidKernel/System.h"  
+#include "MantidKernel/System.h"
 
 #include <limits>
 #include <cmath>
diff --git a/Framework/Kernel/src/GitHubApiHelper.cpp b/Framework/Kernel/src/GitHubApiHelper.cpp
index be9c3a8e15941bb1ef45d45220720610435017a6..80c22b8871e762313b6f08482a4566d0498f1767 100644
--- a/Framework/Kernel/src/GitHubApiHelper.cpp
+++ b/Framework/Kernel/src/GitHubApiHelper.cpp
@@ -5,19 +5,19 @@
 #include <Poco/URI.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <Poco/Net/HTTPClientSession.h>  
+#include <Poco/Net/HTTPClientSession.h>
 
-#include <boost/lexical_cast.hpp>    
+#include <boost/lexical_cast.hpp>
 
-#include <map>                       
-#include <ostream>                   
-#include <string>                    
+#include <map>
+#include <ostream>
+#include <string>
 
 namespace Mantid {
 namespace Kernel {
 
-	// Forward declare
-	class ProxyInfo;
+// Forward declare
+class ProxyInfo;
 
 using namespace Poco::Net;
 using std::map;
diff --git a/Framework/Kernel/src/InternetHelper.cpp b/Framework/Kernel/src/InternetHelper.cpp
index 3bb5aa317205e5d67f58f34174c529160f975ec5..6a132d853c9da8c463b26731d78f3c0f454c361b 100644
--- a/Framework/Kernel/src/InternetHelper.cpp
+++ b/Framework/Kernel/src/InternetHelper.cpp
@@ -17,27 +17,27 @@
 #include <Poco/TemporaryFile.h>
 #include <Poco/URI.h>
 
-#include <Poco/Exception.h>                      
-#include <Poco/File.h>                           
+#include <Poco/Exception.h>
+#include <Poco/File.h>
 #include <Poco/FileStream.h>
-#include <Poco/Net/Context.h>                    
-#include <Poco/Net/HTTPClientSession.h>          
-#include <Poco/Net/HTTPMessage.h>                
-#include <Poco/Net/InvalidCertificateHandler.h>  
-#include <Poco/SharedPtr.h>                      
-#include <Poco/Timespan.h>                       
-#include <Poco/Types.h>                          
+#include <Poco/Net/Context.h>
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPMessage.h>
+#include <Poco/Net/InvalidCertificateHandler.h>
+#include <Poco/SharedPtr.h>
+#include <Poco/Timespan.h>
+#include <Poco/Types.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <Winhttp.h>
 #endif
 
-#include <boost/lexical_cast.hpp>                
+#include <boost/lexical_cast.hpp>
 
 // std
-#include <mutex>                                 
+#include <mutex>
 #include <fstream>
-#include <utility>  
+#include <utility>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/Interpolation.cpp b/Framework/Kernel/src/Interpolation.cpp
index 2633dc8e20c9e355158d204a28421f1df336fff3..6ff8d02d72ac617fc033e08c229f3d57474ac816 100644
--- a/Framework/Kernel/src/Interpolation.cpp
+++ b/Framework/Kernel/src/Interpolation.cpp
@@ -3,9 +3,9 @@
 #include "MantidKernel/UnitFactory.h"
 #include <MantidKernel/StringTokenizer.h>
 
-#include <algorithm>  
-#include <iterator>   
-#include <stdexcept>  
+#include <algorithm>
+#include <iterator>
+#include <stdexcept>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/Logger.cpp b/Framework/Kernel/src/Logger.cpp
index 0d006c77b7e426ea3a5c978e7bf2b4b4c1691d50..953d95f3f2b25533e82a07b4ab939d035bbce3b5 100644
--- a/Framework/Kernel/src/Logger.cpp
+++ b/Framework/Kernel/src/Logger.cpp
@@ -2,11 +2,11 @@
 
 #include "MantidKernel/ThreadSafeLogStream.h"
 
-#include <Poco/Logger.h>         
+#include <Poco/Logger.h>
 #include <Poco/NullStream.h>
 
-#include <algorithm> 
-#include <exception> 
+#include <algorithm>
+#include <exception>
 #include <iostream>
 #include <sstream>
 
diff --git a/Framework/Kernel/src/MagneticFormFactorTable.cpp b/Framework/Kernel/src/MagneticFormFactorTable.cpp
index 929442316fe3c1ed823d7e8027cca691452a84f3..46ae02b7b13f69542a8dc1b1a9d2d913c7a86163 100644
--- a/Framework/Kernel/src/MagneticFormFactorTable.cpp
+++ b/Framework/Kernel/src/MagneticFormFactorTable.cpp
@@ -1,7 +1,7 @@
 // Includes
 #include "MantidKernel/MagneticFormFactorTable.h"
 
-#include "MantidKernel/MagneticIon.h"  // for MagneticIon
+#include "MantidKernel/MagneticIon.h" // for MagneticIon
 
 namespace Mantid {
 namespace PhysicalConstants {
diff --git a/Framework/Kernel/src/MagneticIon.cpp b/Framework/Kernel/src/MagneticIon.cpp
index d38d96c1d8fef899bffdac4851dd0aceeb7c7087..72034db1325a4690c968942b5ada92ac0fbd2783 100644
--- a/Framework/Kernel/src/MagneticIon.cpp
+++ b/Framework/Kernel/src/MagneticIon.cpp
@@ -1,12 +1,11 @@
 #include "MantidKernel/MagneticIon.h"
 
-#include <cmath>        
-#include <memory>       
+#include <cmath>
+#include <memory>
 #include <sstream>
-#include <stdexcept>    
+#include <stdexcept>
 #include <unordered_map>
-#include <utility>      
-
+#include <utility>
 
 namespace Mantid {
 namespace PhysicalConstants {
diff --git a/Framework/Kernel/src/Material.cpp b/Framework/Kernel/src/Material.cpp
index f5c2d973b7072c687b52d039f5e162df41961f85..3c4951941a4537b566813942c837028ff954b3a2 100644
--- a/Framework/Kernel/src/Material.cpp
+++ b/Framework/Kernel/src/Material.cpp
@@ -4,7 +4,7 @@
 #include "MantidKernel/Material.h"
 #include "MantidKernel/Atom.h"
 #include "MantidKernel/StringTokenizer.h"
-#include <NeXusFile.hpp> 
+#include <NeXusFile.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/regex.hpp>
diff --git a/Framework/Kernel/src/OptionalBool.cpp b/Framework/Kernel/src/OptionalBool.cpp
index e2f2276003d559cf227001a75e7e1b449b4986af..4cb3125bed05ee804bc2f210e49441ed7b4303e8 100644
--- a/Framework/Kernel/src/OptionalBool.cpp
+++ b/Framework/Kernel/src/OptionalBool.cpp
@@ -1,5 +1,5 @@
 #include "MantidKernel/OptionalBool.h"
-#include <utility> 
+#include <utility>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/PropertyHistory.cpp b/Framework/Kernel/src/PropertyHistory.cpp
index e1dae19cf13710b8bdbffffa1ea607d20ca10f3a..d63b06066e9ac548e24729038e1f641ea47f01e2 100644
--- a/Framework/Kernel/src/PropertyHistory.cpp
+++ b/Framework/Kernel/src/PropertyHistory.cpp
@@ -5,10 +5,10 @@
 #include "MantidKernel/PropertyHistory.h"
 #include "MantidKernel/Property.h"
 
-#include <boost/lexical_cast.hpp>    
-#include <algorithm>                 
-#include <stdint.h>                  
-#include <ostream>                   
+#include <boost/lexical_cast.hpp>
+#include <algorithm>
+#include <stdint.h>
+#include <ostream>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/PropertyManagerOwner.cpp b/Framework/Kernel/src/PropertyManagerOwner.cpp
index 3242c139bab8eee789591a17517b207a67ccc6cc..97e960fa7825f7b4d1239ddb7c5aaa21f8349335 100644
--- a/Framework/Kernel/src/PropertyManagerOwner.cpp
+++ b/Framework/Kernel/src/PropertyManagerOwner.cpp
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidKernel/Logger.h"   
-#include "MantidKernel/Property.h" 
+#include "MantidKernel/Logger.h"
+#include "MantidKernel/Property.h"
 #include "MantidKernel/PropertyManagerOwner.h"
 #include "MantidKernel/PropertyManager.h"
 #include <json/json.h>
-#include <algorithm>               
+#include <algorithm>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/PropertyNexus.cpp b/Framework/Kernel/src/PropertyNexus.cpp
index b5fc3add6c6e70120b1a6bb6e81dcb0815a6caad..21e1f1b6d48d8261053de2a98321fc00a66e0748 100644
--- a/Framework/Kernel/src/PropertyNexus.cpp
+++ b/Framework/Kernel/src/PropertyNexus.cpp
@@ -5,7 +5,7 @@
 
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/Property.h"  
+#include "MantidKernel/Property.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/make_unique.h"
diff --git a/Framework/Kernel/src/PropertyWithValue.cpp b/Framework/Kernel/src/PropertyWithValue.cpp
index 4825cd1e35c72e8a37e27ff57ba9f318bb22edc2..d8cd6ccefe9eb84e30b6e94ee9a212c46c6a018c 100644
--- a/Framework/Kernel/src/PropertyWithValue.cpp
+++ b/Framework/Kernel/src/PropertyWithValue.cpp
@@ -4,12 +4,12 @@
 // PropertyWithValue implementation
 #include "MantidKernel/PropertyWithValue.tcc"
 
-#include <NeXusFile.hpp> 
+#include <NeXusFile.hpp>
 
 namespace Mantid {
 namespace Kernel {
-	// Forward declare
-	class PropertyManager;
+// Forward declare
+class PropertyManager;
 
 #define PROPERTYWITHVALUE_SAVEPROPERTY(type)                                   \
   template <>                                                                  \
diff --git a/Framework/Kernel/src/Statistics.cpp b/Framework/Kernel/src/Statistics.cpp
index cdf7078004fec44737bd65145452c33ea3441824..a42617046cccd533d475d32bf260448588806edc 100644
--- a/Framework/Kernel/src/Statistics.cpp
+++ b/Framework/Kernel/src/Statistics.cpp
@@ -13,7 +13,6 @@
 #include <iostream>
 #include <sstream>
 
-
 namespace Mantid {
 namespace Kernel {
 
diff --git a/Framework/Kernel/src/ThreadPool.cpp b/Framework/Kernel/src/ThreadPool.cpp
index f53232b64090cfab91228b0d14c6a8af7dd9ef18..d38c15b11ad06b0f64d464c83367811b829ba221 100644
--- a/Framework/Kernel/src/ThreadPool.cpp
+++ b/Framework/Kernel/src/ThreadPool.cpp
@@ -5,14 +5,14 @@
 
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/MultiThreaded.h"
-#include "MantidKernel/ProgressBase.h"      
-#include "MantidKernel/Task.h"              
+#include "MantidKernel/ProgressBase.h"
+#include "MantidKernel/Task.h"
 #include "MantidKernel/ThreadPoolRunnable.h"
 
-#include <Poco/Thread.h>                    
+#include <Poco/Thread.h>
 
-#include <algorithm>                        
-#include <stdexcept>                        
+#include <algorithm>
+#include <stdexcept>
 #include <sstream>
 // needed on windows and any place missing openmp
 #if defined(_WIN32) || !defined(_OPENMP)
diff --git a/Framework/Kernel/src/ThreadPoolRunnable.cpp b/Framework/Kernel/src/ThreadPoolRunnable.cpp
index 81b569e41cc96e6ad0c789f2dfb68c8a9bdb9067..abc8bf0161426a4d07158421232f4f13b73b3025 100644
--- a/Framework/Kernel/src/ThreadPoolRunnable.cpp
+++ b/Framework/Kernel/src/ThreadPoolRunnable.cpp
@@ -1,9 +1,9 @@
-#include "MantidKernel/ProgressBase.h"    
-#include "MantidKernel/Task.h"            
+#include "MantidKernel/ProgressBase.h"
+#include "MantidKernel/Task.h"
 #include "MantidKernel/ThreadPoolRunnable.h"
-#include "MantidKernel/ThreadScheduler.h" 
+#include "MantidKernel/ThreadScheduler.h"
 
-#include <Poco/Thread.h>  
+#include <Poco/Thread.h>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/ThreadSafeLogStream.cpp b/Framework/Kernel/src/ThreadSafeLogStream.cpp
index 4df24046bd8c8ea08401273e5ae82ae1ee9b6462..0a5902f6ac3dc63014b17bdff151cf473d6bc44b 100644
--- a/Framework/Kernel/src/ThreadSafeLogStream.cpp
+++ b/Framework/Kernel/src/ThreadSafeLogStream.cpp
@@ -3,8 +3,8 @@
 //-----------------------------------------------
 #include "MantidKernel/ThreadSafeLogStream.h"
 
-#include <Poco/Logger.h>             
-#include <Poco/StreamUtil.h>         
+#include <Poco/Logger.h>
+#include <Poco/StreamUtil.h>
 #include <Poco/UnbufferedStreamBuf.h>
 
 using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/src/UnitConversion.cpp b/Framework/Kernel/src/UnitConversion.cpp
index 4c18659b8492351e304aec0acf4afc4b75b1c22b..c3fe3fb4e2d169fd5269c33521753155e684acda 100644
--- a/Framework/Kernel/src/UnitConversion.cpp
+++ b/Framework/Kernel/src/UnitConversion.cpp
@@ -2,8 +2,8 @@
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/UnitFactory.h"
 
-#include <cmath>     
-#include <stdexcept> 
+#include <cmath>
+#include <stdexcept>
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Framework/Kernel/src/VMD.cpp b/Framework/Kernel/src/VMD.cpp
index 294a048bc85e9117e36d4c068feb4929f45f1590..6b013d20052ff1928cbc3890035680f5446ee069 100644
--- a/Framework/Kernel/src/VMD.cpp
+++ b/Framework/Kernel/src/VMD.cpp
@@ -1,4 +1,4 @@
-#include "MantidKernel/Matrix.h" 
+#include "MantidKernel/Matrix.h"
 #include "MantidKernel/VMD.h"
 #include "MantidKernel/StringTokenizer.h"
 #include "MantidKernel/Strings.h"
@@ -7,8 +7,8 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <iterator>              
-#include <math.h>                
+#include <iterator>
+#include <math.h>
 #include <sstream>
 #include <stdexcept>