diff --git a/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h b/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
index 515f95fa7d4e755bf2e99e24ba6d6dd839a8859c..03137f7dc1b058bd36149845b913f199e80b61f9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUS_H_
-#define MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -73,5 +72,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h b/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
index 6aaca0aa0d331054fd6b12044f6b6a4e03c0abe1..75ce0a26f85cb0fe7c80e0efaa2815c7ef4b4c0c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ASCIIPOINTBASE_H_
-#define MANTID_DATAHANDLING_ASCIIPOINTBASE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -63,5 +62,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_ASCIIPOINTBASE_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h b/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
index 6d03a0ab0ab33624526a8970491020077db29146..6eb0d54646b1c4be7a34678e358602e4c7b77cd0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_KERNEL_BANKPULSETIMES_H
-#define MANTID_KERNEL_BANKPULSETIMES_H
+#pragma once
 
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/Property.h"
@@ -47,5 +46,3 @@ public:
   /// Vector of period numbers corresponding to each pulse
   std::vector<int> periodNumbers;
 };
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h b/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
index 7bd094cfec2db240157fba069f1669ab3450db20..d4c2a2ff43a0ee7d4da0db5d05f9bc9e00bbba2e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CHECKMANTIDVERSION_H_
-#define MANTID_DATAHANDLING_CHECKMANTIDVERSION_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -39,5 +38,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CHECKMANTIDVERSION_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h b/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
index 3a97b9aabc3d1aee8d8274838bc130f0829cf82b..dd91de0468861f5c41b79b1b5301de8ec039cb58 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_COMPRESSEVENTS_H_
-#define MANTID_DATAHANDLING_COMPRESSEVENTS_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 
@@ -52,5 +51,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_COMPRESSEVENTS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
index 2f16b50836c783c5a0d261b1363b8040353df6cc..46a685dd613c4a17423f6e5d84d5b17764fbcf16 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENT_H_
-#define MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENT_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument.h"
@@ -32,5 +31,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENT_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h
index dd11ed774594ee35a0f9ddb9646abe045d516231..6a43da046e13b3a222ab11ab0c3e7412364dc0a3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIES_H_
-#define MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIES_H_
+#pragma once
 
 #include "MantidDataHandling/CreatePolarizationEfficienciesBase.h"
 #include "MantidKernel/System.h"
@@ -31,5 +30,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIES_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h
index ace298ff46194ccbb180141345e31fea9929c04a..b6883f778d4548b9e4bb57d5904fc3a62ea9b597 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIESBASE_H_
-#define MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIESBASE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -52,5 +51,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CREATEPOLARIZATIONEFFICIENCIESBASE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h b/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
index 74893dc83826abfe49c6dec9e9747c022f06d9bc..881f3232de8f0e8725a19bf8d0297a020fad7955 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATESAMPLESHAPE_H_
-#define MANTID_DATAHANDLING_CREATESAMPLESHAPE_H_
+#pragma once
 
 //--------------------------------
 // Includes
@@ -51,5 +50,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CREATESAMPLESHAPE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
index c0af7a755d03a31208e5ddb03730712fa85c6d04..642f04f376ba9187770c33627378dafc427fefa0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACE_H_
-#define MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument.h"
@@ -69,5 +68,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DataBlock.h b/Framework/DataHandling/inc/MantidDataHandling/DataBlock.h
index 7e542f3f4c5e251f4280cf3cce5be1291260e418..040a1da942f6c8159dbfcbd14fa0c6585828804b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DataBlock.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DataBlock.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCK_H_
-#define MANTID_DATAHANDLING_DATABLOCK_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidNexus/NexusClasses.h"
@@ -59,5 +58,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DATABLOCK_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DataBlockComposite.h b/Framework/DataHandling/inc/MantidDataHandling/DataBlockComposite.h
index 5e9a5b01241942e1e177e33bf6b9da55bb3584a0..b519ddaddbb26abf1c51fdc111c0e7541f4a5aac 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DataBlockComposite.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DataBlockComposite.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCK_COMPOSITE_H_
-#define MANTID_DATAHANDLING_DATABLOCK_COMPOSITE_H_
+#pragma once
 
 #include "MantidDataHandling/DataBlock.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -149,5 +148,4 @@ void DLLExport populateDataBlockCompositeWithContainer(
   }
 }
 } // namespace DataHandling
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DataBlockGenerator.h b/Framework/DataHandling/inc/MantidDataHandling/DataBlockGenerator.h
index 132a1f918a4954acc448f8d479c148df780994ee..ce3122546dce0ab179753eb471fea9d08c0788dd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DataBlockGenerator.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DataBlockGenerator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCKGENERATOR_H_
-#define MANTID_DATAHANDLING_DATABLOCKGENERATOR_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include <boost/optional.hpp>
@@ -40,5 +39,3 @@ public:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DefaultEventLoader.h b/Framework/DataHandling/inc/MantidDataHandling/DefaultEventLoader.h
index 6385fd299fba4546d5d7fe2bce4e73738394ae14..f5b4bd0a5c53763e15882f3b1c1866832cdcc21d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DefaultEventLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DefaultEventLoader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DEFAULTEVENTLOADER_H_
-#define MANTID_DATAHANDLING_DEFAULTEVENTLOADER_H_
+#pragma once
 
 #include "MantidAPI/Axis.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -151,5 +150,3 @@ void DefaultEventLoader::makeMapToEventLists(
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DEFAULTEVENTLOADER_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h b/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
index d2d0698f36a68d7dcae4c4e000934ce713e46d3f..e55330eaa483d7180fafa24a4c3df46007433891 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DEFINEGAUGEVOLUME_H_
-#define MANTID_DATAHANDLING_DEFINEGAUGEVOLUME_H_
+#pragma once
 
 //--------------------------------
 // Includes
@@ -49,5 +48,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DEFINEGAUGEVOLUME_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h b/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
index b432cec292fc84d1e09cf50d5a4a1147c4068398..121cfbd08749c957b4f6c06f15b66019846816b8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DELETETABLEROWS_H_
-#define MANTID_DATAHANDLING_DELETETABLEROWS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -49,5 +48,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_DELETETABLEROWS_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h b/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
index 92a00eab1d40552dbf7533ddf954a65ee83f4cf4..0d7cfce521674b52135c20379a374810708264ed 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DetermineChunking_H_
-#define MANTID_DATAHANDLING_DetermineChunking_H_
+#pragma once
 
 #include "MantidAPI/IEventWorkspace_fwd.h"
 #include "MantidAPI/ParallelAlgorithm.h"
@@ -64,5 +63,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DetermineChunking_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DllConfig.h b/Framework/DataHandling/inc/MantidDataHandling/DllConfig.h
index 7916244b4988ce044f62f9a7cf7657605026fda2..e3baae7154b835d534fae5997f077e88ab06523a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DllConfig.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DllConfig.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DLLCONFIG_H_
-#define MANTID_DATAHANDLING_DLLCONFIG_H_
+#pragma once
 
 /*
     This file contains the DLLExport/DLLImport linkage configuration for the
@@ -20,5 +19,3 @@
 #else
 #define MANTID_DATAHANDLING_DLL DLLImport
 #endif /* IN_MANTID_DATAHANDLING*/
-
-#endif // MANTID_DATAHANDLING_DLLCONFIG_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h b/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
index c50b1014e2b8bdd963e4cc425e9b0a1feb092b42..d0cd55b2c89778ecec0a79667127683f85ee4bbf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DOWNLOADFILE_H_
-#define MANTID_DATAHANDLING_DOWNLOADFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -44,5 +43,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DOWNLOADFILE_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
index 85b820ba47599f28bfe8a00dbd3ab9cd8418ab30..ec00f4cee4dc549cc517ff91c1c810c3d3e731ed 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DOWNLOADINSTRUMENT_H_
-#define MANTID_DATAHANDLING_DOWNLOADINSTRUMENT_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/ProxyInfo.h"
@@ -58,5 +57,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_DOWNLOADINSTRUMENT_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
index 41aab046801aec17cb8462f47ff4378bcc9aa2a2..92b67220c4f1fc6aa00c3ac621d311110fd62753 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EventWorkspaceCollection_H_
-#define MANTID_DATAHANDLING_EventWorkspaceCollection_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
@@ -100,5 +99,3 @@ using EventWorkspaceCollection_uptr = std::unique_ptr<EventWorkspaceCollection>;
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_EventWorkspaceCollection_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
index 22067db2e4888b81c41023bae2d2855ec382ba0e..45be425670b9b5255ea15e3a8876baee9c019d87 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACE_H_
-#define MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -34,5 +33,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ExtractPolarizationEfficiencies.h b/Framework/DataHandling/inc/MantidDataHandling/ExtractPolarizationEfficiencies.h
index 3e3a429a6979292158d591175518c3c1718afcc6..adf43574345e5f7e303be3b92f7c6f0b29625526 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ExtractPolarizationEfficiencies.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ExtractPolarizationEfficiencies.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIES_H_
-#define MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIES_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -33,5 +32,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIES_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
index 4c768be59cf8909a67d43b2c3c085dfe2f7719e3..41fbcf8f2340fa75bb2ba8a4987b5a21fef90c1d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FILTEREVENTSBYLOGVALUEPRENEXUS_H_
-#define FILTEREVENTSBYLOGVALUEPRENEXUS_H_
+#pragma once
 
 #include "MantidAPI/DeprecatedAlgorithm.h"
 #include "MantidAPI/IFileLoader.h"
@@ -272,5 +271,4 @@ private:
   bool m_corretctTOF;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*FILTEREVENTSBYLOGVALUEPRENEXUS_H_*/
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
index 5eeb79339d9c89aadd59fac64f2ef91cc96dbfa2..6f35c0a432697a70d626cf8d89fe5662033ccd3f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_FINDDETECTORSINSHAPE_H_
-#define MANTID_DATAHANDLING_FINDDETECTORSINSHAPE_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 
@@ -63,5 +62,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_FINDDETECTORSINSHAPE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
index 0850a24058d48c9387aa734b5441dbf4f83c6c2c..363f92ca3d7eb8aca780bee1cd693b01e1f38199 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDLING_FIND_DETPAR_H_
-#define DATAHANDLING_FIND_DETPAR_H_
+#pragma once
 
 #include <float.h>
 #include <fstream>
@@ -258,5 +257,3 @@ public:
 
 } // end namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h b/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
index bf9d94676eb3f56e50117561a7792bba613f1291..68e99c7a732daf5f7db8b2c2f2d84b2532cac562 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_GENERATEGROUPINGPOWDER_H_
-#define MANTID_DATAHANDLING_GENERATEGROUPINGPOWDER_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -39,5 +38,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_GENERATEGROUPINGPOWDER_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
index 1c0cd9ff902b26441517ba9a47ab32c903da796c..7504062a1892de9b6e52e43f6c144fd1a3d23d30 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_GROUPDETECTORS_H_
-#define MANTID_DATAHANDLING_GROUPDETECTORS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -69,5 +68,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_GROUPDETECTORS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
index 9f5dcbb1e915bd6c2daf79434391ebc78f8e5854..6ed7cacd3bbe31a092728ab36282afd7647c9da8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_GROUPDETECTORS2_H_
-#define MANTID_DATAHANDLING_GROUPDETECTORS2_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -282,5 +281,3 @@ void GroupDetectors2::moveOthers(const std::set<int64_t> &unGroupedSet,
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_GROUPDETECTORS2_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/H5Util.h b/Framework/DataHandling/inc/MantidDataHandling/H5Util.h
index 8c5d5e0da625ace31e60e5101ce692be71d1d42a..3bec8788dd1dd23b188f50dceb32a6165b22cf92 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/H5Util.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/H5Util.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_H5UTIL_H_
-#define MANTID_DATAHANDLING_H5UTIL_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 
@@ -122,5 +121,3 @@ std::vector<NumT> readArray1DCoerce(H5::DataSet &dataset);
 } // namespace H5Util
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_H5UTIL_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h b/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
index f2f61365f27e5a545fdce8b23660f1a88237ed8b..e2a089021e35e3a4e80970865920ed7edfc8e8bd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ISISDATAARCHIVE_H_
-#define MANTID_DATAHANDLING_ISISDATAARCHIVE_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -45,5 +44,3 @@ protected:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_ISISDATAARCHIVE_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h b/Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h
index 032ae6c434939d789fad95f40782c8ab8b143631..4281af62a6d7bc46ee4daa39723a2e8633b72153 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ISISRUNLOGS_H_
-#define MANTID_DATAHANDLING_ISISRUNLOGS_H_
+#pragma once
 
 #include "MantidKernel/LogParser.h"
 #include "MantidKernel/System.h"
@@ -45,5 +44,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_ISISRUNLOGS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/JoinISISPolarizationEfficiencies.h b/Framework/DataHandling/inc/MantidDataHandling/JoinISISPolarizationEfficiencies.h
index b51b291787e2315946d386d379eb1eb3b207a32e..f2bbf256eff989dd6b64e3ba1c5d9d21878137bf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/JoinISISPolarizationEfficiencies.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/JoinISISPolarizationEfficiencies.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIES_H_
-#define MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIES_H_
+#pragma once
 
 #include "MantidDataHandling/CreatePolarizationEfficienciesBase.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -43,5 +42,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIES_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/Load.h b/Framework/DataHandling/inc/MantidDataHandling/Load.h
index 231f51d5ca8d9cc3ef3c0a806788dbaaceed3410..a4ee231daa3ef1c22959177a2b26894e3b5e93e7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/Load.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/Load.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOAD_H_
-#define MANTID_DATAHANDLING_LOAD_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/WorkspaceGroup_fwd.h"
@@ -107,5 +106,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LOAD_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOEventFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOEventFile.h
index ca3dc7e0ec0b2ba2205c4f8b918106e09d677b9f..5db6a29512b0743d656fbd94cb207e320a7a30b3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOEventFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOEventFile.h
@@ -1,5 +1,4 @@
-#ifndef DATAHANDING_ANSTOEVENTFILE_H_
-#define DATAHANDING_ANSTOEVENTFILE_H_
+#pragma once
 
 #include <cstdio>
 #include <stdexcept>
@@ -358,5 +357,3 @@ void ReadEventFile(IReader &loader, IEventHandler &handler, IProgress &progress,
 } // namespace ANSTO
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_ANSTOEVENTFILE_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
index 23e549868b03e609eb6f26e77fb00395ad7b3a18..34e41fd3a2efacac290d4f1a7b67b77b7d35de3f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_ANSTO_H_
-#define DATAHANDING_ANSTO_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -266,5 +265,3 @@ public:
 } // namespace ANSTO
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_ANSTO_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
index f3c9c58869e58d7cb614daa4b16a88cf3ae5536d..2a0ff98847c63c1fb3feaf3df721106e20d92c41 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADASCII_H_
-#define MANTID_DATAHANDLING_LOADASCII_H_
+#pragma once
 
 #include "MantidAPI/DeprecatedAlgorithm.h"
 #include "MantidAPI/IFileLoader.h"
@@ -82,5 +81,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LOADASCII_H_  */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
index df4771a4f6a17577b9718e31bbeb5ef7532ae010..71b19ea45c7da8ae5ac023692b502dfdc4652976 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadAscii2_H_
-#define MANTID_DATAHANDLING_LoadAscii2_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -114,5 +113,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LoadAscii2_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAsciiStl.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAsciiStl.h
index 214527a9ce26759e7182cd7ed5e39c8bd7cc77cc..9799919e6de009e1f00f6c9cafaac56cc14d6090 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAsciiStl.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAsciiStl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADASCIISTL_H_
-#define MANTID_DATAHANDLING_LOADASCIISTL_H_
+#pragma once
 #include "MantidDataHandling/LoadStl.h"
 #include <iosfwd>
 namespace Mantid {
@@ -38,5 +37,4 @@ private:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /* MANTID_DATAHANDLING_LOADASCIISTL_H_ */
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h b/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
index 3319ee3e59a107f4bbfa6ee2a382cc076cfb17e7..8a5ddcacf084ccb47497f3eab6ed90f8cbf109f7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_LOADBBY_H_
-#define DATAHANDING_LOADBBY_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -96,5 +95,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_LOADBBY_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadBankFromDiskTask.h b/Framework/DataHandling/inc/MantidDataHandling/LoadBankFromDiskTask.h
index 0faae2d5f90603c32c6435ed89f3ca76d8042d9c..20394ae5f907805aaf155beffd47ab573ca12a1b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadBankFromDiskTask.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadBankFromDiskTask.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADBANKFROMDISKTASK_H_
-#define MANTID_DATAHANDLING_LOADBANKFROMDISKTASK_H_
+#pragma once
 
 #include "MantidAPI/Progress.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -80,5 +79,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADBANKFROMDISKTASK_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadBinaryStl.h b/Framework/DataHandling/inc/MantidDataHandling/LoadBinaryStl.h
index dca31766a2b6514a7c893609c98ae4d254d35eb2..885a37edf73fbc9814dc1cae64cf8a05e7cdf248 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadBinaryStl.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadBinaryStl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADBINARYSTL_H_
-#define MANTID_DATAHANDLING_LOADBINARYSTL_H_
+#pragma once
 #include "MantidDataHandling/LoadStl.h"
 
 namespace Mantid {
@@ -37,5 +36,4 @@ private:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /* MANTID_DATAHANDLING_LOADBINARYSTL_H_ */
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
index 6946b50cdc308398813774b1c2c5046813fcbc56..f6d120b7d2c7a7384f4cd5902a29cb8d1d7b49e7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADCALFILE_H_
-#define MANTID_DATAHANDLING_LOADCALFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/IAlgorithm.h"
@@ -77,5 +76,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADCALFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
index 42f03728fd565d6a059dfb92511bdaf2e307ecff..4e2c787aa22a0ab03fd1211ed942737137312913 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadCanSAS1D_H
-#define MANTID_DATAHANDLING_LoadCanSAS1D_H
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/WorkspaceGroup_fwd.h"
@@ -90,5 +89,3 @@ protected:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
index 78055b88b192c07cdfdf532c752558e3f0f3beb5..ae61a75f103693aeafcc6b9b6c2fbe625b5726a7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadCanSAS1D2_H
-#define MANTID_DATAHANDLING_LoadCanSAS1D2_H
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -82,5 +81,4 @@ private:
                            const std::string &output_name);
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // MANTID_DATAHANDLING_LoadCanSAS1D2_H
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
index c4aeee6ccabed564374581601360e01671fa619f..e10d459b1077bbfbc1d3c7c7868248208ed7b846 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDAVEGRP_H_
-#define MANTID_DATAHANDLING_LOADDAVEGRP_H_
+#pragma once
 
 #include <fstream>
 #include <string>
@@ -149,5 +148,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_LOADDAVEGRP_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
index 2512cf9a095322da1a6e55005148e3ebfb6f30a5..be5c952181f92b7203eddf43fc8ebeb07be073f4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDETECTORINFO_H_
-#define MANTID_DATAHANDLING_LOADDETECTORINFO_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument.h"
@@ -89,5 +88,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADDETECTORINFO_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
index 4aebb341456715554d8af95070714065ffeba1f4..88bcf39e5020d969a6e9e07e19dcdf64fec7f032 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILE_H_
-#define MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/GroupingWorkspace.h"
@@ -219,5 +218,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
index 18f9a246d2865fd9cf3959245681a72079b77ba8..1384ea4286423631a2681bc682122df0eb63a9c0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDIFFCAL_H_
-#define MANTID_DATAHANDLING_LOADDIFFCAL_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument.h"
@@ -61,5 +60,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADDIFFCAL_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
index 206e1c54393584d2d7324cd387feb84dd1517a15..63f73c07997424eff10e45a399d4ebc1a089a94c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDSPACEMAP_H_
-#define MANTID_DATAHANDLING_LOADDSPACEMAP_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -59,5 +58,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADDSPACEMAP_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEMU.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEMU.h
index d74c777d737a099e26a9fcbf17fb9e8de4dedb84..ac4d4e56124925dd5f4bc4716017fcddf3f0b04d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEMU.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEMU.h
@@ -1,5 +1,4 @@
-#ifndef DATAHANDING_LOADEMU_H_
-#define DATAHANDING_LOADEMU_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -187,5 +186,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_LOADEMU_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
index a1d234e51de4ac7e2c75211c5dc81f210ef00a34..87483d94a9fab406854da88aa1c3278026b6a535 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADEMPTYINSTRUMENT_H_
-#define MANTID_DATAHANDLING_LOADEMPTYINSTRUMENT_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -79,5 +78,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADEMPTYINSTRUMENT_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
index 502500ffdf9ef547a64d1f5f06754e28770ac7c7..b75c9dd5cda5c23914c6a9cfcd8b06ce4bc01e0a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADEVENTNEXUS_H_
-#define MANTID_DATAHANDLING_LOADEVENTNEXUS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/WorkspaceGroup.h"
@@ -803,5 +802,3 @@ bool LoadEventNexus::runLoadIDFFromNexus(const std::string &nexusfilename,
 }
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADEVENTNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexusIndexSetup.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexusIndexSetup.h
index d732e8f5b8913ea524df92403b1a8d6280d21746..c2cc435cc9c3f91d121686e525027a7aa5b1f70c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexusIndexSetup.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexusIndexSetup.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUP_H_
-#define MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUP_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -53,5 +52,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUP_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
index 81c1f80a309dff2924ef69941482a0d630f95559..cb7adfda1243f155f8c8f0ad57be9da5c7bc1e1f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADEVENTPRENEXUS_H_
-#define LOADEVENTPRENEXUS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -218,5 +217,4 @@ private:
   void processInvestigationInputs();
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*LOADEVENTPRENEXUS_H_*/
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
index 26de9f2ae30d9615203bbde2a95aeaf57f7047bc..a185b4b5c6cd87f91116b2175188b8c4e705e476 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADFITS_H_
-#define MANTID_DATAHANDLING_LOADFITS_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -181,5 +180,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_LOADFITS_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h b/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
index 922c10ed71f4c61698f929928cded9d661611cc2..682472a00f9fe4ac18ad0c7ebe60b4a9aeab89c4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADFULLPROFRESOLUTION_H_
-#define MANTID_DATAHANDLING_LOADFULLPROFRESOLUTION_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/TableWorkspace.h"
@@ -161,5 +160,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADFULLPROFRESOLUTION_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
index 52a72709400b088781719da9641a59849787e83f..432086914e8de06fd59358a3cad912e88ceed564 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILE_H_
-#define MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/TableWorkspace.h"
@@ -79,5 +78,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
index dbda2cf879cc39a659d6269627a547995f38b532..8a357fc09ec3c17f412ce1c7945d323865c38058 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_LOADGSS_H_
-#define DATAHANDING_LOADGSS_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -71,5 +70,4 @@ private:
                                 const std::vector<double> &twothetas);
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // DATAHANDING_LOADGSS_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadGeometry.h b/Framework/DataHandling/inc/MantidDataHandling/LoadGeometry.h
index 1b75e144a39383a0ab29b837f9bc60b7ed3b3f32..f1af430b305b3c049de712b148a4f07e52d9f914 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadGeometry.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadGeometry.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADGEOMETRY_H_
-#define MANTID_DATAHANDLING_LOADGEOMETRY_H_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -31,5 +30,3 @@ const std::vector<std::string> validExtensions();
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADGEOMETRY_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRSANS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRSANS.h
index 66c8f2777173e3439a9d77989ba193c5e0d9548a..d13111d5726373be0963231e50606a864ed1ebbb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRSANS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadHFIRSANS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadHFIRSANS_H
-#define MANTID_DATAHANDLING_LoadHFIRSANS_H
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/XmlHandler.h"
@@ -136,5 +135,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h
index cd70a124b2d4875d7e5fe36e22bbaed6a5f5c56d..f21a7fcafe3d32b1b573cad59d77892e63bd31b7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadHelper_H_
-#define MANTID_DATAHANDLING_LoadHelper_H_
+#pragma once
 
 #include "MantidAPI/Run.h"
 #include "MantidKernel/System.h"
@@ -58,5 +57,3 @@ private:
 } // namespace DataHandling
 // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LoadHelper_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
