diff --git a/Code/Mantid/Framework/ICat/src/GSoapGenerated.cpp b/Code/Mantid/Framework/ICat/src/GSoapGenerated.cpp
index 59964c151c8ff4a69f9750f46ad62958bba1f93c..a02479c90293dfab1611200ffef21f5a788e73a0 100644
--- a/Code/Mantid/Framework/ICat/src/GSoapGenerated.cpp
+++ b/Code/Mantid/Framework/ICat/src/GSoapGenerated.cpp
@@ -19,13 +19,3 @@ GCC_DIAG_OFF(vla)
 
 #include "ICat3/GSoapGenerated/soapC.cpp"
 #include "ICat3/GSoapGenerated/soapICATPortBindingProxy.cpp"
-
-GCC_DIAG_ON(cast-qual)
-GCC_DIAG_ON(conversion)
-GCC_DIAG_ON(unused-parameter)
-GCC_DIAG_ON(strict-aliasing)
-GCC_DIAG_ON(format)
-GCC_DIAG_ON(vla)
-#if GCC_VERSION > 40700 // 4.8.0
-  GCC_DIAG_ON(literal-suffix)
-#endif // GCC_VERSION
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
index 69e15f6fb4d18628b8fd0b44e288a6a148a2abe7..83f37e34aa79be1f42d2e004700c97a34fae87c7 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
@@ -49,7 +49,7 @@
   // define macros for turning the warning suppression on/off
   #if GCC_VERSION >= 40600 // 4.6.0
     #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
-	GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
+                         GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
     #define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
   #else
     #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
diff --git a/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp b/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp
index 31c45e8e70f6674a0e8ac1c2fd34d2b5cfd0ade7..c503d15a1c18a22116786dac231b88e5406d9b43 100644
--- a/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp
+++ b/Code/Mantid/Framework/PythonAPI/src/boostpython.cpp
@@ -73,14 +73,3 @@ GCC_DIAG_OFF(uninitialized)
 #include "boostpython/str.cpp"
 #include "boostpython/tuple.cpp"
 #include "boostpython/wrapper.cpp"
-
-GCC_DIAG_ON(conversion)
-GCC_DIAG_ON(missing-field-initializers)
-GCC_DIAG_ON(unused-parameter)
-GCC_DIAG_ON(type-limits)
-GCC_DIAG_ON(unused-value)
-GCC_DIAG_ON(strict-aliasing)
-GCC_DIAG_ON(uninitialized)
-#if GCC_VERSION >= 40800 // 4.8.0
-  GCC_DIAG_ON(unused-local-typedefs)
-#endif