index db7cf61b2e54161d0a5be8adb0b756d612b39f1b..d950f2206240db0973e2612c178eaf004816d9c3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADIDFFROMNEXUS_H_
-#define MANTID_DATAHANDLING_LOADIDFFROMNEXUS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -83,5 +82,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADIDFFROMNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
index 92ac1a46db2edb5c16228af5f2ef3bdeb7ec2256..d24ba3fe0d206c79a40dbc01fba7cc4e88a2f857 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLDIFFRACTION_H_
-#define MANTID_DATAHANDLING_LOADILLDIFFRACTION_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -119,5 +118,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADILLDIFFRACTION_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h
index d340ac4a14ddb7649958f0e7bf0e6757613adec7..691c3ede883a4325a109cb43807dca2e55a3c562 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLINDIRECT2_H_
-#define MANTID_DATAHANDLING_LOADILLINDIRECT2_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
@@ -70,5 +69,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADILLINDIRECT2_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLPolarizationFactors.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLPolarizationFactors.h
index 93a4e840bc8d4f305b7bbe4616eacd9c977c0cad..12627afee1397864355871d3e611018e686535f7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLPolarizationFactors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLPolarizationFactors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORS_H_
-#define MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -32,5 +31,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
index a44fcb11fe0cb74069e8752868ef021f66cb9d0a..cc4377ee76657f038b2a4492bd399ce0425adf31 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLREFLECTOMETRY_H_
-#define MANTID_DATAHANDLING_LOADILLREFLECTOMETRY_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -99,5 +98,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADILLREFLECTOMETRY_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
index 5c36237d2c3ca133dbd397e7f6dcdd5c72fd78ce..f057580f8632d6516e1ac394290de492f1fe4e5e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLSANS_H_
-#define MANTID_DATAHANDLING_LOADILLSANS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
@@ -101,5 +100,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADILLSANS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h
index e0ed8454cf3c0523f820b8343b271251b717480a..5988e8116e754fd35fd328348c4616bc2662e767 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLTOF2_H_
-#define MANTID_DATAHANDLING_LOADILLTOF2_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
@@ -91,5 +90,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADILLTOF2_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
index a57f42863c5100e20cc6242494e34e8ec6ebebf2..1843942ec663c75af3adbf73e8a46e4aa5a911f7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadISISNexus22_H_
-#define MANTID_DATAHANDLING_LoadISISNexus22_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -211,5 +210,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LoadISISNexus2_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadISISPolarizationEfficiencies.h b/Framework/DataHandling/inc/MantidDataHandling/LoadISISPolarizationEfficiencies.h
index 1a50994c9bf2475779756231e8fb352b37210708..588aa7bb6caf74dd64d326bbbbe3065c92f65dad 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadISISPolarizationEfficiencies.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadISISPolarizationEfficiencies.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIES_H_
-#define MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIES_H_
+#pragma once
 
 #include "MantidDataHandling/CreatePolarizationEfficienciesBase.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -32,5 +31,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIES_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
index 18f7c9fef04e0db94a73f5d24dcb34cee41f300a..05aacf736e880c1c71ba8313e13366fc2e441ee3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADINSTRUMENT_H_
-#define MANTID_DATAHANDLING_LOADINSTRUMENT_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 
@@ -96,5 +95,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADINSTRUMENT_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
index 69d900eb849471f8f5231eccc1bb8d84d27ab45e..751ce3ac5efc917838b68e5df19d31093e300fa9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADINSTRUMENTFROMNEXUS_H_
-#define MANTID_DATAHANDLING_LOADINSTRUMENTFROMNEXUS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -92,5 +91,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADINSTRUMENTFROMNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
index 92a67481f04ec6235ccb337b4064129d26171e3d..9c06decdd2fac5926b2832bfcb491784c8db98d3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADINSTRUMENTFROMRAW_H_
-#define MANTID_DATAHANDLING_LOADINSTRUMENTFROMRAW_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -92,5 +91,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADINSTRUMENTFROMRAW_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h b/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
index f2be12083988a9413c2f02bcf108860f08da1562..c86549044b6342058d3f9526f8c88cc9be1b63e6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADISAWDETCAL_H_
-#define MANTID_DATAHANDLING_LOADISAWDETCAL_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ExperimentInfo.h"
@@ -84,5 +83,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_ALGORITHM_DIFFRACTIONEVENTREADDETCAL_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h b/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
index cb297dbd503694ab2160d2865cd5f8e6b9bbb302..d26d86786d46a974a5f137694bfd80d67f49365c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADLLB_H_
-#define MANTID_DATAHANDLING_LOADLLB_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
@@ -65,5 +64,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADLLB_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h b/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
index 624b309b06cddc05928acf0dde6d2092882163f8..399408c33e93004d74407ecb054ceb03e7cb31bf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADLOG_H_
-#define MANTID_DATAHANDLING_LOADLOG_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -131,5 +130,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADLOG_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
index 895759465965128bc406b9bdb918efefd06e99bf..0344b3cd18ca25170d499dee5bb576a355e0032d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMLZ_H_
-#define MANTID_DATAHANDLING_LOADMLZ_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -87,5 +86,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADMLZ_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
index 494568e574d106ee2ef20f1b3b54985f5314833c..1ccef3b185fa8853b8d4471389a8501f226be32c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMAPPINGTABLE_H_
-#define MANTID_DATAHANDLING_LOADMAPPINGTABLE_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -70,5 +69,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADRAW_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
index 3860267c259ff94c5634d5ead25e38c4ef4f4680..6cb9d80d880ca55192dd244a0640ba0bec1fdd7c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMASK_H_
-#define MANTID_DATAHANDLING_LOADMASK_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidAPI/ParallelAlgorithm.h"
@@ -117,5 +116,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADMASK_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
index 161b965ac89592d524dab6c40d0766fb38198ec5..b398dd8572352174c819366012984a7b907c7942 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMCSTAS_H_
-#define MANTID_DATAHANDLING_LOADMCSTAS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/IEventWorkspace.h"
@@ -53,5 +52,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LoadMcStas_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
index 2deb507ca360d146c3391097c823c27de343cf40..0741ffe0d6d3405fe18727e45bc2fab95accbe7a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMCSTASNEXUS_H_
-#define MANTID_DATAHANDLING_LOADMCSTASNEXUS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidKernel/System.h"
@@ -40,5 +39,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADMCSTASNEXUS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
index e91fad035273ed4179714b2344b333b9b6f3eafe..a3f9b9aef7f17ae3944a383c1298a0602a96b7f7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMUONLOG_H_
-#define MANTID_DATAHANDLING_LOADMUONLOG_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -80,5 +79,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADMUONLOG_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
index 62a38b328ac8e2a924381b4b17fdabdc70e01693..53e709f1bbc503967d600118e615f00b5987f211 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMUONNEXUS_H_
-#define MANTID_DATAHANDLING_LOADMUONNEXUS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -113,5 +112,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADMUONNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
index ff31c2fd6ec88bc827e684982616bb49a01a213d..9fb3ba6f39d765ce260278b325f5bc59e23c29ac 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMUONNEXUS1_H_
-#define MANTID_DATAHANDLING_LOADMUONNEXUS1_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -115,5 +114,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADMUONNEXUS1_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
index 51654a3ecca82354629e6385b13d2524a819cdc6..c08c01166e15523d6d57019377a318a67768e01b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMUONNEXUS2_H_
-#define MANTID_DATAHANDLING_LOADMUONNEXUS2_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -89,5 +88,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADMUONNEXUS2_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNGEM.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNGEM.h
index 87e2e9f2602f5fd4cc4cc761a11e6f964a6e865b..f5bb976844b2a35293c14d2badd88c922c536fc3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNGEM.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNGEM.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTID_DATAHANDLING_LOADNGEM_H_
-#define MANTID_DATAHANDLING_LOADNGEM_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -132,5 +131,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_LOADNGEM_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
index 5b69ff1bd85d26276541324d7bdec0a4ce0c15f7..4eac6e929550289fc5ddbd3d1ec5a92cbdec4566 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNXSPE_H_
-#define MANTID_DATAHANDLING_LOADNXSPE_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -63,5 +62,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADNXSPE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNXcanSAS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNXcanSAS.h
index 5608bfb84bc14ad02b5c7185b69c83196870e6af..79ac726248052e3d4ad8659eb69759e7166dbe1a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNXcanSAS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNXcanSAS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNXCANSAS_H_
-#define MANTID_DATAHANDLING_LOADNXCANSAS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADNXCANSAS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
index e298379be942708b29252654fa65a843973b95b4..a5e83b3d9295ea2002c679f2bee49c39c86e0dc7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUS_H_
-#define MANTID_DATAHANDLING_LOADNEXUS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -97,5 +96,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
index 1cb10731cc7a84210a4884558beef1d2240d0629..679c713698c3f5237028dea94b62caa5c80b0ebc 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSLOGS_H_
-#define MANTID_DATAHANDLING_LOADNEXUSLOGS_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 #include <nexus/NeXusFile.hpp>
@@ -86,5 +85,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADNEXUSLOGS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
index c2d1fd4b93e6e6fe6f866fd4e77794796d04653c..ffbf9a2815dbbe0116a0c795c8c2bc7d78f0ccbf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSMONITORS_H_
-#define MANTID_DATAHANDLING_LOADNEXUSMONITORS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/DeprecatedAlgorithm.h"
@@ -57,5 +56,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADNEXUSMONITORS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
index d058fd05d3acfd5323e9a237408ba24184ec1797..429d903f8b6fb441daf3b29656c6656ffd013f33 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSMONITORS2_H_
-#define MANTID_DATAHANDLING_LOADNEXUSMONITORS2_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidAPI/ParallelAlgorithm.h"
@@ -113,5 +112,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_LOADNEXUSMONITORS2_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
index fff204682b223115811104a69ee90eb32822654f..cde394eb67b85e1f8f6d54d502805d02e9aa3656 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSPROCESSED_H_
-#define MANTID_DATAHANDLING_LOADNEXUSPROCESSED_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -237,5 +236,3 @@ bool UDlesserExecCount(Mantid::NeXus::NXClassInfo elem1,
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADNEXUSPROCESSED_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed2.h
index e2577fd333d2dfa220570f0beb85e15d5c854011..19c80c794dade82caaa3ac1cb29ea91ed4ad256f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSPROCESSED2_H_
-#define MANTID_DATAHANDLING_LOADNEXUSPROCESSED2_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -58,5 +57,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADNEXUSPROCESSED2_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadOff.h b/Framework/DataHandling/inc/MantidDataHandling/LoadOff.h
index c36ad88a294b8626703a239196f1b7768674cdd8..65f28caf7def09e9a4ee41b457a687e44d170741 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadOff.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadOff.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADOFF_H_
-#define MANTID_DATAHANDLING_LOADOFF_H_
+#pragma once
 #include "MantidDataHandling/MeshFileIO.h"
 #include "MantidDataHandling/ReadMaterial.h"
 #include "MantidKernel/Logger.h"
@@ -41,5 +40,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADOFF_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
index e2dd5b5b93f65c3052fa53ec37664a7219d8fa6c..ef57c6a47f75ee07f4ca47e191ea023144c05218 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPDFGETNFILE_H_
-#define MANTID_DATAHANDLING_LOADPDFGETNFILE_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/Workspace2D.h"
@@ -77,5 +76,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADPDFGETNFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPLN.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPLN.h
index 5250de4f7b40f32d9660b7a78e04ad09ea8f87d0..116d89d10530b19e998e7b80d50ef2f3c4d4e4c6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPLN.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPLN.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_LOADPLN_H_
-#define DATAHANDING_LOADPLN_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -120,5 +119,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_LOADPLN_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPSIMuonBin.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPSIMuonBin.h
index 129d1e91ca1196e9ba4153c1cfef6516b46ffa87..b1dbc4addfe391e61d629390dadea9c2cf42101b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPSIMuonBin.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPSIMuonBin.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPSIMUONBIN_H_
-#define MANTID_DATAHANDLING_LOADPSIMUONBIN_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadRawHelper.h"
@@ -116,5 +115,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADPSIMUONBIN_H_*/
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
index 18f15a7374a74465ffde60df3060956d13222157..30cd215e3cd220bb1b1ccaabedfba7f1c697f7e3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPARAMETERFILE_H_
-#define MANTID_DATAHANDLING_LOADPARAMETERFILE_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 
@@ -76,5 +75,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADPARAMETERFILE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
index 8e1533b5d3c7895548aa3490acc457a3a96d0ddf..b2c75974bd058b7614f306ae436a2dff3792ce4e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadPreNexus_H_
-#define MANTID_DATAHANDLING_LoadPreNexus_H_
+#pragma once
 
 #include "MantidAPI/IEventWorkspace_fwd.h"
 #include "MantidAPI/IFileLoader.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LoadPreNexus_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
index 4e0da957a05b2f7001ebba1535c9512e063290b6..1b15e8f587ffb8df8c5352fb36b627d7386bbb75 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADPRENEXUSMONITORS_H_
-#define LOADPRENEXUSMONITORS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -61,5 +60,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*LOADPRENEXUSMONITORS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h b/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
index 53cabd7d3b619d3216dcf211755a115988b9dc9f..2826c08bdedb9add4ef04a5472889f21fce5f128 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_LOADQKK_H_
-#define DATAHANDING_LOADQKK_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -49,5 +48,4 @@ private:
   void exec() override;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // DATAHANDING_LOADQKK_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
index b0786e935f766ee0bc92233aca83a27d656896e8..742db4282a9dd1f240f3c14286b35bbe910bb2bb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADRKH_H_
-#define MANTID_DATAHANDLING_LOADRKH_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -90,5 +89,4 @@ private:
                          API::Progress &prog, bool readXError = false);
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*MANTID_DATAHANDLING_LOADRKH_H_*/
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
index cec1f74157267342f32e3f040548c4247e0ebdf1..c3bad0c283c721fa044bb16a3e6e63828652f9c8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADRAW3_H_
-#define MANTID_DATAHANDLING_LOADRAW3_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -125,5 +124,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LoadRaw3_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
index eac7be13ca4a58756b5e03060247ac393fa41607..0b0b0e114a466174c30925d2cb553b177f59ee04 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADRAWBIN0_H
-#define MANTID_DATAHANDLING_LOADRAWBIN0_H
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -109,5 +108,4 @@ private:
   std::vector<boost::shared_ptr<HistogramData::HistogramX>> m_timeChannelsVec;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
index 4fa53f3428ca9371f8b07b53149874082032ae59..6388503966999b5b2b98cc80a38db7682f4e83b8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADRAWHELPER_H_
-#define MANTID_DATAHANDLING_LOADRAWHELPER_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/Run.h"
@@ -252,5 +251,4 @@ private:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*MANTID_DATAHANDLING_LOADRAW_H_*/
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
index 5ad1724bc4d034682355c013bc2750b5ee609deb..2d92979d0db08e373cb1c51412c62685c8f8f8cb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADRAWSPECTRUM0_H
-#define MANTID_DATAHANDLING_LOADRAWSPECTRUM0_H
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -90,5 +89,4 @@ private:
   int64_t m_noTimeRegimes;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSESANS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSESANS.h
index 9d3be69ade8b11011d080c4caf8cb8b7cd180f2c..2451cf13ff5021b11bfc1fddf7922fa1faeebe8d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSESANS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSESANS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSESANS_H_
-#define MANTID_DATAHANDLING_LOADSESANS_H_
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -81,5 +80,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADSESANS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
index e569b316c9dd9c50d315600680f89394c22a6557..3078a4f20168e7c6dc5fb6f141137803bdc0be28 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSINQFOCUS_H_
-#define MANTID_DATAHANDLING_LOADSINQFOCUS_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -73,5 +72,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADSINQFOCUS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
index df63e73acb9dfda2bb687830bb6f74008d222c9a..9f9465d3492cc6b7d69a56fee2c2a2b3f6c5acea 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSNSSPEC_H_
-#define MANTID_DATAHANDLING_LOADSNSSPEC_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -64,5 +63,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LOADSNSPEC_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
index 2fe1b4b2267076d5fb27969b1c6baec98eae41b2..89e09c8afbe3c4d4535dc7218bf776d0db0cdc48 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPE_H_
-#define MANTID_DATAHANDLING_LOADSPE_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -62,5 +61,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LoadSPE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
index 1c3bc50ddc06e01c6ca789ca3ca771a2d37a44a7..fb273f82cb821e98bf884dc601155d78d7ffbe9c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDDATAHANDLING_LOADSAMPLEDETAILSFROMRAW_H_
-#define MANTIDDATAHANDLING_LOADSAMPLEDETAILSFROMRAW_H_
+#pragma once
 
 //-----------------------------------------------------
 // Includes
@@ -55,5 +54,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTIDDATAHANDLING_LOADSAMPLEDETAILSFROMRAW_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleEnvironment.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleEnvironment.h
index 98fa6031a2bd716441933db446b2ecb126ae99c3..8ba473ab80602936772005dd0558981b1333d9a7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleEnvironment.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleEnvironment.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDLING_LOAD_ENVIRONMENT_H_
-#define DATAHANDLING_LOAD_ENVIRONMENT_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MeshFileIO.h"
@@ -54,5 +53,3 @@ private:
 
 } // end namespace DataHandling
 } // namespace Mantid
-
-#endif /* DATAHANDLING_LOAD_ENVIRONMENT_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleShape.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleShape.h
index 8d3048c080eeef4366edf3273fea186df0fb933b..2d3d329ddcea39a154935d409f91ae79dc21855b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleShape.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDLING_LOAD_SHAPE_H_
-#define DATAHANDLING_LOAD_SHAPE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/MeshFileIO.h"
@@ -55,5 +54,4 @@ void DLLExport rotate(Geometry::MeshObject &sampleMesh,
                       API::MatrixWorkspace_const_sptr inputWS);
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /* DATAHANDLING_LOAD_SHAPE_H_ */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
index fe12c5a513d7f97a1290363369e8fc073e43068a..bdab1283344a0ab62cca899925d7aecee91dc10e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSASSENA_H_
-#define MANTID_DATAHANDLING_LOADSASSENA_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -100,5 +99,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_LOADSASSENA_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
index c156c1fed0ad95e8298af1eb55c212f4e4c1a8a1..e875c3a9a779b102d9e961476cbce1ee95d65934 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPEC_H_
-#define MANTID_DATAHANDLING_LOADSPEC_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -68,5 +67,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LOADSPEC_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
index b649529eb8ab43188e119a4f57d96a0f0a5f925b..57b499e60df7cbdf64caf2aa3f5860622bbcba29 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LoadSpice2D_H
-#define MANTID_DATAHANDLING_LoadSpice2D_H
+#pragma once
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/XmlHandler.h"
@@ -133,5 +132,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
index 0e5e112753b34f0e6a6c55aae4b6f73596a819b6..ac7ee0710b51a6db766b6c179f4ebdb48afaef17 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPICEASCII_H_
-#define MANTID_DATAHANDLING_LOADSPICEASCII_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
@@ -75,5 +74,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADSPICEASCII_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
index 448e638278234d33126bd36717113f879efa52f6..8d4b2cab9d8a3665ed4c1beccc1222af25d21051 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPICEXML2DDET_H_
-#define MANTID_DATAHANDLING_LOADSPICEXML2DDET_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
@@ -142,5 +141,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADSPICEXML2DDET_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadStl.h b/Framework/DataHandling/inc/MantidDataHandling/LoadStl.h
index c5d36c62f800ba8db18d5ccd05776fec34b36314..1e9e80755cb3bfa2e45ea5999e2d6d664bff0bf5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadStl.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadStl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSTL_H_
-#define MANTID_DATAHANDLING_LOADSTL_H_
+#pragma once
 #include "MantidDataHandling/LoadSampleShape.h"
 #include "MantidDataHandling/MeshFileIO.h"
 #include "MantidDataHandling/ReadMaterial.h"
@@ -66,5 +65,4 @@ protected:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /* MANTID_DATAHANDLING_LOADSTL_H_ */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadStlFactory.h b/Framework/DataHandling/inc/MantidDataHandling/LoadStlFactory.h
index 738129307266cdaac13d118298ab431c53a71604..15b4cabf2f9bf780f27729893bf688f262a3fa58 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadStlFactory.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadStlFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSTLFACTORY_H_
-#define MANTID_DATAHANDLING_LOADSTLFACTORY_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidDataHandling/LoadAsciiStl.h"
@@ -32,5 +31,4 @@ public:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSwans.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSwans.h
index 7fe597619f5fac393d69ab7d17f1d4dd4f829df7..3417868ca2c4908225bf57473466587d47bbf57f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSwans.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSwans.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSWANS_H_
-#define MANTID_DATAHANDLING_LOADSWANS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/IFileLoader.h"
@@ -53,5 +52,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_LOADSWANS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadTBL.h b/Framework/DataHandling/inc/MantidDataHandling/LoadTBL.h
index 483723ba13d881d21fe1089e61de7c28c8db2f7e..e06cee458cc743fa382512596306667ba5f45ffb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadTBL.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadTBL.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADTBL_H_
-#define MANTID_DATAHANDLING_LOADTBL_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -65,5 +64,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_LOADTBL_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
index ffe7b944a6bae02e0e4e2b2837c7cdf6d349096e..04bd38da86b9280fdda3890e5b4f9c3c0031ab07 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADTOFRAWNEXUS_H_
-#define MANTID_DATAHANDLING_LOADTOFRAWNEXUS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -109,5 +108,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLINGLOADTOFRAWNEXUS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
index 43f9af110b3bbc18bf7e28a2fbf9c09dc29a8934..7c31f9358ea6f2d952011bc3559e51492efe10fe 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MASKDETECTORS_H_
-#define MANTID_DATAHANDLING_MASKDETECTORS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -126,5 +125,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_MASKDETECTORS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
index 53862bfb39f8fad087120f5e3a1ea21a61056891..654a65d570fa808960e4b084277b0c4afb442f4c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MASKDETECTORSINSHAPE_H_
-#define MANTID_DATAHANDLING_MASKDETECTORSINSHAPE_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 
@@ -69,5 +68,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_MASKDETECTORSINSHAPE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MaskSpectra.h b/Framework/DataHandling/inc/MantidDataHandling/MaskSpectra.h
index 9099da96791b5aea4d03b5ae265ac2ec9d0726b4..c69016613fe66a2d2af1cde7f826dfec700fbfa2 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MaskSpectra.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MaskSpectra.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MASKSPECTRA_H_
-#define MANTID_DATAHANDLING_MASKSPECTRA_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -37,5 +36,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_MASKSPECTRA_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MeshFileIO.h b/Framework/DataHandling/inc/MantidDataHandling/MeshFileIO.h
index 3483f5039c46b56ebc98f6a6b131cf2a75a14c73..56b15366c2459fca9754b739e9787e093093ee15 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MeshFileIO.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MeshFileIO.h
@@ -9,8 +9,7 @@
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/V3D.h"
 
-#ifndef MANTID_DATAHANDLING_MESHFILEIO_H_
-#define MANTID_DATAHANDLING_MESHFILEIO_H_
+#pragma once
 namespace {
 Mantid::Kernel::Logger g_log("MeshFileIO");
 }
@@ -92,5 +91,4 @@ inline ScaleUnits getScaleType(const std::string &scaleProperty) {
 }
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*MANTID_DATAHANDLING_MESHFILEIO_H_*/
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h b/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
index d30e9ef4312d05a2e796eee7766febdd878fea72..a6eaeb60fdde89046054d0a3779237a3dd7bf861 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MODIFYDETECTORDOTDATFILE_H_
-#define MANTID_DATAHANDLING_MODIFYDETECTORDOTDATFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_MODIFYDETECTORDOTDATFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h b/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
index 0c210fd8b458ad524a2483699af6cdce8b82b472..1a66cd822eeddcedf5f0d07ae49dfb1849dec4c8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MOVEINSTRUMENTCOMPONENT_H_
-#define MANTID_DATAHANDLING_MOVEINSTRUMENTCOMPONENT_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -74,5 +73,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_MOVEINSTRUMENTCOMPONENT_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NXcanSASDefinitions.h b/Framework/DataHandling/inc/MantidDataHandling/NXcanSASDefinitions.h
index 8f3b4c9e1a1c43488ce9c3e71ef2a0b7cafcd0ed..292ffa29eb284523726cdce43226d4b10ba02893 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NXcanSASDefinitions.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NXcanSASDefinitions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_NXCANSASDEFINITIONS_H_
-#define MANTID_DATAHANDLING_NXCANSASDEFINITIONS_H_
+#pragma once
 
 #include <string>
 
@@ -139,5 +138,4 @@ const std::string sasTransmissionSpectrumT = "T";
 const std::string sasTransmissionSpectrumTdev = "Tdev";
 } // namespace NXcanSAS
 } // namespace DataHandling
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h b/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
index 62e22a025cb0f5f3b31202211fc71e89522c402c..a426ad64598e933f1a7551dc9f7c529228a21f14 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_NEXUSTESTER_H_
-#define MANTID_DATAHANDLING_NEXUSTESTER_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -36,5 +35,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_NEXUSTESTER_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ORNLDataArchive.h b/Framework/DataHandling/inc/MantidDataHandling/ORNLDataArchive.h
index 3d01d27b1bce79cd87450f200f54ef44b0ee4ce1..3b840f78cc4952a886e3f61b026fb6edbfb08957 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ORNLDataArchive.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ORNLDataArchive.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ORNLDATAARCHIVE_H_
-#define MANTID_DATAHANDLING_ORNLDATAARCHIVE_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -41,5 +40,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_ORNLDATAARCHIVE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h b/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
index 845ccbbfc13f840633dfecc1d9f3ec7c76b47362..a23da323949693123f324f00b51a5a17114aa685 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_
-#define MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_
+#pragma once
 
 #include <iosfwd>
 
@@ -45,5 +44,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ParallelEventLoader.h b/Framework/DataHandling/inc/MantidDataHandling/ParallelEventLoader.h
index 3fd152f999d297b82dba1fbf4fc43ce8e98bd1e3..9b8fe418a8896d313ed62f1e3fc657275eadc6be 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ParallelEventLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ParallelEventLoader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_PARALLELEVENTLOADER_H_
-#define MANTID_DATAHANDLING_PARALLELEVENTLOADER_H_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -43,5 +42,3 @@ public:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_PARALLELEVENTLOADER_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/PatchBBY.h b/Framework/DataHandling/inc/MantidDataHandling/PatchBBY.h
index fb3693e54ffe735f064382225a5c00f6d0826ac1..879a975b1183cc9e66a80f34a565d16b562c79bb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/PatchBBY.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/PatchBBY.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_PATCHBBY_H_
-#define DATAHANDING_PATCHBBY_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -50,5 +49,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // DATAHANDING_PATCHBBY_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h b/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
index 0977202b5c1c73b27d64f7a2a5110fda8244f6d6..11e454e4d7c25eebd39f45db34aca49c4f3270f3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_PRECOMPILEDHEADER_H_
-#define MANTID_DATAHANDLING_PRECOMPILEDHEADER_H_
+#pragma once
 
 // Algorithm
 #include "MantidAPI/Algorithm.h"
@@ -15,5 +14,3 @@
 #include <nexus/NeXusFile.hpp>
 #include <nexus/NeXusException.hpp>
 // clang-format on
-
-#endif // MANTID_DATAHANDLING_PRECOMPILEDHEADER_H_
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ProcessBankData.h b/Framework/DataHandling/inc/MantidDataHandling/ProcessBankData.h
index 6e3994d8b7f55079573579c3bb591f993c8f69b5..d2e643bb24bd033c85a7acc4858aae1ef26882a7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ProcessBankData.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ProcessBankData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_PROCESSBANKDATA_H
-#define MANTID_DATAHANDLING_PROCESSBANKDATA_H
+#pragma once
 
 #include "MantidDataHandling/BankPulseTimes.h"
 #include "MantidGeometry/IDTypes.h"
@@ -96,5 +95,3 @@ private:
 }; // ENDDEF-CLASS ProcessBankData
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h b/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
index 64b08bb78b669a7d7a6d057ec81d3b0a582cb999..d7685a70e42c73ca7f3d634367e6df8a44c86420 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDDATAHANDLING_RAWFILEINFO_H_
-#define MANTIDDATAHANDLING_RAWFILEINFO_H_
+#pragma once
 
 //------------------------------------
 // Includes
@@ -70,5 +69,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTIDDATAHANDLING_RAWFILEINFO_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h b/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
index d953e2711e6e9638edcab71442af0a3aea0f7363..0eeac974c0139f90d7713e0c6c5a4464b554c934 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ReadMaterial_H_
-#define MANTID_DATAHANDLING_ReadMaterial_H_
+#pragma once
 
 #include "MantidKernel/EmptyValues.h"
 #include "MantidKernel/MaterialBuilder.h"
@@ -103,5 +102,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_ReadMaterial_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h b/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
index edafe79c6cbe157bebb36326c9dc51721a0225a8..8734bbe38fb9b85d267c2ccc18e569117c6e5815 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_REMOVELOGS_H_
-#define MANTID_DATAHANDLING_REMOVELOGS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -86,5 +85,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_REMOVELOGS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h b/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
index 13421421ddc2d62366f52e7aed30c0e40bc5cc2f..f1a8a615de2639f6be8d49a40decec0c6bdbc511 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_RENAMELOG_H_
-#define MANTID_DATAHANDLING_RENAMELOG_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -44,5 +43,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_RENAMELOG_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h b/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
index 783e3c04490d73fecccb710a985d40d2595e7666..0383426c66c894074ffda1b7f3f0be0831da92e5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENT_H_
-#define MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENT_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -73,5 +72,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENT_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h b/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
index fa704d7af16817056dd5f5509c00096ac8456605..f2122c90a601e2101d99b0630cbfe339383218d0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ROTATESOURCE_H_
-#define MANTID_DATAHANDLING_ROTATESOURCE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -38,5 +37,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_ROTATESOURCE_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentFactory.h b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentFactory.h
index 0ec20d79f1e01c2e8478e3e0b279cb3baaeee59e..970be314c9e9331366213f0e89adb1fa1f078736 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentFactory.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORY_H_
-#define MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORY_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidDataHandling/SampleEnvironmentSpec.h"
@@ -77,5 +76,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORY_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpec.h b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpec.h
index 594ac2b69af2ec2cf3383c6ca846e70d38cdd85e..bfc40cde254908cfc17a9bdeba72cab6a717bac5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpec.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPEC_H_
-#define MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPEC_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidGeometry/Instrument/Container.h"
@@ -61,5 +60,3 @@ using SampleEnvironmentSpec_const_uptr =
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPEC_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpecParser.h b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpecParser.h
index 9692418e0ddc520c9a5b7b29393569b934cd2e9c..4163307f7efe7e528aef76dc76c845bfdae31aab 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpecParser.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SampleEnvironmentSpecParser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPECPARSER_H_
-#define MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPECPARSER_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidDataHandling/SampleEnvironmentSpec.h"
@@ -67,5 +66,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAMPLEENVIRONMENTSPECPARSER_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
index b7c905c9d0fcd0dea7554156e65f826fd85a8b94..0bdfc77f2913fc952f9c886b5867c955c878e40a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEANSTOASCII_H_
-#define MANTID_DATAHANDLING_SAVEANSTOASCII_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/DeprecatedAlgorithm.h"
@@ -52,5 +51,4 @@ private:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /*  MANTID_DATAHANDLING_SAVEANSTO_H_  */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
index 2e259b043836e95760e11fcee6f4361425f020c1..5f642bc6d1f5873cc45c859579f031fbcf21f5b4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEASCII_H_
-#define MANTID_DATAHANDLING_SAVEASCII_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -50,5 +49,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SAVEASCII_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
index 4f189859690356d091e1df104ebce941bf1fc99e..eff74596efa5ef746e6db99c46cd608cc464edaf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SaveAscii2_H_
-#define MANTID_DATAHANDLING_SaveAscii2_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -103,5 +102,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SaveAscii2_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveBankScatteringAngles.h b/Framework/DataHandling/inc/MantidDataHandling/SaveBankScatteringAngles.h
index 99714c3247a78a34de2944246b288c8e7d457551..2a53d11faa892343e0930f3948cf49a607375f77 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveBankScatteringAngles.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveBankScatteringAngles.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLES_H_
-#define MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLES_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -38,5 +37,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLES_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
index 633927abc9af9a7db3ddd402b8d79ae952be4609..7ea37b0c3ff56b3eb1ebf5635b692d258b5faf21 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVECSV_H_
-#define MANTID_DATAHANDLING_SAVECSV_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -109,5 +108,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_SAVECSV_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
index 4484b51821c39e62269ad3b5d9c093f6278e2053..814261ef01dc90b735706b211ab42333463a2a6d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVECALFILE_H_
-#define MANTID_DATAHANDLING_SAVECALFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -63,5 +62,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVECALFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
index 00e9589fe83663fdfff328249182307384b2eee9..3591c440196359fea3629874f566eb408f3ed86c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SaveCanSAS1D_H
-#define MANTID_DATAHANDLING_SaveCanSAS1D_H
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -152,5 +151,3 @@ protected:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
index 0998ead565f5507e69bf09eb259dd034f861122a..d0f23b7092bf63405481e4842779166e87368a85 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVECANSAS1D2_H
-#define MANTID_DATAHANDLING_SAVECANSAS1D2_H
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -91,5 +90,3 @@ protected:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
index 8d4876f651ffc37bdc26a5e7c00447983d6a5635..260aaf8f181803a174c3df2b5a1ee270225cb1be 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDAVEGRP_H_
-#define MANTID_DATAHANDLING_SAVEDAVEGRP_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -58,5 +57,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEDAVEGRP_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
index bc76800bf5604e4117f13997f71b6575a87a1293..74c401a3473a359324b76b0a7e23b53a53e85aea 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDETECTORSGROUPING_H_
-#define MANTID_DATAHANDLING_SAVEDETECTORSGROUPING_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/GroupingWorkspace.h"
@@ -63,5 +62,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEDETECTORSGROUPING_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
index 6eef65db684333f3d49ff345cd5aef591fa29870..e8fe9599b8620fc35b76a100c2d1e748f8ebe603 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDIFFCAL_H_
-#define MANTID_DATAHANDLING_SAVEDIFFCAL_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEDIFFCAL_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffFittingAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffFittingAscii.h
index cca4c9fa263b678e47ff3888e4085f22c3872e9d..dcd6c22ba1de54cb27b9c9fd661dafa16f79884e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffFittingAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffFittingAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDIFFFITTINGASCII_H_
-#define MANTID_DATAHANDLING_SAVEDIFFFITTINGASCII_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -82,5 +81,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SAVEDIFFFITTINGASCII_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
index d8e7ac1cce45a4659be81103bdc2ba420b873205..677e333009e5072595504add1117ba30e1915bc5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDSPACEMAP_H_
-#define MANTID_DATAHANDLING_SAVEDSPACEMAP_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/OffsetsWorkspace.h"
@@ -47,5 +46,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEDSPACEMAP_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveFITS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveFITS.h
index fb820f5b068074197e887af2727d002aefe27a51..598722ddebaaa051c7aa9fdc17e8cb7f627f8136 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveFITS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveFITS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEFITS_H_
-#define MANTID_DATAHANDLING_SAVEFITS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -73,5 +72,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEFITS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
index 29e28f44ba7e5f792f56fce8228855b3d79697f7..7066d366f4b6999e7ed3fbec0183c939de23fcd3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_SAVEFOCUSEDXYE_H_
-#define DATAHANDING_SAVEFOCUSEDXYE_H_
+#pragma once
 
 #include "MantidAPI/SerialAlgorithm.h"
 
@@ -104,5 +103,4 @@ private:
   std::string m_comment;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // DATAHANDING_SAVEFOCUSEDXYE_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h b/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
index 752f3705ee00eacfbe53f67f3cc7c59de7237c2d..5c84972f33ead9ce1dccae91ced78b17df539bac 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEFullprofRESOLUTION_H_
-#define MANTID_DATAHANDLING_SAVEFullprofRESOLUTION_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/TableWorkspace.h"
@@ -81,5 +80,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEFullprofRESOLUTION_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveGDA.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGDA.h
index 7319c4bb925540f0094731df38be21e4a713fec1..cb18f94e051e18d9d441b8069b95869e61901768 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveGDA.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGDA.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEGDA_H_
-#define MANTID_DATAHANDLING_SAVEGDA_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVEGDA_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
index b3465ba1de1e46e9663fe52fe7d40ebe8a950dc5..95c151bbcde41e0b1a2b592bf0d17138f5eccb63 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILE_H_
-#define MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
@@ -165,5 +164,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
index 0d5698a914f3f796c19f453da48e7ec0ca841b1c..e7ef93dc392e53fb81b7bee2f92799b9711e9882 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_SAVEGSS_H_
-#define DATAHANDING_SAVEGSS_H_
+#pragma once
 
 #include "MantidAPI/Run.h"
 #include "MantidAPI/SerialAlgorithm.h"
@@ -166,5 +165,4 @@ private:
   bool m_overwrite_std_bank_header;
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // DATAHANDING_SAVEGSS_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
index 22690a3e15de3b80a5710e1f0044b110d4f7cd37..d9fc9c73b209841c7ee398a3ee463e4a50509427 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SaveILLCosmosAscii_H_
-#define MANTID_DATAHANDLING_SaveILLCosmosAscii_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/DeprecatedAlgorithm.h"
@@ -53,5 +52,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SaveILLCosmosAscii_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
index e8b4fcc435859f4d2ea2a80b90b8fa11e02bd46e..c54da2896ed9ec925ee2dfb2c461ce221aaadaf1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEISISNEXUS_H_
-#define MANTID_DATAHANDLING_SAVEISISNEXUS_H_
+#pragma once
 
 #include "../../src/LoadRaw/isisraw2.h"
 #include "MantidAPI/Algorithm.h"
@@ -143,5 +142,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_SAVEISISNEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h b/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
index 70588ae64f63c4c212f60bea2fc603ceaeb5e8b5..ee5edac22ee88cfb63d79bcb00a8d0da40a7b1be 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEISAWDETCAL_H_
-#define MANTID_DATAHANDLING_SAVEISAWDETCAL_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument_fwd.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEISAWDETCAL_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h b/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
index f1d47c422a8d57ff6a54b9699aadabcdbb5f225a..4c286ed55c9b2e9d6f3e02267abfaf260bfc7ea7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEMASKINGTOFILE_H_
-#define MANTID_DATAHANDLING_SAVEMASKINGTOFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -46,5 +45,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEMASKINGTOFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
index 74f8b6496004694032312dde5a30e171cbf87a6f..07ff65e22c943caa126294699309c8180076a8bb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ALGORITHMS_SAVENISTDAT_H_
-#define MANTID_ALGORITHMS_SAVENISTDAT_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -53,5 +52,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_ALGORITHMS_SAVENISTDAT_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
index 446268157ce1c195dad45fb3e762ea038e2ef088..d41a6212e0058572f7f0ec8d41607bbd8b323094 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENXSPE_H_
-#define MANTID_DATAHANDLING_SAVENXSPE_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -78,5 +77,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVENXSPE_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
index 6f404c8457bf24ac8f541bb0cfa763cf8f428ee0..919f38167084c9306ff26c4f16f0a0b092dce2c4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENXTOMO_H_
-#define MANTID_DATAHANDLING_SAVENXTOMO_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -124,5 +123,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVENXTOMO_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXcanSAS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXcanSAS.h
index e434b1b1abdde6e1c9f2dedcc49289cdc1358e4d..3e00f540af1ae9f5d47247433231ce617a8f36e8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNXcanSAS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNXcanSAS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENXCANSAS_H_
-#define MANTID_DATAHANDLING_SAVENXCANSAS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -50,5 +49,3 @@ makeCanSASRelaxedName(const std::string &input);
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVENXCANSAS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
index b30c075beebbf4ebd30c579489da33f2bfd51ddd..621a64cff31b7d65accdfe3bfbaec15b7f07d8ee 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENEXUS_H_
-#define MANTID_DATAHANDLING_SAVENEXUS_H_
+#pragma once
 
 #include "MantidAPI/SerialAlgorithm.h"
 #include <climits>
@@ -77,5 +76,3 @@ protected:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_SAVENEXUS_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusESS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusESS.h
index fb52db78c9473fda260eac33d670f2b6efaaab92..e7fb995e865387dd467345d940c3be9cc6bdcee2 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusESS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusESS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENEXUSESS_H_
-#define MANTID_DATAHANDLING_SAVENEXUSESS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -42,5 +41,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVENEXUSESS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusGeometry.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusGeometry.h
index fff3604f30a91021c3b66368caaaa7052d8c569d..d07e95d253db94dbd802e4a908d79c07a08ff165 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusGeometry.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusGeometry.h
@@ -12,8 +12,7 @@
  * @author Takudzwa Makoni, RAL (UKRI), ISIS
  * @date 16/08/2019
  */
-#ifndef MANTID_DATAHANDLING_SAVENEXUSGEOMETRY_H_
-#define MANTID_DATAHANDLING_SAVENEXUSGEOMETRY_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -36,5 +35,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVENEXUSGEOMETRY_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
index 8f769f01186a2d70ecd9f6afeb0f9465962e82d2..6ab2f7ba1c68f237a84c313ed67b221395eb3e75 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENEXUSPROCESSED_H_
-#define MANTID_DATAHANDLING_SAVENEXUSPROCESSED_H_
+#pragma once
 
 #include "MantidAPI/Progress.h"
 #include "MantidAPI/SerialAlgorithm.h"
@@ -106,5 +105,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_SAVENEXUSPROCESSED_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
index 022cd98bab0f4dc20f506eaf491fc1107e27bb51..03053999c9f65828e4cc4a02325477046d8535c1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDING_SAVEOPENGENIEASCII_H_
-#define DATAHANDING_SAVEOPENGENIEASCII_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -102,5 +101,4 @@ private:
   const std::string m_intType = "Integer";
 };
 } // namespace DataHandling
-} // namespace Mantid
-#endif // DATAHANDING_SAVEOPENGENIEASCII_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h b/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
index 65a852b25e55727f1d6b810b3bbaa79ccff99658..50525c698a7fbe7468e0284f79845943bc5f7df4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEPAR_H_
-#define SAVEPAR_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 
@@ -81,5 +80,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*SAVEPAR_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h b/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
index a13dc4db268b74abe23f2bbd9e8f7fb3da4af7d6..305db7dbe06a7c999ba585c68702cf28bc85deac 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEPDFGUI_H_
-#define MANTID_DATAHANDLING_SAVEPDFGUI_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -43,5 +42,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVEPDFGUI_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h b/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
index 447b6eb1379c79806740bb8876a24e4b70c207e4..640e1a25b0b7e9f0580908806ad6e8502a492698 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEPHX_H_
-#define SAVEPHX_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 
@@ -67,5 +66,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*SAVEPHX_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
index 9b6f7acc44a289a979eb66e2e98497f90ba6e8f5..3cc796c68f92cb4ca946b7d6bf74471cdd2e63b9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ALGORITHMS_SAVEPARAMETERFILE_H_
-#define MANTID_ALGORITHMS_SAVEPARAMETERFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/Instrument/FitParameter.h"
@@ -41,5 +40,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_ALGORITHMS_SAVEPARAMETERFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h b/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
index 9fa3126ae638a9fb2a589a54503d99cbeac3f47d..21864cc39335c253a27bcddeeb56860a17b04032 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVERKH_H_
-#define MANTID_DATAHANDLING_SAVERKH_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -71,5 +70,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVERKH_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveRMCProfile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveRMCProfile.h
index e27ba506f3d0784ce493c8d828300ccf9fb196ae..cce8b3d8a49eae7cfc0a36fea0f1214e695ed96c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveRMCProfile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveRMCProfile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVERMCPROFILE_H_
-#define MANTID_DATAHANDLING_SAVERMCPROFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -43,5 +42,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVERMCPROFILE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
index 682b5f94ce2cc04809868fd61c5c08269c57fa52..6a1d5ca4d35462a97d8c2b40fbe23f7944d18d0c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SaveReflCustomAscii_H_
-#define MANTID_DATAHANDLING_SaveReflCustomAscii_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -56,5 +55,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SaveReflCustomAscii_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
index 10fc838df888706f7f9958995d40ded12148186c..75f1a4ddb433518be28dc0af324a53f414eca372 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEREFLTHREECOLUMNASCII_H_
-#define MANTID_DATAHANDLING_SAVEREFLTHREECOLUMNASCII_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -57,5 +56,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SAVEREFLTHREECOLUMNASCII_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflectometryAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflectometryAscii.h
index 51c8a3bf2a8d425ef3b8a404ab712ebf50ece6e3..e03bde6c999e56f965c758d87656ca80fba992a3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflectometryAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflectometryAscii.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SaveReflectometryAscii_H_
-#define MANTID_DATAHANDLING_SaveReflectometryAscii_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -87,5 +86,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SaveReflectometryAscii_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveSESANS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveSESANS.h
index ec39db4957e64842def9384665a9fedd72708b8c..abb38eca6d0237b8c3c6c62107fa3922626eea54 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveSESANS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveSESANS.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVESESANS_H_
-#define MANTID_DATAHANDLING_SAVESESANS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -75,5 +74,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SAVESESANS_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
index e9918ace09bcffb41393c8ba08b5a7e3899f88b4..44e1fbb01251e7e3eb1c2e72e9763a1f0a423d03 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVESPE_H_
-#define MANTID_DATAHANDLING_SAVESPE_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -121,5 +120,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVESPE_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveSampleEnvironmentAndShape.h b/Framework/DataHandling/inc/MantidDataHandling/SaveSampleEnvironmentAndShape.h
index e0756268b61e7d274f4e1009eb34b83db254f62b..642ec30fa58fa2e64a674986176ca2e656e522b2 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveSampleEnvironmentAndShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveSampleEnvironmentAndShape.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDLING_SAVE_ENVIRONMENT_H_
-#define DATAHANDLING_SAVE_ENVIRONMENT_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/Matrix.h"
@@ -58,5 +57,3 @@ const Mantid::Geometry::MeshObject &
 toMeshObject(const Mantid::Geometry::IObject &object);
 } // end namespace DataHandling
 } // namespace Mantid
-
-#endif /* DATAHANDLING_SAVE_ENVIRONMENT_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveStl.h b/Framework/DataHandling/inc/MantidDataHandling/SaveStl.h
index 80017f89f2a3c5bf21c51a0078a27e2b39282449..416fc51e5b3b1897f6166fcaaca95bb500bb99ef 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveStl.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveStl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVESTL_H_
-#define MANTID_DATAHANDLING_SAVESTL_H_
+#pragma once
 
 #include "MantidDataHandling/MeshFileIO.h"
 #include "MantidKernel/BinaryStreamWriter.h"
@@ -40,5 +39,4 @@ private:
 };
 
 } // namespace DataHandling
-} // namespace Mantid
-#endif /* MANTID_DATAHANDLING_SAVESTL_H_ */
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveTBL.h b/Framework/DataHandling/inc/MantidDataHandling/SaveTBL.h
index 8f6c3ee43164ccd51ecc949ffe92bbef39ceed80..2f18dcdc83d2c01877a98fa5490229d824718217 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveTBL.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveTBL.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVETBL_H_
-#define MANTID_DATAHANDLING_SAVETBL_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -61,5 +60,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*  MANTID_DATAHANDLING_SAVETBL_H_  */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
index 698fdb384ac2e070d01feba3d3b474dc58a91105..b2c591cb256a7589e6a2bbc1972d8902724d0d13 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVESNSNEXUS_H_
-#define MANTID_DATAHANDLING_SAVESNSNEXUS_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -131,5 +130,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h b/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
index 04546a2c171997d0cd8a6516d1db4f9af5e74725..2adc2c6184fdfd61eaefcdf51970517524175f30 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEVTP_H_
-#define MANTID_DATAHANDLING_SAVEVTP_H_
+#pragma once
 
 //---------------------------------------------------
 // Includes
@@ -82,5 +81,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif // MANTID_DATAHANDLING_SAVEVTP_H_
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetBeam.h b/Framework/DataHandling/inc/MantidDataHandling/SetBeam.h
index 390ba70d47c08fab6eb082e59e7295a69936984c..d5f75d1d3c2a440cefe59a7db0022371806c7c0f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetBeam.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetBeam.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SETBEAM_H_
-#define MANTID_DATAHANDLING_SETBEAM_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -33,5 +32,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SETBEAM_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetSample.h b/Framework/DataHandling/inc/MantidDataHandling/SetSample.h
index 34e50943abf6cec0f437ea617414be4a88238b9a..d06a69145c688a8d1f871fa202529af4b2ddba83 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetSample.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetSample.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SETSAMPLE_H_
-#define MANTID_DATAHANDLING_SETSAMPLE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidDataHandling/DllConfig.h"
@@ -62,5 +61,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SETSAMPLE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h b/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
index f9b7bdff274be9297edec06a1f649bfb6d291e2e..496aec8cccdd8e60be3d744313424e6405432aa4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SetSampleMaterial_H_
-#define MANTID_DATAHANDLING_SetSampleMaterial_H_
+#pragma once
 
 #include "MantidAPI/DistributedAlgorithm.h"
 #include "MantidDataHandling/ReadMaterial.h"
@@ -53,5 +52,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SetSampleMaterial_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h b/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
index 1b2181ed259fa4d3036e4ca151407d74a0eba484..4c59658e91f635490fb75d3fd844ff9fc2540cd3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SETSCALINGPSD_H_
-#define MANTID_DATAHANDLING_SETSCALINGPSD_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -93,5 +92,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_SETSCALINGPSD_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
index c1d9afbd93446bc07fcc743622ce8e8a0b05f9e3..46b2e59dbc08a98a6e0df4ceff24800e8f26d132 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SORTTABLEWORKSPACE_H_
-#define MANTID_DATAHANDLING_SORTTABLEWORKSPACE_H_
+#pragma once
 
 #include "MantidAPI/ParallelAlgorithm.h"
 #include "MantidKernel/System.h"
@@ -32,5 +31,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_SORTTABLEWORKSPACE_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h b/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
index e67390053a5eb02acbd852ba89c1e6210f12a100..6241b76be76374d9c869efee299dd0a0349cf009 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTOR_H_
-#define MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTOR_H_
+#pragma once
 
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidKernel/DateAndTime.h"
@@ -21,5 +20,3 @@ Mantid::Types::Core::DateAndTime DLLExport
 extractEndTime(const std::string &filename);
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTOR_H_ */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h b/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
index 9db64738cb1cd47da4ed1c709e234b20be78d743..09ab3265f0fee5204384ba6cf8f87aa1daf57bdb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_UPDATEINSTRUMENTFROMFILE_H_
-#define MANTID_DATAHANDLING_UPDATEINSTRUMENTFROMFILE_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidGeometry/IDetector.h"
@@ -117,5 +116,3 @@ private:
 
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /*MANTID_DATAHANDLING_UPDATEINSTRUMENTFROMFILE_H_*/
diff --git a/Framework/DataHandling/inc/MantidDataHandling/XmlHandler.h b/Framework/DataHandling/inc/MantidDataHandling/XmlHandler.h
index 9dbad9b2bf7e159a1cd355f2d909bb1df5a76a74..48629d90a7cf0428d50f7876fdf2b69f77cc0bb3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/XmlHandler.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/XmlHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATAHANDLING_XMLHANDLER_H_
-#define DATAHANDLING_XMLHANDLER_H_
+#pragma once
 
 #include "DllConfig.h"
 
@@ -36,5 +35,3 @@ private:
 };
 } // namespace DataHandling
 } // namespace Mantid
-
-#endif /* DATAHANDLING_XMLHANDLER_H_ */
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.h b/Framework/DataHandling/src/LoadRaw/isisraw.h
index 4d046942a8a4629f5c95736660498c721bbbba0f..402e857227b808e04e6dbb68e1c97b4924b7d645 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw.h
+++ b/Framework/DataHandling/src/LoadRaw/isisraw.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ISISRAW_H
-#define ISISRAW_H
+#pragma once
 
 /**
   @file isisraw.h ISIS VMS raw file definitions
@@ -385,5 +384,3 @@ public:
   int printInfo(std::ostream &os);
   int getTimeChannels(float *rtcb1, int n);
 };
-
-#endif /* ISISRAW_H */
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw2.h b/Framework/DataHandling/src/LoadRaw/isisraw2.h
index feeed7af3a339b6436a6c8d87fc087b3d1ffe32d..3811f1a494ad361fd795507eb6b67178d0b7827d 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw2.h
+++ b/Framework/DataHandling/src/LoadRaw/isisraw2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ISISRAW2_H
-#define ISISRAW2_H
+#pragma once
 
 #include "isisraw.h"
 
@@ -27,5 +26,3 @@ private:
   char *outbuff; ///< output buffer
   int m_bufferSize;
 };
-
-#endif /* ISISRAW2_H */
diff --git a/Framework/DataHandling/src/LoadRaw/item_struct.h b/Framework/DataHandling/src/LoadRaw/item_struct.h
index 4f55b9dbe5bef486889e1c95588c87a05cf40b0f..7f3839e1f63aaf9d9ed731befd5ef4165f7b8ac3 100644
--- a/Framework/DataHandling/src/LoadRaw/item_struct.h
+++ b/Framework/DataHandling/src/LoadRaw/item_struct.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ITEM_STRUCT_H
-#define ITEM_STRUCT_H
+#pragma once
 
 #include <map>
 #include <string>
@@ -80,5 +79,3 @@ public:
   int getArrayItem(const std::string &item_name, int nspec, T *larray);
   int getArrayItem(const std::string &item_name, T *larray);
 };
-
-#endif /* ITEM_STRUCT_H */
diff --git a/Framework/DataHandling/src/LoadRaw/vms_convert.h b/Framework/DataHandling/src/LoadRaw/vms_convert.h
index 56a5acaff24280df70b18eab9db63c311b01c1dc..805465e109aefa5106a81c92c8b893ffcc96a1b8 100644
--- a/Framework/DataHandling/src/LoadRaw/vms_convert.h
+++ b/Framework/DataHandling/src/LoadRaw/vms_convert.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ENDIAN_CONVERT
-#define ENDIAN_CONVERT
+#pragma once
 
 // We aren't going to EVER change this code - so let's ignore the warnings.
 #if defined(__GNUC__) && !(defined(__INTEL_COMPILER))
@@ -42,5 +41,3 @@ void local_to_ieee_float(float *val, const int *n, int *errcode);
 void local_to_ieee_double(double *val, const int *n, int *errcode);
 void ieee_float_to_local(float *val, const int *n, int *errcode);
 void ieee_double_to_local(double *val, const int *n, int *errcode);
-
-#endif /* ENDIAN_CONVERT */
diff --git a/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h b/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
index 83f9b5b216a99aedcc3b3410414b6d195d4e09a7..b7bff479f0c24d6da86a66d3316dd7aef5f2cd47 100644
--- a/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
+++ b/Framework/DataHandling/test/AppendGeometryToSNSNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUSTEST_H_
-#define MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUSTEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -74,5 +73,3 @@ public:
     // AnalysisDataService::Instance().remove(outWSName);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_APPENDGEOMETRYTOSNSNEXUSTEST_H_ */
diff --git a/Framework/DataHandling/test/CheckMantidVersionTest.h b/Framework/DataHandling/test/CheckMantidVersionTest.h
index 97ece0341f46e42b11cc331a73977e6b757a06b3..f3ec5cba9265d808558e0e83269f79998f462bd5 100644
--- a/Framework/DataHandling/test/CheckMantidVersionTest.h
+++ b/Framework/DataHandling/test/CheckMantidVersionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CHECKMANTIDVERSIONTEST_H_
-#define MANTID_DATAHANDLING_CHECKMANTIDVERSIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -142,5 +141,3 @@ public:
   void test_execLocalNewerMajor() { runTest("2.0.2", "v1.11.7", false); }
   void test_execRemoteNewerMajor() { runTest("2.3.7", "v3.0.0", true); }
 };
-
-#endif /* MANTID_DATAHANDLING_CHECKMANTIDVERSIONTEST_H_ */
diff --git a/Framework/DataHandling/test/CompressEventsTest.h b/Framework/DataHandling/test/CompressEventsTest.h
index eb1997ec3a392e6c48b1536f8d14f987cb69750f..1aab4ca4284fa1c566ddb9dc85f29f362bc569c3 100644
--- a/Framework/DataHandling/test/CompressEventsTest.h
+++ b/Framework/DataHandling/test/CompressEventsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COMPRESSEVENTSTEST_H_
-#define COMPRESSEVENTSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -155,5 +154,3 @@ public:
     doTest("CompressEvents_input", "CompressEvents_input", 0.0, 50, .001);
   }
 };
-
-#endif
diff --git a/Framework/DataHandling/test/CreateChunkingFromInstrumentTest.h b/Framework/DataHandling/test/CreateChunkingFromInstrumentTest.h
index 9673f32fba3902ca3150175c5ba710848170c6e9..cb84830e25581a743e3ce54f3a12149e8ffc2556 100644
--- a/Framework/DataHandling/test/CreateChunkingFromInstrumentTest.h
+++ b/Framework/DataHandling/test/CreateChunkingFromInstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENTTEST_H_
-#define MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -119,5 +118,3 @@ public:
     TS_ASSERT(!alg.isExecuted());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_CREATECHUNKINGFROMINSTRUMENTTEST_H_ */
diff --git a/Framework/DataHandling/test/CreatePolarizationEfficienciesTest.h b/Framework/DataHandling/test/CreatePolarizationEfficienciesTest.h
index 845f039267c8828ed061f5d2d285d5b55aaa13df..dc4cccab49e765466b47105b10a961acebe8092a 100644
--- a/Framework/DataHandling/test/CreatePolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/CreatePolarizationEfficienciesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ALGORITHMS_CREATEPOLARIZATIONEFFICIENCIES_TEST_H_
-#define MANTID_ALGORITHMS_CREATEPOLARIZATIONEFFICIENCIES_TEST_H_
+#pragma once
 
 #include "MantidAPI/Axis.h"
 #include "MantidDataHandling/CreatePolarizationEfficiencies.h"
@@ -323,5 +322,3 @@ private:
     return retVal;
   }
 };
-
-#endif /* MANTID_ALGORITHMS_CREATEPOLARIZATIONEFFICIENCIES_TEST_H_ */
diff --git a/Framework/DataHandling/test/CreateSampleShapeTest.h b/Framework/DataHandling/test/CreateSampleShapeTest.h
index ce52a081c26cb6f1f0e76939c54c890e88fc505e..2ec12a4988c2d9c9ad52985c230e4e288ec12813 100644
--- a/Framework/DataHandling/test/CreateSampleShapeTest.h
+++ b/Framework/DataHandling/test/CreateSampleShapeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef CREATESAMPLESHAPETEST_H_
-#define CREATESAMPLESHAPETEST_H_
+#pragma once
 
 //---------------------------------------
 // Includes
@@ -119,5 +118,3 @@ public:
         Mantid::API::AnalysisDataService::Instance().remove("TestWorkspace"));
   }
 };
-
-#endif
diff --git a/Framework/DataHandling/test/CreateSimulationWorkspaceTest.h b/Framework/DataHandling/test/CreateSimulationWorkspaceTest.h
index 64a86634f7d52a0ee15035d3c54fd0066b9d1170..29edc1c95e617e9afaaf3b060c2dc813d250071c 100644
--- a/Framework/DataHandling/test/CreateSimulationWorkspaceTest.h
+++ b/Framework/DataHandling/test/CreateSimulationWorkspaceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACETEST_H_
-#define MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -261,5 +260,4 @@ private:
   CreateSimulationWorkspace alg;
 
   const std::string outWsName = "outTestWs";
-};
-#endif /* MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACETEST_H_ */
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/DataBlockCompositeTest.h b/Framework/DataHandling/test/DataBlockCompositeTest.h
index 94a8f52237c7d4bab5de6af2123617c03b1fd463..5412b5fd8bc9fdf281daf814236eacc2c5eef395 100644
--- a/Framework/DataHandling/test/DataBlockCompositeTest.h
+++ b/Framework/DataHandling/test/DataBlockCompositeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCKCOMPOSITETEST_H_
-#define MANTID_DATAHANDLING_DATABLOCKCOMPOSITETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -1005,5 +1004,3 @@ private:
     return composite;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_DATABLOCKCOMPOSITETEST_H_ */
diff --git a/Framework/DataHandling/test/DataBlockGeneratorTest.h b/Framework/DataHandling/test/DataBlockGeneratorTest.h
index e04d1eb7a6e2abedbf5dc6689f33339252218ca8..c9f2ca5701a7796754bb08d7927c97b338f6ade0 100644
--- a/Framework/DataHandling/test/DataBlockGeneratorTest.h
+++ b/Framework/DataHandling/test/DataBlockGeneratorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCKGENERATORTEST_H_
-#define MANTID_DATAHANDLING_DATABLOCKGENERATORTEST_H_
+#pragma once
 
 #include "MantidDataHandling/DataBlockGenerator.h"
 #include <cxxtest/TestSuite.h>
@@ -114,5 +113,4 @@ private:
                       expectedOutput.size());
     TSM_ASSERT("Should be done", generator.isDone());
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/DataBlockTest.h b/Framework/DataHandling/test/DataBlockTest.h
index 308de0d873ce8be443fe6744537e8f827329490b..1ab53a84d34a2b4946dcdc083f37f6413457b604 100644
--- a/Framework/DataHandling/test/DataBlockTest.h
+++ b/Framework/DataHandling/test/DataBlockTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DATABLOCKTEST_H_
-#define MANTID_DATAHANDLING_DATABLOCKTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -67,5 +66,3 @@ public:
     TSM_ASSERT("Should not be equal", !(block1 == block2));
   }
 };
-
-#endif /* MANTID_DATAHANDLING_DATABLOCKTEST_H_ */
diff --git a/Framework/DataHandling/test/DefineGaugeVolumeTest.h b/Framework/DataHandling/test/DefineGaugeVolumeTest.h
index 24fd4c21d2ece60cb4c1d8c1197b9275d82bfe52..cb8198a59292fd89a706607a4b492f44c5725533 100644
--- a/Framework/DataHandling/test/DefineGaugeVolumeTest.h
+++ b/Framework/DataHandling/test/DefineGaugeVolumeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DEFINEGAUGEVOLUMETEST_H_
-#define DEFINEGAUGEVOLUMETEST_H_
+#pragma once
 
 #include "MantidDataHandling/DefineGaugeVolume.h"
 #include <cxxtest/TestSuite.h>
@@ -82,5 +81,3 @@ public:
     AnalysisDataService::Instance().remove("EmptyWorkspace");
   }
 };
-
-#endif
diff --git a/Framework/DataHandling/test/DeleteTableRowsTest.h b/Framework/DataHandling/test/DeleteTableRowsTest.h
index e1f41e6172fe09c0d38efc9da8fb75beac206651..32ddd784d13bc6a41e5297e8da12cb5d5ac09b67 100644
--- a/Framework/DataHandling/test/DeleteTableRowsTest.h
+++ b/Framework/DataHandling/test/DeleteTableRowsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DELETETABLEROWSTEST_H_
-#define DELETETABLEROWSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -48,5 +47,3 @@ public:
     AnalysisDataService::Instance().remove(wsName);
   }
 };
-
-#endif /*DELETETABLEROWSTEST_H_*/
diff --git a/Framework/DataHandling/test/DetermineChunkingTest.h b/Framework/DataHandling/test/DetermineChunkingTest.h
index 02e1f181e1a8b865a8ab5648982967aecb803958..3e91d68028f8eff5726b19adcbcdde264443572b 100644
--- a/Framework/DataHandling/test/DetermineChunkingTest.h
+++ b/Framework/DataHandling/test/DetermineChunkingTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DetermineChunkingTEST_H_
-#define MANTID_DATAHANDLING_DetermineChunkingTEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -86,5 +85,3 @@ public:
     do_test_CNCS(false);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_DetermineChunkingTEST_H_ */
diff --git a/Framework/DataHandling/test/DownloadFileTest.h b/Framework/DataHandling/test/DownloadFileTest.h
index 591efe1c674029fce0376ca29146a1f1021aee5a..7b0cfe2ac780f28578d4dcfedfbcfe2ebb28ea7b 100644
--- a/Framework/DataHandling/test/DownloadFileTest.h
+++ b/Framework/DataHandling/test/DownloadFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DOWNLOADFILETEST_H_
-#define MANTID_DATAHANDLING_DOWNLOADFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -127,5 +126,3 @@ public:
     TS_ASSERT_EQUALS("HTTPS request succeeded", ss.str());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_DOWNLOADFILETEST_H_ */
diff --git a/Framework/DataHandling/test/DownloadInstrumentTest.h b/Framework/DataHandling/test/DownloadInstrumentTest.h
index 66206743f8bed206559d0aafa3adce49239b0a34..87cb744d9e847ad882f3ba172b8ccd66bd90ea16 100644
--- a/Framework/DataHandling/test/DownloadInstrumentTest.h
+++ b/Framework/DataHandling/test/DownloadInstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_DOWNLOADINSTRUMENTTEST_H_
-#define MANTID_DATAHANDLING_DOWNLOADINSTRUMENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -207,5 +206,3 @@ public:
   std::vector<std::string> m_originalInstDir;
   std::vector<Poco::File> m_directoriesToRemove;
 };
-
-#endif /* MANTID_DATAHANDLING_DOWNLOADINSTRUMENTTEST_H_ */
diff --git a/Framework/DataHandling/test/EventWorkspaceCollectionTest.h b/Framework/DataHandling/test/EventWorkspaceCollectionTest.h
index a1df4c30aa14d16014d9eeba6fa07e9b397d79f1..5434b7d912d79fb5363f8be2438c6d0516283ce8 100644
--- a/Framework/DataHandling/test/EventWorkspaceCollectionTest.h
+++ b/Framework/DataHandling/test/EventWorkspaceCollectionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EventWorkspaceCollectionTEST_H_
-#define MANTID_DATAHANDLING_EventWorkspaceCollectionTEST_H_
+#pragma once
 
 #include "MantidKernel/TimeSeriesProperty.h"
 
@@ -177,5 +176,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_DATAHANDLING_EventWorkspaceCollectionTEST_H_ */
diff --git a/Framework/DataHandling/test/ExtractMonitorWorkspaceTest.h b/Framework/DataHandling/test/ExtractMonitorWorkspaceTest.h
index 443f7972a79756aedc75ba41ffc9eb3a62d64ff4..9c1ffc5bbc6685c37cc093d3e29606a51f8954db 100644
--- a/Framework/DataHandling/test/ExtractMonitorWorkspaceTest.h
+++ b/Framework/DataHandling/test/ExtractMonitorWorkspaceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACETEST_H_
-#define MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -112,5 +111,3 @@ public:
 private:
   std::string outWSName;
 };
-
-#endif /* MANTID_DATAHANDLING_EXTRACTMONITORWORKSPACETEST_H_ */
diff --git a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
index 651ee47b3d821a5cb24cbf16ea110734973aa6a5..71b64c73d44830f1e1b7191f6c65c86bc8720fcd 100644
--- a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIESTEST_H_
-#define MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIESTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -566,5 +565,3 @@ private:
     return workspace;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_EXTRACTPOLARIZATIONEFFICIENCIESTEST_H_ */
diff --git a/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h b/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
index 99d7f8a9dc51bf9ee2d01d4205cf0e6bbe79b60c..97e207d79394a6816f1a33caf603aeab7c499d27 100644
--- a/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
+++ b/Framework/DataHandling/test/FilterEventsByLogValuePreNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FILTEREVENTSBYLOGVALUEPRENEXUSTEST_H_
-#define FILTEREVENTSBYLOGVALUEPRENEXUSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -77,5 +76,3 @@ public:
     TS_ASSERT_THROWS_NOTHING(filteralg.setProperty("CorrectTOFtoSample", true));
   }
 };
-
-#endif /*FILTEREVENTSBYLOGVALUEPRENEXUS_H_*/
diff --git a/Framework/DataHandling/test/FindDetectorsInShapeTest.h b/Framework/DataHandling/test/FindDetectorsInShapeTest.h
index 5f44b10a36e792fed987fbd61b4473270181b4ff..7a6af438b28c6bcf935a5aeaf58afbc65c13fe89 100644
--- a/Framework/DataHandling/test/FindDetectorsInShapeTest.h
+++ b/Framework/DataHandling/test/FindDetectorsInShapeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FINDDETECTORSINSHAPETEST_H_
-#define FINDDETECTORSINSHAPETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -157,5 +156,3 @@ private:
   std::string inputFile;
   std::string wsName;
 };
-
-#endif /*FINDDETECTORSINSHAPETEST_H_*/
diff --git a/Framework/DataHandling/test/FindDetectorsParTest.h b/Framework/DataHandling/test/FindDetectorsParTest.h
index 1246d09dac6d8f2dfa8b4184abeefd95ac31287e..a38cf5f8345cb48de234afebe510495a1fd4bfd4 100644
--- a/Framework/DataHandling/test/FindDetectorsParTest.h
+++ b/Framework/DataHandling/test/FindDetectorsParTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FIND_DETECTORSPAR_H_
-#define FIND_DETECTORSPAR_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/TableRow.h"
@@ -560,4 +559,3 @@ private:
     TSM_ASSERT_EQUALS("azimuthal width wrong ", azw_pattern, bufs[4].str());
   }
 };
-#endif
diff --git a/Framework/DataHandling/test/GenerateGroupingPowderTest.h b/Framework/DataHandling/test/GenerateGroupingPowderTest.h
index e31ea01b90663741a4a504d0c524d20d04e3fac7..2efd0f58835c2b98c96b2d4b9a9c5b1a8d49583e 100644
--- a/Framework/DataHandling/test/GenerateGroupingPowderTest.h
+++ b/Framework/DataHandling/test/GenerateGroupingPowderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_GENERATEGROUPINGPOWDERTEST_H_
-#define MANTID_DATAHANDLING_GENERATEGROUPINGPOWDERTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidDataHandling/GenerateGroupingPowder.h"
@@ -219,5 +218,3 @@ private:
     return filename;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_GENERATEGROUPINGPOWDERTEST_H_ */
diff --git a/Framework/DataHandling/test/GroupDetectors2Test.h b/Framework/DataHandling/test/GroupDetectors2Test.h
index 485fe40093aeb0ac038b3ac07d0b30b774ed9f6e..b7a8b43b4996c0c564f8f7b129583124601185dc 100644
--- a/Framework/DataHandling/test/GroupDetectors2Test.h
+++ b/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GROUPDETECTORS2TEST_H_
-#define GROUPDETECTORS2TEST_H_
+#pragma once
 
 #include "MantidDataHandling/GroupDetectors2.h"
 #include "MantidTestHelpers/ComponentCreationHelper.h"
@@ -1263,5 +1262,3 @@ private:
 
   GroupDetectors2 alg;
 };
-
-#endif /*GROUPDETECTORS2TEST_H_*/
diff --git a/Framework/DataHandling/test/GroupDetectorsTest.h b/Framework/DataHandling/test/GroupDetectorsTest.h
index 1ffbb91ba95337de15e2997114e26c177c4648c5..51343f9ac30ea31d49d182019f9bcf6c5911f2c8 100644
--- a/Framework/DataHandling/test/GroupDetectorsTest.h
+++ b/Framework/DataHandling/test/GroupDetectorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GROUPDETECTORSTEST_H_
-#define GROUPDETECTORSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -171,5 +170,3 @@ public:
 private:
   GroupDetectors grouper;
 };
-
-#endif /*GROUPDETECTORSTEST_H_*/
diff --git a/Framework/DataHandling/test/H5UtilTest.h b/Framework/DataHandling/test/H5UtilTest.h
index 5b87a93bfb8dcc92b42f9b06e8151fc4000358b7..119220c21cd87cb79bedc58f9ce4a394575f3e11 100644
--- a/Framework/DataHandling/test/H5UtilTest.h
+++ b/Framework/DataHandling/test/H5UtilTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_H5UTILTEST_H_
-#define MANTID_DATAHANDLING_H5UTILTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -318,5 +317,3 @@ private:
     }
   }
 };
-
-#endif /* MANTID_DATAHANDLING_H5UTILTEST_H_ */
diff --git a/Framework/DataHandling/test/ISISDataArchiveTest.h b/Framework/DataHandling/test/ISISDataArchiveTest.h
index 5c85051226ecef07ca2d818fc11bb5e05c408061..2a89d686f86ef1b80828c27e58da1f48ea5c8c16 100644
--- a/Framework/DataHandling/test/ISISDataArchiveTest.h
+++ b/Framework/DataHandling/test/ISISDataArchiveTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ISISDATAARCHIVETEST_H_
-#define ISISDATAARCHIVETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -180,5 +179,3 @@ public:
     TS_ASSERT_EQUALS(actualResult, "");
   }
 };
-
-#endif /*ISISDATAARCHIVETEST_H_*/
diff --git a/Framework/DataHandling/test/InstrumentRayTracerTest.h b/Framework/DataHandling/test/InstrumentRayTracerTest.h
index bcf49f8ab61b315105403f3b607a26490cfae966..2a3e577d2289a1bf17aed583b3a570477ba65e09 100644
--- a/Framework/DataHandling/test/InstrumentRayTracerTest.h
+++ b/Framework/DataHandling/test/InstrumentRayTracerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTRAYTRACERTEST_H_
-#define INSTRUMENTRAYTRACERTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -109,5 +108,3 @@ private:
     std::cout << "\n";
   }
 };
-
-#endif // InstrumentRayTracerTEST_H_
diff --git a/Framework/DataHandling/test/JoinISISPolarizationEfficienciesTest.h b/Framework/DataHandling/test/JoinISISPolarizationEfficienciesTest.h
index a3348a991d88efff42d01010cc224dce17983b8d..99b87596d364aee55128cbfffd272b1919dbd43a 100644
--- a/Framework/DataHandling/test/JoinISISPolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/JoinISISPolarizationEfficienciesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIESTEST_H_
-#define MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIESTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -598,5 +597,3 @@ private:
     return retVal;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_JOINISISPOLARIZATIONEFFICIENCIESTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadAscii2Test.h b/Framework/DataHandling/test/LoadAscii2Test.h
index 2154b18ca91a01a8d1e6853c5330f7bf0ddf3598..7feaa017b0a2fb386403e1ce164159a1d928c244 100644
--- a/Framework/DataHandling/test/LoadAscii2Test.h
+++ b/Framework/DataHandling/test/LoadAscii2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADASCIITEST_H_
-#define LOADASCIITEST_H_
+#pragma once
 
 #include "MantidDataHandling/LoadAscii2.h"
 #include "SaveAscii2Test.h"
@@ -714,5 +713,3 @@ private:
     filename = save.getPropertyValue("Filename");
   }
 };
-
-#endif // LOADASCIITEST_H_
diff --git a/Framework/DataHandling/test/LoadAsciiStlTest.h b/Framework/DataHandling/test/LoadAsciiStlTest.h
index febe2edb304063061a554c8841ceda5790fc9ebd..96e1e2d6ee58999b07fdf58f0e5315b39c3d44d0 100644
--- a/Framework/DataHandling/test/LoadAsciiStlTest.h
+++ b/Framework/DataHandling/test/LoadAsciiStlTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_ASCIISTL_TEST_H_
-#define LOAD_ASCIISTL_TEST_H_
+#pragma once
 
 #include "MantidAPI/FileFinder.h"
 #include "MantidDataHandling/LoadAsciiStl.h"
@@ -83,5 +82,3 @@ private:
   }
   const ScaleUnits units = ScaleUnits::metres;
 };
-
-#endif /* LOAD_ASCIISTL_TEST_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadAsciiTest.h b/Framework/DataHandling/test/LoadAsciiTest.h
index aec7302a1d3cfa98ec8c6d25f357b0e9ad27a1f7..4a3d84cba65f215af24502fcd00e097f9fc2f8a7 100644
--- a/Framework/DataHandling/test/LoadAsciiTest.h
+++ b/Framework/DataHandling/test/LoadAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADASCIITEST_H_
-#define LOADASCIITEST_H_
+#pragma once
 
 #include "MantidDataHandling/LoadAscii.h"
 #include "cxxtest/TestSuite.h"
@@ -312,5 +311,3 @@ private:
     }
   }
 };
-
-#endif // LOADASCIITEST_H_
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadBBYTest.h b/Framework/DataHandling/test/LoadBBYTest.h
index f5e04d40e1d166c54aaa29dd52a11c6fbc4c4a37..e9e55b71bcdc6972ad7e27eda2dab3e75d313214 100644
--- a/Framework/DataHandling/test/LoadBBYTest.h
+++ b/Framework/DataHandling/test/LoadBBYTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef LOADMCSTASTEST_H_
-#define LOADMCSTASTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -181,5 +180,3 @@ public:
     TS_ASSERT_LESS_THAN(0.0399999, minTime);
   }
 };
-
-#endif /*LoadBBYTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadBinaryStlTest.h b/Framework/DataHandling/test/LoadBinaryStlTest.h
index f87e0b6cee8220339b669ccef0e5e659823c5d00..2915fd793f263dad7e448319a0ee8b25463065de 100644
--- a/Framework/DataHandling/test/LoadBinaryStlTest.h
+++ b/Framework/DataHandling/test/LoadBinaryStlTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_BINARYSTL_TEST_H_
-#define LOAD_BINARYSTL_TEST_H_
+#pragma once
 #include "MantidAPI/FileFinder.h"
 #include "MantidDataHandling/LoadBinaryStl.h"
 #include "MantidGeometry/Objects/MeshObject.h"
@@ -89,5 +88,4 @@ private:
   }
 
   const ScaleUnits units = ScaleUnits::metres;
-};
-#endif /* LOAD_BINARYSTL_TEST_H_ */
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadCalFileTest.h b/Framework/DataHandling/test/LoadCalFileTest.h
index 4a09ac4e5b8b302cece4c9a40615d076f8f2ceb0..66c5b0e9a91002eee246004d02b26f27ef2355d0 100644
--- a/Framework/DataHandling/test/LoadCalFileTest.h
+++ b/Framework/DataHandling/test/LoadCalFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADCALFILETEST_H_
-#define MANTID_DATAHANDLING_LOADCALFILETEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Run.h"
@@ -162,5 +161,3 @@ private:
     return loadAlg;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADCALFILETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadCanSAS1dTest.h b/Framework/DataHandling/test/LoadCanSAS1dTest.h
index 0597730ec9636f83233cbefa48541681628ad33f..db4cedf7a37dff40d75ec96575a9963d00d9e2fa 100644
--- a/Framework/DataHandling/test/LoadCanSAS1dTest.h
+++ b/Framework/DataHandling/test/LoadCanSAS1dTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADCANSAS1DTEST_H
-#define LOADCANSAS1DTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -238,5 +237,3 @@ const double LoadCanSAS1dTest::es808[] = {
     0.153269,  0.141219,  0.13289,   0.130725,  0.123281,  0.11705,
     0.104102,  0.0991949, 0.0933884, 0.082556,  0.0757769, 0.0715806,
     0.0674828, 0.064006,  0.0600373, 0.0581645, 0.0766164};
-
-#endif
diff --git a/Framework/DataHandling/test/LoadDAETest.h b/Framework/DataHandling/test/LoadDAETest.h
index 2ad2dc28d0f5a21e62eea5126d9fd73e7dc23fdb..cb6cd3bd816fd385b6a66e0d8c851c06edcba4cd 100644
--- a/Framework/DataHandling/test/LoadDAETest.h
+++ b/Framework/DataHandling/test/LoadDAETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADDAETEST_H_
-#define LOADDAETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -32,5 +31,3 @@ public:
         "LoadDAE is deprecated (on 2013-04-22). Use StartLiveData instead.");
   }
 };
-
-#endif /*LOADDAETEST_H_*/
diff --git a/Framework/DataHandling/test/LoadDaveGrpTest.h b/Framework/DataHandling/test/LoadDaveGrpTest.h
index 5dc43a1a032d3becf262c975f33783b90996937e..a580b0b378f352c898f8dd6aa4bcdb1c2aa73962 100644
--- a/Framework/DataHandling/test/LoadDaveGrpTest.h
+++ b/Framework/DataHandling/test/LoadDaveGrpTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADDAVEGRPTEST_H_
-#define LOADDAVEGRPTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
@@ -98,5 +97,3 @@ public:
     }
   }
 };
-
-#endif // LOADDAVEGRPTEST_H_
diff --git a/Framework/DataHandling/test/LoadDetectorInfoTest.h b/Framework/DataHandling/test/LoadDetectorInfoTest.h
index d9d0e1a0d7b1244ed1b76bdb4c194e1a55dad3ab..a8909db12b5b816f64bbecff08aa225a58ea2df8 100644
--- a/Framework/DataHandling/test/LoadDetectorInfoTest.h
+++ b/Framework/DataHandling/test/LoadDetectorInfoTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADDETECTORINFOTEST_H_
-#define LOADDETECTORINFOTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -457,5 +456,3 @@ private:
   std::string m_testfile;
   std::string m_wsName;
 };
-
-#endif /*LOADDETECTORINFOTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h b/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
index c0d09b42f7a524827d989f6ed26bf991e5e2dfa0..c213f76a3d7c6ea58c4aa3e599ff675c296839a5 100644
--- a/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
+++ b/Framework/DataHandling/test/LoadDetectorsGroupingFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILETEST_H_
-#define MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILETEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -467,5 +466,3 @@ public:
     TS_ASSERT_EQUALS(gws->getNumberHistograms(), 32);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADDETECTORSGROUPINGFILETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadDiffCalTest.h b/Framework/DataHandling/test/LoadDiffCalTest.h
index 278fcb855ef3d7ab33e419b45280218fa6ab60e9..6df1b26d6a3b29a373ad22babacf574fe481efc8 100644
--- a/Framework/DataHandling/test/LoadDiffCalTest.h
+++ b/Framework/DataHandling/test/LoadDiffCalTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDIFFCALTEST_H_
-#define MANTID_DATAHANDLING_LOADDIFFCALTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -161,5 +160,3 @@ public:
       Poco::File(groupingfile).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADDIFFCALTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadDspacemapTest.h b/Framework/DataHandling/test/LoadDspacemapTest.h
index 15515bd4d39489efb86d0113298a0fdaf0450f4c..7c8abd8070de89633a970a8d3a9f7e2cf69e9daa 100644
--- a/Framework/DataHandling/test/LoadDspacemapTest.h
+++ b/Framework/DataHandling/test/LoadDspacemapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADDSPACEMAPTEST_H_
-#define MANTID_DATAHANDLING_LOADDSPACEMAPTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidDataHandling/LoadDspacemap.h"
@@ -95,5 +94,3 @@ public:
     doTestVulcan("pid_offset_vulcan_new.dat.bin", "VULCAN-Binary");
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADDSPACEMAPTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadEMUauTest.h b/Framework/DataHandling/test/LoadEMUauTest.h
index 86c16e69bec8e0ca14b516f1bad5d0874da8e4c4..c4fabc01c4ba867a093efa98792125d81d358c22 100644
--- a/Framework/DataHandling/test/LoadEMUauTest.h
+++ b/Framework/DataHandling/test/LoadEMUauTest.h
@@ -1,6 +1,5 @@
 
-#ifndef LOADEMUAUTEST_H_
-#define LOADEMUAUTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -93,5 +92,3 @@ public:
     TS_ASSERT_DELTA(iparam("SampleAnalyser"), 1.8, 1.0e-3);
   }
 };
-
-#endif /*LOADEMUAUTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadEmptyInstrumentTest.h b/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
index 7ccbe4e87a37682503b02cce54351663ab2cb47e..ecf044d2e22abcf194210757ea577bea50516778 100644
--- a/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADEMPTYINSTRUMENTTEST_H_
-#define LOADEMPTYINSTRUMENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -1114,5 +1113,3 @@ private:
   std::string inputFile;
   std::string wsName;
 };
-
-#endif /*LOADEMPTYINSTRUMENTTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadEventNexusIndexSetupTest.h b/Framework/DataHandling/test/LoadEventNexusIndexSetupTest.h
index 89b791b43a137e082ae23a50c64288b9e049567a..59c3920f5be90a67bc573b3ee8456165ca73c7cb 100644
--- a/Framework/DataHandling/test/LoadEventNexusIndexSetupTest.h
+++ b/Framework/DataHandling/test/LoadEventNexusIndexSetupTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUPTEST_H_
-#define MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUPTEST_H_
+#pragma once
 
 #include "MantidTestHelpers/FakeObjects.h"
 #include <cxxtest/TestSuite.h>
@@ -367,5 +366,3 @@ public:
 private:
   MatrixWorkspace_sptr m_ws;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADEVENTNEXUSINDEXSETUPTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadEventNexusTest.h b/Framework/DataHandling/test/LoadEventNexusTest.h
index e46d7c81b4d53df1cfafb7800fb68e29c1422b3c..228a491444b3f53494523fc1cf8d4e2a9894c772 100644
--- a/Framework/DataHandling/test/LoadEventNexusTest.h
+++ b/Framework/DataHandling/test/LoadEventNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADEVENTNEXUSTEST_H_
-#define LOADEVENTNEXUSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -1116,5 +1115,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /*LOADEVENTNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadEventPreNexus2Test.h b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
index a736050a075dc88d5dc993e5a3bce8888a1339db..2e046e128e8b983955149527ea253edf519bf2c4 100644
--- a/Framework/DataHandling/test/LoadEventPreNexus2Test.h
+++ b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADEVENTPRENEXUSTEST_H_
-#define LOADEVENTPRENEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -310,5 +309,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /* LOADEVENTPRENEXUSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadFITSTest.h b/Framework/DataHandling/test/LoadFITSTest.h
index 157998040461a05f85992fd5eb7299dc06d2560c..aa6f05f7bc90d35dcb2c533786e38e5a09b9a828 100644
--- a/Framework/DataHandling/test/LoadFITSTest.h
+++ b/Framework/DataHandling/test/LoadFITSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADFITSTEST_H_
-#define MANTID_DATAHANDLING_LOADFITSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -458,5 +457,3 @@ public:
     TS_ASSERT(lf.execute());
   }
 };
-
-#endif // MANTID_DATAHANDLING_LOADFITSTEST_H_
diff --git a/Framework/DataHandling/test/LoadFullprofResolutionTest.h b/Framework/DataHandling/test/LoadFullprofResolutionTest.h
index f349739430394eb5949c168b2320fc4d660143ce..1bbfed94e8410c314000688a4900971ca93b96bd 100644
--- a/Framework/DataHandling/test/LoadFullprofResolutionTest.h
+++ b/Framework/DataHandling/test/LoadFullprofResolutionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADFULLPROFRESOLUTIONTEST_H_
-#define MANTID_DATAHANDLING_LOADFULLPROFRESOLUTIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -1177,5 +1176,3 @@ public:
 private:
   std::string wsName; // For Workspace property
 };
-
-#endif /* MANTID_DATAHANDLING_LOADFULLPROFRESOLUTIONTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h b/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
index fdad1f4afcf5f154d8c5157a7f0a63b4e5b8a464..8b8ea9147fb140ee71bd49213413d71b967a3df8 100644
--- a/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
+++ b/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILETEST_H_
-#define MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -527,5 +526,3 @@ public:
 private:
   std::string wsName; // For workspace property
 };
-
-#endif /* MANTID_DATAHANDLING_LOADGSASINSTRUMENTFILETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadGSSTest.h b/Framework/DataHandling/test/LoadGSSTest.h
index 4c844d1682344922ca534356e508a68d1c2b7c0e..66aa280e96b3d7993dae67cc08f4221e3e07e23b 100644
--- a/Framework/DataHandling/test/LoadGSSTest.h
+++ b/Framework/DataHandling/test/LoadGSSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADGSSTEST_H_
-#define LOADGSSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -216,5 +215,4 @@ private:
     loadAlg->setRethrows(true);
     return loadAlg;
   }
-};
-#endif // LOADGSSTEST_H_
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadHFIRSANSTest.h b/Framework/DataHandling/test/LoadHFIRSANSTest.h
index 970d0f0792e7dff29001b777a212d50704e80028..e35f166f77464acb4053a3f9facda5a992640628 100644
--- a/Framework/DataHandling/test/LoadHFIRSANSTest.h
+++ b/Framework/DataHandling/test/LoadHFIRSANSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LoadHFIRSANSTEST_H
-#define LoadHFIRSANSTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -218,5 +217,4 @@ public:
 
 private:
   std::string inputFile;
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadIDFFromNexusTest.h b/Framework/DataHandling/test/LoadIDFFromNexusTest.h
index 8d50824272c1ea6c32d528877140ea57bb055908..86b4a7c51e32507c4f367477250a52628fd9d82b 100644
--- a/Framework/DataHandling/test/LoadIDFFromNexusTest.h
+++ b/Framework/DataHandling/test/LoadIDFFromNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADINSTRUMENTTESTFROMRAW_H_
-#define LOADINSTRUMENTTESTFROMRAW_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -455,5 +454,3 @@ private:
   std::string inputFile;
   std::string wsName;
 };
-
-#endif /*LOADINSTRUMENTTESTFROMRAW_H_*/
diff --git a/Framework/DataHandling/test/LoadILLDiffractionTest.h b/Framework/DataHandling/test/LoadILLDiffractionTest.h
index 7b3e33df9a56970e86fff3ac4b6b95a6b4cdd7bc..a93a1ac43353f4fbf0c2ccbc7222e3c81ccbb5cd 100644
--- a/Framework/DataHandling/test/LoadILLDiffractionTest.h
+++ b/Framework/DataHandling/test/LoadILLDiffractionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLDIFFRACTIONTEST_H_
-#define MANTID_DATAHANDLING_LOADILLDIFFRACTIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -488,5 +487,3 @@ public:
 private:
   LoadILLDiffraction m_alg;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLDIFFRACTIONTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLIndirect2Test.h b/Framework/DataHandling/test/LoadILLIndirect2Test.h
index f778c8cee20dbb638f59f4ebdc4a089c874dbdf3..9b04ad1f4b0cd5da6cbdd3d81cd011f06f7ce8e5 100644
--- a/Framework/DataHandling/test/LoadILLIndirect2Test.h
+++ b/Framework/DataHandling/test/LoadILLIndirect2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLINDIRECT2TEST_H_
-#define MANTID_DATAHANDLING_LOADILLINDIRECT2TEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -164,5 +163,3 @@ private:
     return loader;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLINDIRECT2TEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLPolarizationFactorsTest.h b/Framework/DataHandling/test/LoadILLPolarizationFactorsTest.h
index 8da70044c442e80756410a5257ad9b8a04dac8b7..25d0b1fb4b078e8f41ca27f04643a4cb4ac853f2 100644
--- a/Framework/DataHandling/test/LoadILLPolarizationFactorsTest.h
+++ b/Framework/DataHandling/test/LoadILLPolarizationFactorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORSTEST_H_
-#define MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -229,5 +228,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLPOLARIZATIONFACTORSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLReflectometryTest.h b/Framework/DataHandling/test/LoadILLReflectometryTest.h
index 16c47d1292012f438fab38b0ae68542eb2a6a807..b1c9cd5b4fc26bd93aabf4220e8bf3e407624bf4 100644
--- a/Framework/DataHandling/test/LoadILLReflectometryTest.h
+++ b/Framework/DataHandling/test/LoadILLReflectometryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLREFLECTOMETRYTEST_H_
-#define MANTID_DATAHANDLING_LOADILLREFLECTOMETRYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -779,5 +778,3 @@ private:
     return loader;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLREFLECTOMETRYTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLSANSTest.h b/Framework/DataHandling/test/LoadILLSANSTest.h
index 89bcd122c504aa5a879a5156a1738fcd8cb9b302..46d7b6214cd506933954499945fec7d8eebbf95b 100644
--- a/Framework/DataHandling/test/LoadILLSANSTest.h
+++ b/Framework/DataHandling/test/LoadILLSANSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLSANSTEST_H_
-#define MANTID_DATAHANDLING_LOADILLSANSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -281,5 +280,3 @@ public:
 private:
   LoadILLSANS m_alg;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLSANSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadILLTOF2Test.h b/Framework/DataHandling/test/LoadILLTOF2Test.h
index 24c7dcd227ee6c73c2e13a98a2f69b788bed2f8b..af8c635b512d13899e40f1cc13bcbbf1fd612fd0 100644
--- a/Framework/DataHandling/test/LoadILLTOF2Test.h
+++ b/Framework/DataHandling/test/LoadILLTOF2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADILLTOF2TEST_H_
-#define LOADILLTOF2TEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -243,5 +242,3 @@ public:
 private:
   std::string m_dataFile;
 };
-
-#endif /*LOADILLTOF2TEST_H_*/
diff --git a/Framework/DataHandling/test/LoadILLTest.h b/Framework/DataHandling/test/LoadILLTest.h
index 5930f13d441b9e1c22f1a277534f83c9dbe3330d..2fa6ef09668c53da197f888c77bd4943030541c7 100644
--- a/Framework/DataHandling/test/LoadILLTest.h
+++ b/Framework/DataHandling/test/LoadILLTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADILLTEST_H_
-#define MANTID_DATAHANDLING_LOADILLTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -91,5 +90,3 @@ public:
     checkLoader("ILL/Figaro/000002", "LoadILLReflectometry");
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADILLTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadISISNexusTest.h b/Framework/DataHandling/test/LoadISISNexusTest.h
index 605cfae38924f108824f197e9bfdfa3126eb9ded..4c691e3351cba3814b8d9e80eb2801b242c2dcc6 100644
--- a/Framework/DataHandling/test/LoadISISNexusTest.h
+++ b/Framework/DataHandling/test/LoadISISNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADISISNEXUSTEST_H_
-#define LOADISISNEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -1665,5 +1664,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /*LOADISISNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadISISPolarizationEfficienciesTest.h b/Framework/DataHandling/test/LoadISISPolarizationEfficienciesTest.h
index 40292126ff970a65505fae6051b5dabbf9a957f1..fc554962b7abbf59aa5f86fc5c02eef58f60efcb 100644
--- a/Framework/DataHandling/test/LoadISISPolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/LoadISISPolarizationEfficienciesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIESTEST_H_
-#define MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIESTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -165,5 +164,3 @@ private:
                             "3.30000,1.000000,0.00993287\n"
                             "4.50000,1.000000,0.00668106\n"};
 };
-
-#endif /* MANTID_DATAHANDLING_LOADISISPOLARIZATIONEFFICIENCIESTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadInstrumentFromNexusTest.h b/Framework/DataHandling/test/LoadInstrumentFromNexusTest.h
index 784e11cc01b71b908d9bb9dd3f7c43436e502c40..028d5813634bd749ecb0ea40d8e9469e4461e5b6 100644
--- a/Framework/DataHandling/test/LoadInstrumentFromNexusTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentFromNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADINSTRUMENTFROMNEXUS_H_
-#define LOADINSTRUMENTFROMNEXUS_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -84,5 +83,3 @@ private:
     TS_ASSERT(alg.isExecuted());
   }
 };
-
-#endif /*LOADINSTRUMENTFROMNEXUS_H_*/
diff --git a/Framework/DataHandling/test/LoadInstrumentFromRawTest.h b/Framework/DataHandling/test/LoadInstrumentFromRawTest.h
index 4e88eabb87ffdc26db18a160134bc2b590885c74..914a76005b2b137e17dbe66db747579403795cd1 100644
--- a/Framework/DataHandling/test/LoadInstrumentFromRawTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentFromRawTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADINSTRUMENTTESTFROMRAW_H_
-#define LOADINSTRUMENTTESTFROMRAW_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -116,5 +115,3 @@ private:
   std::string inputFile;
   std::string wsName;
 };
-
-#endif /*LOADINSTRUMENTTESTFROMRAW_H_*/
diff --git a/Framework/DataHandling/test/LoadInstrumentTest.h b/Framework/DataHandling/test/LoadInstrumentTest.h
index 9d5ee1554178420ef31bb59ae1490ec1568ac3f3..8263e32e0576dcb869991d8a3b0797142789b7de 100644
--- a/Framework/DataHandling/test/LoadInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADINSTRUMENTTEST_H_
-#define LOADINSTRUMENTTEST_H_
+#pragma once
 
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/ExperimentInfo.h"
@@ -948,5 +947,3 @@ public:
 
   void test_SNAP() { doTest("SNAP_Definition.xml", 1); }
 };
-
-#endif /*LOADINSTRUMENTTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadIsawDetCalTest.h b/Framework/DataHandling/test/LoadIsawDetCalTest.h
index 07218c7281f993dc80d535fc1deb74a43aaff84f..2ef508bb91b8d1e2ece3c0f0ebd9f7fc14809f23 100644
--- a/Framework/DataHandling/test/LoadIsawDetCalTest.h
+++ b/Framework/DataHandling/test/LoadIsawDetCalTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DIFFRACTIONEVENTREADDETCALTEST_H_
-#define DIFFRACTIONEVENTREADDETCALTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -195,5 +194,3 @@ private:
   const std::string inputFile = "SNAP_34172_low.DetCal, SNAP_34172_high.DetCal";
   const std::string wsName = "testSNAP";
 };
-
-#endif /*DIFFRACTIONEVENTREADDETCALTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadLLBTest.h b/Framework/DataHandling/test/LoadLLBTest.h
index 4eb3dbf64e6d295ef59c828eab09eaa80ef52d43..31d1b88277bca223c18fa3c597c1dcde3f74d035 100644
--- a/Framework/DataHandling/test/LoadLLBTest.h
+++ b/Framework/DataHandling/test/LoadLLBTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADLLBTEST_H_
-#define MANTID_DATAHANDLING_LOADLLBTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -106,5 +105,4 @@ private:
     loader->setRethrows(true);
     return loader;
   }
-};
-#endif /* MANTID_DATAHANDLING_LOADLLBTEST_H_ */
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadLogTest.h b/Framework/DataHandling/test/LoadLogTest.h
index 2a3935a1c7fbd7f0edfe0c563735a2b4f3114646..c2812d8f294becf0a0de609a40718e61c78ff830 100644
--- a/Framework/DataHandling/test/LoadLogTest.h
+++ b/Framework/DataHandling/test/LoadLogTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADLOGTEST_H_
-#define LOADLOGTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -314,5 +313,3 @@ private:
   std::string outputSpace;
   std::string inputSpace;
 };
-
-#endif /*LOADLOGTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadMLZTest.h b/Framework/DataHandling/test/LoadMLZTest.h
index c31e874af5bd30de3198e65f1c7e93db46255c90..7107779ba7c910f3a5ecb32850f7fa8d366bf124 100644
--- a/Framework/DataHandling/test/LoadMLZTest.h
+++ b/Framework/DataHandling/test/LoadMLZTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMLZTEST_H_
-#define LOADMLZTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -100,5 +99,3 @@ private:
   Mantid::DataHandling::LoadMLZ loader;
   std::string m_dataFile;
 };
-
-#endif /*LoadMLZTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadMappingTableTest.h b/Framework/DataHandling/test/LoadMappingTableTest.h
index 3709ace829a201f668275590cf6c78adf014725b..907b640facf13647da9ae71fa82931139173dc02 100644
--- a/Framework/DataHandling/test/LoadMappingTableTest.h
+++ b/Framework/DataHandling/test/LoadMappingTableTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMAPPINGTABLETEST_H_
-#define LOADMAPPINGTABLETEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -94,5 +93,4 @@ private:
   std::string inputFile;
   std::string outputSpace;
   MatrixWorkspace_sptr work1;
-};
-#endif /*LOADMAPPINGTABLETEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadMaskTest.h b/Framework/DataHandling/test/LoadMaskTest.h
index d9d860485b4017fdb17368d8b6ccadf301118311..9b68071bbe3862359e4fb2ecdbd33e47893c0130 100644
--- a/Framework/DataHandling/test/LoadMaskTest.h
+++ b/Framework/DataHandling/test/LoadMaskTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADMASKTEST_H_
-#define MANTID_DATAHANDLING_LOADMASKTEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -607,5 +606,3 @@ public:
 private:
   LoadMask loadFile;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADMASKINGFILETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadMcStasNexusTest.h b/Framework/DataHandling/test/LoadMcStasNexusTest.h
index fdf8a151d9623bb69c2ba703a897c30b07693e08..3b856f9d3c1f97790c98431fd95009b47792aadf 100644
--- a/Framework/DataHandling/test/LoadMcStasNexusTest.h
+++ b/Framework/DataHandling/test/LoadMcStasNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMCSTASNEXUSTEST_H_
-#define LOADMCSTASNEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -111,5 +110,4 @@ private:
   LoadMcStasNexus loadMcStasNexusAlg;
   std::string inputFile;
   std::string outputSpace;
-};
-#endif /*LOADMCSTASNEXUSTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadMcStasTest.h b/Framework/DataHandling/test/LoadMcStasTest.h
index 9d1cfc97033fa459dfd4abc055502630dc3a7c83..82f354c36db0acb9e43b30ffe4181a8111f73429 100644
--- a/Framework/DataHandling/test/LoadMcStasTest.h
+++ b/Framework/DataHandling/test/LoadMcStasTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef LOADMCSTASTEST_H_
-#define LOADMCSTASTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -225,5 +224,3 @@ public:
 private:
   LoadMcStas loadFile;
 };
-
-#endif /*LoadMcStasTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadMuonLogTest.h b/Framework/DataHandling/test/LoadMuonLogTest.h
index 7a837547e685b40fa7bb3d55e19ae05027eff529..9ae6a1b014233b6598a4224c81257c2ef0d87908 100644
--- a/Framework/DataHandling/test/LoadMuonLogTest.h
+++ b/Framework/DataHandling/test/LoadMuonLogTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMUONLOGTEST_H_
-#define LOADMUONLOGTEST_H_
+#pragma once
 
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
@@ -98,5 +97,4 @@ private:
   std::string inputFile;
   std::string outputSpace;
   std::string inputSpace;
-};
-#endif /*LOADMUONLOGTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadMuonNexus1Test.h b/Framework/DataHandling/test/LoadMuonNexus1Test.h
index 975b99ef501485200b2cee9ffbf1558b6276689c..faf0615ea1bf39a30b412ecb7b03e65d2fd66f3d 100644
--- a/Framework/DataHandling/test/LoadMuonNexus1Test.h
+++ b/Framework/DataHandling/test/LoadMuonNexus1Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMUONNEXUS1TEST_H_
-#define LOADMUONNEXUS1TEST_H_
+#pragma once
 
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
@@ -1047,5 +1046,3 @@ public:
 private:
   LoadMuonNexus1 loader;
 };
-
-#endif /*LOADMUONNEXUS1TEST_H_*/
diff --git a/Framework/DataHandling/test/LoadMuonNexus2Test.h b/Framework/DataHandling/test/LoadMuonNexus2Test.h
index afac49784aff5c4766ff1dc4f922f1c056e81f51..f528f96203c0e2e26fdfcb87f1f0a12915c41989 100644
--- a/Framework/DataHandling/test/LoadMuonNexus2Test.h
+++ b/Framework/DataHandling/test/LoadMuonNexus2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMUONNEXUS2TEST_H_
-#define LOADMUONNEXUS2TEST_H_
+#pragma once
 
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
@@ -491,5 +490,3 @@ public:
 private:
   LoadMuonNexus2 loader;
 };
-
-#endif /*LOADMUONNEXUS2TEST_H_*/
diff --git a/Framework/DataHandling/test/LoadMuonNexusTest.h b/Framework/DataHandling/test/LoadMuonNexusTest.h
index 599a5c430da7b78f8f35ea49a9f77b2031a280b1..cb67f1f54cbd448afcb370a52694bec222ffa42f 100644
--- a/Framework/DataHandling/test/LoadMuonNexusTest.h
+++ b/Framework/DataHandling/test/LoadMuonNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADMUONNEXUSTEST_H_
-#define LOADMUONNEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -17,5 +16,3 @@ class LoadMuonNexusTest : public CxxTest::TestSuite {
 public:
   void testExec() {}
 };
-
-#endif /*LOADMUONNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadNGEMTest.h b/Framework/DataHandling/test/LoadNGEMTest.h
index b465a46c2e930a0654da439add019e17cce74373..ba6e07e92c9109ae1ea74cc82dfcabd589135040 100644
--- a/Framework/DataHandling/test/LoadNGEMTest.h
+++ b/Framework/DataHandling/test/LoadNGEMTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADNGEMTEST_H_
-#define LOADNGEMTEST_H_
+#pragma once
 
 #include <MantidAPI/AnalysisDataService.h>
 #include <MantidAPI/FileFinder.h>
@@ -201,5 +200,3 @@ private:
     return filepath;
   }
 };
-
-#endif // LOADNGEMTEST_H_
diff --git a/Framework/DataHandling/test/LoadNXSPETest.h b/Framework/DataHandling/test/LoadNXSPETest.h
index 3d75f47f8f1dde1402b0dad8c39dd5e792a798d0..6f97817c40b4b20c3ed662293109b1788596647f 100644
--- a/Framework/DataHandling/test/LoadNXSPETest.h
+++ b/Framework/DataHandling/test/LoadNXSPETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNXSPETEST_H_
-#define MANTID_DATAHANDLING_LOADNXSPETEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -68,5 +67,3 @@ public:
     TS_ASSERT(good_confidence > no_confidence);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADNXSPETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadNXcanSASTest.h b/Framework/DataHandling/test/LoadNXcanSASTest.h
index fd8baad407b2c4c1315925acfc0beea9098ec6c3..5291bdea12163e7f18a3b5dea06f85f6b0b96f2b 100644
--- a/Framework/DataHandling/test/LoadNXcanSASTest.h
+++ b/Framework/DataHandling/test/LoadNXcanSASTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNXCANSASTEST_H_
-#define MANTID_DATAHANDLING_LOADNXCANSASTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -601,5 +600,4 @@ private:
 
     alg2D.setPropertyValue("OutputWorkspace", outWsName);
   }
-};
-#endif /* MANTID_DATAHANDLING_LOADNXCANSASTEST_H_ */
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadNexusLogsTest.h b/Framework/DataHandling/test/LoadNexusLogsTest.h
index e49f1fc4c43b347d0251effc60d9c71b852c4d93..0c2cabbf0c25344a4de513c8b7c283367ec3da14 100644
--- a/Framework/DataHandling/test/LoadNexusLogsTest.h
+++ b/Framework/DataHandling/test/LoadNexusLogsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADNEXUSLOGSTEST_H_
-#define LOADNEXUSLOGSTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -299,5 +298,3 @@ private:
     return WorkspaceFactory::Instance().create("Workspace2D", 1, 1, 1);
   }
 };
-
-#endif /* LOADNEXUSLOGS_H_*/
diff --git a/Framework/DataHandling/test/LoadNexusMonitorsTest.h b/Framework/DataHandling/test/LoadNexusMonitorsTest.h
index f4b0c013a9b0720512b066dfb789cf0d71e5bc7b..a824d5e3298c1b139ee6f104ae80d358191c053d 100644
--- a/Framework/DataHandling/test/LoadNexusMonitorsTest.h
+++ b/Framework/DataHandling/test/LoadNexusMonitorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADNEXUSMONITORSTEST_H_
-#define LOADNEXUSMONITORSTEST_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Run.h"
@@ -372,5 +371,3 @@ private:
   LoadNexusMonitors ld;
   LoadNexusMonitors2 ld2;
 };
-
-#endif /*LOADNEXUSMONITORSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadNexusProcessed2Test.h b/Framework/DataHandling/test/LoadNexusProcessed2Test.h
index 50622570ef4419901644b8300f0b56d64c317b3d..d233ecfe376a427fef533986d143e9bcae99008d 100644
--- a/Framework/DataHandling/test/LoadNexusProcessed2Test.h
+++ b/Framework/DataHandling/test/LoadNexusProcessed2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADNEXUSPROCESSED2TEST_H_
-#define MANTID_DATAHANDLING_LOADNEXUSPROCESSED2TEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -310,5 +309,3 @@ public:
     TS_ASSERT(!wsOut->detectorInfo().isEquivalent(wsIn->detectorInfo()));
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADNEXUSPROCESSED2TEST_H_ */
diff --git a/Framework/DataHandling/test/LoadNexusProcessedTest.h b/Framework/DataHandling/test/LoadNexusProcessedTest.h
index 39dbbc8f813cd1221c30f50d8f406aaa3500ca76..5a43a2046beb3842a499bace593665cce383132c 100644
--- a/Framework/DataHandling/test/LoadNexusProcessedTest.h
+++ b/Framework/DataHandling/test/LoadNexusProcessedTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADNEXUSPROCESSEDTEST_H_
-#define LOADNEXUSPROCESSEDTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -1461,5 +1460,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /*LOADNEXUSPROCESSEDTESTRAW_H_*/
diff --git a/Framework/DataHandling/test/LoadNexusTest.h b/Framework/DataHandling/test/LoadNexusTest.h
index 5a75fce8a233c2a15cb6352331eee4ec323fbda3..a2a28f08e823dea99eb777ccdb492cc9cb589ba1 100644
--- a/Framework/DataHandling/test/LoadNexusTest.h
+++ b/Framework/DataHandling/test/LoadNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADNEXUSTEST_H_
-#define LOADNEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -143,5 +142,3 @@ private:
   std::string inputFile;
   std::string outputSpace;
 };
-
-#endif /*LOADNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadPDFgetNFileTest.h b/Framework/DataHandling/test/LoadPDFgetNFileTest.h
index 72433c114a88444f1dfeae796afc997ff302eef0..d305b1a9524e32e1b2ace14e440aadcdee7e00b0 100644
--- a/Framework/DataHandling/test/LoadPDFgetNFileTest.h
+++ b/Framework/DataHandling/test/LoadPDFgetNFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPDFGETNFILETEST_H_
-#define MANTID_DATAHANDLING_LOADPDFGETNFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -120,5 +119,3 @@ public:
     return;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADPDFGETNFILETEST_H_ */
diff --git a/Framework/DataHandling/test/LoadPLNTest.h b/Framework/DataHandling/test/LoadPLNTest.h
index 98f3862a5b5923b334a7a10da17afb46515fcb07..564dd5342365d46dc039531fc96e2226a8fe84c1 100644
--- a/Framework/DataHandling/test/LoadPLNTest.h
+++ b/Framework/DataHandling/test/LoadPLNTest.h
@@ -1,5 +1,4 @@
-#ifndef LOADPLNTEST_H_
-#define LOADPLNTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -135,5 +134,3 @@ public:
     TS_ASSERT_DELTA(logpm("SampleRotation"), 13.001, 1.0e-3);
   }
 };
-
-#endif /*LOADPLNTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadPSIMuonBinTest.h b/Framework/DataHandling/test/LoadPSIMuonBinTest.h
index ad2e4ab4c4c6479ceeb486f8fc61690757a7849b..45b3ae72f569ddc59622ae6fa77ea931c992d6ee 100644
--- a/Framework/DataHandling/test/LoadPSIMuonBinTest.h
+++ b/Framework/DataHandling/test/LoadPSIMuonBinTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPSIMUONBINTEST_H_
-#define MANTID_DATAHANDLING_LOADPSIMUONBINTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -196,5 +195,3 @@ private:
     return filepath;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADPSIMUONBINTEST_H_ */
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadParameterFileTest.h b/Framework/DataHandling/test/LoadParameterFileTest.h
index 2cbc7505b9eb0292195d077a1bd724339a27d223..5f2665851f4673d7482d6ede97b49ec3a7ca6737 100644
--- a/Framework/DataHandling/test/LoadParameterFileTest.h
+++ b/Framework/DataHandling/test/LoadParameterFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADPARAMETERFILETEST_H_
-#define LOADPARAMETERFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -239,5 +238,3 @@ private:
   std::string inputFile;
   std::string wsName;
 };
-
-#endif /*LOADPARAMETERFILETEST_H_*/
diff --git a/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h b/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h
index 77735d416d99910294f5b4366ba4cae6b3504679..b32a79c5c2134ec9927e91dcf742b966f54314c8 100644
--- a/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h
+++ b/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADPRENEXUSMONITORSTEST_H_
-#define LOADPRENEXUSMONITORSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -76,5 +75,3 @@ private:
   Mantid::DataHandling::LoadPreNexusMonitors loader;
   std::string runinfoFile;
 };
-
-#endif /* LOADPRENEXUSMONITORSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadPreNexusTest.h b/Framework/DataHandling/test/LoadPreNexusTest.h
index 9118d74536f8ba4a7c8d5c5ddd714cba427cf9c1..b7c274374202083e691e4d7dcfb0375a168b1766 100644
--- a/Framework/DataHandling/test/LoadPreNexusTest.h
+++ b/Framework/DataHandling/test/LoadPreNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPRENEXUSTEST_H_
-#define MANTID_DATAHANDLING_LOADPRENEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -68,5 +67,3 @@ public:
     AnalysisDataService::Instance().remove(outWSName);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADPRENEXUSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadQKKTest.h b/Framework/DataHandling/test/LoadQKKTest.h
index 6055850102066a18f916c5f42532cd2293232964..1003fe6a1d25085c5a85a3cc119ef2e193aefe47 100644
--- a/Framework/DataHandling/test/LoadQKKTest.h
+++ b/Framework/DataHandling/test/LoadQKKTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADQKKTEST_H_
-#define LOADQKKTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/SpectrumInfo.h"
@@ -74,5 +73,3 @@ public:
     }
   }
 };
-
-#endif // LOADQKKTEST_H_
diff --git a/Framework/DataHandling/test/LoadRKHTest.h b/Framework/DataHandling/test/LoadRKHTest.h
index e7ea85e46eb8007f27d996b809fc260e86578a72..780a70a3af4e03d015284ddde735cca3b7e4a1e4 100644
--- a/Framework/DataHandling/test/LoadRKHTest.h
+++ b/Framework/DataHandling/test/LoadRKHTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADRKHTEST_H_
-#define LOADRKHTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
@@ -370,5 +369,3 @@ private:
     file.close();
   }
 };
-
-#endif // LOADRKHTEST_H_
diff --git a/Framework/DataHandling/test/LoadRaw3Test.h b/Framework/DataHandling/test/LoadRaw3Test.h
index 9b0032e63db4a2e1fe8dfd8b9854f6b6e7f3e775..44ed9b419dcd0e68850c013f0171c361e2d6f226 100644
--- a/Framework/DataHandling/test/LoadRaw3Test.h
+++ b/Framework/DataHandling/test/LoadRaw3Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LoadRaw3TEST_H_
-#define LoadRaw3TEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
@@ -1231,5 +1230,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /*LoadRaw3TEST_H_*/
diff --git a/Framework/DataHandling/test/LoadRawBin0Test.h b/Framework/DataHandling/test/LoadRawBin0Test.h
index 65b913b36457ebf09a00b0ce7bc4f96ce5f727fb..6a098125181c3be100b0a2da1801982786377da0 100644
--- a/Framework/DataHandling/test/LoadRawBin0Test.h
+++ b/Framework/DataHandling/test/LoadRawBin0Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LoadRawBin0Test123_H_
-#define LoadRawBin0Test123_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -175,5 +174,3 @@ private:
   std::string inputFile;
   std::string outputSpace;
 };
-
-#endif /*LoadRawBin0Test_H_*/
diff --git a/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h b/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
index 5067ae6b14ed33bab9e35b44f69a21e2453598bc..dfb363245ae97b1db026e177f3c79b821762cd51 100644
--- a/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
+++ b/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADRAWSAVENXSLOADNXSTEST_H_
-#define LOADRAWSAVENXSLOADNXSTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
@@ -235,5 +234,3 @@ private:
   std::string outputSpace;
   std::string outputFile;
 };
-
-#endif /* LOADRAWSAVENXSLOADNXSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadRawSpectrum0Test.h b/Framework/DataHandling/test/LoadRawSpectrum0Test.h
index fae42744e5f54267775efd590c4f301b8a5d4203..c2baba38295e3fb39da316f1430d50deb952e611 100644
--- a/Framework/DataHandling/test/LoadRawSpectrum0Test.h
+++ b/Framework/DataHandling/test/LoadRawSpectrum0Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LoadRawSpectrum0Test_H_
-#define LoadRawSpectrum0Test_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -169,5 +168,3 @@ private:
   std::string inputFile;
   std::string outputSpace;
 };
-
-#endif /*LoadRawSpectrum0Test_H_*/
diff --git a/Framework/DataHandling/test/LoadSESANSTest.h b/Framework/DataHandling/test/LoadSESANSTest.h
index 00722d4b61273eb42f6012a4f1eb78013de1a1f5..4a4bc4ffbcdbfd6a5a1c22cff46ad24ca1915396 100644
--- a/Framework/DataHandling/test/LoadSESANSTest.h
+++ b/Framework/DataHandling/test/LoadSESANSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSESANSTEST_H_
-#define MANTID_DATAHANDLING_LOADSESANSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -115,5 +114,3 @@ private:
 
   LoadSESANS testAlg;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADSESANSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadSINQFocusTest.h b/Framework/DataHandling/test/LoadSINQFocusTest.h
index ec2928468610bc66838449f83cf893ed052b3f7f..30d2bbdbfb7afd3c85b243b893dcfeeaaf3b68c1 100644
--- a/Framework/DataHandling/test/LoadSINQFocusTest.h
+++ b/Framework/DataHandling/test/LoadSINQFocusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSINQTEST_H_
-#define MANTID_DATAHANDLING_LOADSINQTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -65,5 +64,3 @@ public:
 private:
   std::string m_testFile;
 };
-
-#endif /* MANTID_DATAHANDLING_LOADSINQTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadSNSNexusTest.h b/Framework/DataHandling/test/LoadSNSNexusTest.h
index 18e059038efc38b9e0c363e71637e63ab9be5991..fd8b636cb307548aaf50770b0f6d62cafda0540a 100644
--- a/Framework/DataHandling/test/LoadSNSNexusTest.h
+++ b/Framework/DataHandling/test/LoadSNSNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSNSNEXUSTEST_H_
-#define LOADSNSNEXUSTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -112,5 +111,3 @@ public:
     // TS_ASSERT_EQUALS(ws->sample().getName(),"NONE");
   }
 };
-
-#endif /*LOADSNSNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSNSspecTest.h b/Framework/DataHandling/test/LoadSNSspecTest.h
index 55e048213a19dd12e53877f691a64e04a1943174..6505003b5e3334d33cac50d2f05c464ab8978ae6 100644
--- a/Framework/DataHandling/test/LoadSNSspecTest.h
+++ b/Framework/DataHandling/test/LoadSNSspecTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSNSSPECTEST_H_
-#define LOADSNSSPECTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -114,5 +113,3 @@ public:
 private:
   Mantid::DataHandling::LoadSNSspec loader;
 };
-
-#endif /*LoadSNSSPECTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSPETest.h b/Framework/DataHandling/test/LoadSPETest.h
index 11ab26612086a6af350ade2c2335ec9a152f800f..c97dd8f796e36dd8b3d59f51c5d9282929544524 100644
--- a/Framework/DataHandling/test/LoadSPETest.h
+++ b/Framework/DataHandling/test/LoadSPETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSPETEST_H_
-#define LOADSPETEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
@@ -90,5 +89,3 @@ public:
 private:
   Mantid::DataHandling::LoadSPE loader;
 };
-
-#endif /*LoadSPETEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSampleDetailsFromRawTest.h b/Framework/DataHandling/test/LoadSampleDetailsFromRawTest.h
index 54885ac9fc2ee56029e679fbaa64c075a44477d5..f69d170502fab54d61d4fb6fefb5039024c9d025 100644
--- a/Framework/DataHandling/test/LoadSampleDetailsFromRawTest.h
+++ b/Framework/DataHandling/test/LoadSampleDetailsFromRawTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSAMPLEDETAILSFROMRAWTEST_H_
-#define LOADSAMPLEDETAILSFROMRAWTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -71,5 +70,3 @@ private:
     TS_ASSERT(alg.isExecuted());
   }
 };
-
-#endif /*LOADSAMPLEDETAILSFROMRAWTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSampleEnvironmentTest.h b/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
index 4c82e4388b032716ab5d273102277b462f5af882..a85e19ea9e47590a73aa9d72ab561f7e7950d302 100644
--- a/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
+++ b/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_ENVIRONMENTEST_H_
-#define LOAD_ENVIRONMENTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FileFinder.h"
@@ -111,5 +110,3 @@ private:
     return cube;
   }
 };
-
-#endif /* LOAD_ENVIRONMENTTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadSampleShapeTest.h b/Framework/DataHandling/test/LoadSampleShapeTest.h
index e58ea987aac4e598ee75cf7c1fd6f48a91653911..bcd5e660083bc312271ff24e07e9c0ad78717f81 100644
--- a/Framework/DataHandling/test/LoadSampleShapeTest.h
+++ b/Framework/DataHandling/test/LoadSampleShapeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_SHAPETEST_H_
-#define LOAD_SHAPETEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FileFinder.h"
@@ -288,5 +287,4 @@ private:
     loadAlg->setRethrows(true);
     return loadAlg;
   }
-};
-#endif /* LOAD_SHAPETEST_H_ */
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadSassenaTest.h b/Framework/DataHandling/test/LoadSassenaTest.h
index 62d1bbbd270bd556c420811e4e8ad9ac8f5b7036..b7d4dcefea2ae20b2c7a5286539a44cf7cb9aa41 100644
--- a/Framework/DataHandling/test/LoadSassenaTest.h
+++ b/Framework/DataHandling/test/LoadSassenaTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSASSENATEST_H_
-#define MANTID_DATAHANDLING_LOADSASSENATEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/WorkspaceGroup.h"
@@ -98,5 +97,3 @@ private:
   Mantid::DataHandling::LoadSassena m_alg;
 
 }; // end of class LoadSassenaTest
-
-#endif // MANTID_DATAHANDLING_LOADSASSENATEST_H_
diff --git a/Framework/DataHandling/test/LoadSaveAsciiTest.h b/Framework/DataHandling/test/LoadSaveAsciiTest.h
index 637184c2c426872c7c86980bf56cf3c9fc008e51..05c4cd2b46f71e7390f4b51fa6a2c7680a10665c 100644
--- a/Framework/DataHandling/test/LoadSaveAsciiTest.h
+++ b/Framework/DataHandling/test/LoadSaveAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSAVEASCIITEST_H_
-#define LOADSAVEASCIITEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -91,5 +90,3 @@ public:
     Poco::File(filename).remove();
   }
 };
-
-#endif /*LOADSAVEASCIITEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSpecTest.h b/Framework/DataHandling/test/LoadSpecTest.h
index 2fdab530b6754db92fe6d4b4a13603bd885ca202..3d0a3cb098b0d4850488e29cca7a99150bb18535 100644
--- a/Framework/DataHandling/test/LoadSpecTest.h
+++ b/Framework/DataHandling/test/LoadSpecTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSNSSPECTEST_H_
-#define LOADSNSSPECTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -104,5 +103,3 @@ public:
 private:
   Mantid::DataHandling::LoadSpec loader;
 };
-
-#endif /*LoadSNSSPECTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadSpice2dTest.h b/Framework/DataHandling/test/LoadSpice2dTest.h
index 51bc27170d0b57597b14a0be5400788d52ed9663..7f0acac4d8a9408700c720967a9e259e8064d936 100644
--- a/Framework/DataHandling/test/LoadSpice2dTest.h
+++ b/Framework/DataHandling/test/LoadSpice2dTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADSPICE2DTEST_H
-#define LOADSPICE2DTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -246,5 +245,4 @@ public:
 private:
   std::string inputFile;
   Mantid::DataHandling::LoadSpice2D spice2d;
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadSpiceAsciiTest.h b/Framework/DataHandling/test/LoadSpiceAsciiTest.h
index 9862a95a87e7313c745b63eead577502bcfcf4e1..4cfee433ed9023f6daed6b635149d1fe91488cbb 100644
--- a/Framework/DataHandling/test/LoadSpiceAsciiTest.h
+++ b/Framework/DataHandling/test/LoadSpiceAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPICEASCIITEST_H_
-#define MANTID_DATAHANDLING_LOADSPICEASCIITEST_H_
+#pragma once
 
 #include "MantidDataHandling/LoadSpiceAscii.h"
 #include <cxxtest/TestSuite.h>
@@ -178,5 +177,3 @@ public:
     TS_ASSERT(!testalg.isExecuted());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADSPICEASCIITEST_H_ */
diff --git a/Framework/DataHandling/test/LoadSpiceXML2DDetTest.h b/Framework/DataHandling/test/LoadSpiceXML2DDetTest.h
index 34dfa080d1788e79a6e1e75dadb2a15c79d5123e..e41e36beb7c65740cb7ed60473598d80d4fb9c58 100644
--- a/Framework/DataHandling/test/LoadSpiceXML2DDetTest.h
+++ b/Framework/DataHandling/test/LoadSpiceXML2DDetTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSPICEXML2DDETTEST_H_
-#define MANTID_DATAHANDLING_LOADSPICEXML2DDETTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -745,5 +744,3 @@ public:
     return datatablews;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADSPICEXML2DDETTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadStlTest.h b/Framework/DataHandling/test/LoadStlTest.h
index d3752f7b48c77015d6e6225391fb6e10377e8746..670dc417e336b150fcc20f469355891d0ce5e2e9 100644
--- a/Framework/DataHandling/test/LoadStlTest.h
+++ b/Framework/DataHandling/test/LoadStlTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_STL_TEST_H_
-#define LOAD_STL_TEST_H_
+#pragma once
 #include "MantidDataHandling/LoadStl.h"
 #include "MantidGeometry/Objects/MeshObject.h"
 #include "MantidKernel/V3D.h"
@@ -71,5 +70,4 @@ public:
     TS_ASSERT_DIFFERS(HashV3DPair{}(pair2), HashV3DPair{}(pair3));
     TS_ASSERT_DIFFERS(HashV3DPair{}(pair1), HashV3DPair{}(pair3));
   }
-};
-#endif /* LOAD_STL_TEST_H_ */
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/LoadSwansTest.h b/Framework/DataHandling/test/LoadSwansTest.h
index 6240f7ab030c3fa35a08518c0e555916a973da2e..f1ce11d74b5b00a811030e774dd88f56212fa7a4 100644
--- a/Framework/DataHandling/test/LoadSwansTest.h
+++ b/Framework/DataHandling/test/LoadSwansTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADSWANSTEST_H_
-#define MANTID_DATAHANDLING_LOADSWANSTEST_H_
+#pragma once
 
 #include "MantidAPI/Run.h"
 #include "MantidDataHandling/LoadSwans.h"
@@ -76,5 +75,3 @@ public:
         outputWS->run().getPropertyValueAsType<double>("wavelength"), 3.5);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_LOADSWANSTEST_H_ */
diff --git a/Framework/DataHandling/test/LoadTBLTest.h b/Framework/DataHandling/test/LoadTBLTest.h
index 7230989f652606e0e7ceb50d99178369169f99bd..08b723dd30f17a219ce355fcf9a74ab10a064bf3 100644
--- a/Framework/DataHandling/test/LoadTBLTest.h
+++ b/Framework/DataHandling/test/LoadTBLTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADTBLTEST_H_
-#define LOADTBLTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -402,5 +401,3 @@ private:
     TS_ASSERT_THROWS_NOTHING(Poco::File(m_abspath).remove());
   }
 };
-
-#endif // LOADTBLTEST_H_
diff --git a/Framework/DataHandling/test/LoadTOFRawNexusTest.h b/Framework/DataHandling/test/LoadTOFRawNexusTest.h
index 38f83ef651f865ab3d3555c8285e6806a708297f..9b229c327f9390df92b3bba9f27ab96b1b44538f 100644
--- a/Framework/DataHandling/test/LoadTOFRawNexusTest.h
+++ b/Framework/DataHandling/test/LoadTOFRawNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADTOFRAWNEXUSTEST_H_
-#define LOADTOFRAWNEXUSTEST_H_
+#pragma once
 
 #include "MantidDataHandling/LoadTOFRawNexus.h"
 
@@ -275,5 +274,3 @@ public:
     TS_ASSERT(loader.execute());
   }
 };
-
-#endif /*LOADTOFRAWNEXUSTEST_H_*/
diff --git a/Framework/DataHandling/test/LoadTest.h b/Framework/DataHandling/test/LoadTest.h
index a24581987a9dca80fc1e38dac03164a03eff7d2e..b7ef50b9f1f724a3a09062e3a2ba5325d2c08507 100644
--- a/Framework/DataHandling/test/LoadTest.h
+++ b/Framework/DataHandling/test/LoadTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOADTEST_H_
-#define LOADTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -364,5 +363,3 @@ public:
     }
   }
 };
-
-#endif /*LOADTEST_H_*/
diff --git a/Framework/DataHandling/test/MaskDetectorsInShapeTest.h b/Framework/DataHandling/test/MaskDetectorsInShapeTest.h
index 7cd274a36a6cdd6be39ef23be24b1d7c3979ceb8..9a6cac9aa9b8d290c6af54f10872f27addbdae1e 100644
--- a/Framework/DataHandling/test/MaskDetectorsInShapeTest.h
+++ b/Framework/DataHandling/test/MaskDetectorsInShapeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MARKDEADDETECTORSINSHAPETEST_H_
-#define MARKDEADDETECTORSINSHAPETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -161,5 +160,4 @@ public:
 
     AnalysisDataService::Instance().remove(workspace);
   }
-};
-#endif /*MARKDEADDETECTORSINSHAPETEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/MaskDetectorsTest.h b/Framework/DataHandling/test/MaskDetectorsTest.h
index 3aa29b96412a704936e93d11537065a9fd388622..9258e4f7859a280f32431b83bd73df66f650411c 100644
--- a/Framework/DataHandling/test/MaskDetectorsTest.h
+++ b/Framework/DataHandling/test/MaskDetectorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MARKDEADDETECTORSTEST_H_
-#define MARKDEADDETECTORSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -822,5 +821,3 @@ public:
 private:
   MaskDetectors marker;
 };
-
-#endif /*MARKDEADDETECTORSTEST_H_*/
diff --git a/Framework/DataHandling/test/MaskSpectraTest.h b/Framework/DataHandling/test/MaskSpectraTest.h
index 5b4b45250da1265146e9b5fa40e6d617b7dfff81..da35a4c65377075d11bd360853330642e08885dc 100644
--- a/Framework/DataHandling/test/MaskSpectraTest.h
+++ b/Framework/DataHandling/test/MaskSpectraTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MASKSPECTRATEST_H_
-#define MANTID_DATAHANDLING_MASKSPECTRATEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -127,5 +126,3 @@ public:
     TS_ASSERT_EQUALS(spectrumInfo.isMasked(3), true);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_MASKSPECTRATEST_H_ */
diff --git a/Framework/DataHandling/test/MeshFileIOTest.h b/Framework/DataHandling/test/MeshFileIOTest.h
index ebf640ff1032132b5468b501acaa8d9b1a014e77..77ac5a8ebb30c5102aee0ece4df17ef7403fb044 100644
--- a/Framework/DataHandling/test/MeshFileIOTest.h
+++ b/Framework/DataHandling/test/MeshFileIOTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LOAD_SHAPETEST_H_
-#define LOAD_SHAPETEST_H_
+#pragma once
 
 #include "MantidAPI/FileFinder.h"
 #include "MantidDataHandling/LoadBinaryStl.h"
@@ -161,5 +160,3 @@ private:
     }
   }
 };
-
-#endif
\ No newline at end of file
diff --git a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
index 129e247147271e8249bcce74e82523beaf61a89c..db4395595c92a2a9695dfec7fe2aec86348da279 100644
--- a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
+++ b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_MODIFYDETECTORDOTDAYFILETEST_H_
-#define MANTID_DATAHANDLING_MODIFYDETECTORDOTDAYFILETEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -136,5 +135,3 @@ public:
     Poco::File(fullFilename).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_MODIFYDETECTORDOTDAYFILETEST_H_ */
diff --git a/Framework/DataHandling/test/MoveInstrumentComponentTest.h b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
index 6ff50b753527b3de8557fa5803f3294065dbe029..d06d56d17062d1543103c6a34bc1614e25694b81 100644
--- a/Framework/DataHandling/test/MoveInstrumentComponentTest.h
+++ b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MOVEINSTRUMENTCOMPONENTTEST_H_
-#define MOVEINSTRUMENTCOMPONENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -146,5 +145,3 @@ private:
   boost::shared_ptr<Instrument> instrument;
   MatrixWorkspace_sptr WS;
 };
-
-#endif /*MOVEINSTRUMENTCOMPONENTTEST_H_*/
diff --git a/Framework/DataHandling/test/NXcanSASTestHelper.h b/Framework/DataHandling/test/NXcanSASTestHelper.h
index 979bd7b7ab7e3fe9aa313687fe15482383e145a7..208a518af2a599ab901ed293c9ee2a6ab171e39b 100644
--- a/Framework/DataHandling/test/NXcanSASTestHelper.h
+++ b/Framework/DataHandling/test/NXcanSASTestHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLINGTEST_NXCANSASTESTHELPER_H
-#define MANTID_DATAHANDLINGTEST_NXCANSASTESTHELPER_H
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include <Poco/TemporaryFile.h>
@@ -121,5 +120,4 @@ provide2DWorkspace(NXcanSASTestParameters &parameters);
 void set2DValues(Mantid::API::MatrixWorkspace_sptr ws);
 
 void removeFile(std::string filename);
-} // namespace NXcanSASTestHelper
-#endif
+} // namespace NXcanSASTestHelper
\ No newline at end of file
diff --git a/Framework/DataHandling/test/NexusTesterTest.h b/Framework/DataHandling/test/NexusTesterTest.h
index 62d4017ace1e29696145ade5a33a4566c37b25e3..b6faa1dcf5577b9aab4cc47aa095c2f4c82f6b9d 100644
--- a/Framework/DataHandling/test/NexusTesterTest.h
+++ b/Framework/DataHandling/test/NexusTesterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_NEXUSTESTERTEST_H_
-#define MANTID_DATAHANDLING_NEXUSTESTERTEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -55,5 +54,3 @@ public:
     TS_ASSERT_LESS_THAN(0.0, LoadSpeed);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_NEXUSTESTERTEST_H_ */
diff --git a/Framework/DataHandling/test/ORNLDataArchiveTest.h b/Framework/DataHandling/test/ORNLDataArchiveTest.h
index a9bdff128de76f5d84bae78b20db2c87e45c3e43..c2eeba4b342bd778bb78bb39e38f4c3f2635990c 100644
--- a/Framework/DataHandling/test/ORNLDataArchiveTest.h
+++ b/Framework/DataHandling/test/ORNLDataArchiveTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ORNLDATAARCHIVETEST_H_
-#define ORNLDATAARCHIVETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -144,5 +143,3 @@ public:
     TS_ASSERT(arch);
   }
 };
-
-#endif // ORNLDATAARCHIVETEST_H_
diff --git a/Framework/DataHandling/test/PDLoadCharacterizationsTest.h b/Framework/DataHandling/test/PDLoadCharacterizationsTest.h
index d7b09ee9ef125f336a1ee626dbd8dec1b5cf51d9..d4c8195d86a9ea115aadc3a2899aa0712757ec1e 100644
--- a/Framework/DataHandling/test/PDLoadCharacterizationsTest.h
+++ b/Framework/DataHandling/test/PDLoadCharacterizationsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONSTEST_H_
-#define MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONSTEST_H_
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <cxxtest/TestSuite.h>
@@ -473,5 +472,3 @@ public:
   }
   */
 };
-
-#endif /* MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONSTEST_H_ */
diff --git a/Framework/DataHandling/test/PrecompiledHeader.h b/Framework/DataHandling/test/PrecompiledHeader.h
index 619dc343fa424195d5cce63029d708b09e24fcb6..01998fafe5ca90306f4703414f66b1e6587bd976 100644
--- a/Framework/DataHandling/test/PrecompiledHeader.h
+++ b/Framework/DataHandling/test/PrecompiledHeader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLINGTEST_PRECOMPILED_HEADER_H_
-#define MANTID_DATAHANDLINGTEST_PRECOMPILED_HEADER_H_
+#pragma once
 
 // cxxtest
 #include <cxxtest/WrappedTestSuite.h>
@@ -17,5 +16,3 @@
 #include <set>
 #include <string>
 #include <vector>
-
-#endif // MANTID_DATAHANDLINGTEST_PRECOMPILED_HEADER_H_
\ No newline at end of file
diff --git a/Framework/DataHandling/test/RawFileInfoTest.h b/Framework/DataHandling/test/RawFileInfoTest.h
index b6a772a0b42fd139d0afe5f8c2c7d22b56b263fc..db90b36c467a46671b92fdeb144725b1b90fa942 100644
--- a/Framework/DataHandling/test/RawFileInfoTest.h
+++ b/Framework/DataHandling/test/RawFileInfoTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RAWFILEINFOTEST_H_
-#define RAWFILEINFOTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/ITableWorkspace.h"
@@ -135,5 +134,3 @@ private:
   // buildserver)
   const std::string m_filetotest;
 };
-
-#endif
diff --git a/Framework/DataHandling/test/RemoveLogsTest.h b/Framework/DataHandling/test/RemoveLogsTest.h
index 52a674bfc9d7e52353b09c59df310c5e2b0458f1..eae8f6d845299befc59192e9a80d0c6fe47104cd 100644
--- a/Framework/DataHandling/test/RemoveLogsTest.h
+++ b/Framework/DataHandling/test/RemoveLogsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REMOVELOGSTEST_H_
-#define REMOVELOGSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -163,5 +162,3 @@ private:
   RemoveLogs m_remover;
   std::string m_sampleWorkspace;
 };
-
-#endif /*REMOVELOGSTEST_H_*/
diff --git a/Framework/DataHandling/test/RenameLogTest.h b/Framework/DataHandling/test/RenameLogTest.h
index 79da18f9978f9603a79f09b1a6a9769593f5bd61..3ad646c3272421711bcb0a2092cbfe2a1fffd22a 100644
--- a/Framework/DataHandling/test/RenameLogTest.h
+++ b/Framework/DataHandling/test/RenameLogTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_RENAMELOGTEST_H_
-#define MANTID_DATAHANDLING_RENAMELOGTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -148,5 +147,3 @@ private:
   std::vector<Types::Core::DateAndTime> m_rawTimes;
   std::vector<double> m_rawValues;
 };
-
-#endif /* MANTID_DATAHANDLING_RENAMELOGTEST_H_ */
diff --git a/Framework/DataHandling/test/RotateInstrumentComponentTest.h b/Framework/DataHandling/test/RotateInstrumentComponentTest.h
index e07e026cd69271b0e95434d719f9a753380e2049..917664f79eec13dd9797be2b8516a68cd95c52ab 100644
--- a/Framework/DataHandling/test/RotateInstrumentComponentTest.h
+++ b/Framework/DataHandling/test/RotateInstrumentComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENTTEST_H_
-#define MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -104,5 +103,3 @@ private:
     return testWS;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_ROTATEINSTRUMENTCOMPONENTTEST_H_ */
diff --git a/Framework/DataHandling/test/RotateSourceTest.h b/Framework/DataHandling/test/RotateSourceTest.h
index 2dc5a59d5adf5b6c9e2aeb617c8c24ef336cff6b..5625b837f0ac2201332544a28d4f4fb1f2656f46 100644
--- a/Framework/DataHandling/test/RotateSourceTest.h
+++ b/Framework/DataHandling/test/RotateSourceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_ROTATESOURCETEST_H_
-#define MANTID_DATAHANDLING_ROTATESOURCETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -191,5 +190,3 @@ public:
     TS_ASSERT_DELTA(newPos.Z(), 1.0, 1E-5);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_ROTATESOURCETEST_H_ */
diff --git a/Framework/DataHandling/test/SampleEnvironmentFactoryTest.h b/Framework/DataHandling/test/SampleEnvironmentFactoryTest.h
index 5b4362eca0f0d55b6deaf5bb06d93b09aa32deec..54989dbd17a69859a10cc78b3677c7beecfec016 100644
--- a/Framework/DataHandling/test/SampleEnvironmentFactoryTest.h
+++ b/Framework/DataHandling/test/SampleEnvironmentFactoryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORYTEST_H_
-#define MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORYTEST_H_
+#pragma once
 
 #include "MantidDataHandling/SampleEnvironmentFactory.h"
 #include "MantidGeometry/Instrument/Container.h"
@@ -114,5 +113,3 @@ private:
     }
   };
 };
-
-#endif /* MANTID_DATAHANDLING_SAMPLEENVIRONMENTFACTORYTEST_H_ */
diff --git a/Framework/DataHandling/test/SampleEnvironmentSpecFileFinderTest.h b/Framework/DataHandling/test/SampleEnvironmentSpecFileFinderTest.h
index 6473c24a165ae62418599181169a2c1ddec0a87b..4ffa11066f7eed8fe68322754475e62a9b5e9d1d 100644
--- a/Framework/DataHandling/test/SampleEnvironmentSpecFileFinderTest.h
+++ b/Framework/DataHandling/test/SampleEnvironmentSpecFileFinderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECFILEFINDERTEST_H
-#define MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECFILEFINDERTEST_H
+#pragma once
 
 #include "MantidDataHandling/SampleEnvironmentFactory.h"
 #include <cxxtest/TestSuite.h>
@@ -142,5 +141,3 @@ private:
   const std::string m_envName = "TestingEnv";
   const std::string m_badName = "BadEnv";
 };
-
-#endif // MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECFILEFINDERTEST_H
diff --git a/Framework/DataHandling/test/SampleEnvironmentSpecParserTest.h b/Framework/DataHandling/test/SampleEnvironmentSpecParserTest.h
index 92846ea1cfef2b909e573cec667deee1f044be8a..a043183b4c2af0042b3fa6098037c962fc841ab8 100644
--- a/Framework/DataHandling/test/SampleEnvironmentSpecParserTest.h
+++ b/Framework/DataHandling/test/SampleEnvironmentSpecParserTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECPARSERTEST_H_
-#define MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECPARSERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -492,5 +491,3 @@ private:
     return parser.parse(name, "", instream);
   }
 };
-
-#endif /* MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECPARSERTEST_H_ */
diff --git a/Framework/DataHandling/test/SampleEnvironmentSpecTest.h b/Framework/DataHandling/test/SampleEnvironmentSpecTest.h
index c091fedda7df6ce64ee0da5e74f36c409f02b8d2..c51a1eb2e494b91b9085a43e1b53fb9e80989ab6 100644
--- a/Framework/DataHandling/test/SampleEnvironmentSpecTest.h
+++ b/Framework/DataHandling/test/SampleEnvironmentSpecTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECTEST_H_
-#define MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -108,5 +107,3 @@ public:
                      const std::invalid_argument &);
   }
 };
-
-#endif /* MANTID_GEOMETRY_SAMPLEENVIRONMENTSPECTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveANSTOAsciiTest.h b/Framework/DataHandling/test/SaveANSTOAsciiTest.h
index 5c24ba2940938f1f561be094ecdcb80f6d57baf8..3ee6ca51d410110d7a5b5570e4f1ee427795e6f9 100644
--- a/Framework/DataHandling/test/SaveANSTOAsciiTest.h
+++ b/Framework/DataHandling/test/SaveANSTOAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEANSTOASCIITEST_H_
-#define SAVEANSTOASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -230,5 +229,3 @@ private:
   std::string m_filename, m_name, m_long_filename;
   std::vector<double> m_dataX, m_dataY, m_dataE;
 };
-
-#endif /*SAVEANSTOTEST_H_*/
diff --git a/Framework/DataHandling/test/SaveAscii2Test.h b/Framework/DataHandling/test/SaveAscii2Test.h
index 7631fce85b1ad5c607e1297a34ec957e60a86724..5d646f4c9612bfa4e01c74317b9535ace7d79780 100644
--- a/Framework/DataHandling/test/SaveAscii2Test.h
+++ b/Framework/DataHandling/test/SaveAscii2Test.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEASCIITEST_H_
-#define SAVEASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -1047,5 +1046,4 @@ private:
         l2, polar, azimutal, nBins);
     AnalysisDataService::Instance().add(m_name, wsToSave);
   }
-};
-#endif /*SAVEASCIITEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveAsciiTest.h b/Framework/DataHandling/test/SaveAsciiTest.h
index 9de6e378b4a472f10d637e67b164ff4d535cda65..10de218915c3200fdd7a6e908998ba37543fe005 100644
--- a/Framework/DataHandling/test/SaveAsciiTest.h
+++ b/Framework/DataHandling/test/SaveAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEASCIITEST_H_
-#define SAVEASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -165,5 +164,3 @@ public:
     AnalysisDataService::Instance().remove(WSname);
   }
 };
-
-#endif /*SAVEASCIITEST_H_*/
diff --git a/Framework/DataHandling/test/SaveBankScatteringAnglesTest.h b/Framework/DataHandling/test/SaveBankScatteringAnglesTest.h
index e6d658925c30f3625a7784e67050a959c4c2f213..da2f92c5e88db9ec38b9028f9c672ef25b7e1954 100644
--- a/Framework/DataHandling/test/SaveBankScatteringAnglesTest.h
+++ b/Framework/DataHandling/test/SaveBankScatteringAnglesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLESTEST_H_
-#define MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLESTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -118,5 +117,3 @@ private:
     groupAlg->execute();
   }
 };
-
-#endif // MANTID_DATAHANDLING_SAVEBANKSCATTERINGANGLESTEST_H_
diff --git a/Framework/DataHandling/test/SaveCSVTest.h b/Framework/DataHandling/test/SaveCSVTest.h
index 04e0ab2d17011220b9739ac08cface826d1f06f9..749b80f8ce0b8e9fc6a72942175b0de51e814cc0 100644
--- a/Framework/DataHandling/test/SaveCSVTest.h
+++ b/Framework/DataHandling/test/SaveCSVTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVECSVTEST_H_
-#define SAVECSVTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/WorkspaceFactory.h"
@@ -265,5 +264,3 @@ private:
     stream.close();
   }
 };
-
-#endif /*SAVECSVTEST_H_*/
diff --git a/Framework/DataHandling/test/SaveCalFileTest.h b/Framework/DataHandling/test/SaveCalFileTest.h
index 53fcaf4a7bd30e5fa61d3cdfb43c62d27581e68c..29bf4eb9554d1005fea752e3630f1c3815ec5bf0 100644
--- a/Framework/DataHandling/test/SaveCalFileTest.h
+++ b/Framework/DataHandling/test/SaveCalFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVECALFILETEST_H_
-#define MANTID_DATAHANDLING_SAVECALFILETEST_H_
+#pragma once
 
 #include "MantidAPI/SpectrumInfo.h"
 #include "MantidDataHandling/LoadInstrument.h"
@@ -89,5 +88,3 @@ public:
       Poco::File(filename).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVECALFILETEST_H_ */
diff --git a/Framework/DataHandling/test/SaveCanSAS1dTest.h b/Framework/DataHandling/test/SaveCanSAS1dTest.h
index 85a6034dfe975f8a0460a04d1d8f83b6aa345809..363f891be4df0c652032a16ad33ed7361379cde9 100644
--- a/Framework/DataHandling/test/SaveCanSAS1dTest.h
+++ b/Framework/DataHandling/test/SaveCanSAS1dTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVECANSAS1DTEST_H
-#define SAVECANSAS1DTEST_H
+#pragma once
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/Axis.h"
@@ -276,5 +275,3 @@ private:
   std::string m_runNum;
   MatrixWorkspace_sptr ws;
 };
-
-#endif
diff --git a/Framework/DataHandling/test/SaveCanSAS1dTest2.h b/Framework/DataHandling/test/SaveCanSAS1dTest2.h
index 23d7628862ccf3ecb3ee9bfa7a327ba4c6426cf5..af23d1e4c2155eedca920384adf9edc158a45e5e 100644
--- a/Framework/DataHandling/test/SaveCanSAS1dTest2.h
+++ b/Framework/DataHandling/test/SaveCanSAS1dTest2.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVECANSAS1D2TEST_H
-#define SAVECANSAS1D2TEST_H
+#pragma once
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/Axis.h"
@@ -388,5 +387,3 @@ private:
   std::string m_runNum;
   MatrixWorkspace_sptr ws;
 };
-
-#endif
diff --git a/Framework/DataHandling/test/SaveDaveGrpTest.h b/Framework/DataHandling/test/SaveDaveGrpTest.h
index 8c702bf26a7dc0eca642dc19896fafba49052979..307f27d592ba04562561b49555636e23a5d60fcd 100644
--- a/Framework/DataHandling/test/SaveDaveGrpTest.h
+++ b/Framework/DataHandling/test/SaveDaveGrpTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDAVEGRPTEST_H_
-#define MANTID_DATAHANDLING_SAVEDAVEGRPTEST_H_
+#pragma once
 
 #include "MantidDataHandling/SaveDaveGrp.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -281,5 +280,3 @@ private:
     return inputWS;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEDAVEGRPTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveDetectorsGroupingTest.h b/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
index e05d9560bcc816b7222258d35117874eba968f58..afd64124b1c47301075be0d32c3cef0a84d18e70 100644
--- a/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
+++ b/Framework/DataHandling/test/SaveDetectorsGroupingTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDETECTORSGROUPINGTEST_H_
-#define MANTID_DATAHANDLING_SAVEDETECTORSGROUPINGTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Run.h"
@@ -151,5 +150,3 @@ public:
     file.remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEDETECTORSGROUPINGTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveDiffCalTest.h b/Framework/DataHandling/test/SaveDiffCalTest.h
index 6825892872f4854d724e88b82c1523aabcb717ed..748689f998598104cb9f7240e6dee8c018104ed9 100644
--- a/Framework/DataHandling/test/SaveDiffCalTest.h
+++ b/Framework/DataHandling/test/SaveDiffCalTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDIFFCALTEST_H_
-#define MANTID_DATAHANDLING_SAVEDIFFCALTEST_H_
+#pragma once
 
 #include <Poco/File.h>
 #include <cxxtest/TestSuite.h>
@@ -200,5 +199,3 @@ public:
       Poco::File(filename).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEDIFFCALTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveDspacemapTest.h b/Framework/DataHandling/test/SaveDspacemapTest.h
index 0882e71ac7906b292c76457847c68b930b3d240b..c0e1c660a891de332207560ab26112c805d856ae 100644
--- a/Framework/DataHandling/test/SaveDspacemapTest.h
+++ b/Framework/DataHandling/test/SaveDspacemapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEDSPACEMAPTEST_H_
-#define MANTID_DATAHANDLING_SAVEDSPACEMAPTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidDataHandling/LoadDspacemap.h"
@@ -117,5 +116,3 @@ public:
       Poco::File(filename).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEDSPACEMAPTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveFITSTest.h b/Framework/DataHandling/test/SaveFITSTest.h
index 7bfa59e8e31d5e6d768140de5180b5bf75e8e981..652e7f51cd4349c116191319ea5df96be7995806 100644
--- a/Framework/DataHandling/test/SaveFITSTest.h
+++ b/Framework/DataHandling/test/SaveFITSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEFITSTEST_H_
-#define MANTID_DATAHANDLING_SAVEFITSTEST_H_
+#pragma once
 
 #include "MantidDataHandling/SaveFITS.h"
 
@@ -143,5 +142,3 @@ public:
         saved.remove());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEFITSTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveFocusedXYETest.h b/Framework/DataHandling/test/SaveFocusedXYETest.h
index 713c9f4ac629f753da7cfef6023c2c7583cbf0fa..19e3783fdcaff463ab6267a13273fa9fa71dde5e 100644
--- a/Framework/DataHandling/test/SaveFocusedXYETest.h
+++ b/Framework/DataHandling/test/SaveFocusedXYETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEFOCUSEDXYETEST_H_
-#define SAVEFOCUSEDXYETEST_H_
+#pragma once
 
 #include "MantidDataHandling/SaveFocusedXYE.h"
 
@@ -646,5 +645,3 @@ private:
     return saver;
   }
 };
-
-#endif // SAVEFOCUSEDXYETEST_H_
diff --git a/Framework/DataHandling/test/SaveFullprofResolutionTest.h b/Framework/DataHandling/test/SaveFullprofResolutionTest.h
index 86972222444a744214f93eeb145fa29791c14a89..9bfadb39e281b78845e5278a17a38e285609ff45 100644
--- a/Framework/DataHandling/test/SaveFullprofResolutionTest.h
+++ b/Framework/DataHandling/test/SaveFullprofResolutionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEFullprofRESOLUTIONTEST_H_
-#define MANTID_DATAHANDLING_SAVEFullprofRESOLUTIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -308,5 +307,3 @@ public:
     return;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEFullprofRESOLUTIONTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveGDATest.h b/Framework/DataHandling/test/SaveGDATest.h
index b3be210d72e85df30fa756bd6e925b3d69f7f2f1..221578a36388ff3dc46fb58500a5cfc9484716fe 100644
--- a/Framework/DataHandling/test/SaveGDATest.h
+++ b/Framework/DataHandling/test/SaveGDATest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEGDATEST_H_
-#define MANTID_DATAHANDLING_SAVEGDATEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -314,5 +313,3 @@ const std::string SaveGDATest::PARAMS_FILE_TEXT =
     "INS  2PRCF 2   0.000000E+00   0.151242E+03   0.103200E+02   0.000000E+00\n"
     "INS  2PRCF 3   0.000000E+00   0.000000E+00   0.000000E+00\n"
     "0.000000E+00\n";
-
-#endif // MANTID_DATAHANDLING_SAVEGDATEST_H_
diff --git a/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h b/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
index 9a2c58bbff3beab8cd894cdb5ce23717a6bd5a26..a01cb51288a53e41eb72c3f9903cbe68fe9ce04f 100644
--- a/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
+++ b/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILETEST_H_
-#define MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -531,5 +530,3 @@ public:
     return true;
   }
 };
-
-#endif /* MANTID_ALGORITHMS_SAVEGSASINSTRUMENTFILETEST_H_ */
diff --git a/Framework/DataHandling/test/SaveGSSTest.h b/Framework/DataHandling/test/SaveGSSTest.h
index 33d0127fe126ae2090b0dc59ec28fec9260249f8..e22ea6823ba66013d8cd59f7ec028980f71dc6e3 100644
--- a/Framework/DataHandling/test/SaveGSSTest.h
+++ b/Framework/DataHandling/test/SaveGSSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEGSSTEST_H_
-#define SAVEGSSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/Axis.h"
@@ -367,5 +366,3 @@ private:
 
   SaveGSS *m_alg = nullptr;
 };
-
-#endif // SAVEGSSTEST_H_
diff --git a/Framework/DataHandling/test/SaveILLCosmosAsciiTest.h b/Framework/DataHandling/test/SaveILLCosmosAsciiTest.h
index 71418abceb7a87937910f90819c4de89fba554d3..84e267de2275976d204c06abd0360cec26457e5f 100644
--- a/Framework/DataHandling/test/SaveILLCosmosAsciiTest.h
+++ b/Framework/DataHandling/test/SaveILLCosmosAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEILLCOSMOSASCIITEST_H_
-#define MANTID_DATAHANDLING_SAVEILLCOSMOSASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -307,5 +306,4 @@ private:
   int m_points{2};
   std::vector<double> m_data;
   std::vector<double> m_zeros;
-};
-#endif /*MANTID_DATAHANDLING_SAVEILLCOSMOSASCIITEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveIsawDetCalTest.h b/Framework/DataHandling/test/SaveIsawDetCalTest.h
index 595267c82889c44e8f61c78f96907930f31672b8..2221f2f618f431b6c93a144caead9caf8d37de40 100644
--- a/Framework/DataHandling/test/SaveIsawDetCalTest.h
+++ b/Framework/DataHandling/test/SaveIsawDetCalTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEISAWDETCALTEST_H_
-#define MANTID_DATAHANDLING_SAVEISAWDETCALTEST_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidDataHandling/SaveIsawDetCal.h"
@@ -54,5 +53,3 @@ public:
       Poco::File(filename).remove();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEISAWDETCALTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveMaskTest.h b/Framework/DataHandling/test/SaveMaskTest.h
index ac94fa2e0bb32c38999aede79d141d28c20d82f6..e1584c0c7cff2d521950b94faf112dbb6ff942b1 100644
--- a/Framework/DataHandling/test/SaveMaskTest.h
+++ b/Framework/DataHandling/test/SaveMaskTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEMASKINGTOFILETEST_H_
-#define MANTID_DATAHANDLING_SAVEMASKINGTOFILETEST_H_
+#pragma once
 
 #include "MantidDataHandling/SaveMask.h"
 
@@ -99,5 +98,3 @@ public:
     cleanfile.remove(false);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEMASKINGTOFILETEST_H_ */
diff --git a/Framework/DataHandling/test/SaveNISTDATTest.h b/Framework/DataHandling/test/SaveNISTDATTest.h
index 44400c291ffaa19a182bc04a6ccbf43bdeeeaa1f..2e8fda3652cfbf351d29d39f050228e1d4de4097 100644
--- a/Framework/DataHandling/test/SaveNISTDATTest.h
+++ b/Framework/DataHandling/test/SaveNISTDATTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVENISTDATTEST_H_
-#define SAVENISTDATTEST_H_
+#pragma once
 
 #include "MantidDataHandling/Load.h"
 #include "MantidDataHandling/SaveNISTDAT.h"
@@ -54,5 +53,3 @@ public:
     Poco::File(outputFile).remove();
   }
 };
-
-#endif /*SAVENISTDATTEST_H_*/
diff --git a/Framework/DataHandling/test/SaveNXSPETest.h b/Framework/DataHandling/test/SaveNXSPETest.h
index e9691bdfbd7adc27313e9d270b7b9377013c2264..71525257205f7a223878624a109a0453a256363f 100644
--- a/Framework/DataHandling/test/SaveNXSPETest.h
+++ b/Framework/DataHandling/test/SaveNXSPETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVENXSPETEST_H_
-#define SAVENXSPETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -229,5 +228,3 @@ private:
     return boost::make_tuple(dims, signal, error);
   }
 };
-
-#endif /*SAVENXSPETEST_H_*/
diff --git a/Framework/DataHandling/test/SaveNXTomoTest.h b/Framework/DataHandling/test/SaveNXTomoTest.h
index 471f7bb2908820167c314e6377e46b2fd2dbfa68..82a7768c5a652a90142769f355f56bc4ad371406 100644
--- a/Framework/DataHandling/test/SaveNXTomoTest.h
+++ b/Framework/DataHandling/test/SaveNXTomoTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVENXTOMOTEST_H_
-#define SAVENXTOMOTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -418,5 +417,3 @@ private:
   std::string m_inputWS;
   int m_axisSize;
 };
-
-#endif /*SAVENXTOMOTEST_H_*/
diff --git a/Framework/DataHandling/test/SaveNXcanSASTest.h b/Framework/DataHandling/test/SaveNXcanSASTest.h
index 849c03ad294200f320d747e0964ba1b134c6ff37..6607bbdffffd4a7a292cc4f023ef5da3cf7ff924 100644
--- a/Framework/DataHandling/test/SaveNXcanSASTest.h
+++ b/Framework/DataHandling/test/SaveNXcanSASTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENXCANSASTEST_H_
-#define MANTID_DATAHANDLING_SAVENXCANSASTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -1005,5 +1004,3 @@ private:
     file.close();
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVENXCANSASTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveNexusESSTest.h b/Framework/DataHandling/test/SaveNexusESSTest.h
index 94771441e27ad14edce666ec1c3717f3b65b44b7..99b1845310e06569c115ed1e85c65db0f06c2b6e 100644
--- a/Framework/DataHandling/test/SaveNexusESSTest.h
+++ b/Framework/DataHandling/test/SaveNexusESSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENEXUSESSTEST_H_
-#define MANTID_DATAHANDLING_SAVENEXUSESSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -262,5 +261,3 @@ public:
     auto ws_out = test_utility::reload(handle.fullPath());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVENEXUSESSTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveNexusGeometryTest.h b/Framework/DataHandling/test/SaveNexusGeometryTest.h
index 8c200e4f0c9d24546114079872b549f0abaafc87..436664f8d3b6039b6b34be79044fac19614e5e40 100644
--- a/Framework/DataHandling/test/SaveNexusGeometryTest.h
+++ b/Framework/DataHandling/test/SaveNexusGeometryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVENEXUSGEOMETRYTEST_H_
-#define MANTID_DATAHANDLING_SAVENEXUSGEOMETRYTEST_H_
+#pragma once
 
 #include "MantidAPI/IEventWorkspace.h"
 #include "MantidAPI/ITableWorkspace.h"
@@ -215,5 +214,3 @@ public:
     TS_ASSERT(!saver.isExecuted());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVENEXUSGEOMETRYTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveNexusProcessedTest.h b/Framework/DataHandling/test/SaveNexusProcessedTest.h
index 903e54a0629e6bb781b41ca6ce1a31065f770801..b3bf80278c428e21104d95affb74887193ad7d0b 100644
--- a/Framework/DataHandling/test/SaveNexusProcessedTest.h
+++ b/Framework/DataHandling/test/SaveNexusProcessedTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVENEXUSPROCESSEDTEST_H_
-#define SAVENEXUSPROCESSEDTEST_H_
+#pragma once
 
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
@@ -1086,5 +1085,4 @@ private:
   std::string inputFile;
   std::string outputSpace;
   bool clearfiles;
-};
-#endif /*SAVENEXUSPROCESSEDTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveNexusTest.h b/Framework/DataHandling/test/SaveNexusTest.h
index 833d1e5749af7b70dd29265ba499ffa1b0cf00ad..724b6ef0eeaaf1ecc6dfb5dee0de374becf21770 100644
--- a/Framework/DataHandling/test/SaveNexusTest.h
+++ b/Framework/DataHandling/test/SaveNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVENEXUSTEST_H_
-#define SAVENEXUSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -114,5 +113,4 @@ private:
   SaveNexus algToBeTested;
   std::string outputFile;
   std::string title;
-};
-#endif /*SAVENEXUSTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveOpenGenieAsciiTest.h b/Framework/DataHandling/test/SaveOpenGenieAsciiTest.h
index 217b3f919d207f61b3e951dcc7577cbb7722b03e..518f60d7bce2c894f0447b32e8726e08b8cc0f2f 100644
--- a/Framework/DataHandling/test/SaveOpenGenieAsciiTest.h
+++ b/Framework/DataHandling/test/SaveOpenGenieAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEOPENGENIEASCIITEST_H_
-#define SAVEOPENGENIEASCIITEST_H_
+#pragma once
 #include "MantidDataHandling/SaveOpenGenieAscii.h"
 
 #include "MantidDataHandling/Load.h"
@@ -94,5 +93,3 @@ private:
     return alg;
   }
 };
-
-#endif /* SAVEOPENGENIEASCIITEST_H_ */
diff --git a/Framework/DataHandling/test/SavePARTest.h b/Framework/DataHandling/test/SavePARTest.h
index 49cfb85448a34dce740973cf9235bbe6c200b3c2..53aecc977af60afc69cbbb6ea26d5fc544669f3c 100644
--- a/Framework/DataHandling/test/SavePARTest.h
+++ b/Framework/DataHandling/test/SavePARTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEPARTEST_H_
-#define SAVEPARTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -176,5 +175,3 @@ private:
     return inputWS;
   }
 };
-
-#endif /*SAVEPARTEST_H_*/
diff --git a/Framework/DataHandling/test/SavePDFGuiTest.h b/Framework/DataHandling/test/SavePDFGuiTest.h
index 4bdfe5388137c6dbc4bb4679784aef14ae66ad57..d2a2d0245d8c37b1222adc0f86e869ebd90b172f 100644
--- a/Framework/DataHandling/test/SavePDFGuiTest.h
+++ b/Framework/DataHandling/test/SavePDFGuiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEPDFGUITEST_H_
-#define MANTID_DATAHANDLING_SAVEPDFGUITEST_H_
+#pragma once
 
 #include <Poco/File.h>
 #include <cxxtest/TestSuite.h>
@@ -129,5 +128,3 @@ public:
     AnalysisDataService::Instance().deepRemoveGroup(groupName);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVEPDFGUITEST_H_ */
diff --git a/Framework/DataHandling/test/SavePHXTest.h b/Framework/DataHandling/test/SavePHXTest.h
index 09bc1f29161c61907863640ec9842ef10414c8ae..4f1aa9d45fb21f524ea6950412fbfedf4d6d3ed7 100644
--- a/Framework/DataHandling/test/SavePHXTest.h
+++ b/Framework/DataHandling/test/SavePHXTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEPHXTEST_H_
-#define SAVEPHXTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <fstream>
@@ -206,5 +205,3 @@ private:
     return inputWS;
   }
 };
-
-#endif /*SAVEPHXTEST_H_*/
diff --git a/Framework/DataHandling/test/SaveParameterFileTest.h b/Framework/DataHandling/test/SaveParameterFileTest.h
index ec70ec0e1f91f2db3e2d334c74c408a9e5667891..ceef868a5138684cea719c03fd120b80a4e17447 100644
--- a/Framework/DataHandling/test/SaveParameterFileTest.h
+++ b/Framework/DataHandling/test/SaveParameterFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEPARAMETERFILETEST_H_
-#define SAVEPARAMETERFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -195,5 +194,3 @@ public:
 private:
   MatrixWorkspace_sptr m_ws;
 };
-
-#endif /*SAVEPARAMETERFILETEST_H_*/
diff --git a/Framework/DataHandling/test/SaveRKHTest.h b/Framework/DataHandling/test/SaveRKHTest.h
index 028860043a73a797adde7efdc97abb12e4aca1e4..3eff74e3cdec6d5ee5c9f6f1fd2ee10ee3460dc1 100644
--- a/Framework/DataHandling/test/SaveRKHTest.h
+++ b/Framework/DataHandling/test/SaveRKHTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVERKHTEST_H_
-#define SAVERKHTEST_H_
+#pragma once
 
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/SaveRKH.h"
@@ -279,5 +278,3 @@ private:
     return ws;
   }
 };
-
-#endif // SAVERKHTEST_H_
diff --git a/Framework/DataHandling/test/SaveRMCProfileTest.h b/Framework/DataHandling/test/SaveRMCProfileTest.h
index ed3643e876040ff29308d7bf615dab7933af9213..78630f05465f55f965f9aab91673c76bae7ea3ba 100644
--- a/Framework/DataHandling/test/SaveRMCProfileTest.h
+++ b/Framework/DataHandling/test/SaveRMCProfileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVERMCPROFILETEST_H_
-#define MANTID_DATAHANDLING_SAVERMCPROFILETEST_H_
+#pragma once
 
 #include <Poco/File.h>
 #include <cxxtest/TestSuite.h>
@@ -136,5 +135,3 @@ public:
     AnalysisDataService::Instance().deepRemoveGroup(groupName);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SAVERMCPROFILETEST_H_ */
diff --git a/Framework/DataHandling/test/SaveReflCustomAsciiTest.h b/Framework/DataHandling/test/SaveReflCustomAsciiTest.h
index 06cbb34c3c773e3a9da3b80abb65abf18d9bd7d0..5b66a08765e79c060978431419b239b5ecefacf2 100644
--- a/Framework/DataHandling/test/SaveReflCustomAsciiTest.h
+++ b/Framework/DataHandling/test/SaveReflCustomAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEREFLCUSTOMASCIITEST_H_
-#define SAVEREFLCUSTOMASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -254,5 +253,4 @@ private:
   }
   std::string m_filename, m_name, m_long_filename;
   std::vector<double> m_dataX, m_dataY, m_dataE;
-};
-#endif /*SAVEREFLCUSTOMASCIITEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveReflThreeColumnAsciiTest.h b/Framework/DataHandling/test/SaveReflThreeColumnAsciiTest.h
index 65f84327359f0e744068111ff460c9fbe6a3a09f..28660e35b806bf5ee4306fc8369faacd68d9c23a 100644
--- a/Framework/DataHandling/test/SaveReflThreeColumnAsciiTest.h
+++ b/Framework/DataHandling/test/SaveReflThreeColumnAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVEREFLTHREECOLUMNASCIITEST_H_
-#define SAVEREFLTHREECOLUMNASCIITEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -236,5 +235,3 @@ private:
   std::string m_filename, m_name, m_long_filename;
   std::vector<double> m_dataX, m_dataY, m_dataE;
 };
-
-#endif /*SAVEREFLTHREECOLUMNASCIITEST_H_*/
diff --git a/Framework/DataHandling/test/SaveReflectometryAsciiTest.h b/Framework/DataHandling/test/SaveReflectometryAsciiTest.h
index d0693246f208826abdbcc4977f484d162e210e54..7d25e46662079ad712e92135b408826cf077853a 100644
--- a/Framework/DataHandling/test/SaveReflectometryAsciiTest.h
+++ b/Framework/DataHandling/test/SaveReflectometryAsciiTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVEReflectometryAsciiTEST_H_
-#define MANTID_DATAHANDLING_SAVEReflectometryAsciiTEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -778,5 +777,4 @@ private:
   bool not_empty(std::ifstream &in) {
     return in.peek() != std::ifstream::traits_type::eof();
   }
-};
-#endif /*MANTID_DATAHANDLING_SAVEReflectometryAsciiTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveSESANSTest.h b/Framework/DataHandling/test/SaveSESANSTest.h
index f34feb0e4b10597a48c8d1a8dac4b55ce82563b1..5b8fe5282f11e8e92d78b10ce8edf2f247dbdedc 100644
--- a/Framework/DataHandling/test/SaveSESANSTest.h
+++ b/Framework/DataHandling/test/SaveSESANSTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SAVESESANSTEST_H_
-#define MANTID_DATAHANDLING_SAVESESANSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -136,5 +135,3 @@ private:
   const double ln2 = log(2.0);
   const double echoConstant = 1.5;
 };
-
-#endif /* MANTID_DATAHANDLING_SAVESESANSTEST_H_ */
diff --git a/Framework/DataHandling/test/SaveSPETest.h b/Framework/DataHandling/test/SaveSPETest.h
index 9c840ceb1f0281a50a6afb946f0e396f2ffaccc0..a47fca9b566f144e9a594c7928dc0ce60d22a9c2 100644
--- a/Framework/DataHandling/test/SaveSPETest.h
+++ b/Framework/DataHandling/test/SaveSPETest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVESPETEST_H_
-#define SAVESPETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -206,5 +205,3 @@ private:
 private:
   IAlgorithm *saver;
 };
-
-#endif /*SAVESPETEST_H_*/
diff --git a/Framework/DataHandling/test/SaveStlTest.h b/Framework/DataHandling/test/SaveStlTest.h
index bf44d53a94e5e39ab2c7f0b094cf49336fd94858..9a02116c0492daa86995b32026f87500d4ab2cb2 100644
--- a/Framework/DataHandling/test/SaveStlTest.h
+++ b/Framework/DataHandling/test/SaveStlTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVE_STL_TEST_H_
-#define SAVE_STL_TEST_H_
+#pragma once
 #include "MantidAPI/FileFinder.h"
 #include "MantidDataHandling//SaveStl.h"
 #include "MantidDataHandling/LoadBinaryStl.h"
@@ -88,5 +87,4 @@ public:
   const std::string cubePath =
       FileFinder::Instance().getFullPath("cubeBin.stl");
   std::string path;
-};
-#endif /*SAVE_STL_TEST_H_*/
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveTBLTest.h b/Framework/DataHandling/test/SaveTBLTest.h
index d2dc444cd4cc6e6f50ff766122060e833aa39b3a..1c144f0a57dcdeefecbc0c9f5e6508d28bcedef3 100644
--- a/Framework/DataHandling/test/SaveTBLTest.h
+++ b/Framework/DataHandling/test/SaveTBLTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVETBLTEST_H_
-#define SAVETBLTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -451,5 +450,4 @@ private:
   std::string m_name;
   std::string m_filename;
   std::string m_abspath;
-};
-#endif /*SAVETBLTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SaveToSNSHistogramNexusTest.h b/Framework/DataHandling/test/SaveToSNSHistogramNexusTest.h
index 13f7d3f663e88ac1f240c1f43af14132f585437e..d7772ce2e7f453dd52a3e565330ee1395ff5e59c 100644
--- a/Framework/DataHandling/test/SaveToSNSHistogramNexusTest.h
+++ b/Framework/DataHandling/test/SaveToSNSHistogramNexusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SAVESNSNEXUSTEST_H_
-#define SAVESNSNEXUSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmFactory.h"
 #include "MantidAPI/IAlgorithm.h"
@@ -58,5 +57,4 @@ private:
   SaveToSNSHistogramNexus algToBeTested;
   std::string outputFile;
   std::string title;
-};
-#endif /*SaveToSNSHistogramNexusTEST_H_*/
+};
\ No newline at end of file
diff --git a/Framework/DataHandling/test/SetBeamTest.h b/Framework/DataHandling/test/SetBeamTest.h
index d2a8534da5b8904673e4e3d16ca86414914636cb..d8bf13d9939ebc5407b9c1603d3d1efdad144143 100644
--- a/Framework/DataHandling/test/SetBeamTest.h
+++ b/Framework/DataHandling/test/SetBeamTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SETBEAMTEST_H_
-#define MANTID_DATAHANDLING_SETBEAMTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -121,5 +120,3 @@ private:
     return props;
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SETBEAMTEST_H_ */
diff --git a/Framework/DataHandling/test/SetSampleMaterialTest.h b/Framework/DataHandling/test/SetSampleMaterialTest.h
index 6adb0380a530c638b3b5bcf24b82c15d8a423f9e..fe1273aa1f77d6605ab003b5b0f4c7a98af91d40 100644
--- a/Framework/DataHandling/test/SetSampleMaterialTest.h
+++ b/Framework/DataHandling/test/SetSampleMaterialTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SetSampleMaterialTEST_H_
-#define SetSampleMaterialTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -284,5 +283,3 @@ public:
     TS_ASSERT_DELTA(material.numberDensity(), 0.23 * (2. + 3.), 1e-12)
   }
 };
-
-#endif /*SetSampleMaterialTEST_H_*/
diff --git a/Framework/DataHandling/test/SetSampleTest.h b/Framework/DataHandling/test/SetSampleTest.h
index 8a8544c605ee3a18bc61694642b7f2cbd3ae4542..875d08b474957e57c0a37c1d5dd31427260e31ad 100644
--- a/Framework/DataHandling/test/SetSampleTest.h
+++ b/Framework/DataHandling/test/SetSampleTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SETSAMPLETEST_H_
-#define MANTID_DATAHANDLING_SETSAMPLETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -767,5 +766,3 @@ private:
   const std::string m_instName = "ISIS_Histogram";
   const std::string m_envName = "TestEnv";
 };
-
-#endif /* MANTID_ALGORITHMS_SETSAMPLETEST_H_ */
diff --git a/Framework/DataHandling/test/SetScalingPSDTest.h b/Framework/DataHandling/test/SetScalingPSDTest.h
index d31702a90e413b69a0a51962e0d003e0fc39705c..3813cb5add2c02d985e877d9e91f577343789afe 100644
--- a/Framework/DataHandling/test/SetScalingPSDTest.h
+++ b/Framework/DataHandling/test/SetScalingPSDTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SETSCALINGPSDTEST_H_
-#define SETSCALINGPSDTEST_H_
+#pragma once
 
 #include "MantidAPI/SpectrumInfo.h"
 #include "MantidDataHandling/LoadEmptyInstrument.h"
@@ -180,5 +179,3 @@ private:
   /// Constant shift
   const double m_y_offset;
 };
-
-#endif /*SETSCALINGPSDTEST_H_*/
diff --git a/Framework/DataHandling/test/SortTableWorkspaceTest.h b/Framework/DataHandling/test/SortTableWorkspaceTest.h
index 112e4d15de0cc7e8189ddbf462ebe8f3398ff9d3..8c8b773cfab2bbfdddb18a12624139ed6fd99159 100644
--- a/Framework/DataHandling/test/SortTableWorkspaceTest.h
+++ b/Framework/DataHandling/test/SortTableWorkspaceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_SORTTABLEWORKSPACETEST_H_
-#define MANTID_DATAHANDLING_SORTTABLEWORKSPACETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -590,5 +589,3 @@ public:
     TS_ASSERT(!alg.isExecuted());
   }
 };
-
-#endif /* MANTID_DATAHANDLING_SORTTABLEWORKSPACETEST_H_ */
diff --git a/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h b/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
index 20195f8a73a83f3b3ebe1fb2fb97231d38baa632..ea9247a2dbfa450231647222665829c359437775 100644
--- a/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
+++ b/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTORTEST_H_
-#define MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -89,5 +88,3 @@ private:
                endTimeExtracted == expectedEndTimeString);
   }
 };
-
-#endif /* MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTORTEST_H_ */
diff --git a/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h b/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
index f8b3191eafd947f6d62af3c54a13f09df647decb..0ed7df3c1e8de0982e5cdaa03c4d52ed3395db18 100644
--- a/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
+++ b/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UPDATEINSTRUMENTTESTFROMFILE_H_
-#define UPDATEINSTRUMENTTESTFROMFILE_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -311,5 +310,3 @@ private:
   std::string wsName;
   std::string xmlFile;
 };
-
-#endif /*UPDATEINSTRUMENTTESTFROMFILE_H_*/
diff --git a/Framework/DataHandling/test/XMLInstrumentParameterTest.h b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
index 5689c5990592f369fb8afc0d7a69b27da71def25..f17e095d5b215b4f3ea61e270b26e2e1808392e9 100644
--- a/Framework/DataHandling/test/XMLInstrumentParameterTest.h
+++ b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef XMLLOGFILETEST_H_
-#define XMLLOGFILETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -109,5 +108,3 @@ public:
     TS_ASSERT_DELTA(testParamEntry.createParamValue(dummy), 0.0, 0.0001);
   }
 };
-
-#endif /*XMLLOGFILETEST_H_*/