diff --git a/Framework/Geometry/inc/MantidGeometry/ComponentParser.h b/Framework/Geometry/inc/MantidGeometry/ComponentParser.h
index 953a5b7e8a4fbd2e53aa29d09b52a0bcc746ac4e..c17434e7f5ef489cfabe5a81d7f46b585e56622d 100644
--- a/Framework/Geometry/inc/MantidGeometry/ComponentParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/ComponentParser.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_COMPONENTPARSER_H_
-#define MANTID_GEOMETRY_COMPONENTPARSER_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidKernel/System.h"
@@ -66,5 +65,3 @@ private:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTPARSER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/AngleUnits.h b/Framework/Geometry/inc/MantidGeometry/Crystal/AngleUnits.h
index b52be6203f44c33d6a231af4db8aa10105768674..862cae80c8351c8b374c4239d25f631396c85d6a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/AngleUnits.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/AngleUnits.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_ANGLEUNITS_H_
-#define MANTID_GEOMETRY_ANGLEUNITS_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/PhysicalConstants.h"
@@ -27,5 +26,3 @@ constexpr double rad2deg = 180. / M_PI;
 enum AngleUnits { angDegrees, angRadians };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_ANGLEUNITS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h
index efe815f73bc5b45c4b00b50c8ade30848fd017f2..8de06fe5f8f14052a9a5bd9bb02af219a84f1552 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.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_BASICHKLFILTERS_H_
-#define MANTID_GEOMETRY_BASICHKLFILTERS_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/HKLFilter.h"
 #include "MantidGeometry/Crystal/ReflectionCondition.h"
@@ -156,5 +155,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_BASICHKLFILTERS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
index 35e958ea9d5493c894efcd00ad351cad7daf69f6..7dde867cf22a22da8637a5c3f8613f46046cf952 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.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_BRAGGSCATTERER_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/V3D.h"
@@ -87,5 +86,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
index f40dfeb76ef7682771cd1cbfef8f3aa7e351ede6..790745ccdc0e073d36451da7769415bebd47e083 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.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_BRAGGSCATTERERFACTORY_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/DynamicFactory.h"
@@ -92,5 +91,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
             .subscribeScatterer<classname>()),                                 \
        0));                                                                    \
   }
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
index f2924e5513098ce7571b154b920b38aea6c350e7..2f559f6306d8af69069d4d82df07dc1d4768a826 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.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_BRAGGSCATTERERINCRYSTALSTRUCTURE_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERINCRYSTALSTRUCTURE_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/BraggScatterer.h"
 #include "MantidGeometry/Crystal/SpaceGroup.h"
@@ -81,5 +80,3 @@ getTokenizedPositionString(const std::string &position);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERINCRYSTALSTRUCTURE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
index 1aac6d8c9e4ee6e2ef1c33dda1f199a4b6fbe8dc..78d63cfd96235f6b693897984ae22b88b1ea144e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.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_CENTERINGGROUP_H_
-#define MANTID_GEOMETRY_CENTERINGGROUP_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/Group.h"
 #include "MantidGeometry/DllConfig.h"
@@ -92,5 +91,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
     SingletonHolder<Mantid::Geometry::CenteringGroupCreatorImpl>;
 }
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_CENTERINGGROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
index 17358ec9e8c66b8482aad1e2e94cfd0509b5b1cf..be2af73f21a975ba4c2ab3b8d2bd63b93360e3c2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.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_COMPOSITEBRAGGSCATTERER_H_
-#define MANTID_GEOMETRY_COMPOSITEBRAGGSCATTERER_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/BraggScatterer.h"
 #include "MantidGeometry/DllConfig.h"
@@ -85,5 +84,3 @@ protected:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h
index c58ca26de988994133990c1b7a6c072068d99241..26c4c8eb2a6a6be26f38cea434c388f6ab407052 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.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_CONCRETEPEAKTRANSFORMFACTORY_H_
-#define MANTID_GEOMETRY_CONCRETEPEAKTRANSFORMFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransformFactory.h"
 #include <boost/make_shared.hpp>
@@ -40,5 +39,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ConventionalCell.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ConventionalCell.h
index 0084b2d16e18807d1aac2316d39888041bf218b8..ebf2d8a9060a784cd4fe4c80982b8950f25039f6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ConventionalCell.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ConventionalCell.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_CONVENTIONAL_CELL_H_
-#define MANTID_GEOMETRY_CONVENTIONAL_CELL_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/ReducedCell.h"
 #include "MantidGeometry/DllConfig.h"
@@ -82,5 +81,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_CONVENTIONAL_CELL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h
index a1398df0d6d9f616a29d1929683af7c9a94e4347..e6fea4d924a0b738ebcdf7c6684bbafef0e0015c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.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_CRYSTALSTRUCTURE_H_
-#define MANTID_GEOMETRY_CRYSTALSTRUCTURE_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/CompositeBraggScatterer.h"
 #include "MantidGeometry/Crystal/HKLFilter.h"
@@ -106,5 +105,3 @@ using CrystalStructure_sptr = boost::shared_ptr<CrystalStructure>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_CRYSTALSTRUCTURE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
index dc6da9d6439158aa26cdc7a321ae1a6f25809770..bd272c178fa259fd94535facb50c4a9c8d790458 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.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_CYCLICGROUP_H_
-#define MANTID_GEOMETRY_CYCLICGROUP_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/Group.h"
 #include "MantidGeometry/DllConfig.h"
@@ -80,5 +79,3 @@ using CyclicGroup_const_sptr = boost::shared_ptr<const CyclicGroup>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_CYCLICGROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/EdgePixel.h b/Framework/Geometry/inc/MantidGeometry/Crystal/EdgePixel.h
index 1e0eb796b24684cd7f9c8814e8550ab75605c856..b8e5220195be76621c8affcb0b3105bdaff1fda0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/EdgePixel.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/EdgePixel.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_EDGEPIXEL_H_
-#define MANTID_GEOMETRY_EDGEPIXEL_H_
+#pragma once
 
 #include "MantidGeometry/Instrument.h"
 
@@ -19,5 +18,3 @@ MANTID_GEOMETRY_DLL bool edgePixel(Geometry::Instrument_const_sptr inst,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_EDGEPIXEL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h b/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
index e34e3fc03ae825545d1c43e4fd2d99a5d6cf99b6..6510d3cd102c2903a55635d8db75ab75424a16d2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/Group.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_GROUP_H_
-#define MANTID_GEOMETRY_GROUP_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/SymmetryOperation.h"
 #include "MantidGeometry/DllConfig.h"
@@ -212,5 +211,3 @@ MANTID_GEOMETRY_DLL bool operator!=(const Group_const_sptr &lhs,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_GROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/GroupTransformation.h b/Framework/Geometry/inc/MantidGeometry/Crystal/GroupTransformation.h
index 9e21dd21097373a15c0163b2ec65091828e08da9..f4d44480ce1efe98262046297ef7a444bc49e6b4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/GroupTransformation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/GroupTransformation.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_GROUPTRANSFORMATION_H_
-#define MANTID_GEOMETRY_GROUPTRANSFORMATION_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/Group.h"
 #include "MantidGeometry/Crystal/SymmetryOperation.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_GROUPTRANSFORMATION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
index ad40e49ea511b93c57a487a407c73dd2a7e96042..84f299d6b7ea18bef3362b3dd52950ed4ff805c9 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.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_HKLFILTER_H_
-#define MANTID_GEOMETRY_HKLFILTER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/V3D.h"
@@ -156,5 +155,3 @@ operator|(const HKLFilter_const_sptr &lhs, const HKLFilter_const_sptr &rhs);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_HKLFILTER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h
index bad2bea3e8fbd8f90aaa74ca4adabcab1256134e..7f814a12930735fc79cd68517071f44cd269744c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.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_HKLFILTERWAVELENGTH_H_
-#define MANTID_GEOMETRY_HKLFILTERWAVELENGTH_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/HKLFilter.h"
 #include "MantidGeometry/DllConfig.h"
@@ -41,5 +40,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_HKLFILTERWAVELENGTH_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
index c43ccfe1c0ea23e9611b916ca78caf36b52e26b5..fb45fef75fae54b1f9746615252d257493c098da 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.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_HKLGENERATOR_H_
-#define MANTID_GEOMETRY_HKLGENERATOR_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/UnitCell.h"
 #include "MantidGeometry/DllConfig.h"
@@ -167,5 +166,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_HKLGENERATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h
index f0f8eddbc45efa67a0c982c677e031ca174b08e1..06a9d44125832377ee8b90815d3dd9ea363884c0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_IPEAK_H_
-#define MANTID_API_IPEAK_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakShape.h"
 #include "MantidGeometry/DllConfig.h"
@@ -114,5 +113,3 @@ public:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_API_IPEAK_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IndexingUtils.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IndexingUtils.h
index 9d2366f9872c79246b0dfeed5caf4719bec054d5..db2f6f8369031248e713e7f4671c0d7d8c90daf1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IndexingUtils.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IndexingUtils.h
@@ -6,8 +6,7 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 /* File: Indexing_Utils.h */
 
-#ifndef MANTID_GEOMETRY_INDEXING_UTILS_H_
-#define MANTID_GEOMETRY_INDEXING_UTILS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -266,5 +265,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_INDEXING_UTILS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
index 3a62ceb78ea415947b846d67258d2de4fef89edd..e4201f67d8ba4f754ddf93c3f2bb9eb38328763f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.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_ISOTROPICATOMBRAGGSCATTERER_H_
-#define MANTID_GEOMETRY_ISOTROPICATOMBRAGGSCATTERER_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/BraggScattererInCrystalStructure.h"
 #include "MantidGeometry/Crystal/UnitCell.h"
@@ -129,5 +128,3 @@ getIsotropicAtomBraggScattererString(const BraggScatterer_sptr &scatterer);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_ISOTROPICATOMBRAGGSCATTERER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPair.h b/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPair.h
index 0e43c81950ebc10262649f39f4d5fa55b250839b..a4119b7f95312c028b566b8620e176a0475935a1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPair.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPair.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_MATRIXVECTORPAIR_H_
-#define MANTID_GEOMETRY_MATRIXVECTORPAIR_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Matrix.h"
@@ -93,5 +92,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MATRIXVECTORPAIR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPairParser.h b/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPairParser.h
index a8822c85c1aa3c0cf09b837431704395acd02966..681ba50785722fbea6aa91fb89bc0581e4417593 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPairParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/MatrixVectorPairParser.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_MATRIXVECTORPAIRPARSER_H_
-#define MANTID_GEOMETRY_MATRIXVECTORPAIRPARSER_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/MatrixVectorPair.h"
 #include "MantidGeometry/Crystal/V3R.h"
@@ -291,5 +290,3 @@ parseMatrixVectorPair(const std::string &matrixVectorString) {
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MATRIXVECTORPAIRPARSER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h b/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h
index 204554cb32f1d7c95d097ff3a21f21f308b5685a..331a3719fdc4181523a445591e4cdd5535bd95de 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.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_NiggliCell_H_
-#define MANTID_GEOMETRY_NiggliCell_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/UnitCell.h"
 #include <nexus/NeXusFile.hpp>
@@ -49,5 +48,4 @@ private:
   Kernel::DblMatrix UB;
 };
 } // namespace Geometry
-} // namespace Mantid
-#endif /* MANTID_GEOMETRY_UNITCELL_H_ */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h b/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
index 2b54974c0c8ee2c2f6dd7a61f9f2bbd3e855ad08..ee036125206b24046cad105b893647c043b94036 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.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_ORIENTEDLATTICE_H_
-#define MANTID_GEOMETRY_ORIENTEDLATTICE_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/UnitCell.h"
 #include <nexus/NeXusFile.hpp>
@@ -80,5 +79,4 @@ private:
   void recalculate() override;
 };
 } // namespace Geometry
-} // namespace Mantid
-#endif /* MANTID_GEOMETRY_UNITCELL_H_ */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h
index 92a4686b6c657d3f6ba16dd779f3e9a1b54d1722..71da3ee732382c4867d7dddd70e8be38ad457cd6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.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_PEAKSHAPE_H_
-#define MANTID_GEOMETRY_PEAKSHAPE_H_
+#pragma once
 
 #include "MantidKernel/SpecialCoordinateSystem.h"
 #include "MantidKernel/System.h"
@@ -45,5 +44,3 @@ using PeakShape_const_sptr = boost::shared_ptr<const PeakShape>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PEAKSHAPE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h
index 72574998147292955399254b8613bd892dce8e29..f0f9804670f21480fb387212819ca0d5ea1cb5a8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.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_PEAKTRANSFORM_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORM_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/IPeak.h"
 #include "MantidKernel/SpecialCoordinateSystem.h"
@@ -75,5 +74,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PEAKTRANSFORM_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h
index 4552171d5ec0cfe763d0a656e9c54add02aefb74..d4e3191a69f0a286171a172eafdc6407db895c93 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.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_PEAKTRANSFORMFACTORY_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORMFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransform.h"
 #include "MantidKernel/System.h"
@@ -30,5 +29,3 @@ public:
 using PeakTransformFactory_sptr = boost::shared_ptr<PeakTransformFactory>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
index e0f59e83bed4fbf686d36e9c02027734d089f069..736ee923f430dfefc1cb42b186734fd8f5716ad1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.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_PEAKTRANSFORMHKL_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORMHKL_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/ConcretePeakTransformFactory.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -40,5 +39,3 @@ public:
 using PeakTransformHKLFactory = ConcretePeakTransformFactory<PeakTransformHKL>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PEAKTRANSFORMHKL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
index 43f74f11bdc2600aa29b6b3d8cf201570a96c588..88d01814312530d8ca67fa6533b17c85dddeb856 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.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_PEAKTRANSFORMQLab_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORMQLab_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/ConcretePeakTransformFactory.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -41,5 +40,3 @@ using PeakTransformQLabFactory =
     ConcretePeakTransformFactory<PeakTransformQLab>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PEAKTRANSFORMQLab_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
index f73a7419d934855a559aa2fc87910b21c4957bdd..81a2feea26b75bed7045ab41931f7041b7bdc080 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.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_PEAKTRANSFORMQSAMPLE_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORMQSAMPLE_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/ConcretePeakTransformFactory.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -41,5 +40,3 @@ using PeakTransformQSampleFactory =
     ConcretePeakTransformFactory<PeakTransformQSample>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PEAKTRANSFORMQSAMPLE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h
index a96b949b29a31a351ad35dbc77e2e46178cc5218..c927a69916c9f21e335eae21f1f3a6e6147c9ed8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.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_PEAKTRANSFORMSELECTOR_H_
-#define MANTID_GEOMETRY_PEAKTRANSFORMSELECTOR_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransformFactory.h"
 #include "MantidKernel/System.h"
@@ -45,5 +44,3 @@ private:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
index ffc154acc7db30951e4ca5036575391f1f9c8aeb..0705b53ef095f2b981ba910b7cdf99e2f6ad96d0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.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_POINTGROUP_H_
-#define MANTID_GEOMETRY_POINTGROUP_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Matrix.h"
@@ -121,5 +120,3 @@ MANTID_GEOMETRY_DLL PointGroupCrystalSystemMap getPointGroupsByCrystalSystem();
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_POINTGROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
index 4ab88db189ce673065f407158e9b34f6fee05d2f..9daff821777edea933935493f9af38a41cc91b46 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.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_POINTGROUPFACTORY_H_
-#define MANTID_GEOMETRY_POINTGROUPFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PointGroup.h"
 #include "MantidGeometry/Crystal/SpaceGroup.h"
@@ -130,5 +129,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
            hmSymbol, generators, description)),                                \
        0));                                                                    \
   }
-
-#endif /* MANTID_GEOMETRY_POINTGROUPFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h
index 10568d8dfc489b81771f13233ca4676381385989..433f3741f9900ffceef1127a4f8c03cdc4e5746a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.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_PRODUCTGROUP_H_
-#define MANTID_GEOMETRY_PRODUCTGROUP_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/Group.h"
 #include "MantidGeometry/DllConfig.h"
@@ -61,5 +60,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_PRODUCTGROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ReducedCell.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ReducedCell.h
index 75da88854b0f815fd793816ae3cb958f91815c36..fd10f7a13942de9a79361356b36d2dd19df9277f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ReducedCell.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ReducedCell.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_REDUCED_CELL_H_
-#define MANTID_GEOMETRY_REDUCED_CELL_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Matrix.h"
@@ -85,5 +84,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_REDUCED_CELL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
index fc8876dbef6d93f83fa44a9146737de9cb4b1203..4440efa22939bad85ac1e464a81cd64379a1cafd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.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_REFLECTIONCONDITION_H_
-#define MANTID_GEOMETRY_REFLECTIONCONDITION_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 
@@ -188,5 +187,3 @@ getReflectionConditionBySymbol(const std::string &symbol);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_REFLECTIONCONDITION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionGenerator.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionGenerator.h
index 99c85e7a299cf65ddf4a7cd4a42d67bc8ab1a776..b390b1e622cce7871de9185c5e160c043629bac5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionGenerator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionGenerator.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_REFLECTIONGENERATOR_H_
-#define MANTID_GEOMETRY_REFLECTIONGENERATOR_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/CrystalStructure.h"
 #include "MantidGeometry/Crystal/HKLFilter.h"
@@ -124,5 +123,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_REFLECTIONGENERATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ScalarUtils.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ScalarUtils.h
index 0bed0404f8fdeb7480a2dfe86e4c1645097a35d9..9657bcfd3c507d27d03455abb3538bde23763922 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ScalarUtils.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ScalarUtils.h
@@ -6,8 +6,7 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 /* File: Scalar_Utils.h */
 
-#ifndef MANTID_GEOMETRY_SCALAR_UTILS_H_
-#define MANTID_GEOMETRY_SCALAR_UTILS_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -83,5 +82,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SCALAR_UTILS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
index 0cb47d4460a4e7e763a6402b9673a8011e32dbc9..80a94f38db8f7ac40ecf05a59e1525434bea09b0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.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_SPACEGROUP_H_
-#define MANTID_GEOMETRY_SPACEGROUP_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/Group.h"
 #include "MantidGeometry/Crystal/PointGroup.h"
@@ -92,5 +91,3 @@ using SpaceGroup_const_sptr = boost::shared_ptr<const SpaceGroup>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SPACEGROUP_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
index 6f66028ca36b1ac1780ff1182b404a96d5485ba8..2ebd7cf6642f505ca17c64300c14f10874be17b6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.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_SPACEGROUPFACTORY_H_
-#define MANTID_GEOMETRY_SPACEGROUPFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/SpaceGroup.h"
 #include "MantidGeometry/DllConfig.h"
@@ -328,5 +327,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
                                                    generators)),               \
        0));                                                                    \
   }
-
-#endif /* MANTID_GEOMETRY_SPACEGROUPFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
index bde0d468fbddc7dfa7e58cae8ae116728ede8fe0..6af3f26b9c6de948bcbcdcd2147f07ee91653877 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.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_STRUCTUREFACTORCALCULATOR_H_
-#define MANTID_GEOMETRY_STRUCTUREFACTORCALCULATOR_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/CrystalStructure.h"
 #include "MantidGeometry/DllConfig.h"
@@ -62,5 +61,3 @@ create(const CrystalStructure &crystalStructure) {
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_STRUCTUREFACTORCALCULATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
index bc35214bccac9d1aacbe56b07c7e59d1c9529c9b..fa27b0196274a0f6e82bbfc8c5c2405efa698baf 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.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_STRUCTUREFACTORCALCULATORSUMMATION_H_
-#define MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORSUMMATION_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/StructureFactorCalculator.h"
 #include "MantidGeometry/DllConfig.h"
@@ -44,5 +43,3 @@ using StructureFactorSummation_sptr =
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORSUMMATION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
index cb3b35535b5731313cb297aa90aceb91ffbae58b..1e99515d891ccb204a80bade4631efe552d446f5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.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_SYMMETRYELEMENT_H_
-#define MANTID_GEOMETRY_SYMMETRYELEMENT_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/SymmetryOperation.h"
 #include "MantidGeometry/Crystal/V3R.h"
@@ -193,5 +192,3 @@ using SymmetryElementMirror_sptr = boost::shared_ptr<SymmetryElementMirror>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SYMMETRYELEMENT_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
index aaa0d4b2d9b75ba82a2ae8af70046fe0a66d5250..3e6020aa522d386012b890502f6309e52a5375a5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.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_SYMMETRYELEMENTFACTORY_H_
-#define MANTID_GEOMETRY_SYMMETRYELEMENTFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/SymmetryElement.h"
 #include "MantidGeometry/Crystal/SymmetryOperation.h"
@@ -265,5 +264,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
                 .subscribeSymmetryElementGenerator<classname>(#classname)),    \
            0));                                                                \
   }
-
-#endif /* MANTID_GEOMETRY_SYMMETRYELEMENTFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperation.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperation.h
index d597830fd0a1a838f4faf8e2deb6f0427b7161c0..0c6c039c9104686243aa1e8cf066fe82797045e6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperation.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_SYMMETRYOPERATION_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATION_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/MatrixVectorPair.h"
 #include "MantidGeometry/Crystal/V3R.h"
@@ -178,5 +177,3 @@ Kernel::Matrix<T> convertMatrix(const Kernel::Matrix<U> &matrix) {
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
index b11775d31bab695e83f77d3d985c7bb0e7a9690d..fdd1eee178ec66d7d032302c9aa940660188510f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.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_SYMMETRYOPERATIONFACTORY_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORY_H_
+#pragma once
 
 #include <list>
 #include <map>
@@ -84,5 +83,3 @@ EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
            operation)),                                                        \
        0));                                                                    \
   }
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationSymbolParser.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationSymbolParser.h
index a13ac97f189ed2603c4d724bb6145d44a69c4590..85873b84c34651b99194bddf05ed23e3950a6cbd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationSymbolParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationSymbolParser.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_SYMMETRYOPERATIONSYMBOLPARSER_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATIONSYMBOLPARSER_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/MatrixVectorPair.h"
 #include "MantidGeometry/Crystal/V3R.h"
@@ -68,5 +67,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATIONSYMBOLPARSER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/UnitCell.h b/Framework/Geometry/inc/MantidGeometry/Crystal/UnitCell.h
index 29971dcac89ba54066fea5bc4cb75ea771654b81..65628c9b65ec88647ddb38067a92ed8ffc5da64c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/UnitCell.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/UnitCell.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_UNITCELL_H_
-#define MANTID_GEOMETRY_UNITCELL_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/AngleUnits.h"
 #include "MantidGeometry/DllConfig.h"
@@ -223,5 +222,3 @@ MANTID_GEOMETRY_DLL std::string unitCellToStr(const UnitCell &unitCell);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_UNITCELL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h b/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h
index 87a01e7a497eeaacbc0bb888e59ee911f6741293..e18d1b06ca3f7563d3b0ce7e8be4cb96d6dc02ab 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.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_V3R_H_
-#define MANTID_GEOMETRY_V3R_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 
@@ -136,5 +135,3 @@ V3R operator*(const Kernel::Matrix<T> &lhs, const V3R &rhs) {
 }
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_V3R_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/DllConfig.h b/Framework/Geometry/inc/MantidGeometry/DllConfig.h
index 6262c56c11837802771f4fb536aa62e97b105dcc..e327e54f7f0f7db8f8a1654bcb27b8c236984574 100644
--- a/Framework/Geometry/inc/MantidGeometry/DllConfig.h
+++ b/Framework/Geometry/inc/MantidGeometry/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_GEOMETRY_DLLCONFIG_H_
-#define MANTID_GEOMETRY_DLLCONFIG_H_
+#pragma once
 
 /*
     This file contains the DLLExport/DLLImport linkage configuration for the
@@ -22,5 +21,3 @@
 #define MANTID_GEOMETRY_DLL DLLImport
 #define EXTERN_MANTID_GEOMETRY EXTERN_IMPORT
 #endif /* IN_MANTID_GEOMETRY*/
-
-#endif // MANTID_GEOMETRY_DLLCONFIG_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
index 19e3f0e0cdc62666a884dc0408612c2c78036538..091c7d033f2e956e1b2d1e8d9b938cbd4730b6a6 100644
--- a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.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_ICOMPASSEMBLY_
-#define MANTID_GEOMETRY_ICOMPASSEMBLY_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IComponent.h"
@@ -86,5 +85,3 @@ using ICompAssembly_const_sptr = boost::shared_ptr<const ICompAssembly>;
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/IComponent.h b/Framework/Geometry/inc/MantidGeometry/IComponent.h
index a0f5989e7333463a767828d39eda6591cc417a0e..227bad24012d6a94610c1b1910c75f64a86582c8 100644
--- a/Framework/Geometry/inc/MantidGeometry/IComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/IComponent.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_ICOMPONENT_H_
-#define MANTID_GEOMETRY_ICOMPONENT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -187,5 +186,3 @@ public:
 };
 
 } // Namespace Mantid
-
-#endif // MANTID_GEOMETRY_ICOMPONENT_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/IDTypes.h b/Framework/Geometry/inc/MantidGeometry/IDTypes.h
index 7d6a85984209a2e27090a0fdecaadf566c3e2676..ec14172bbefb73eb7f5e6af793733f04f8c29875 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDTypes.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDTypes.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_IDTYPES_H_
-#define MANTID_GEOMETRY_IDTYPES_H_
+#pragma once
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
@@ -19,5 +18,3 @@ using specnum_t = int32_t;
 /// Typedef for a detector ID
 using detid_t = int32_t;
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_IDTYPES_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector.h b/Framework/Geometry/inc/MantidGeometry/IDetector.h
index a967e9bfbac6e78b589b0ed1a4c646a1927918ae..05786226a4b812e754f1da5bc2870a231bdb98f8 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector.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_IDETECTOR_H_
-#define MANTID_GEOMETRY_IDETECTOR_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -107,5 +106,3 @@ using IDetector_const_sptr =
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_IDETECTOR_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h b/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h
index ceb7486fa76cfb3511eed1f68b6a6c4cb992d4ae..7aba4ba4a6c845be365b2cd0351838783163ffd7 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.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_IDETECTOR_FWD_H_
-#define MANTID_GEOMETRY_IDETECTOR_FWD_H_
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 
@@ -29,5 +28,3 @@ using IDetector_const_uptr = std::unique_ptr<const IDetector>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_IDETECTOR_FWD_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
index 08a188ede6cb35b7174cc9ba7f12f7f3d921a591..b60c01dce71c9a589676bab4aa04d9996dd8e10e 100644
--- a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef IMANTID_GEOMETRY_OBJCOMPONENT_H_
-#define IMANTID_GEOMETRY_OBJCOMPONENT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IComponent.h"
@@ -110,5 +109,3 @@ using IObjComponent_const_sptr = boost::shared_ptr<const IObjComponent>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_OBJCOMPONENT_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Framework/Geometry/inc/MantidGeometry/Instrument.h
index aceb8e09096f3186f870c6cacf9d3f633c461ffc..fc15d08504633e4fe7429586805f35fd57261dbd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument.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_INSTRUMENT_H_
-#define MANTID_GEOMETRY_INSTRUMENT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IDetector.h"
@@ -325,5 +324,4 @@ tofToDSpacingFactor(const double l1, const double l2, const double twoTheta,
 } // namespace Conversion
 
 } // namespace Geometry
-} // Namespace Mantid
-#endif /*MANTID_GEOMETRY_INSTRUMENT_H_*/
+} // Namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
index 9f2b7d6bfdea9208106f94bb5316a79d89fb7841..963f91e1c0eabfd49ebb71ad7437f2381eb54343 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COMPONENT_ASSEMBLY_
-#define COMPONENT_ASSEMBLY_
+#pragma once
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/ICompAssembly.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -113,5 +112,3 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h
index c0b06760ace19dc52c66666d499a8501ef329e3a..a258235dcdb241c679c2f7c9a9eebd6fc309933a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Component.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_Component_H_
-#define MANTID_GEOMETRY_Component_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"
@@ -348,5 +347,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_Component_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentHelper.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentHelper.h
index 6fd6ac74261667565d66c5a9023dcb2d3cd308f4..f89242d34b28566d1066f09277d806110a9cfe76 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentHelper.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentHelper.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_COMPONENTHELPERS_H_
-#define MANTID_GEOMETRY_COMPONENTHELPERS_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Instrument.h"
@@ -55,5 +54,3 @@ sphereXML(double radius, const Kernel::V3D &centre, const std::string &id);
 } // namespace ComponentHelper
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTHELPERS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h
index 7c17d7096289c58e58fe604c65a03e7d617726d2..0ac0ae77d4bf22d2e56266836be59637c3e48519 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfo.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_COMPONENTINFO_H_
-#define MANTID_GEOMETRY_COMPONENTINFO_H_
+#pragma once
 
 #include "MantidBeamline/ComponentType.h"
 #include "MantidGeometry/DllConfig.h"
@@ -156,5 +155,3 @@ using ComponentInfoConstIt = ComponentInfoIterator<const ComponentInfo>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFO_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoBankHelpers.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoBankHelpers.h
index 5707574148516618b798ee3b0d63391a7794ea6b..fa244b65a053b52f963f1f0d495bdcf49d1e7578 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoBankHelpers.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoBankHelpers.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_GEOMETRY_COMPONENTINFOBANKHELPERS_H_
-#define MANTID_GEOMETRY_COMPONENTINFOBANKHELPERS_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <Eigen/Core>
@@ -26,5 +25,3 @@ offsetFromAncestor(const Mantid::Geometry::ComponentInfo &compInfo,
 } // namespace ComponentInfoBankHelpers
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOBANKHELPERS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoItem.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoItem.h
index 0dbed999b748c5de9dc1315166ee60fcac49b1dc..1afa346425c20da237cafcefb0067e272d71a21a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoItem.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoItem.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_COMPONENTINFOITEM_H_
-#define MANTID_GEOMETRY_COMPONENTINFOITEM_H_
+#pragma once
 
 #include "MantidKernel/Quat.h"
 #include "MantidKernel/V3D.h"
@@ -51,5 +50,3 @@ public:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOITEM_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoIterator.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoIterator.h
index 949bc55a7c59844d2678a93b4638ccef09b0bea0..57ac3b2efb17f020399d72c7377a4bcb33ed7be2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoIterator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentInfoIterator.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_COMPONENTINFOITERATOR_H_
-#define MANTID_GEOMETRY_COMPONENTINFOITERATOR_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/ComponentInfoItem.h"
 #include "MantidGeometry/Instrument/InfoIteratorBase.h"
@@ -22,5 +21,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOITERATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentVisitor.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentVisitor.h
index f7d9650977c19f6eb03fd60620944c145f2da230..3d72ae4e92583921738fbb96bfd1b5c2cf479a80 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentVisitor.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ComponentVisitor.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_COMPONENTVISITOR_H
-#define MANTID_GEOMETRY_COMPONENTVISITOR_H
+#pragma once
 
 #include <cstddef>
 namespace Mantid {
@@ -41,5 +40,4 @@ public:
   virtual ~ComponentVisitor() {}
 };
 } // namespace Geometry
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h
index b4d096fd33fa1659d60904ee66f4915fd5d8b982..3d6252f3dc4fd68526d2280876157dc9c30d9c76 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Container.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_CONTAINER_H_
-#define MANTID_GEOMETRY_CONTAINER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Objects/IObject.h"
@@ -138,5 +137,3 @@ using Container_const_sptr = boost::shared_ptr<const Container>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_CONTAINER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
index 99aae6a8215784b6f823cba700ac3f8d54d76b5c..6ad6097b938eb9c50cf69cc6ce4e30a5cc19f97e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.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_DETECTOR_H_
-#define MANTID_GEOMETRY_DETECTOR_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -80,5 +79,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_DETECTOR_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
index c49873cea93cf868286fae53e9098bf8b57c5ef0..a1902ecc91df66d4522051e7cd6f037bab8694ac 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.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_DETECTORGROUP_H_
-#define MANTID_GEOMETRY_DETECTORGROUP_H_
+#pragma once
 
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -254,5 +253,3 @@ using DetectorGroup_const_sptr = boost::shared_ptr<const DetectorGroup>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_DETECTORGROUP_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
index d4ed8d5001e68e8c94e2db602876fc5642c52956..a5ddee6c290c22cbd9dd140f26f4683bebdb90a0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.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_DETECTORINFO_H_
-#define MANTID_GEOMETRY_DETECTORINFO_H_
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <mutex>
@@ -141,5 +140,3 @@ using DetectorInfoConstIt = DetectorInfoIterator<const DetectorInfo>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_DETECTORINFO_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
index a6b0d15e4d20a2c976a16f84f0a7af667e71da79..43c0b41b9a9b7cea33e557a8a6ba1bc401d82797 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.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_DETECTORINFOITEM_H_
-#define MANTID_GEOMETRY_DETECTORINFOITEM_H_
+#pragma once
 
 #include "MantidKernel/Quat.h"
 #include "MantidKernel/V3D.h"
@@ -68,5 +67,3 @@ public:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_DETECTORINFOITEM_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
index 4c604e26da0a9274ca2cf762263056baa4665e0a..55ef41ace236dbb5f53225b6b8ceb8c7fe758f8c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.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_DETECTORINFOITERATOR_H_
-#define MANTID_GEOMETRY_DETECTORINFOITERATOR_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/DetectorInfoItem.h"
 #include "MantidGeometry/Instrument/InfoIteratorBase.h"
@@ -26,5 +25,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_DETECTORINFOITERATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/FitParameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/FitParameter.h
index 477ead504f274557e84a9b2f4920bbb05253845d..cb3b115f84e92575f02370c884c8a0186956262f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/FitParameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/FitParameter.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_FITPARAMETER_H_
-#define MANTID_GEOMETRY_FITPARAMETER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -118,5 +117,3 @@ MANTID_GEOMETRY_DLL std::istream &operator>>(std::istream &, FitParameter &);
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_FITPARAMETER_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.h
index 2fd53a36815f58d1991b18e7ac8e1e80479bd820..7a673cfcef7cd865bf609bf2acfb99f7cfb7267a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.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_GONIOMETER_H_
-#define MANTID_GEOMETRY_GONIOMETER_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/AngleUnits.h"
 #include "MantidKernel/Matrix.h"
@@ -110,5 +109,3 @@ private:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_GONIOMETER_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
index 2e53c392379351f698115922630ecffbeff52b7d..27dc78cf4e59e1bdb772eaa3b60d5e446fe3de44 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GRID_DETECTOR_H
-#define GRID_DETECTOR_H
+#pragma once
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IObjComponent.h"
 #include "MantidGeometry/Instrument/CompAssembly.h"
@@ -221,5 +220,3 @@ using GridDetector_const_sptr = boost::shared_ptr<const GridDetector>;
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif // GRID_DETECTOR_H
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetectorPixel.h b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetectorPixel.h
index 938856d468fb9f65a9c84be2bc0b47103f2125ee..16f3d63b4aa3546ead468ce79bc9796fca1a1a1b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetectorPixel.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/GridDetectorPixel.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_GEOMETRY_GRIDDETECTORPIXEL_H_
-#define MANTID_GEOMETRY_GRIDDETECTORPIXEL_H_
+#pragma once
 
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Instrument/Detector.h"
@@ -79,5 +78,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_GRIDDETECTORPIXEL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
index fbd5db7dbde49ab3fc192e375dff0b8b01b246fc..d8656cb18b12bd2d4537fff23c137571a039e6f6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.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_IDFOBJECT_H_
-#define MANTID_GEOMETRY_IDFOBJECT_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #ifndef Q_MOC_RUN
@@ -102,5 +101,3 @@ using IDFObject_const_sptr = boost::shared_ptr<const AbstractIDFObject>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_IDFOBJECT_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/InfoIteratorBase.h b/Framework/Geometry/inc/MantidGeometry/Instrument/InfoIteratorBase.h
index 9e82ae163573aab3475489607d36f0635601af1a..a8e414043d0de1bf28debde206d330d05e962ff1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/InfoIteratorBase.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/InfoIteratorBase.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_INFOITERATORBASE_H_
-#define MANTID_GEOMETRY_INFOITERATORBASE_H_
+#pragma once
 
 #include <algorithm>
 #include <boost/iterator/iterator_facade.hpp>
@@ -86,5 +85,4 @@ private:
   size_t m_totalSize;
 };
 } // namespace Geometry
-} // namespace Mantid
-#endif /* MANTID_GEOMETRY_INFOITERATORBASE_H_ */
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h b/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
index bacfec4a98f6a68cf4f4d55515c4c8fedb65934e..8c2a48f2cb8fa7fc3ad777f97eaf1b343414ee01 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.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_INSTRUMENTDEFINITIONPARSER_H_
-#define MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSER_H_
+#pragma once
 
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/IDFObject.h"
@@ -408,5 +407,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentVisitor.h b/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentVisitor.h
index fb448922388b51d52bd3bc7d1d5d28d4371ae5f4..211efca7b122329afaa2ed29a49058840b208bc6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentVisitor.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentVisitor.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_INSTRUMENTVISITOR_H_
-#define MANTID_GEOMETRY_INSTRUMENTVISITOR_H_
+#pragma once
 
 #include "MantidBeamline/ComponentType.h"
 #include "MantidGeometry/DllConfig.h"
@@ -202,5 +201,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_INSTRUMENTVISITOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
index 54fea3f41b2f8c6dd8ce1d7e88b95435aad62850..ab39a271b7044a7ce737e7f199bc73425c8cd61d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef OBJCOMPONENT_ASSEMBLY_
-#define OBJCOMPONENT_ASSEMBLY_
+#pragma once
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Instrument/CompAssembly.h"
 #include "MantidGeometry/Instrument/ObjComponent.h"
@@ -108,5 +107,3 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif /*OBJCOMPONENT_ASSEMBLY_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
index d00bc710cae40f6882c2cdf09ee98f0a8af5aa58..d68c808bc150b5b4d53428badd51a9c54db86bdb 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.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_OBJCOMPONENT_H_
-#define MANTID_GEOMETRY_OBJCOMPONENT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IObjComponent.h"
@@ -101,5 +100,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_OBJCOMPONENT_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h
index c4aed8497e68a5d6b59ca2410a467ca6ae66114e..7ffbde96fff9640658375f9a92866e9b123993fe 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.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_PARCOMPONENT_FACTORY_H_
-#define MANTID_GEOMETRY_PARCOMPONENT_FACTORY_H_
+#pragma once
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
@@ -50,5 +49,3 @@ public:
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index 7d5d6499b8b2daa58cb72ea1320d3d4f79fde801..fbf60f640a41c3b7e252118a16b7f00401f79aa9 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.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_PARAMETER_H_
-#define MANTID_GEOMETRY_PARAMETER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #ifndef Q_MOC_RUN
@@ -207,5 +206,3 @@ using Parameter_sptr = boost::shared_ptr<Parameter>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_PARAMETER_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
index fb32e4bb4783613dbf9625521f0939dccd5bda39..76419226e1089232edce496d19c0969b7abac083 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.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_PARAMETERFACTORY_H_
-#define MANTID_GEOMETRY_PARAMETERFACTORY_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -76,5 +75,3 @@ void ParameterFactory::subscribe(const std::string &className) {
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_PARAMETERFACTORY_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
index f975e090486884b9cb12e062357b2e47691f4188..9eac249730b3b585cd39449ed106967c1c520379 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PARAMETERMAP_H_
-#define PARAMETERMAP_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IComponent.h"
@@ -380,5 +379,3 @@ using ParameterMap_const_sptr = boost::shared_ptr<const ParameterMap>;
 } // Namespace Geometry
 
 } // Namespace Mantid
-
-#endif /*PARAMETERMAP_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
index f4a30be3594b63ed971a8b73eb41a8cb9bf0135a..7b9cde4e821f65fc2aae9d62ada1f99d5adbb82d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RECTANGULAR_DETECTOR_H
-#define RECTANGULAR_DETECTOR_H
+#pragma once
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IObjComponent.h"
 #include "MantidGeometry/Instrument/CompAssembly.h"
@@ -104,5 +103,3 @@ using RectangularDetector_const_sptr =
 
 } // Namespace Geometry
 } // Namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ReferenceFrame.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ReferenceFrame.h
index bedf6f495d0a7c7223a1617462ff686044ed90af..913ac506d58ece241b34acdeff4135b93ed8591e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ReferenceFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ReferenceFrame.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_REFERENCEFRAME_H_
-#define MANTID_GEOMETRY_REFERENCEFRAME_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/V3D.h"
@@ -88,5 +87,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_REFERENCEFRAME_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/SampleEnvironment.h b/Framework/Geometry/inc/MantidGeometry/Instrument/SampleEnvironment.h
index 5198a15ca407be8d1c30dd18456bf794901b5229..9a67b6209206904ef87c077e383fd4d484d722b5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/SampleEnvironment.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/SampleEnvironment.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_SAMPLEENVIRONMENT_H_
-#define MANTID_GEOMETRY_SAMPLEENVIRONMENT_H_
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -69,5 +68,3 @@ using SampleEnvironment_uptr = std::unique_ptr<SampleEnvironment>;
 using SampleEnvironment_const_uptr = std::unique_ptr<const SampleEnvironment>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_SAMPLEENVIRONMENT_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
index 6c0e948c1734c8d70c020a4ca44257011ebc0578..3a0d697a6e4bfa8f5b4714eeec270412696159eb 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef STRUCTUREDDETECTOR_H
-#define STRUCTUREDDETECTOR_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/IObjComponent.h"
@@ -181,5 +180,4 @@ using StructuredDetector_sptr = boost::shared_ptr<StructuredDetector>;
 using StructuredDetector_const_sptr =
     boost::shared_ptr<const StructuredDetector>;
 } // namespace Geometry
-} // namespace Mantid
-#endif // STRUCTUREDDETECTOR_H
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/XMLInstrumentParameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/XMLInstrumentParameter.h
index a80d21774297b40a7544dc9cff87d77467d4f8f7..7f45f7bfb0fba78756b74a5736d4e8e017f4229c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/XMLInstrumentParameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/XMLInstrumentParameter.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_XMLINSTRUMENTPARAMETER_H_
-#define MANTID_GEOMETRY_XMLINSTRUMENTPARAMETER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -97,5 +96,3 @@ public:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_XMLINSTRUMENTPARAMETER_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h b/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h
index fa3c28f0f131d30f9dc273c328cbf3e14943d439..b7a2784a7df3e572f25fe949995dd293b7a4214e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.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_INSTRUMENT_FWD_H_
-#define MANTID_GEOMETRY_INSTRUMENT_FWD_H_
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 
@@ -29,5 +28,3 @@ using Instrument_const_uptr = std::unique_ptr<const Instrument>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_INSTRUMENT_FWD_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
index d5ef5531cad4709faa02e8a50e7434ca3e473a0a..2a3ee239ea0003817e7b6e88940afb3c8a67956f 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.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_COMPOSITEIMPLICITFUNCTION_H_
-#define MANTID_ALGORITHMS_COMPOSITEIMPLICITFUNCTION_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -53,5 +52,3 @@ protected:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
index 6e3fbaaf8a05de0249d72cfed91dbb57c09343a0..885b80b8169be055ef963b1b50514d55995c1324 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.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_GENERALFRAME_H_
-#define MANTID_GEOMETRY_GENERALFRAME_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
@@ -47,5 +46,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_GENERALFRAME_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
index 980c567fed9046d6dd6ef53c4eed4ab31c197eea..344c3f51dfcccc811fb678e857790b9d6a52fd51 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.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_HKL_H_
-#define MANTID_GEOMETRY_HKL_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
@@ -45,5 +44,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_HKL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
index 5e857c6517e89bd41496e31bc87f86ad02a830fd..d2bd6cea02698dad25b3ad9bea67a43854de73bb 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef I_MD_DIMENSION_H
-#define I_MD_DIMENSION_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
@@ -111,5 +110,4 @@ using VecIMDDimension_const_sptr = std::vector<IMDDimension_const_sptr>;
 /// Vector of shared pointers to IMDDimensions.
 using VecIMDDimension_sptr = std::vector<IMDDimension_sptr>;
 } // namespace Geometry
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimensionFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimensionFactory.h
index ef20b003e79f100817ae15d18936ddbedc0e7858..8065ba5807a11d23f6f448494f201c0976fb324e 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimensionFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimensionFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef IMDDIMENSIONFACTORY_H_
-#define IMDDIMENSIONFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 
@@ -30,5 +29,3 @@ MANTID_GEOMETRY_DLL IMDDimension_sptr createDimension(
     const std::string &dimensionXMLString, int nBins, coord_t min, coord_t max);
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
index 4124eb9e7d0ec2acd70e599029858c4c0ff1ac94..32a25289a8d5cdb3ed51629d33e8368314002508 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTION_H_
-#define MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTION_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
 #include "MantidGeometry/MDGeometry/MDTypes.h"
@@ -52,5 +51,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
index 4e769583ef9f736188326c4f09d493d0dc0954cf..a8b5546051efbc3c24632ee2fbfa10c0d40afe06 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDDIMENSIONEXTENTS_H_
-#define MDDIMENSIONEXTENTS_H_
+#pragma once
 
 /*
  * MDDimensionExtents.h
@@ -107,5 +106,3 @@ private:
 } // namespace Geometry
 
 } // namespace Mantid
-
-#endif /* MDDIMENSIONEXTENTS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
index 6fb784674fcc6ca9fc71c9e1251b6d095888eb19..aaff38f5df0c254980b463cdc1ddd66603b7aa0b 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.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_MDFRAME_H_
-#define MANTID_GEOMETRY_MDFRAME_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -42,5 +41,3 @@ using MDFrame_const_sptr = std::shared_ptr<const MDFrame>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MDFRAME_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
index 0c08d494ed8caa1cf63a2a0e61d71860bfa9190e..10f55050e6fc09d186aac16bdaa0331efc120fdc 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.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_MDFRAMEFACTORY_H_
-#define MANTID_GEOMETRY_MDFRAMEFACTORY_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/GeneralFrame.h"
@@ -95,5 +94,3 @@ MDFrameFactory_uptr MANTID_GEOMETRY_DLL makeMDFrameFactoryChain();
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MDFRAMEFACTORY_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
index 05968acd91de222a2868993f325cbfb2ae12cbbe..309041e0366cf2fcf407ac7c788590ffa6cb0310 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDGEOMETRYXMLBUILDER_H_
-#define MDGEOMETRYXMLBUILDER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
@@ -139,5 +138,3 @@ struct MANTID_GEOMETRY_DLL NoDimensionPolicy {
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* GEOMETRYXMLBUILDER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h
index 2d4c996c0eceb47ea1ca0b32b680e3390a3be78f..247bc0560690eccfde06bfb1ba71049729f20824 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDGEOMETRY_XMLDEFINITIONS_H_
-#define MDGEOMETRY_XMLDEFINITIONS_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <string>
@@ -84,5 +83,4 @@ public:
   static const std::string RebinnedWSName() { return "RebinnedWS"; }
 };
 } // namespace Geometry
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLParser.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLParser.h
index bc2ce88592fae4a0ad0bd5df58e1ab77fda06552..54b645384b27eb25827bdc2ef40acb327621a8a2 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLParser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDGEOMETRY_XML_PARSER_H
-#define MDGEOMETRY_XML_PARSER_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
@@ -95,5 +94,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
index cb88a14712b83ba54aed771797cf127b42f163d2..e83d8ee5d9a41aaf51b6a7ea5c06ca3c90422884 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.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_MDHISTODIMENSION_H_
-#define MANTID_GEOMETRY_MDHISTODIMENSION_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
@@ -160,5 +159,3 @@ using MDHistoDimension_const_sptr = boost::shared_ptr<const MDHistoDimension>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MDHISTODIMENSION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
index d2b6a914d2e6a89758e17c1bd2e837535edd6bdc..e5437d5d67a9ed34c46135eb1455c3e4240ccea2 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.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_MDHISTODIMENSION_BUILDER_H_
-#define MANTID_GEOMETRY_MDHISTODIMENSION_BUILDER_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
 #include "MantidKernel/UnitLabel.h"
@@ -88,5 +87,3 @@ private:
 using Vec_MDHistoDimensionBuilder = std::vector<MDHistoDimensionBuilder>;
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
index 1cb76294689c69bc09b40122f7284b7ee0d8dfa1..99364bd0effc0867f3694e459c7921d144177df4 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDIMPLICITFUNCTION_H_
-#define MANTID_MDALGORITHMS_MDIMPLICITFUNCTION_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDPlane.h"
 #include "MantidGeometry/MDGeometry/MDTypes.h"
@@ -283,5 +282,3 @@ using MDImplicitFunction_sptr = boost::shared_ptr<MDImplicitFunction>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_MDALGORITHMS_MDIMPLICITFUNCTION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlane.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlane.h
index db74ed21e4cef9c7759b619d532b795e346f19e1..db0ea8c5f5b18d1210153e3708eb1a057bd74e67 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlane.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlane.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDPLANE_H_
-#define MANTID_MDALGORITHMS_MDPLANE_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include "MantidKernel/System.h"
@@ -195,5 +194,3 @@ protected:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_MDALGORITHMS_MDPLANE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
index 2a59687d0e423eda190e023088ca528c58873d26..b2c0af05f37bb693f4bbef164bb4754d1004210a 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDGEOMETRY_MDPLANEIMPLICITFUNCTION_H_
-#define MANTID_MDGEOMETRY_MDPLANEIMPLICITFUNCTION_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
 #include "MantidKernel/System.h"
@@ -48,5 +47,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_MDGEOMETRY_MDPLANEIMPLICITFUNCTION_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h
index 2de96cc63f577b32585f5f74b26eace2a295169b..26416c5c60932fe0009e5f20eeb980be5db6a046 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.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_MDTYPES_H_
-#define MANTID_GEOMETRY_MDTYPES_H_
+#pragma once
 
 /**
     This file contains typedefs for entities relating to multi-dimensional
@@ -62,5 +61,3 @@ using signal_t = double;
 #define UNDEF_COORDT std::numeric_limits<coord_t>::quiet_NaN()
 #define UNDEF_UINT64 std::numeric_limits<uint64_t>::max()
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_MDTYPES_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
index c9c457f6ae0001303e30cac2a8f30f356bf71f5d..69ea05eb4537180e985a75a2efc6348f8cdc51ee 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef H_MD_WORKSPACE_CONSTANTS
-#define H_MD_WORKSPACE_CONSTANTS
+#pragma once
 //
 #include <string>
 
@@ -35,5 +34,3 @@ will be replaced by proper class
 /// (in case of wrong word padding or -int casted to unsigned int)
 #define MAX_REASONABLE_BIN_NUMBER 1000000
 //***********************************************************************************************************************************
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
index cd0e73cd953f28291515e5eaa2be2b2ddeb00227..f65cb0e39b31f36acc2b01f0ee5ac16c27c36bcc 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.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_NULLIMPLICITFUNCTION_H_
-#define MANTID_ALGORITHMS_NULLIMPLICITFUNCTION_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -41,5 +40,3 @@ public:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
index 2ca57171ec43e8c5c2e54574eceb84e30c2da0d9..d4d1627a0205d87fbff01793a3d137363a67ff89 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.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_QLAB_H_
-#define MANTID_GEOMETRY_QLAB_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
@@ -43,5 +42,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_QLAB_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
index 5271f17933bde658e74053c6a76c9fd2fd40567d..508fbd2efc711bf16143353e5443a52a055d67d0 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.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_QSAMPLE_H_
-#define MANTID_GEOMETRY_QSAMPLE_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
@@ -41,5 +40,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_QSAMPLE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
index c695ffa8ead4a365238ed2f1b40e67955cce3551..25f7567a7214e2e3f616a93190aad66b66d4d2c5 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.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_UNKNOWN_H_
-#define MANTID_GEOMETRY_UNKNOWN_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/MDGeometry/GeneralFrame.h"
@@ -43,5 +42,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_QLAB_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h b/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
index 9f8fce34a7c59d3f82a487df7621cb173768a924..b64e49dc03ea7c636d54c192da9cd47954f253b8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Acomp_h
-#define Acomp_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Math/BnId.h"
@@ -130,5 +129,3 @@ std::ostream &operator<<(std::ostream &, const Acomp &);
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h b/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
index 660f76265225595fa5ef6d493aa121420593cd4f..34521da00fbe09ccb8c2320466f7e85538b52c61 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Algebra_h
-#define Algebra_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Math/Acomp.h"
@@ -69,5 +68,3 @@ std::ostream &operator<<(std::ostream &, const Algebra &);
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/BnId.h b/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
index accdf9dbf79774dc511a375de0fd27c84e8b1051..f751dd8424a602131645a81592a34d8723a7e455 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BNID_H
-#define BNID_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <iosfwd>
@@ -86,5 +85,3 @@ std::ostream &operator<<(std::ostream &, const BnId &);
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/ConvexPolygon.h b/Framework/Geometry/inc/MantidGeometry/Math/ConvexPolygon.h
index 5b8b75ca7d04e797113aaf624c876e2a2d984d3c..0c0b38c10a3a8faff6020527ccf249ef6e56c9f4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/ConvexPolygon.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/ConvexPolygon.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_CONVEXPOLYGON_H_
-#define MANTID_GEOMETRY_CONVEXPOLYGON_H_
+#pragma once
 
 //-----------------------------------------------------------------------------
 // Includes
@@ -136,5 +135,3 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &os,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_CONVEXPOLYGON_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/MapSupport.h b/Framework/Geometry/inc/MantidGeometry/Math/MapSupport.h
index 1c7813e2f0898e4cd6f6c354316862b4b0a31e8a..663d089fddd16f78bc1ed6f7fe90369380e5cc26 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/MapSupport.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/MapSupport.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MapSupport_h
-#define MapSupport_h
+#pragma once
 
 /**
   \namespace MapSupport
@@ -192,5 +191,3 @@ public:
   }
 };
 } // namespace MapSupport
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/PolyBase.h b/Framework/Geometry/inc/MantidGeometry/Math/PolyBase.h
index 51f241b99abfbc67e139f7554d350ca5b1bcdf04..926ab9599891603b0f71d2ee40a0fa0824f517c0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/PolyBase.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/PolyBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef mathLevel_PolyBase_h
-#define mathLevel_PolyBase_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 
@@ -102,5 +101,4 @@ std::ostream &operator<<(std::ostream &, const PolyBase &);
 
 } // namespace mathLevel
 
-} // NAMESPACE Mantid
-#endif
+} // NAMESPACE Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/PolygonEdge.h b/Framework/Geometry/inc/MantidGeometry/Math/PolygonEdge.h
index 7dbe17932574d1cc387028027593cbbdb5f814a6..d995effc3e925ab04afdac729c684fb31cec2ab1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/PolygonEdge.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/PolygonEdge.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_POLYGONEDGE_H_
-#define MANTID_GEOMETRY_POLYGONEDGE_H_
+#pragma once
 
 //-----------------------------------------------------------------------------
 // Includes
@@ -84,5 +83,3 @@ MANTID_GEOMETRY_DLL bool edgeAimsAt(const PolygonEdge &a, const PolygonEdge &b,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_POLYGONEDGE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/PolygonIntersection.h b/Framework/Geometry/inc/MantidGeometry/Math/PolygonIntersection.h
index cfbb345d8190bab0f16a7080d1db03a6d4e40834..85291acc0d50142a0c412879362ac885bec02b4d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/PolygonIntersection.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/PolygonIntersection.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_POLYGONINTERSECTION_H_
-#define MANTID_GEOMETRY_POLYGONINTERSECTION_H_
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -26,5 +25,3 @@ bool MANTID_GEOMETRY_DLL intersection(const ConvexPolygon &P,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_POLYGONINTERSECTION_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h b/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h
index c398ec66fe454cd3b6108dcdcdd3ca4c3c5e5777..988abe8ab91855da7fa1cdc0cf83871525e5515f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.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_QUADRILATERAL_H_
-#define MANTID_GEOMETRY_QUADRILATERAL_H_
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -106,5 +105,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_QUADRILATERAL_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/RotCounter.h b/Framework/Geometry/inc/MantidGeometry/Math/RotCounter.h
index 0bd4ac48b1276fd5be81c1950e16fb3ac62cb44e..ffb043dc3230a3c1077c64b8c3a21a28ad32d857 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/RotCounter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/RotCounter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RotaryCounter_h
-#define RotaryCounter_h
+#pragma once
 
 #include <vector>
 
@@ -52,5 +51,3 @@ public:
 std::ostream &operator<<(std::ostream &, const RotaryCounter &);
 } // namespace Geometry
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/Triple.h b/Framework/Geometry/inc/MantidGeometry/Math/Triple.h
index 4c4ed0e14b89d43234f1d5f323894129af71ad5e..326366cc2fabd9047999048b242f3d48e46fc718 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/Triple.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/Triple.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Triple_h
-#define Triple_h
+#pragma once
 #include "MantidGeometry/DllConfig.h"
 
 namespace Mantid {
@@ -69,5 +68,4 @@ public:
   bool operator==(const DTriple<F, S, T> &) const;
   bool operator!=(const DTriple<F, S, T> &) const;
 };
-} // NAMESPACE Mantid
-#endif
+} // NAMESPACE Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/mathSupport.h b/Framework/Geometry/inc/MantidGeometry/Math/mathSupport.h
index 300af1d6ff58aa3a12773722632015b2461c8356..89a04da2db2656503cc25f841c3e0fbae07f561b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/mathSupport.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/mathSupport.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MATH_MATHSUPPORT_H_
-#define MANTID_MATH_MATHSUPPORT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Logger.h"
@@ -28,5 +27,4 @@ MANTID_GEOMETRY_DLL int solveCubic(InputIter, std::complex<double> &,
                                    std::complex<double> &);
 
 namespace mathSupport {}
-} // namespace Mantid
-#endif
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h b/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
index 7d80c76e307fb7760f4994246ec40b67621ede4f..80fece8e8158d31aa24b7fe34297bcd9a1e55b5c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGEOMETRY_BOUNDINGBOX_H_
-#define MANTIDGEOMETRY_BOUNDINGBOX_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Tolerance.h"
@@ -212,5 +211,3 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &os,
                                              const BoundingBox &box);
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTIDGEOMETRY_BOUNDINGBOX_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
index ec222f6a12261cd57d64575f1b62a4b1830baff9..4aa9b136885c4b2da8dd13d7064dd8195df4e244 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.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_CSGOBJECT_H_
-#define MANTID_GEOMETRY_CSGOBJECT_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -263,5 +262,3 @@ protected:
 
 } // NAMESPACE Geometry
 } // NAMESPACE Mantid
-
-#endif /*MANTID_GEOMETRY_CSGOBJECT_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
index 94c90e3dfcba086ddc03b2413d5c38522df38b51..df11cc6bbebde545ea4712a9c967e8c6623847a0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.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_IOBJECT_H_
-#define MANTID_GEOMETRY_IOBJECT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Rendering/ShapeInfo.h"
@@ -108,5 +107,3 @@ using IObject_const_uptr = std::unique_ptr<const IObject>;
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_IOBJECT_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h b/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
index 9b1a55b65acd6520a39eae5574ace9bbf990a22d..967bdc1e6731db682d91081a9a88fd5099849d3a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.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_INSTRUMENTRAYTRACER_H_
-#define MANTID_GEOMETRY_INSTRUMENTRAYTRACER_H_
+#pragma once
 
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument.h"
@@ -67,5 +66,3 @@ private:
 };
 } // namespace Geometry
 } // namespace Mantid
-
-#endif // MANTID_GEOMETRY_INSTRUMENTRAYTRACER_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject.h
index 19ac59c16878caf820d2b4e0ef75be7a4f3ea47e..7f6a3bc3adc1d908b093e8fc29b30865357b8ab4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject.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_MESHOBJECT_H_
-#define MANTID_GEOMETRY_MESHOBJECT_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -191,5 +190,3 @@ private:
 
 } // NAMESPACE Geometry
 } // NAMESPACE Mantid
-
-#endif /*MANTID_GEOMETRY_MESHOBJECT_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject2D.h b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject2D.h
index 86ba0295533b07fccffc5c1c527e6fee709f444c..8084e866219fd47e88d2cf2b34450d2d22b1da4c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject2D.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObject2D.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_MESHOBJECT2D_H_
-#define MANTID_GEOMETRY_MESHOBJECT2D_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -120,5 +119,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MESHOBJECT2D_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObjectCommon.h b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObjectCommon.h
index 378c865193bd6bf999d2abe73aaf198b35fde96d..751fbd627b7d198bb71f7e883de4998f8d60b90d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/MeshObjectCommon.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/MeshObjectCommon.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_GEOMETRY_MESHOBJECTCOMMON_H_
-#define MANTID_GEOMETRY_MESHOBJECTCOMMON_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Objects/Track.h"
@@ -62,5 +61,3 @@ MANTID_GEOMETRY_DLL double getTriangleSolidAngle(const Kernel::V3D &a,
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_MESHOBJECTCOMMON_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h b/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
index 5de1bf4e24109fca1beb2882a52a8026aec6ca8a..372b13231529223a02f12281b4648d521b9ca670 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Rules_h
-#define Rules_h
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <map>
@@ -440,5 +439,3 @@ public:
 } // NAMESPACE  Geometry
 
 } // NAMESPACE  Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h b/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
index 48eef45b5f4426fac39695b70c2f5b20e3a8faad..8df997d97a73cd9bfb9cc8b3e6bd480ec235dfdf 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.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_SHAPEFACTORY_H_
-#define MANTID_GEOMETRY_SHAPEFACTORY_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -147,5 +146,3 @@ private:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /*MANTID_GEOMETRY_SHAPEFACTORY_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/Track.h b/Framework/Geometry/inc/MantidGeometry/Objects/Track.h
index aa402a405e06206029957ac9b25c952a658595a6..32d1bde99c60b00ffbffa8afe20d5cc8bf15fc2d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/Track.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/Track.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_TRACK_H_
-#define MANTID_GEOMETRY_TRACK_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -205,5 +204,3 @@ private:
 
 } // NAMESPACE Geometry
 } // NAMESPACE Mantid
-
-#endif /*MANTID_GEOMETRY_TRACK_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h b/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h
index 976f7d9bc011d3852f7c1666da1f2eb63e8a877c..8ea75d6e774e1b3c155b119ef8feda784b5910ac 100644
--- a/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h
+++ b/Framework/Geometry/inc/MantidGeometry/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_GEOMETRY_PRECOMPILEDHEADER_H_
-#define MANTID_GEOMETRY_PRECOMPILEDHEADER_H_
+#pragma once
 
 // Mantid
 #include "MantidKernel/DateAndTime.h"
@@ -36,5 +35,3 @@
 // Poco
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Element.h>
-
-#endif // MANTID_GEOMETRY_PRECOMPILEDHEADER_H
\ No newline at end of file
diff --git a/Framework/Geometry/inc/MantidGeometry/RandomPoint.h b/Framework/Geometry/inc/MantidGeometry/RandomPoint.h
index 0e1302ee74b1e925f6afbd210993876b16a09148..13e8b5df2e6b183db4e7840d7289b9e54fa4d091 100644
--- a/Framework/Geometry/inc/MantidGeometry/RandomPoint.h
+++ b/Framework/Geometry/inc/MantidGeometry/RandomPoint.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_RANDOMPOINT_H_
-#define MANTID_GEOMETRY_RANDOMPOINT_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -91,5 +90,3 @@ boost::optional<Kernel::V3D> bounded(const detail::ShapeInfo &shapeInfo,
 } // namespace RandomPoint
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_RANDOMPOINT_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rasterize.h b/Framework/Geometry/inc/MantidGeometry/Rasterize.h
index 3fc8969ea6b4168e6ed615a2b1f39ca950a6c0d9..90b0e9a76882d0738c7f9eb9d4251bc3321ea83e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rasterize.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rasterize.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_RASTERIZE_H_
-#define MANTID_GEOMETRY_RASTERIZE_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/V3D.h"
@@ -47,5 +46,3 @@ calculateHollowCylinder(const Kernel::V3D &beamDirection, const IObject &shape,
 } // namespace Rasterize
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_RASTERIZE_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
index 1757db3129ee40c3cea97db42d2d1177773a677f..81d4f922d3b4f56e1b6dc16911f1313925618c30 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GEOMETRYHANDLER_H
-#define GEOMETRYHANDLER_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Rendering/RenderingMesh.h"
@@ -113,5 +112,3 @@ public:
 
 } // NAMESPACE Geometry
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h
index 94e2cd588494c97eb3ca70e5888d3d8386be3d5c..a60c85199f9b580432b48db0fe59b51c08532d5c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.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_SURFACETRIANGULATOR_H_
-#define MANTID_GEOMETRY_SURFACETRIANGULATOR_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <memory>
@@ -76,5 +75,3 @@ public:
 } // namespace detail
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SURFACETRIANGULATOR_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/OpenGL_Headers.h b/Framework/Geometry/inc/MantidGeometry/Rendering/OpenGL_Headers.h
index 654d652e551f9436ba4aed1e73cf138375c1be2a..693f431d27aef5cb140ad117146461ecdedaf431 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/OpenGL_Headers.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/OpenGL_Headers.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_OPENGL_HEADERS_H_
-#define MANTID_GEOMETRY_OPENGL_HEADERS_H_
+#pragma once
 
 /* Use this header to include OpenGL. It handles the fact that the path on the
    Mac is different.
@@ -30,5 +29,3 @@
 #include <GL/glu.h>
 
 #endif
-
-#endif /* MANTID_GEOMETRY_OPENGL_HEADERS_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingHelpers.h b/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingHelpers.h
index 3fb531e24559b1519f389918a5ba720019533a46..3140a3cdcaccfc4c562fac11ff2016ca636a5351 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingHelpers.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingHelpers.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_RENDERER_H_
-#define MANTID_GEOMETRY_RENDERER_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <vector>
@@ -41,5 +40,3 @@ MANTID_GEOMETRY_DLL void renderStructured(const StructuredDetector &structDet);
 } // namespace RenderingHelpers
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_RENDERER_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingMesh.h b/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingMesh.h
index 0c938802c63f257941f0234822d307844bf38080..61c7cc07d14739b7a2e2723e98ff38790aa26bf9 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingMesh.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/RenderingMesh.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_RENDERINGMESH_H_
-#define MANTID_GEOMETRY_RENDERINGMESH_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <vector>
@@ -27,5 +26,3 @@ public:
 
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_RENDERINGMESH_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/ShapeInfo.h b/Framework/Geometry/inc/MantidGeometry/Rendering/ShapeInfo.h
index 10139ea110776cb657819c30751b65e81bd995b4..1133720fa812ef03cb897dc579410da104101e19 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/ShapeInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/ShapeInfo.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_SHAPEINFO_H_
-#define MANTID_GEOMETRY_SHAPEINFO_H_
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/V3D.h"
@@ -133,5 +132,3 @@ operator<<(std::ostream &os, const ShapeInfo::GeometryShape shape);
 } // namespace detail
 } // namespace Geometry
 } // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_SHAPEINFO_H_ */
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h b/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
index eee1fe72f7ce6a771a6763b40508d704c6fe1379..f47ae079dcfc10f555c089b4e45c6866d12ff811 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef VTKGEOMETRYCACHEREADER_H
-#define VTKGEOMETRYCACHEREADER_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 
@@ -53,5 +52,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h b/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
index 0987e4bb1b06df30e01dff7a82d697aa5cda4377..475b6fb480d25b0a972a650b0e72b20b65539172 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef VTKGEOMETRYCACHEWRITER_H
-#define VTKGEOMETRYCACHEWRITER_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include <string>
@@ -49,5 +48,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/BaseVisit.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/BaseVisit.h
index c6e8dc4b910ff814f1fad51a1cbe7cb7aee006fd..5ffbb4c294c8937a8545f89dd6105e951e9d730e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/BaseVisit.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/BaseVisit.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GEOMETRY_BASEVISIT_H
-#define GEOMETRY_BASEVISIT_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 
@@ -45,5 +44,3 @@ public:
 
 } // NAMESPACE Geometry
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
index ed52ec033b7c217d3bb6135de1ff6ba48e026211..aa67657b958b16499febcf3f3c6f64208c687b27 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Cone_h
-#define Cone_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -98,5 +97,3 @@ public:
 } // namespace Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
index 5396a77d63bbd26f2a1c35470acf866962f2c460..9743d0f72b716cecfd2c1990c70231e87e24c624 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Cylinder_h
-#define Cylinder_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -94,5 +93,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
index 28750559ae2d1486560bfb4876f12f78cf45ca9f..a63d9dc44b1b585eb63b565b2f2da60ca997bf5e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef General_h
-#define General_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -47,5 +46,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h
index 0b0bfa6e7949063110ebdd0e98f0a9bb1000092f..692e5020c89c04318b3235a0935dbab4de990bf2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.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_LINE_H
-#define MANTID_GEOMETRY_LINE_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/V3D.h"
@@ -82,5 +81,3 @@ public:
 } // namespace Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
index 33659989f4213c6c263d7683d98c35ae7e9d5110..3cc6fd207fbb9c27f03fc12bc26c91406b6eeea2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.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_LINEINTERSECTVISIT_H
-#define MANTID_GEOMETRY_LINEINTERSECTVISIT_H
+#pragma once
 
 #include "MantidGeometry/Surfaces/BaseVisit.h"
 #include "MantidGeometry/Surfaces/Line.h"
@@ -69,5 +68,3 @@ public:
 } // namespace Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
index 1e8eb652d723b606f91239423b27fd279239422e..8901da7a3f963f33071936f0387cd075ec638bf4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PLANE_H
-#define PLANE_H
+#pragma once
 
 #include "MantidGeometry/Surfaces/Quadratic.h"
 #include "MantidKernel/V3D.h"
@@ -90,5 +89,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
index a759aa3fdb40f4a6cb0a46701f2570a7cc967e83..a0f97aa798b459bda4a91de44afe4fd84c0ab851 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Geometry_Quadratic_h
-#define Geometry_Quadratic_h
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Surfaces/Surface.h"
@@ -75,5 +74,3 @@ public:
 } // NAMESPACE Geometry
 
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
index a7c288e680beb14b5e729eb3176fd9f4360732d0..9c3487b8f84d57bf5cda3de401efcc80cfafbd84 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SPHERE_H
-#define SPHERE_H
+#pragma once
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -88,5 +87,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
index c1bc74e8fd5a440346e1fe61ba48a172b26b27f0..bf8d79b4cea38125a932f6c900ae25a3cd79c760 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Geometry_Surface_h
-#define Geometry_Surface_h
+#pragma once
 
 #include "BaseVisit.h"
 #include "MantidGeometry/DllConfig.h"
@@ -89,5 +88,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
index 56e9018004340d2699cbe6f55519bf93efd5566e..951d1ea7486842c4b27338ce6598986a24ab9bd4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef surfaceFactory_h
-#define surfaceFactory_h
+#pragma once
 
 namespace Mantid {
 
@@ -52,5 +51,3 @@ public:
 } // NAMESPACE Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
index 161991a99f39ec90a21650074f9f1c203d141302..990b3c46b3a72b263250097741ffa1b5c0a701f6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef Torus_h
-#define Torus_h
+#pragma once
 
 #include "MantidKernel/V3D.h"
 
@@ -89,5 +88,3 @@ public:
 } // namespace Geometry
 
 } // NAMESPACE Mantid
-
-#endif
diff --git a/Framework/Geometry/src/MDGeometry/IMDDimension.cpp b/Framework/Geometry/src/MDGeometry/IMDDimension.cpp
index 66e04e1c5d7e7e456525116b133bc870e7a2fe16..fa333a4160729dd237e67592aab768d858eceaa3 100644
--- a/Framework/Geometry/src/MDGeometry/IMDDimension.cpp
+++ b/Framework/Geometry/src/MDGeometry/IMDDimension.cpp
@@ -4,8 +4,6 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef I_MDDIMENSION_H
-#define I_MDDIMENSION_H
 
 /** The class discribes one dimension of multidimensional dataset representing
 an ortogonal dimension and linear axis.
@@ -27,5 +25,3 @@ namespace Geometry {
   }*/
 }
 } // namespace Mantid
-
-#endif
diff --git a/Framework/Geometry/test/AcompTest.h b/Framework/Geometry/test/AcompTest.h
index 82f512997bb023bd25e0ac3f78f32d65504f4c3a..c980a2cb64e2cf23ddde93f7b607443d970e57c4 100644
--- a/Framework/Geometry/test/AcompTest.h
+++ b/Framework/Geometry/test/AcompTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ACOMPTEST__
-#define MANTID_ACOMPTEST__
+#pragma once
 #include "MantidGeometry/Math/Acomp.h"
 #include "MantidKernel/V3D.h"
 #include <cmath>
@@ -233,5 +232,4 @@ public:
     // TS_ASSERT_EQUALS(result.first.display(),"");
     // TS_ASSERT_EQUALS(result.second.display(),"");
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/AlgebraTest.h b/Framework/Geometry/test/AlgebraTest.h
index b60a8fec1a34137c2eacf82596bd13af11d2fcf9..79854ab916143f607767821ee72865bcbb3e9f03 100644
--- a/Framework/Geometry/test/AlgebraTest.h
+++ b/Framework/Geometry/test/AlgebraTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTALGEBRA__
-#define MANTID_TESTALGEBRA__
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -181,5 +180,3 @@ public:
                      "b'+a'+((g'+j+(n'm')+(k'l))(c+g+h+i+(e'd'f)))");
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/BasicHKLFiltersTest.h b/Framework/Geometry/test/BasicHKLFiltersTest.h
index 467f688d8e8844e1612af911cccf83845d6227cf..0f2aa7d3764877104906e73ae7dc2f7d0b708640 100644
--- a/Framework/Geometry/test/BasicHKLFiltersTest.h
+++ b/Framework/Geometry/test/BasicHKLFiltersTest.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_BASICHKLFILTERSTEST_H_
-#define MANTID_GEOMETRY_BASICHKLFILTERSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -163,5 +162,4 @@ private:
     MOCK_CONST_METHOD1(getFSquared, double(const V3D &));
   };
 };
-GNU_DIAG_ON_SUGGEST_OVERRIDE
-#endif /* MANTID_GEOMETRY_BASICHKLFILTERSTEST_H_ */
+GNU_DIAG_ON_SUGGEST_OVERRIDE
\ No newline at end of file
diff --git a/Framework/Geometry/test/BnIdTest.h b/Framework/Geometry/test/BnIdTest.h
index fec134f2663f06ae0a6de51bafa32d00d2ee5dfb..0c93578f0b7e9009f4728714f535f8e6d5f2090c 100644
--- a/Framework/Geometry/test/BnIdTest.h
+++ b/Framework/Geometry/test/BnIdTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_BNIDTEST__
-#define MANTID_BNIDTEST__
+#pragma once
 #include "MantidGeometry/Math/BnId.h"
 #include "MantidKernel/V3D.h"
 #include <cmath>
@@ -198,5 +197,4 @@ private:
     rc.write(output);
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/BoundingBoxTest.h b/Framework/Geometry/test/BoundingBoxTest.h
index 22f3ddef890aafb7f4041b4cd43798a77df27db5..ddaec0758ac272d911168f7b43e4c6bab0e69507 100644
--- a/Framework/Geometry/test/BoundingBoxTest.h
+++ b/Framework/Geometry/test/BoundingBoxTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BOUNDINGBOXTEST_H_
-#define BOUNDINGBOXTEST_H_
+#pragma once
 
 #include "MantidGeometry/Objects/BoundingBox.h"
 #include "MantidGeometry/Objects/Track.h"
@@ -386,5 +385,3 @@ private:
                      insideTest);
   }
 };
-
-#endif // BOUNDINGBOXTEST_H_
diff --git a/Framework/Geometry/test/BraggScattererFactoryTest.h b/Framework/Geometry/test/BraggScattererFactoryTest.h
index b49c8fe577f561e3af23421f42ca2b64e44260e7..14b97afa92ea710fabb26cce66c67fad2349ea16 100644
--- a/Framework/Geometry/test/BraggScattererFactoryTest.h
+++ b/Framework/Geometry/test/BraggScattererFactoryTest.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_BRAGGSCATTERERFACTORYTEST_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -68,5 +67,3 @@ private:
     GNU_DIAG_ON_SUGGEST_OVERRIDE
   };
 };
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
index e0b30daf2887382ff489efba360996ba5e543431..7707ae6d9bcc6da157969314500e7cdfce2f107f 100644
--- a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
+++ b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.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_BRAGGSCATTERERINCRYSTALSTRUCTURETEST_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERINCRYSTALSTRUCTURETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -126,5 +125,3 @@ private:
     GNU_DIAG_ON_SUGGEST_OVERRIDE
   };
 };
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERINCRYSTALSTRUCTURETEST_H_ */
diff --git a/Framework/Geometry/test/BraggScattererTest.h b/Framework/Geometry/test/BraggScattererTest.h
index 08126572704b6cfc74d2146c417e7aa29ebdbefb..bcf2cadd61de16ece848011282716426deb35ffc 100644
--- a/Framework/Geometry/test/BraggScattererTest.h
+++ b/Framework/Geometry/test/BraggScattererTest.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_BRAGGSCATTERERTEST_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -57,5 +56,3 @@ private:
     GNU_DIAG_ON_SUGGEST_OVERRIDE
   };
 };
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERTEST_H_ */
diff --git a/Framework/Geometry/test/CSGObjectTest.h b/Framework/Geometry/test/CSGObjectTest.h
index c91431701249d966b35acffdb65aff1d75aeb371..ac8b8631830be1e0e810beaac3428851d14d4bf8 100644
--- a/Framework/Geometry/test/CSGObjectTest.h
+++ b/Framework/Geometry/test/CSGObjectTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTCSGOBJECT__
-#define MANTID_TESTCSGOBJECT__
+#pragma once
 
 #include "MantidGeometry/Objects/CSGObject.h"
 
@@ -1795,5 +1794,3 @@ private:
   IObject_sptr m_sphere;
   IObject_sptr m_sphericalShell;
 };
-
-#endif // MANTID_TESTCSGOBJECT__
diff --git a/Framework/Geometry/test/CenteringGroupTest.h b/Framework/Geometry/test/CenteringGroupTest.h
index 7258c8cb30d97ad77e25609d33f30685e97771be..a7b13c027b8ce3c02750931eb951bea7705c89d8 100644
--- a/Framework/Geometry/test/CenteringGroupTest.h
+++ b/Framework/Geometry/test/CenteringGroupTest.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_CENTERINGGROUPTEST_H_
-#define MANTID_GEOMETRY_CENTERINGGROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -93,5 +92,3 @@ private:
            collection.end();
   }
 };
-
-#endif /* MANTID_GEOMETRY_CENTERINGGROUPTEST_H_ */
diff --git a/Framework/Geometry/test/CompAssemblyTest.h b/Framework/Geometry/test/CompAssemblyTest.h
index fbc43f1a17b4fd8a750b928c77c5103b9c53bfbb..0063a17ed11492c94947d8f142a1a466330e5f13 100644
--- a/Framework/Geometry/test/CompAssemblyTest.h
+++ b/Framework/Geometry/test/CompAssemblyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTCompAssembly__
-#define MANTID_TESTCompAssembly__
+#pragma once
 
 #include "MantidGeometry/Instrument/CompAssembly.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
@@ -564,5 +563,3 @@ public:
     delete (inst);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ComponentInfoBankHelpersTest.h b/Framework/Geometry/test/ComponentInfoBankHelpersTest.h
index f0131bb210490a2ce72e76a7dc489b32e34ed4c2..dab16a4df31e8f69b5b10ab475e081862c122753 100644
--- a/Framework/Geometry/test/ComponentInfoBankHelpersTest.h
+++ b/Framework/Geometry/test/ComponentInfoBankHelpersTest.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_GEOMETRY_COMPONENTINFOBANKHELPERSTEST_H_
-#define MANTID_GEOMETRY_COMPONENTINFOBANKHELPERSTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -320,5 +319,3 @@ public:
       TS_ASSERT(!isAncestorOf(compInfo, source, i));
   }
 };
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOBANKHELPERSTEST_H_ */
diff --git a/Framework/Geometry/test/ComponentInfoIteratorTest.h b/Framework/Geometry/test/ComponentInfoIteratorTest.h
index f978dac916f5ee1692e8755a9127d48f09fe1e00..ed7913d9f97088b2f3f0a116e36664c1da132e01 100644
--- a/Framework/Geometry/test/ComponentInfoIteratorTest.h
+++ b/Framework/Geometry/test/ComponentInfoIteratorTest.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_COMPONENTINFOITERATORTEST_H_
-#define MANTID_GEOMETRY_COMPONENTINFOITERATORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -85,5 +84,3 @@ public:
     TS_ASSERT_EQUALS(detectorCount, 1); // See instrument description above
   }
 };
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOITERATORTEST_H_ */
diff --git a/Framework/Geometry/test/ComponentInfoTest.h b/Framework/Geometry/test/ComponentInfoTest.h
index afe6ff39a54f0eb01cd49944c98e4ba8cb366ebb..489412d7c374c5a7fc0f43d9fa818c20716aba7f 100644
--- a/Framework/Geometry/test/ComponentInfoTest.h
+++ b/Framework/Geometry/test/ComponentInfoTest.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_COMPONENTINFOTEST_H_
-#define MANTID_GEOMETRY_COMPONENTINFOTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -765,5 +764,3 @@ public:
     TS_ASSERT(componentInfo->hasDetectors(componentInfo->indexOfAny("bank1")));
   }
 };
-
-#endif /* MANTID_GEOMETRY_COMPONENTINFOTEST_H_ */
diff --git a/Framework/Geometry/test/ComponentParserTest.h b/Framework/Geometry/test/ComponentParserTest.h
index 191d56100aa5cbe13e6ed87706ab706f3a59e67a..8b68dcaa07f520326b753e3032fe61f8f8e10660 100644
--- a/Framework/Geometry/test/ComponentParserTest.h
+++ b/Framework/Geometry/test/ComponentParserTest.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_COMPONENTPARSERTEST_H_
-#define MANTID_GEOMETRY_COMPONENTPARSERTEST_H_
+#pragma once
 
 #include "MantidGeometry/ComponentParser.h"
 #include "MantidKernel/CPUTimer.h"
@@ -150,5 +149,3 @@ public:
   //    std::cout << tim << " to parse " << num << " entries.\n";
   //  }
 };
-
-#endif /* MANTID_GEOMETRY_COMPONENTPARSERTEST_H_ */
diff --git a/Framework/Geometry/test/ComponentTest.h b/Framework/Geometry/test/ComponentTest.h
index 5f9a194f58a235c5a0f7a5f6b4ecc0b7d5f468c4..d9143c72f12ccd58aae12d3ac72fb71cf5524e98 100644
--- a/Framework/Geometry/test/ComponentTest.h
+++ b/Framework/Geometry/test/ComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTCOMPONENT__
-#define MANTID_TESTCOMPONENT__
+#pragma once
 
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidKernel/Exception.h"
@@ -362,5 +361,3 @@ public:
     TS_ASSERT_EQUALS(comp.type(), "LogicalComponent");
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/CompositeBraggScattererTest.h b/Framework/Geometry/test/CompositeBraggScattererTest.h
index 2bc75e5107351feaffa38a168b0bce023b272ae4..665fcba39ebeb7fb3c8191cfe42f245aa471b67f 100644
--- a/Framework/Geometry/test/CompositeBraggScattererTest.h
+++ b/Framework/Geometry/test/CompositeBraggScattererTest.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_BRAGGSCATTERERCOLLECTIONTEST_H_
-#define MANTID_GEOMETRY_BRAGGSCATTERERCOLLECTIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -203,5 +202,3 @@ private:
             {{5, 4, 4}, 6.93},   {{5, 5, 4}, 65.05},  {{5, 5, 5}, 88.57}};
   }
 };
-
-#endif /* MANTID_GEOMETRY_BRAGGSCATTERERCOLLECTIONTEST_H_ */
diff --git a/Framework/Geometry/test/CompositeImplicitFunctionTest.h b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
index df8910107ad871f87b58a7fd15c9666bdc09ca38..ffa2ee0fc3ba69b7cab5f64e1abba8faa5fe0082 100644
--- a/Framework/Geometry/test/CompositeImplicitFunctionTest.h
+++ b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COMPOSITE_IMPLICIT_FUNCTION_TEST_H_
-#define COMPOSITE_IMPLICIT_FUNCTION_TEST_H_
+#pragma once
 
 #include <cmath>
 #include <cxxtest/TestSuite.h>
@@ -104,5 +103,3 @@ public:
                    Mantid::Geometry::MDImplicitFunction_sptr(nullFunction)));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ConeTest.h b/Framework/Geometry/test/ConeTest.h
index 549b66e4ba9b0a33bacd1fc4254e8b717a3ed779..0930bbf2f5171778ee4143f0c4954e973b3d3b41 100644
--- a/Framework/Geometry/test/ConeTest.h
+++ b/Framework/Geometry/test/ConeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_CONETEST__
-#define MANTID_CONETEST__
+#pragma once
 
 #include "MantidGeometry/Surfaces/Cone.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -155,5 +154,4 @@ private:
     TS_ASSERT_THROWS_NOTHING(pv.write(output));
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/ContainerTest.h b/Framework/Geometry/test/ContainerTest.h
index b1cdecb4ebd13285bfd09c9a702d1e4ef7d81901..681412b540ecc01466b46bdf251c20d97b25036a 100644
--- a/Framework/Geometry/test/ContainerTest.h
+++ b/Framework/Geometry/test/ContainerTest.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_CANTEST_H_
-#define MANTID_GEOMETRY_CANTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -133,5 +132,3 @@ private:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_CANTEST_H_ */
diff --git a/Framework/Geometry/test/ConventionalCellTest.h b/Framework/Geometry/test/ConventionalCellTest.h
index 53db3bb6bb7562c7783481f22ae9b85f518fa9cc..93c7a92b72376ef7bc2e30708504b71a34d1518e 100644
--- a/Framework/Geometry/test/ConventionalCellTest.h
+++ b/Framework/Geometry/test/ConventionalCellTest.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_CONVENTIONAL_CELL_TEST_H_
-#define MANTID_GEOMETRY_CONVENTIONAL_CELL_TEST_H_
+#pragma once
 
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/System.h"
@@ -289,5 +288,3 @@ public:
     TS_ASSERT_DELTA(conv_cell.GetSumOfSides(), 21.6434, 1e-3);
   }
 };
-
-#endif /* MANTID_GEOMETRY_CONVENTIONAL_CELL_TEST_H_ */
diff --git a/Framework/Geometry/test/ConvexPolygonIteratorTest.h b/Framework/Geometry/test/ConvexPolygonIteratorTest.h
index fa652445df82af8d81f80824ce47c93b7d7777dd..d53cba7c7756f056d888fe7d03deaf93839cf746 100644
--- a/Framework/Geometry/test/ConvexPolygonIteratorTest.h
+++ b/Framework/Geometry/test/ConvexPolygonIteratorTest.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_POLYGONPOINTITERATORTEST_H_
-#define MANTID_GEOMETRY_POLYGONPOINTITERATORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -91,5 +90,3 @@ private:
     return rectangle;
   }
 };
-
-#endif /* MANTID_GEOMETRY_POLYGONPOINTITERATORTEST_H_ */
diff --git a/Framework/Geometry/test/ConvexPolygonTest.h b/Framework/Geometry/test/ConvexPolygonTest.h
index fc6bae806d78779bb07963a1a0478ef71300f2dd..a289d237e0770cc75c91832fac242d6de911a526 100644
--- a/Framework/Geometry/test/ConvexPolygonTest.h
+++ b/Framework/Geometry/test/ConvexPolygonTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef CONVEXPOLYGONTEST_H_
-#define CONVEXPOLYGONTEST_H_
+#pragma once
 
 #include "MantidGeometry/Math/ConvexPolygon.h"
 #include "MantidKernel/Exception.h"
@@ -191,5 +190,3 @@ public:
     }
   }
 };
-
-#endif // CONVEXPOLYGONTEST_H_
diff --git a/Framework/Geometry/test/CrystalStructureTest.h b/Framework/Geometry/test/CrystalStructureTest.h
index 2d207bf53ebc8c852a7f0add123037901ea21ce7..f5cde1a0f46b4a910f4cfbc02e9b0c451b98588e 100644
--- a/Framework/Geometry/test/CrystalStructureTest.h
+++ b/Framework/Geometry/test/CrystalStructureTest.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_CRYSTALSTRUCTURETEST_H_
-#define MANTID_GEOMETRY_CRYSTALSTRUCTURETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -112,5 +111,3 @@ private:
   SpaceGroup_const_sptr m_spaceGroup;
   CompositeBraggScatterer_sptr m_scatterers;
 };
-
-#endif /* MANTID_GEOMETRY_CRYSTALSTRUCTURETEST_H_ */
diff --git a/Framework/Geometry/test/CyclicGroupTest.h b/Framework/Geometry/test/CyclicGroupTest.h
index 119b978ae17e504582af9d832d85938a16f6d7b4..c830e8bc0ef56358b02b28c9c7ed74bc2bef0f2c 100644
--- a/Framework/Geometry/test/CyclicGroupTest.h
+++ b/Framework/Geometry/test/CyclicGroupTest.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_CYCLICGROUPTEST_H_
-#define MANTID_GEOMETRY_CYCLICGROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -58,5 +57,3 @@ public:
     TS_ASSERT_EQUALS(groupFive->order(), 8);
   }
 };
-
-#endif /* MANTID_GEOMETRY_CYCLICGROUPTEST_H_ */
diff --git a/Framework/Geometry/test/CylinderTest.h b/Framework/Geometry/test/CylinderTest.h
index 24083118990e928f098da408bc0b28bcbf6d85f8..3890afb4aa2513454c6499b7a93e07360de414b0 100644
--- a/Framework/Geometry/test/CylinderTest.h
+++ b/Framework/Geometry/test/CylinderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTCYLINDER__
-#define MANTID_TESTCYLINDER__
+#pragma once
 
 #include <algorithm>
 #include <cxxtest/TestSuite.h>
@@ -287,5 +286,3 @@ private:
     return output.str();
   }
 };
-
-#endif // MANTID_TESTCYLINDER__
diff --git a/Framework/Geometry/test/DetectorGroupTest.h b/Framework/Geometry/test/DetectorGroupTest.h
index fcb8ddf8c5dce58b7f693b871e7abd6b847f8646..c9c1c7b9d7bc456f4399e31383fc65239226a3b8 100644
--- a/Framework/Geometry/test/DetectorGroupTest.h
+++ b/Framework/Geometry/test/DetectorGroupTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef TESTDETECTORGROUP_H_
-#define TESTDETECTORGROUP_H_
+#pragma once
 
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument/Detector.h"
@@ -138,5 +137,3 @@ private:
   boost::shared_ptr<DetectorGroup> m_detGroup;
   Component m_origin;
 };
-
-#endif /*TESTDETECTORGROUP_H_*/
diff --git a/Framework/Geometry/test/DetectorInfoIteratorTest.h b/Framework/Geometry/test/DetectorInfoIteratorTest.h
index 4626086642ea537c7a47e42aa1102194d2d80123..7a1d0afd08be7da815b6b8dca4a3e53ae3490b52 100644
--- a/Framework/Geometry/test/DetectorInfoIteratorTest.h
+++ b/Framework/Geometry/test/DetectorInfoIteratorTest.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_DETECTORINFOITERATORTEST_H_
-#define MANTID_GEOMETRY_DETECTORINFOITERATORTEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/ComponentInfo.h"
 #include "MantidGeometry/Instrument/Detector.h"
@@ -219,5 +218,3 @@ public:
     TS_ASSERT(it->isMasked());
   }
 };
-
-#endif /* MANTID_GEOMETRY_DETECTORINFOITERATORTEST_H_ */
diff --git a/Framework/Geometry/test/DetectorTest.h b/Framework/Geometry/test/DetectorTest.h
index 819152bc69a97de4b4746abf50b3ab66df8bb22f..0a37f9807b0ba6017afd2c771d0866063c21dec6 100644
--- a/Framework/Geometry/test/DetectorTest.h
+++ b/Framework/Geometry/test/DetectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTDETECTOR__
-#define MANTID_TESTDETECTOR__
+#pragma once
 
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -189,5 +188,3 @@ public:
     TS_ASSERT_EQUALS(-(offset + det.getPhi()), det.getPhiOffset(offset));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/FitParameterTest.h b/Framework/Geometry/test/FitParameterTest.h
index 3ebced24cd3866bf3cb86a42265dfd0c6ba285d7..9281bff2256a4d186665874ec20cbb54950ba286 100644
--- a/Framework/Geometry/test/FitParameterTest.h
+++ b/Framework/Geometry/test/FitParameterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FITPARAMETERTEST_H_
-#define FITPARAMETERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <sstream>
@@ -123,5 +122,3 @@ public:
     TS_ASSERT(fitP.getConstraint().compare("3 < name < 8") == 0);
   }
 };
-
-#endif /*FITPARAMETERTEST_H_*/
diff --git a/Framework/Geometry/test/GeneralFrameTest.h b/Framework/Geometry/test/GeneralFrameTest.h
index 959f71aa6357a3a37208fd02437f36976b34bffc..32eb12180b60e8ba2df6af9edc3856c256fbc649 100644
--- a/Framework/Geometry/test/GeneralFrameTest.h
+++ b/Framework/Geometry/test/GeneralFrameTest.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_GENERALFRAMETEST_H_
-#define MANTID_GEOMETRY_GENERALFRAMETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -40,5 +39,3 @@ public:
     TS_ASSERT_EQUALS("Distance", frame.name());
   }
 };
-
-#endif /* MANTID_GEOMETRY_GENERALFRAMETEST_H_ */
diff --git a/Framework/Geometry/test/GeneralTest.h b/Framework/Geometry/test/GeneralTest.h
index 2ecb529deb8591999b63f67e645f1246cb3a76cd..44b2f8aeb26405e0eac68fbd6b3e5289edcff547 100644
--- a/Framework/Geometry/test/GeneralTest.h
+++ b/Framework/Geometry/test/GeneralTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_GENERALTEST__
-#define MANTID_GENERALTEST__
+#pragma once
 
 #include "MantidGeometry/Surfaces/General.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -71,5 +70,4 @@ private:
     TS_ASSERT_THROWS_NOTHING(pv.write(output));
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/GoniometerTest.h b/Framework/Geometry/test/GoniometerTest.h
index f0490e0173a006c9797952ffe9a6564b9d10a1af..bec6b4e14f4b5c1f42ffda9a201fab4a6b88454a 100644
--- a/Framework/Geometry/test/GoniometerTest.h
+++ b/Framework/Geometry/test/GoniometerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTGONIOMETER__
-#define MANTID_TESTGONIOMETER__
+#pragma once
 
 #include "MantidGeometry/Instrument/Goniometer.h"
 #include "MantidKernel/Quat.h"
@@ -257,5 +256,3 @@ public:
     TS_ASSERT_EQUALS(G2.getR(), G.getR());
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/GridDetectorPixelTest.h b/Framework/Geometry/test/GridDetectorPixelTest.h
index fbbd91e22e2e3bb0a90b1473e4e437f822bdbe25..83198fdb5f155b5a3c12181ae93f77999d87d863 100644
--- a/Framework/Geometry/test/GridDetectorPixelTest.h
+++ b/Framework/Geometry/test/GridDetectorPixelTest.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_GRIDDETECTORPIXELTEST_H_
-#define MANTID_GEOMETRY_GRIDDETECTORPIXELTEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -22,5 +21,3 @@ public:
   /// GridDetectorTest.
   void test_nothing() {}
 };
-
-#endif /* MANTID_GEOMETRY_GRIDDETECTORPIXELTEST_H_ */
diff --git a/Framework/Geometry/test/GridDetectorTest.h b/Framework/Geometry/test/GridDetectorTest.h
index 8b065a10f51061e8fe522b534bbed59ac983eef7..b3ba1c65e85a93365298ee58d422b5902478eb6d 100644
--- a/Framework/Geometry/test/GridDetectorTest.h
+++ b/Framework/Geometry/test/GridDetectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GRID_DETECTOR_TEST_H
-#define GRID_DETECTOR_TEST_H
+#pragma once
 
 #include "MantidGeometry/Instrument/GridDetector.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -251,5 +250,3 @@ private:
     TS_ASSERT_EQUALS(pos, V3D(-0.5, 1.5, 0.5));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/GroupTest.h b/Framework/Geometry/test/GroupTest.h
index aa0f0bd1e46e98c4fe6bb7523db2b897920ec102..81f78997ff7337adacdca16b1d5ed35e16289b57 100644
--- a/Framework/Geometry/test/GroupTest.h
+++ b/Framework/Geometry/test/GroupTest.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_GROUPTEST_H_
-#define MANTID_GEOMETRY_GROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -391,5 +390,3 @@ public:
     TS_ASSERT_THROWS(null * coords, const std::invalid_argument &);
   }
 };
-
-#endif /* MANTID_GEOMETRY_GROUPTEST_H_ */
diff --git a/Framework/Geometry/test/GroupTransformationTest.h b/Framework/Geometry/test/GroupTransformationTest.h
index a7ee2c021987bdc4c3cba25266298285c1e6ca4f..c7d909af4ee4d2b288796adca79518c7627ebb9e 100644
--- a/Framework/Geometry/test/GroupTransformationTest.h
+++ b/Framework/Geometry/test/GroupTransformationTest.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_GROUPTRANSFORMATIONTEST_H_
-#define MANTID_GEOMETRY_GROUPTRANSFORMATIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -133,5 +132,3 @@ public:
     TS_ASSERT_EQUALS(r3cRhGen, r3cRh);
   }
 };
-
-#endif /* MANTID_GEOMETRY_GROUPTRANSFORMATIONTEST_H_ */
diff --git a/Framework/Geometry/test/HKLFilterTest.h b/Framework/Geometry/test/HKLFilterTest.h
index afc3158e31fb04719c55ad15e9bdc83370dfaea8..ca8a7c2966791dd98df2af48d24381cfbb705795 100644
--- a/Framework/Geometry/test/HKLFilterTest.h
+++ b/Framework/Geometry/test/HKLFilterTest.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_HKLFILTERTEST_H_
-#define MANTID_GEOMETRY_HKLFILTERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -218,5 +217,4 @@ private:
     MOCK_CONST_METHOD1(isAllowed, bool(const V3D &));
   };
 };
-GNU_DIAG_ON_SUGGEST_OVERRIDE
-#endif /* MANTID_GEOMETRY_HKLFILTERTEST_H_ */
+GNU_DIAG_ON_SUGGEST_OVERRIDE
\ No newline at end of file
diff --git a/Framework/Geometry/test/HKLFilterWavelengthTest.h b/Framework/Geometry/test/HKLFilterWavelengthTest.h
index 53a112fb7b44a25ddb648d57776dce4793258e2f..562aead837cf6b367bc7381297a4223647702e4f 100644
--- a/Framework/Geometry/test/HKLFilterWavelengthTest.h
+++ b/Framework/Geometry/test/HKLFilterWavelengthTest.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_HKLFILTERWAVELENGTHTEST_H_
-#define MANTID_GEOMETRY_HKLFILTERWAVELENGTHTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -72,5 +71,3 @@ public:
     TS_ASSERT_EQUALS(wlFilter.isAllowed(V3D(1, 0, 2)), false);
   }
 };
-
-#endif /* MANTID_GEOMETRY_HKLFILTERWAVELENGTHTEST_H_ */
diff --git a/Framework/Geometry/test/HKLGeneratorTest.h b/Framework/Geometry/test/HKLGeneratorTest.h
index be3942cec6ba172133f80f951fa2b357cb3afb3e..0aaedc56ae54224084421841a38cd4105647dcc7 100644
--- a/Framework/Geometry/test/HKLGeneratorTest.h
+++ b/Framework/Geometry/test/HKLGeneratorTest.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_HKLGENERATORTEST_H_
-#define MANTID_GEOMETRY_HKLGENERATORTEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/HKLGenerator.h"
 #include <cxxtest/TestSuite.h>
@@ -113,5 +112,3 @@ public:
     TS_ASSERT_EQUALS(std::distance(it, end), 27);
   }
 };
-
-#endif /* MANTID_GEOMETRY_HKLGENERATORTEST_H_ */
diff --git a/Framework/Geometry/test/HKLTest.h b/Framework/Geometry/test/HKLTest.h
index 8d99326f1c82c7cb3401b839ce9aa90cdd2e8b7c..c17508e4ec4b7401cbfba3b93d8b887fb31392b1 100644
--- a/Framework/Geometry/test/HKLTest.h
+++ b/Framework/Geometry/test/HKLTest.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_HKLTEST_H_
-#define MANTID_GEOMETRY_HKLTEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/HKL.h"
 #include "MantidKernel/MDUnit.h"
@@ -49,5 +48,3 @@ public:
                       Mantid::Kernel::SpecialCoordinateSystem::HKL);
   }
 };
-
-#endif /* MANTID_GEOMETRY_HKLTEST_H_ */
diff --git a/Framework/Geometry/test/IDFObjectTest.h b/Framework/Geometry/test/IDFObjectTest.h
index 0b3d52ac50d490d7af3e0186f00abb52489252d5..72e6cf5975897062ca9e5b576302aba9267fa36f 100644
--- a/Framework/Geometry/test/IDFObjectTest.h
+++ b/Framework/Geometry/test/IDFObjectTest.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_IDFOBJECTTEST_H_
-#define MANTID_GEOMETRY_IDFOBJECTTEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/IDFObject.h"
 #include "MantidKernel/ConfigService.h"
@@ -141,5 +140,3 @@ public:
     TS_ASSERT_EQUALS(Poco::Path(filename).toString(), obj.getFileFullPathStr());
   }
 };
-
-#endif /* MANTID_GEOMETRY_IDFOBJECTTEST_H_ */
diff --git a/Framework/Geometry/test/IMDDimensionFactoryTest.h b/Framework/Geometry/test/IMDDimensionFactoryTest.h
index e20904c5dec7b8af11010c17a6c4af6a60378821..1bc1d38586d00cba1c9edbe95d49c748ed9d2474 100644
--- a/Framework/Geometry/test/IMDDimensionFactoryTest.h
+++ b/Framework/Geometry/test/IMDDimensionFactoryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef IMD_DIMENSIONFACTORYTEST_H_
-#define IMD_DIMENSIONFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -152,5 +151,4 @@ public:
     const auto &frame = dimension->getMDFrame();
     TS_ASSERT_EQUALS(frame.name(), "QSample");
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/IMDDimensionTest.h b/Framework/Geometry/test/IMDDimensionTest.h
index 9f8c4db42503a98edbf5ca6f355c7739cd969df1..0f5561e9875bf053c8635ffdd5d8906de7931d13 100644
--- a/Framework/Geometry/test/IMDDimensionTest.h
+++ b/Framework/Geometry/test/IMDDimensionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef H_TEST_IMD_DIMENSION
-#define H_TEST_IMD_DIMENSION
+#pragma once
 
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidKernel/Exception.h"
@@ -16,5 +15,3 @@ public:
   /** Class is pure abstract and has no functionality. Nothing to test. */
   void test_nothing() {}
 };
-
-#endif
diff --git a/Framework/Geometry/test/IndexingUtilsTest.h b/Framework/Geometry/test/IndexingUtilsTest.h
index 635e98da571fe36874a42ca0881d56c09b854a25..a7b80f12db72153c0ea00e177f536e17db376851 100644
--- a/Framework/Geometry/test/IndexingUtilsTest.h
+++ b/Framework/Geometry/test/IndexingUtilsTest.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_INDEXING_UTILS_TEST_H_
-#define MANTID_GEOMETRY_INDEXING_UTILS_TEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/IndexingUtils.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"
@@ -866,5 +865,3 @@ public:
       TS_ASSERT_DELTA(lat_par[i], correct_value[i], 1e-3);
   }
 };
-
-#endif /* MANTID_GEOMETRY_INDEXING_UTILS_TEST_H_ */
diff --git a/Framework/Geometry/test/InstrumentDefinitionParserTest.h b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
index d1a52c7c45141ee7fdc1b2b8a02915be78c19b08..0a9c204b85d0d2997e2e74aba515e4d474fd5aed 100644
--- a/Framework/Geometry/test/InstrumentDefinitionParserTest.h
+++ b/Framework/Geometry/test/InstrumentDefinitionParserTest.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_INSTRUMENTDEFINITIONPARSERTEST_H_
-#define MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSERTEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/ComponentInfo.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
@@ -1133,5 +1132,3 @@ private:
     return std::move(std::get<1>(instrument.makeBeamline(pmap)));
   }
 };
-
-#endif /* MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSERTEST_H_ */
diff --git a/Framework/Geometry/test/InstrumentRayTracerTest.h b/Framework/Geometry/test/InstrumentRayTracerTest.h
index 1a747999f07a190d1092c1061c616d5373c2eb36..a5f12df793abc38fb0e828a15ca1e023c3673e92 100644
--- a/Framework/Geometry/test/InstrumentRayTracerTest.h
+++ b/Framework/Geometry/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 "MantidGeometry/Instrument/RectangularDetector.h"
 #include "MantidGeometry/Objects/InstrumentRayTracer.h"
@@ -243,5 +242,3 @@ private:
 // PERFORMANCE TEST IS IN DataHandling/test/InstrumentRayTracerTest.h because it
 // requires LoadInstrument
 //------------------------------------------------------------------------------------------------------
-
-#endif // InstrumentRayTracerTEST_H_
diff --git a/Framework/Geometry/test/InstrumentTest.h b/Framework/Geometry/test/InstrumentTest.h
index dffaec8ef638ffa50e375c7657f01b39fa0fe309..43faf0c7b245bad1b85fa11a161610bbe6833cab 100644
--- a/Framework/Geometry/test/InstrumentTest.h
+++ b/Framework/Geometry/test/InstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTTEST_H_
-#define INSTRUMENTTEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/ComponentInfo.h"
@@ -731,5 +730,3 @@ private:
   Instrument_sptr m_instrumentParameterized;
   Instrument_sptr m_instrumentNotParameterized;
 };
-
-#endif /*INSTRUMENTTEST_H_*/
diff --git a/Framework/Geometry/test/InstrumentVisitorTest.h b/Framework/Geometry/test/InstrumentVisitorTest.h
index 182557bb8e1bfd0492b9929b67edc0f41440efc6..6f0e958c55b957af656dca55de3c9ebb45fd3a8a 100644
--- a/Framework/Geometry/test/InstrumentVisitorTest.h
+++ b/Framework/Geometry/test/InstrumentVisitorTest.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_INSTRUMENTVISITORVISITORTEST_H_
-#define MANTID_GEOMETRY_INSTRUMENTVISITORVISITORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -526,5 +525,4 @@ public:
     visitor.walkInstrument();
     TS_ASSERT(visitor.size() >= size_t(m_nPixels * m_nPixels));
   }
-};
-#endif /* MANTID_API_INSTRUMENTVISITORVISITORTEST_H_ */
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/IsotropicAtomBraggScattererTest.h b/Framework/Geometry/test/IsotropicAtomBraggScattererTest.h
index 33c7456775b1da9a1fc89d66caad1faf435cb18a..3871cf4348e38ce8ce48d70dd6030cb76bd78606 100644
--- a/Framework/Geometry/test/IsotropicAtomBraggScattererTest.h
+++ b/Framework/Geometry/test/IsotropicAtomBraggScattererTest.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_ISOTROPICATOMBRAGGSCATTERERTEST_H_
-#define MANTID_GEOMETRY_ISOTROPICATOMBRAGGSCATTERERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -243,5 +242,3 @@ private:
     return scatterer;
   }
 };
-
-#endif /* MANTID_GEOMETRY_ISOTROPICATOMBRAGGSCATTERERTEST_H_ */
diff --git a/Framework/Geometry/test/LineIntersectVisitTest.h b/Framework/Geometry/test/LineIntersectVisitTest.h
index 29f58bd1014e93a78335c2e31f9dbf874611a3f2..ecbdde86f1df5fbfe2f05d38b21af7cd28bcfe1f 100644
--- a/Framework/Geometry/test/LineIntersectVisitTest.h
+++ b/Framework/Geometry/test/LineIntersectVisitTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LINEINTERSECTVISITTEST__
-#define MANTID_LINEINTERSECTVISITTEST__
+#pragma once
 
 #include "MantidGeometry/Surfaces/Cone.h"
 #include "MantidGeometry/Surfaces/Cylinder.h"
@@ -115,5 +114,4 @@ private:
     TS_ASSERT_THROWS_NOTHING(pv.write(output));
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/LineTest.h b/Framework/Geometry/test/LineTest.h
index ebce094ddf7a39fd8a4a0fd29fa1edbf0a28fece..96570f9d8f0c10ba766f072bbd387d62300ae562 100644
--- a/Framework/Geometry/test/LineTest.h
+++ b/Framework/Geometry/test/LineTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LINETEST__
-#define MANTID_LINETEST__
+#pragma once
 #include "MantidGeometry/Surfaces/Cylinder.h"
 #include "MantidGeometry/Surfaces/Line.h"
 #include "MantidGeometry/Surfaces/Plane.h"
@@ -229,5 +228,3 @@ public:
     TS_ASSERT_EQUALS(*itr, V3D(-2.0, 0.0, 0.0));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
index 6c5117cd19f4452fd345641f2d93c3da0e095235..c01fea584d7517fe54e5b8c51ae3aa8430715767 100644
--- a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
+++ b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTIONTEST_H_
-#define MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTIONTEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDBoxImplicitFunction.h"
 #include "MantidGeometry/MDGeometry/MDTypes.h"
@@ -335,5 +334,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_MDALGORITHMS_MDBOXIMPLICITFUNCTIONTEST_H_ */
diff --git a/Framework/Geometry/test/MDFrameFactoryTest.h b/Framework/Geometry/test/MDFrameFactoryTest.h
index cd1d79d544f3b57a8523d3937bfb5c4fd3e8bbed..c6d3290f9b3335b2feb4ed1cfbd21f36ed71a533 100644
--- a/Framework/Geometry/test/MDFrameFactoryTest.h
+++ b/Framework/Geometry/test/MDFrameFactoryTest.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_MDFRAMEFACTORYTEST_H_
-#define MANTID_KERNEL_MDFRAMEFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -157,5 +156,3 @@ public:
             .get()));
   }
 };
-
-#endif /* MANTID_KERNEL_MDFRAMEFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
index 36d91bf9080646bd53c98f319d369f12437f7a10..817633ead8c3b592902567506913544179a3b50d 100644
--- a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
+++ b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MD_GEOMETRYXMLBUILDER_TEST_H_
-#define MD_GEOMETRYXMLBUILDER_TEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -532,5 +531,3 @@ public:
                           ->innerText());
   }
 };
-
-#endif /* MD_GEOMETRYXMLBUILDER_TEST_H_ */
diff --git a/Framework/Geometry/test/MDGeometryXMLParserTest.h b/Framework/Geometry/test/MDGeometryXMLParserTest.h
index 7e5db3d9efcb68906c17009d2ed3fb03db75ca0f..d6ca516df69e5d0c1d1186f174daecbd38995e4f 100644
--- a/Framework/Geometry/test/MDGeometryXMLParserTest.h
+++ b/Framework/Geometry/test/MDGeometryXMLParserTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MDGEOMETRY_XML_PARSER_TEST_H_
-#define MDGEOMETRY_XML_PARSER_TEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDGeometryXMLParser.h"
 #include <cxxtest/TestSuite.h>
@@ -361,5 +360,3 @@ public:
     TS_ASSERT_THROWS(xmlParser.execute(), const std::runtime_error &);
   }
 };
-
-#endif
\ No newline at end of file
diff --git a/Framework/Geometry/test/MDHistoDimensionBuilderTest.h b/Framework/Geometry/test/MDHistoDimensionBuilderTest.h
index d9b237a06d4e7322fc140ffbead05db7ecfb25b5..e2cc22ef5d0c9bc0981017c0829fdba26726b57f 100644
--- a/Framework/Geometry/test/MDHistoDimensionBuilderTest.h
+++ b/Framework/Geometry/test/MDHistoDimensionBuilderTest.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_MDHISTODIMENSION_BUILDER_TEST_H_
-#define MANTID_GEOMETRY_MDHISTODIMENSION_BUILDER_TEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h"
 #include "MantidGeometry/MDGeometry/QLab.h"
@@ -260,5 +259,3 @@ public:
     TS_ASSERT_THROWS(builder.create(), const std::invalid_argument &);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/MDHistoDimensionTest.h b/Framework/Geometry/test/MDHistoDimensionTest.h
index a587ab7aac510ba6b2f99449d26336c96159d0f8..63fae00cf2bc0786d8548d8213263f453ffd7396 100644
--- a/Framework/Geometry/test/MDHistoDimensionTest.h
+++ b/Framework/Geometry/test/MDHistoDimensionTest.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_MDHISTODIMENSIONTEST_H_
-#define MANTID_GEOMETRY_MDHISTODIMENSIONTEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
 #include "MantidGeometry/MDGeometry/MDTypes.h"
@@ -112,5 +111,3 @@ public:
                       Mantid::Geometry::QLab::QLabName);
   }
 };
-
-#endif /* MANTID_GEOMETRY_MDHISTODIMENSIONTEST_H_ */
diff --git a/Framework/Geometry/test/MDImplicitFunctionTest.h b/Framework/Geometry/test/MDImplicitFunctionTest.h
index f82c440101af8c18ac9567623ba1dfb7d6fdce3a..6a6a8d7197a95abffe5813da47eace8e3586fb94 100644
--- a/Framework/Geometry/test/MDImplicitFunctionTest.h
+++ b/Framework/Geometry/test/MDImplicitFunctionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDIMPLICITFUNCTIONTEST_H_
-#define MANTID_MDALGORITHMS_MDIMPLICITFUNCTIONTEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
 #include <boost/shared_array.hpp>
@@ -281,5 +280,3 @@ public:
                f.isBoxTouching(vertexes));
   }
 };
-
-#endif /* MANTID_MDALGORITHMS_MDIMPLICITFUNCTIONTEST_H_ */
diff --git a/Framework/Geometry/test/MDPlaneImplicitFunctionTest.h b/Framework/Geometry/test/MDPlaneImplicitFunctionTest.h
index a75dc43d878feebc3049f0ddcdbbba147a2d9f5d..26bde04506737dbe78a434de630882523996ebd9 100644
--- a/Framework/Geometry/test/MDPlaneImplicitFunctionTest.h
+++ b/Framework/Geometry/test/MDPlaneImplicitFunctionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDGEOMETRY_MDIMPLICITFUNCTIONTEST_H_
-#define MANTID_MDGEOMETRY_MDIMPLICITFUNCTIONTEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDPlane.h"
 #include "MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h"
@@ -91,5 +90,3 @@ private:
                        "</Function>");
   }
 };
-
-#endif // MANTID_MDGEOMETRY_MDIMPLICITFUNCTIONTEST_H_
diff --git a/Framework/Geometry/test/MDPlaneTest.h b/Framework/Geometry/test/MDPlaneTest.h
index dbf1e0abc8917085f060e039d5ae4ffd82674de9..257f489bf436ec9b981044d475266548d4579320 100644
--- a/Framework/Geometry/test/MDPlaneTest.h
+++ b/Framework/Geometry/test/MDPlaneTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MDALGORITHMS_MDPLANETEST_H_
-#define MANTID_MDALGORITHMS_MDPLANETEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDPlane.h"
 #include "MantidKernel/System.h"
@@ -334,5 +333,3 @@ public:
     TS_ASSERT(res);
   }
 };
-
-#endif /* MANTID_MDALGORITHMS_MDPLANETEST_H_ */
diff --git a/Framework/Geometry/test/MapSupportTest.h b/Framework/Geometry/test/MapSupportTest.h
index 888de7addbae9c1f63682bfe43acf9d7bc517c0a..b16902cb3e05d5cbda14b4f0a10b24d24879645e 100644
--- a/Framework/Geometry/test/MapSupportTest.h
+++ b/Framework/Geometry/test/MapSupportTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MAPSUPPORTTEST__
-#define MANTID_MAPSUPPORTTEST__
+#pragma once
 #include "MantidGeometry/Math/MapSupport.h"
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/System.h"
@@ -19,5 +18,4 @@ using namespace Mantid;
 class MapSupportTest : public CxxTest::TestSuite {
 public:
   void testConstructor() {}
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/MathSupportTest.h b/Framework/Geometry/test/MathSupportTest.h
index a411770d4dfe05496b792ecd8a409fce8d514ab3..d42f42adabe85cc3b40b76a57b2b23d692e9fe47 100644
--- a/Framework/Geometry/test/MathSupportTest.h
+++ b/Framework/Geometry/test/MathSupportTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTMATHSUPPORT__
-#define MANTID_TESTMATHSUPPORT__
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -63,5 +62,4 @@ public:
     TS_ASSERT_DELTA(root2.imag(), 3, 0.000001);
     TS_ASSERT_DELTA(root3.imag(), -3, 0.000001);
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/MatrixVectorPairParserTest.h b/Framework/Geometry/test/MatrixVectorPairParserTest.h
index 8dccfdc1ee6b943bf7fcc1d07bd8881b6c494d08..59c0fc00dc661112a1d2b06e2d12e299c1d32a7c 100644
--- a/Framework/Geometry/test/MatrixVectorPairParserTest.h
+++ b/Framework/Geometry/test/MatrixVectorPairParserTest.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_MATRIXVECTORPAIRPARSERTEST_H_
-#define MANTID_GEOMETRY_MATRIXVECTORPAIRPARSERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -112,5 +111,3 @@ public:
     TS_ASSERT_EQUALS(pair.getVector(), V3R(0, 0, 0));
   }
 };
-
-#endif /* MANTID_GEOMETRY_MATRIXVECTORPAIRPARSERTEST_H_ */
diff --git a/Framework/Geometry/test/MatrixVectorPairTest.h b/Framework/Geometry/test/MatrixVectorPairTest.h
index 3dea8edfb28b9cd4b91fb001c3db47ce1045d39e..7af7c82f7b42298541c44668668a91deca7dba89 100644
--- a/Framework/Geometry/test/MatrixVectorPairTest.h
+++ b/Framework/Geometry/test/MatrixVectorPairTest.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_MATRIXVECTORPAIRTEST_H_
-#define MANTID_GEOMETRY_MATRIXVECTORPAIRTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -107,5 +106,3 @@ public:
     TS_ASSERT_EQUALS(pairLHS, pairLHSCopy);
   }
 };
-
-#endif /* MANTID_GEOMETRY_MATRIXVECTORPAIRTEST_H_ */
diff --git a/Framework/Geometry/test/MeshObject2DTest.h b/Framework/Geometry/test/MeshObject2DTest.h
index 1aa472f160d7a3fad4c38eaf8f4420f42efd1855..b54adb38e7f21583dd1748bf80eba9ee4d9d6acf 100644
--- a/Framework/Geometry/test/MeshObject2DTest.h
+++ b/Framework/Geometry/test/MeshObject2DTest.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_MESHOBJECT2DTEST_H_
-#define MANTID_GEOMETRY_MESHOBJECT2DTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -381,5 +380,3 @@ public:
     TS_ASSERT_EQUALS(handler->numberOfPoints(), 3);
   }
 };
-
-#endif /* MANTID_GEOMETRY_MESHOBJECT2DTEST_H_ */
diff --git a/Framework/Geometry/test/MeshObjectCommonTest.h b/Framework/Geometry/test/MeshObjectCommonTest.h
index 97aad863584c2449d163931baf28986ab30a9a43..d03b9a63807c007285da6e18b067afa882e42006 100644
--- a/Framework/Geometry/test/MeshObjectCommonTest.h
+++ b/Framework/Geometry/test/MeshObjectCommonTest.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_GEOMETRY_MESHOBJECTCOMMONTEST_H_
-#define MANTID_GEOMETRY_MESHOBJECTCOMMONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <limits>
@@ -126,5 +125,3 @@ public:
                      std::invalid_argument &);
   }
 };
-
-#endif /* MANTID_GEOMETRY_MESHOBJECTCOMMONTEST_H_ */
diff --git a/Framework/Geometry/test/MeshObjectTest.h b/Framework/Geometry/test/MeshObjectTest.h
index ebd57726629da80bcce34a5b6bc575cd17abfa46..266a7bf8fdca3c374813c6e3f95de291bc347df6 100644
--- a/Framework/Geometry/test/MeshObjectTest.h
+++ b/Framework/Geometry/test/MeshObjectTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTMESHOBJECT__
-#define MANTID_TESTMESHOBJECT__
+#pragma once
 
 #include "MantidGeometry/Math/Algebra.h"
 #include "MantidGeometry/Objects/MeshObject.h"
@@ -1184,5 +1183,3 @@ private:
   V3D translation;
   Kernel::Matrix<double> rotation;
 };
-
-#endif // MANTID_TESTMESHOBJECT__
diff --git a/Framework/Geometry/test/MockObjects.h b/Framework/Geometry/test/MockObjects.h
index 4aaaec4b1c982e0b23fb7b272624583f157d1041..d7d742dbf67f4b2d0473903d90bf99f848c48a17 100644
--- a/Framework/Geometry/test/MockObjects.h
+++ b/Framework/Geometry/test/MockObjects.h
@@ -11,8 +11,7 @@
  *      Author: spu92482
  */
 
-#ifndef MANTIDGEOMETRYTEST_MOCKOBJECTS_H_
-#define MANTIDGEOMETRYTEST_MOCKOBJECTS_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/IPeak.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -135,5 +134,4 @@ public:
   MOCK_CONST_METHOD0(getPeakShape, const Mantid::Geometry::PeakShape &());
 };
 } // namespace
-GNU_DIAG_ON_SUGGEST_OVERRIDE
-#endif /* MANTIDGEOMETRYTEST_MOCKOBJECTS_H_ */
+GNU_DIAG_ON_SUGGEST_OVERRIDE
\ No newline at end of file
diff --git a/Framework/Geometry/test/MockRNG.h b/Framework/Geometry/test/MockRNG.h
index 8e9d8265078529f35043bba1c77c5f0c890b2fce..9a06fa28ebfdb534025a2bd0d3658597c650f847 100644
--- a/Framework/Geometry/test/MockRNG.h
+++ b/Framework/Geometry/test/MockRNG.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_MOCKRNG_H_
-#define MANTID_GEOMETRY_MOCKRNG_H_
+#pragma once
 
 #include "MantidKernel/PseudoRandomNumberGenerator.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -29,5 +28,3 @@ public:
   MOCK_CONST_METHOD0(max, double());
   GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
-
-#endif /* MANTID_GEOMETRY_MOCKRNG_H_ */
diff --git a/Framework/Geometry/test/NiggliCellTest.h b/Framework/Geometry/test/NiggliCellTest.h
index 97932b5fa673456111dfb30d0eb11cfddc59fea1..58b0222b565ba638c88c230dcfd359b3eb3c8924 100644
--- a/Framework/Geometry/test/NiggliCellTest.h
+++ b/Framework/Geometry/test/NiggliCellTest.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_NiggliCellTEST_H_
-#define MANTID_GEOMETRY_NiggliCellTEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/NiggliCell.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"
@@ -118,5 +117,3 @@ public:
     TS_ASSERT_DELTA(gamma, 60, 1e-1);
   }
 };
-
-#endif /* MANTID_GEOMETRY_NiggliCellTEST_H_ */
diff --git a/Framework/Geometry/test/NullImplicitFunctionTest.h b/Framework/Geometry/test/NullImplicitFunctionTest.h
index 9750abad0cf7b78dfebfa19b6c6fe6ee79cca67a..f6655f33e44a180bfc936a2013d3aaf93b46e100 100644
--- a/Framework/Geometry/test/NullImplicitFunctionTest.h
+++ b/Framework/Geometry/test/NullImplicitFunctionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef NULL_IMPLICIT_FUNCTION_TEST_H_
-#define NULL_IMPLICIT_FUNCTION_TEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/NullImplicitFunction.h"
 #include <cxxtest/TestSuite.h>
@@ -37,5 +36,4 @@ public:
         "The xml string should be empty for any instance of this type",
         std::string(), function.toXMLString());
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/ObjCompAssemblyTest.h b/Framework/Geometry/test/ObjCompAssemblyTest.h
index 6697468645d93951ae80fd3405d6890844921331..ee93afc62108346bbc80a4c7ec7038910b8ffadc 100644
--- a/Framework/Geometry/test/ObjCompAssemblyTest.h
+++ b/Framework/Geometry/test/ObjCompAssemblyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTObjObjCompAssembly__
-#define MANTID_TESTObjObjCompAssembly__
+#pragma once
 
 #include "MantidGeometry/Instrument/ObjCompAssembly.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -400,5 +399,3 @@ public:
                      const std::runtime_error &);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ObjComponentTest.h b/Framework/Geometry/test/ObjComponentTest.h
index 05ee1035db521bba091bde15030596d2fd675e43..9426b47add22bf75eac55e94998d9b8dc1369916 100644
--- a/Framework/Geometry/test/ObjComponentTest.h
+++ b/Framework/Geometry/test/ObjComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTOBJCOMPNENT__
-#define MANTID_TESTOBJCOMPNENT__
+#pragma once
 
 #include "MantidGeometry/Instrument/ObjComponent.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -549,5 +548,3 @@ private:
     return retVal;
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/OrientedLatticeTest.h b/Framework/Geometry/test/OrientedLatticeTest.h
index 86b89c3ccfe6b897bdbf66bb88ef34d8274a3b1d..e05dae46707f34bda62bcc7b6ab80dc4165efefc 100644
--- a/Framework/Geometry/test/OrientedLatticeTest.h
+++ b/Framework/Geometry/test/OrientedLatticeTest.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_ORIENTEDLATTICETEST_H_
-#define MANTID_GEOMETRY_ORIENTEDLATTICETEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/OrientedLattice.h"
 #include "MantidKernel/Matrix.h"
@@ -302,5 +301,3 @@ public:
     TSM_ASSERT_EQUALS("y direction is", V3D(0, -1, 0), eyPrime);
   }
 };
-
-#endif /* MANTID_GEOMETRY_UNITCELLTEST_H_ */
diff --git a/Framework/Geometry/test/ParCompAssemblyTest.h b/Framework/Geometry/test/ParCompAssemblyTest.h
index 7306799fe11e116b3e440fc787aec9a1da8ca22d..375f567bc6b234c35f21844091261a3d888fcfc3 100644
--- a/Framework/Geometry/test/ParCompAssemblyTest.h
+++ b/Framework/Geometry/test/ParCompAssemblyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTPARCOMPASSEMBLY_H_
-#define MANTID_TESTPARCOMPASSEMBLY_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/CompAssembly.h"
 #include "MantidKernel/Quat.h"
@@ -152,5 +151,3 @@ public:
   //  // Keep references to detectors alive
   //  boost::shared_ptr<Component> m_det1, m_det2, m_det3
 };
-
-#endif
diff --git a/Framework/Geometry/test/ParComponentFactoryTest.h b/Framework/Geometry/test/ParComponentFactoryTest.h
index df1dcff347aa224d5044e70da6a1aaad8e6bdc3d..964599dca2ba2860c1633de7a700650207ab19cf 100644
--- a/Framework/Geometry/test/ParComponentFactoryTest.h
+++ b/Framework/Geometry/test/ParComponentFactoryTest.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_PARCOMPONENTFACTORYTEST_H_
-#define MANTID_GEOMETRY_PARCOMPONENTFACTORYTEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/Detector.h"
 #include "MantidGeometry/Instrument/ParComponentFactory.h"
@@ -45,5 +44,3 @@ public:
     TS_ASSERT(pinst);
   }
 };
-
-#endif /* MANTID_GEOMETRY_PARCOMPONENTFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/ParDetectorTest.h b/Framework/Geometry/test/ParDetectorTest.h
index 6a41227615947ed9b8095c583cc31fc4a6049cb1..3a90cbb00d42896389f30e4b0edbca9e8db6e457 100644
--- a/Framework/Geometry/test/ParDetectorTest.h
+++ b/Framework/Geometry/test/ParDetectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTPARDETECTOR__
-#define MANTID_TESTPARDETECTOR__
+#pragma once
 
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidGeometry/Instrument/Detector.h"
@@ -118,5 +117,3 @@ public:
     TS_ASSERT_DELTA(rot[0].imagK(), 0.75, 1e-08);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ParInstrumentTest.h b/Framework/Geometry/test/ParInstrumentTest.h
index 22e7ee0b3cd62cd7f837f9d14ef406a7ed0385a6..035fb7b821b7180dd2bb15d7e6bab299500ed333 100644
--- a/Framework/Geometry/test/ParInstrumentTest.h
+++ b/Framework/Geometry/test/ParInstrumentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PARINSTRUMENTTEST_H_
-#define PARINSTRUMENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -114,5 +113,3 @@ private:
   Detector *det2;
   Detector *det3;
 };
-
-#endif /*INSTRUMENTTEST_H_*/
diff --git a/Framework/Geometry/test/ParObjCompAssemblyTest.h b/Framework/Geometry/test/ParObjCompAssemblyTest.h
index 8bd7fbda51646916df187506750bd77b8e7b3d2e..cebb427960ade049a62a50f67888e1ca4e8482e2 100644
--- a/Framework/Geometry/test/ParObjCompAssemblyTest.h
+++ b/Framework/Geometry/test/ParObjCompAssemblyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTParObjObjCompAssembly__
-#define MANTID_TESTParObjObjCompAssembly__
+#pragma once
 
 #include "MantidGeometry/Instrument/ObjCompAssembly.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -157,5 +156,3 @@ public:
         boost::dynamic_pointer_cast<ICompAssembly>(ic);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ParObjComponentTest.h b/Framework/Geometry/test/ParObjComponentTest.h
index 27ca851e2aae91a1085b73a2300a51181a313de4..d52a23b49502f123e222eb8ab66a819c2e7ab292 100644
--- a/Framework/Geometry/test/ParObjComponentTest.h
+++ b/Framework/Geometry/test/ParObjComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTPAROBJCOMPNENT__
-#define MANTID_TESTPAROBJCOMPNENT__
+#pragma once
 
 #include "MantidGeometry/Instrument/ObjComponent.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -373,5 +372,3 @@ private:
     return retVal;
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ParameterMapTest.h b/Framework/Geometry/test/ParameterMapTest.h
index a1239cf8617f4a9df66b5f005beae5f33036daff..85effd1906fb1ba5099e039676560e299609cc29 100644
--- a/Framework/Geometry/test/ParameterMapTest.h
+++ b/Framework/Geometry/test/ParameterMapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PARAMETERMAPTEST_H_
-#define PARAMETERMAPTEST_H_
+#pragma once
 
 #include "MantidBeamline/ComponentInfo.h"
 #include "MantidBeamline/DetectorInfo.h"
@@ -818,5 +817,3 @@ private:
   Mantid::Geometry::ParameterMap m_pmap;
   Mantid::Geometry::IDetector *m_leaf;
 };
-
-#endif /* PARAMETERMAPTEST_H_ */
diff --git a/Framework/Geometry/test/ParametrizedComponentTest.h b/Framework/Geometry/test/ParametrizedComponentTest.h
index a6be8c2bc53f51b6eb7a6488e92177a9f1a909bb..840407957f4d7a7b6dd11565408a3aa6838e343a 100644
--- a/Framework/Geometry/test/ParametrizedComponentTest.h
+++ b/Framework/Geometry/test/ParametrizedComponentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTPARCOMPONENT__
-#define MANTID_TESTPARCOMPONENT__
+#pragma once
 
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Instrument/Component.h"
@@ -264,5 +263,3 @@ private:
   const std::string m_quatName;
   const Quat m_quatValue;
 };
-
-#endif
diff --git a/Framework/Geometry/test/PeakTransformHKLTest.h b/Framework/Geometry/test/PeakTransformHKLTest.h
index 4573bc828f0654f2a68997333a994ca95e14c4e5..314bd2f254b4680eca50a7699d790e3892a50066 100644
--- a/Framework/Geometry/test/PeakTransformHKLTest.h
+++ b/Framework/Geometry/test/PeakTransformHKLTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGEOMETRY_PEAKTRANSFORMHKL_TEST_H_
-#define MANTIDGEOMETRY_PEAKTRANSFORMHKL_TEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransformHKL.h"
 #include "MockObjects.h"
@@ -277,5 +276,4 @@ public:
     PeakTransformHKL transform;
     TS_ASSERT_EQUALS(Mantid::Kernel::HKL, transform.getCoordinateSystem())
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/PeakTransformQLabTest.h b/Framework/Geometry/test/PeakTransformQLabTest.h
index df2798ef1525ad2dc1d476e89ed612b5066833d2..3afdc1dca7e8bb7b9774872f52bd27104290b4a3 100644
--- a/Framework/Geometry/test/PeakTransformQLabTest.h
+++ b/Framework/Geometry/test/PeakTransformQLabTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGEOMETRY_PEAKTRANSFORMQLAB_TEST_H_
-#define MANTIDGEOMETRY_PEAKTRANSFORMQLAB_TEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransformQLab.h"
 #include "MockObjects.h"
@@ -224,6 +223,3 @@ public:
     TS_ASSERT_EQUALS(Mantid::Kernel::QLab, transform.getCoordinateSystem())
   }
 };
-#endif
-
-// end MANTIDGEOMETRY_PEAKTRANSFORMQLAB_TEST_H_
diff --git a/Framework/Geometry/test/PeakTransformQSampleTest.h b/Framework/Geometry/test/PeakTransformQSampleTest.h
index 3c9e74101f6f1228c85e39de2698ace2a3e8f5f7..ae520f5880e38e3a53c5e1070c85dc576fa7ae5b 100644
--- a/Framework/Geometry/test/PeakTransformQSampleTest.h
+++ b/Framework/Geometry/test/PeakTransformQSampleTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGEOMETRY_PEAKTRANSFORMQSAMPLE_TEST_H_
-#define MANTIDGEOMETRY_PEAKTRANSFORMQSAMPLE_TEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransformQSample.h"
 #include "MockObjects.h"
@@ -231,6 +230,3 @@ public:
     TS_ASSERT_EQUALS(Mantid::Kernel::QSample, transform.getCoordinateSystem())
   }
 };
-#endif
-
-// end MANTIDAPI_PEAKTRANSFORMQSAMPLE_TEST_H_
diff --git a/Framework/Geometry/test/PeakTransformSelectorTest.h b/Framework/Geometry/test/PeakTransformSelectorTest.h
index 673cd628c1b991b5704c37c54b3fae6f856a8321..e844270b88ff72570f31dc4685f643b9530c5c51 100644
--- a/Framework/Geometry/test/PeakTransformSelectorTest.h
+++ b/Framework/Geometry/test/PeakTransformSelectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDAPI_PEAKTRANSFORMSELECTOR_TEST_H_
-#define MANTIDAPI_PEAKTRANSFORMSELECTOR_TEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransform.h"
 #include "MantidGeometry/Crystal/PeakTransformSelector.h"
@@ -196,5 +195,3 @@ public:
     TS_ASSERT(Mock::VerifyAndClearExpectations(pRightFactory));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/PlaneTest.h b/Framework/Geometry/test/PlaneTest.h
index ee3b0b71f08a26169813f2d1b1be29ab1a650eef..528778083b2999fc5c8000139470169b521d3608 100644
--- a/Framework/Geometry/test/PlaneTest.h
+++ b/Framework/Geometry/test/PlaneTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_PLANETEST__
-#define MANTID_PLANETEST__
+#pragma once
 
 #include "MantidGeometry/Surfaces/Plane.h"
 #include "MantidGeometry/Surfaces/Quadratic.h"
@@ -215,5 +214,3 @@ private:
     return output.str();
   }
 };
-
-#endif // MANTID_PLANETEST__
diff --git a/Framework/Geometry/test/PointGroupFactoryTest.h b/Framework/Geometry/test/PointGroupFactoryTest.h
index b7a692df2fff2ff6311361860063977dcaad1c0c..e077212d7eb46ac5f5d4f60587ff7a9f249eddbe 100644
--- a/Framework/Geometry/test/PointGroupFactoryTest.h
+++ b/Framework/Geometry/test/PointGroupFactoryTest.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_POINTGROUPFACTORYTEST_H_
-#define MANTID_GEOMETRY_POINTGROUPFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -147,5 +146,3 @@ private:
         spaceGroup);
   }
 };
-
-#endif /* MANTID_GEOMETRY_POINTGROUPFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/PointGroupTest.h b/Framework/Geometry/test/PointGroupTest.h
index f8c4696cdccf4e9574246a6e3108a87473e3bf00..ffa669cea282506642ca808e432a1fc2c6c2430a 100644
--- a/Framework/Geometry/test/PointGroupTest.h
+++ b/Framework/Geometry/test/PointGroupTest.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_POINTGROUPTEST_H_
-#define MANTID_GEOMETRY_POINTGROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -477,5 +476,3 @@ private:
     std::cout << "Eq: " << h << ", Time: " << time / 1000.0 << '\n';
   }
 };
-
-#endif /* MANTID_GEOMETRY_POINTGROUPTEST_H_ */
diff --git a/Framework/Geometry/test/PolyTest.h b/Framework/Geometry/test/PolyTest.h
index 2d429fc8911c903e25f7b8cd5d754cbe38e0420f..22253fb0a6670eee72cbe0650c1314b4c813c4b2 100644
--- a/Framework/Geometry/test/PolyTest.h
+++ b/Framework/Geometry/test/PolyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTPOLY__
-#define MANTID_TESTPOLY__
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -229,5 +228,3 @@ private:
     return output.str();
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/PolygonEdgeTest.h b/Framework/Geometry/test/PolygonEdgeTest.h
index 05cf57bbf073d961bc9ae50853aeee2b317a0a23..db89de113729161a3c7b6afabc8fe5b4a8d0364a 100644
--- a/Framework/Geometry/test/PolygonEdgeTest.h
+++ b/Framework/Geometry/test/PolygonEdgeTest.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_POLYGONEDGETEST_H_
-#define MANTID_GEOMETRY_POLYGONEDGETEST_H_
+#pragma once
 
 //-----------------------------------------------------------------------------
 // Includes
@@ -89,5 +88,3 @@ public:
     TS_ASSERT_EQUALS(classify(edge.end(), edge), Mantid::Geometry::Destination);
   }
 };
-
-#endif /* MANTID_GEOMETRY_POLYGONEDGETEST_H_ */
diff --git a/Framework/Geometry/test/PolygonIntersectionTest.h b/Framework/Geometry/test/PolygonIntersectionTest.h
index bbaab3dd522ec5adf584fb7ceb4c3d76d3700351..4ad561a33398c3f770bfc7d3cc9f38fd7325f58a 100644
--- a/Framework/Geometry/test/PolygonIntersectionTest.h
+++ b/Framework/Geometry/test/PolygonIntersectionTest.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_POLYGONINTERSECTIONTEST_H_
-#define MANTID_GEOMETRY_POLYGONINTERSECTIONTEST_H_
+#pragma once
 #include "MantidGeometry/Math/ConvexPolygon.h"
 #include "MantidGeometry/Math/PolygonIntersection.h"
 #include "MantidGeometry/Math/Quadrilateral.h"
@@ -240,5 +239,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_POLYGONINTERSECTIONTEST_H_ */
diff --git a/Framework/Geometry/test/PrecompiledHeader.h b/Framework/Geometry/test/PrecompiledHeader.h
index 5755342c6faa49b1a67f00026f423a8f9f05cb76..2938ffd0a3e091e68eeb75289179e3af4211b5a3 100644
--- a/Framework/Geometry/test/PrecompiledHeader.h
+++ b/Framework/Geometry/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_GEOMETRYTEST_PRECOMPILED_HEADER_H_
-#define MANTID_GEOMETRYTEST_PRECOMPILED_HEADER_H_
+#pragma once
 
 // cxxtest
 #include <cxxtest/WrappedTestSuite.h>
@@ -14,5 +13,3 @@
 #include <set>
 #include <string>
 #include <vector>
-
-#endif // MANTID_GEOMETRYTEST_PRECOMPILED_HEADER_H_
\ No newline at end of file
diff --git a/Framework/Geometry/test/ProductOfCyclicGroupsTest.h b/Framework/Geometry/test/ProductOfCyclicGroupsTest.h
index b9cd4e3073328a0c09db461f48a289922e008a14..665028eb37b4b6da330384dbe7ce2c688c436419 100644
--- a/Framework/Geometry/test/ProductOfCyclicGroupsTest.h
+++ b/Framework/Geometry/test/ProductOfCyclicGroupsTest.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_PRODUCTGROUPTEST_H_
-#define MANTID_GEOMETRY_PRODUCTGROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -88,5 +87,3 @@ private:
     ~TestableProductOfCyclicGroups() override {}
   };
 };
-
-#endif /* MANTID_GEOMETRY_PRODUCTGROUPTEST_H_ */
diff --git a/Framework/Geometry/test/QLabTest.h b/Framework/Geometry/test/QLabTest.h
index 2c1f0e56da46255b5e14e8c200815c8d701ef83c..c0eeb158a9db80bd024bbadf462bba425869b5c4 100644
--- a/Framework/Geometry/test/QLabTest.h
+++ b/Framework/Geometry/test/QLabTest.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_QLABTEST_H_
-#define MANTID_GEOMETRY_QLABTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -43,5 +42,3 @@ public:
                       Mantid::Kernel::SpecialCoordinateSystem::QLab);
   }
 };
-
-#endif /* MANTID_GEOMETRY_QLABTEST_H_ */
diff --git a/Framework/Geometry/test/QSampleTest.h b/Framework/Geometry/test/QSampleTest.h
index 21e6037f67fdd0dbb27b46e6dc6a1d961c1532fd..3cf6c4247165657e0aa2be54dba250bdf18c4cbe 100644
--- a/Framework/Geometry/test/QSampleTest.h
+++ b/Framework/Geometry/test/QSampleTest.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_QSAMPLETEST_H_
-#define MANTID_GEOMETRY_QSAMPLETEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/QSample.h"
 #include "MantidKernel/MDUnit.h"
@@ -44,5 +43,3 @@ public:
         Mantid::Kernel::SpecialCoordinateSystem::QSample);
   }
 };
-
-#endif /* MANTID_GEOMETRY_QSAMPLETEST_H_ */
diff --git a/Framework/Geometry/test/QuadrilateralTest.h b/Framework/Geometry/test/QuadrilateralTest.h
index 8e247f62f6514284fbffcc4238f14225b9a68f3d..736d288abb3b576c371d6ada9bc94741f327e98b 100644
--- a/Framework/Geometry/test/QuadrilateralTest.h
+++ b/Framework/Geometry/test/QuadrilateralTest.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_QUADRILATERALTEST_H_
-#define MANTID_GEOMETRY_QUADRILATERALTEST_H_
+#pragma once
 
 #include "MantidGeometry/Math/Quadrilateral.h"
 #include <cfloat>
@@ -174,5 +173,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_QUADRILATERALTEST_H_ */
diff --git a/Framework/Geometry/test/RandomPointTest.h b/Framework/Geometry/test/RandomPointTest.h
index 1b870c8bf6b4f6d0a02d3f3408a5c0c6a6e910d2..a94c0cc00d556cadd96eac88619037e2285d88c8 100644
--- a/Framework/Geometry/test/RandomPointTest.h
+++ b/Framework/Geometry/test/RandomPointTest.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_RANDOMPOINTTEST_H_
-#define MANTID_GEOMETRY_RANDOMPOINTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -308,5 +307,3 @@ public:
     TS_ASSERT_EQUALS(localPoint, localPointResult);
   }
 };
-
-#endif /* MANTID_GEOMETRY_RANDOMPOINTTEST_H_ */
diff --git a/Framework/Geometry/test/RasterizeTest.h b/Framework/Geometry/test/RasterizeTest.h
index 63de4d4880ef2c6e26399c00a7ad5b481d4fb3c4..9a1c6c12688f6ca783ea5ebe56d328c366cc2f94 100644
--- a/Framework/Geometry/test/RasterizeTest.h
+++ b/Framework/Geometry/test/RasterizeTest.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_RASTERIZETEST_H_
-#define MANTID_GEOMETRY_RASTERIZETEST_H_
+#pragma once
 
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Rasterize.h"
@@ -216,5 +215,3 @@ public:
     simpleRasterChecks(raster, sphere, 912, SPHERE_VOLUME, .01);
   }
 };
-
-#endif /* MANTID_GEOMETRY_RASTERIZETEST_H_ */
diff --git a/Framework/Geometry/test/RectangularDetectorTest.h b/Framework/Geometry/test/RectangularDetectorTest.h
index 09220e9ed9a39a0b572cfd1f680891213014ba72..46e3c72a4f737a1cb61e0e14d77e1e27bdc7042f 100644
--- a/Framework/Geometry/test/RectangularDetectorTest.h
+++ b/Framework/Geometry/test/RectangularDetectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RECTANGULAR_DETECTOR_TEST_H
-#define RECTANGULAR_DETECTOR_TEST_H
+#pragma once
 
 #include "MantidGeometry/Instrument/RectangularDetector.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -231,5 +230,3 @@ public:
     delete parDet;
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/ReducedCellTest.h b/Framework/Geometry/test/ReducedCellTest.h
index 33de4ed0738e28bc47102d68b375b14d2ac6d06a..113f559620885f174d522bfef4b9de4e020b1feb 100644
--- a/Framework/Geometry/test/ReducedCellTest.h
+++ b/Framework/Geometry/test/ReducedCellTest.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_REDUCED_CELL_TEST_H_
-#define MANTID_GEOMETRY_REDUCED_CELL_TEST_H_
+#pragma once
 
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/System.h"
@@ -69,5 +68,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_REDUCED_CELL_TEST_H_ */
diff --git a/Framework/Geometry/test/ReferenceFrameTest.h b/Framework/Geometry/test/ReferenceFrameTest.h
index ddaa20e3c1622f96751c3423e402065201be6fb8..82d82a3a3c7c1cf6fb5b646173ad57040bf16fa0 100644
--- a/Framework/Geometry/test/ReferenceFrameTest.h
+++ b/Framework/Geometry/test/ReferenceFrameTest.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_REFERENCEFRAMETEST_H_
-#define MANTID_GEOMETRY_REFERENCEFRAMETEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -218,5 +217,3 @@ public:
     TS_ASSERT_EQUALS("Y", z.pointingHorizontalAxis());
   }
 };
-
-#endif /* MANTID_GEOMETRY_REFERENCEFRAMETEST_H_ */
diff --git a/Framework/Geometry/test/ReflectionConditionTest.h b/Framework/Geometry/test/ReflectionConditionTest.h
index 881123dd648664e32ea520b7e7ec982de62beb84..4a51275c6f967256a215d1278d1a65c59ae9c7ae 100644
--- a/Framework/Geometry/test/ReflectionConditionTest.h
+++ b/Framework/Geometry/test/ReflectionConditionTest.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_REFLECTIONCONDITIONTEST_H_
-#define MANTID_GEOMETRY_REFLECTIONCONDITIONTEST_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/ReflectionCondition.h"
 #include <cxxtest/TestSuite.h>
@@ -121,5 +120,3 @@ public:
                      const std::invalid_argument &)
   }
 };
-
-#endif /* MANTID_GEOMETRY_REFLECTIONCONDITIONTEST_H_ */
diff --git a/Framework/Geometry/test/ReflectionGeneratorTest.h b/Framework/Geometry/test/ReflectionGeneratorTest.h
index bc452c21467acf4c9aa75f3e1b86b8d0ed1f1572..65ee7b39ff8c89c6a897e9928cf7e673ff5cfff1 100644
--- a/Framework/Geometry/test/ReflectionGeneratorTest.h
+++ b/Framework/Geometry/test/ReflectionGeneratorTest.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_REFLECTIONGENERATORTEST_H_
-#define MANTID_GEOMETRY_REFLECTIONGENERATORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -125,5 +124,3 @@ public:
     TS_ASSERT_EQUALS(hkls.size(), 44);
   }
 };
-
-#endif /* MANTID_GEOMETRY_REFLECTIONGENERATORTEST_H_ */
diff --git a/Framework/Geometry/test/RotCounterTest.h b/Framework/Geometry/test/RotCounterTest.h
index c91d73043647fb3b46de4a361578e7ce6d6341ae..8c6adc81cf4aedda0c9f353edb70126cb1341aab 100644
--- a/Framework/Geometry/test/RotCounterTest.h
+++ b/Framework/Geometry/test/RotCounterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_ROTCOUNTERTEST__
-#define MANTID_ROTCOUNTERTEST__
+#pragma once
 #include "MantidGeometry/Math/RotCounter.h"
 #include "MantidKernel/V3D.h"
 #include <cmath>
@@ -94,5 +93,4 @@ private:
     rc.write(output);
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/RulesBoolValueTest.h b/Framework/Geometry/test/RulesBoolValueTest.h
index 8c2e2b8c3645790edfd2aff5d01356bacba79c85..1605119cac9d98bfb195f34779074ada75faf85e 100644
--- a/Framework/Geometry/test/RulesBoolValueTest.h
+++ b/Framework/Geometry/test/RulesBoolValueTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESBOOLVALUE_TEST__
-#define MANTID_RULESBOOLVALUE_TEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -143,5 +142,3 @@ public:
                      0); // Always return 0 bcos a end node cannot be simplified
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/RulesCompGrpTest.h b/Framework/Geometry/test/RulesCompGrpTest.h
index c8e18104fd80c13bc723d97ffdcff87d5ac743a1..1448fde76a32f77e9f8227f176cd5538c5d64089 100644
--- a/Framework/Geometry/test/RulesCompGrpTest.h
+++ b/Framework/Geometry/test/RulesCompGrpTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESCOMPGRPTEST__
-#define MANTID_RULESCOMPGRPTEST__
+#pragma once
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/System.h"
 #include <cfloat>
@@ -162,5 +161,3 @@ private:
 };
 //---------------------------------End of
 // CompGrp----------------------------------------
-
-#endif
diff --git a/Framework/Geometry/test/RulesCompObjTest.h b/Framework/Geometry/test/RulesCompObjTest.h
index 0c4b3664a4a047cdd1ecc81374032329190ec172..46934f3368f3af204b7b7625f32c6628112e95c5 100644
--- a/Framework/Geometry/test/RulesCompObjTest.h
+++ b/Framework/Geometry/test/RulesCompObjTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESCOMPOBJTEST__
-#define MANTID_RULESCOMPOBJTEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -196,5 +195,3 @@ private:
 };
 //---------------------------------End of
 // CompObj----------------------------------------
-
-#endif
diff --git a/Framework/Geometry/test/RulesIntersectionTest.h b/Framework/Geometry/test/RulesIntersectionTest.h
index 9e96bb6acfa6a7f3ac8179cfc9d6d55af2c3b6dd..e79433f64a080e968854ea8c29e291328816a0af 100644
--- a/Framework/Geometry/test/RulesIntersectionTest.h
+++ b/Framework/Geometry/test/RulesIntersectionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESINTERSECTIONTEST__
-#define MANTID_RULESINTERSECTIONTEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -296,5 +295,3 @@ public:
 };
 //-----------------------------------------------End of
 // Intersection---------------------------------------
-
-#endif
diff --git a/Framework/Geometry/test/RulesSurfPointTest.h b/Framework/Geometry/test/RulesSurfPointTest.h
index 9ebbb5b623a2b28e451d50861eae0dbd8d67bcac..67005dee4bd02010246d0b63114012abcec1d697 100644
--- a/Framework/Geometry/test/RulesSurfPointTest.h
+++ b/Framework/Geometry/test/RulesSurfPointTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESSURFPOINTTEST__
-#define MANTID_RULESSURFPOINTTEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -262,5 +261,3 @@ public:
 };
 //---------------------------------End of
 // SurfPoint-------------------------------------
-
-#endif
diff --git a/Framework/Geometry/test/RulesTest.h b/Framework/Geometry/test/RulesTest.h
index 58fa0136384364443aa0994b0d85a1ad30ebc8b1..e90fd540c1ce70fcdaf7d8e7fda978b7e7576d77 100644
--- a/Framework/Geometry/test/RulesTest.h
+++ b/Framework/Geometry/test/RulesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESTEST__
-#define MANTID_RULESTEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -143,5 +142,3 @@ private:
     return std::move(Root);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/RulesUnionTest.h b/Framework/Geometry/test/RulesUnionTest.h
index 19e3931f8caa0797ee8d892d9e6ca36542b82b01..ce2d056621e07476cd927203f0e513cdaea94960 100644
--- a/Framework/Geometry/test/RulesUnionTest.h
+++ b/Framework/Geometry/test/RulesUnionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_RULESUNIONTEST__
-#define MANTID_RULESUNIONTEST__
+#pragma once
 #include "MantidGeometry/Objects/CSGObject.h"
 #include "MantidGeometry/Objects/Rules.h"
 #include "MantidGeometry/Surfaces/Cone.h"
@@ -323,5 +322,3 @@ public:
     TS_ASSERT_EQUALS(A.isValid(input), false);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/SampleEnvironmentTest.h b/Framework/Geometry/test/SampleEnvironmentTest.h
index dcbaa942ab3605126f7ae03f661c1f4a52e1337a..5b6481f1fc3db120651d78f79f90a916a8136808 100644
--- a/Framework/Geometry/test/SampleEnvironmentTest.h
+++ b/Framework/Geometry/test/SampleEnvironmentTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef TESTSAMPLEENVIRONMENT_H_
-#define TESTSAMPLEENVIRONMENT_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/SampleEnvironment.h"
 #include "MantidGeometry/Objects/ShapeFactory.h"
@@ -109,5 +108,3 @@ private:
     return kit;
   }
 };
-
-#endif // TESTSAMPLEENVIRONMENT_H_
diff --git a/Framework/Geometry/test/ScalarUtilsTest.h b/Framework/Geometry/test/ScalarUtilsTest.h
index 7f3c4a3d7bded8713bcb5134e6f128006b13e94f..f652587527897e857cbfbd21b0778d50f667f2b1 100644
--- a/Framework/Geometry/test/ScalarUtilsTest.h
+++ b/Framework/Geometry/test/ScalarUtilsTest.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_SCALAR_UTILS_TEST_H_
-#define MANTID_GEOMETRY_SCALAR_UTILS_TEST_H_
+#pragma once
 
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/System.h"
@@ -325,5 +324,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_SCALAR_UTILS_TEST_H_ */
diff --git a/Framework/Geometry/test/ShapeFactoryTest.h b/Framework/Geometry/test/ShapeFactoryTest.h
index 59020f3c9571fc57e78f9341bf176a242ff7fea3..89c254a13ab569d66d2b0601b0e7750a18eb7556 100644
--- a/Framework/Geometry/test/ShapeFactoryTest.h
+++ b/Framework/Geometry/test/ShapeFactoryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SHAPEFACTORYTEST_H_
-#define SHAPEFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -656,5 +655,3 @@ public:
 private:
   std::string inputFile;
 };
-
-#endif /*SHAPEFACTORYTEST_H_*/
diff --git a/Framework/Geometry/test/SpaceGroupFactoryTest.h b/Framework/Geometry/test/SpaceGroupFactoryTest.h
index 905013af63212e8e15e7793a22821241ef48be53..db86a95a89f4f809b9430ba0473550e83b6a15a9 100644
--- a/Framework/Geometry/test/SpaceGroupFactoryTest.h
+++ b/Framework/Geometry/test/SpaceGroupFactoryTest.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_SPACEGROUPFACTORYTEST_H_
-#define MANTID_GEOMETRY_SPACEGROUPFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -434,5 +433,3 @@ private:
     SpaceGroupFactoryImpl &m_factory;
   };
 };
-
-#endif /* MANTID_GEOMETRY_SPACEGROUPFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/SpaceGroupTest.h b/Framework/Geometry/test/SpaceGroupTest.h
index b8f17c218474c321620dc04c042b17d3630b40b7..25b5ff2960856b9e8ef969d807ee4ab21cf903d9 100644
--- a/Framework/Geometry/test/SpaceGroupTest.h
+++ b/Framework/Geometry/test/SpaceGroupTest.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_SPACEGROUPTEST_H_
-#define MANTID_GEOMETRY_SPACEGROUPTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -258,5 +257,3 @@ private:
     ~TestableSpaceGroup() override {}
   };
 };
-
-#endif /* MANTID_GEOMETRY_SPACEGROUPTEST_H_ */
diff --git a/Framework/Geometry/test/SphereTest.h b/Framework/Geometry/test/SphereTest.h
index aa17f3f08df2caaff772616dc504ec5e2ef0201e..90474c32facdfcb32e5b6ae170d2dc2c43a1adc3 100644
--- a/Framework/Geometry/test/SphereTest.h
+++ b/Framework/Geometry/test/SphereTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTSPHERE__
-#define MANTID_TESTSPHERE__
+#pragma once
 
 #include <algorithm>
 #include <cxxtest/TestSuite.h>
@@ -310,5 +309,3 @@ private:
     return output.str();
   }
 };
-
-#endif // MANTID_TESTSPHERE__
diff --git a/Framework/Geometry/test/StructureFactorCalculatorSummationTest.h b/Framework/Geometry/test/StructureFactorCalculatorSummationTest.h
index 9a0a2a762db2937923db68796265c97e6fc7a467..1c55d1da9b60e274654a41a6c8e76db98ede2367 100644
--- a/Framework/Geometry/test/StructureFactorCalculatorSummationTest.h
+++ b/Framework/Geometry/test/StructureFactorCalculatorSummationTest.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_STRUCTUREFACTORCALCULATORSUMMATIONTEST_H_
-#define MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORSUMMATIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -78,5 +77,3 @@ private:
     return si;
   }
 };
-
-#endif /* MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORSUMMATIONTEST_H_ */
diff --git a/Framework/Geometry/test/StructureFactorCalculatorTest.h b/Framework/Geometry/test/StructureFactorCalculatorTest.h
index dc9ed3ff3f9d40143bbc865db942080461a407cd..ef1658d4aab732239036df8aa061f41999f04a56 100644
--- a/Framework/Geometry/test/StructureFactorCalculatorTest.h
+++ b/Framework/Geometry/test/StructureFactorCalculatorTest.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_STRUCTUREFACTORCALCULATORTEST_H_
-#define MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -112,5 +111,3 @@ private:
     GNU_DIAG_ON_SUGGEST_OVERRIDE
   };
 };
-
-#endif /* MANTID_GEOMETRY_STRUCTUREFACTORCALCULATORTEST_H_ */
diff --git a/Framework/Geometry/test/StructuredDetectorTest.h b/Framework/Geometry/test/StructuredDetectorTest.h
index 1b4074b46581f694529b7306636e00233778e1c7..9b73c739d256ec18a929898d2da40e9ab163bdb4 100644
--- a/Framework/Geometry/test/StructuredDetectorTest.h
+++ b/Framework/Geometry/test/StructuredDetectorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef STRUCTURED_DETECTOR_TEST_H
-#define STRUCTURED_DETECTOR_TEST_H
+#pragma once
 
 #include "MantidGeometry/Instrument/StructuredDetector.h"
 #include "MantidGeometry/Objects/BoundingBox.h"
@@ -246,5 +245,3 @@ public:
     TS_ASSERT_EQUALS(det->getChild(1)->getName(), "MyStructuredDetector(x=1)");
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/SurfaceFactoryTest.h b/Framework/Geometry/test/SurfaceFactoryTest.h
index 613aaeb15c7b455f0961b9d3a5e484f25053e023..ed919775353e116edf644a9876abd13a138e4b0f 100644
--- a/Framework/Geometry/test/SurfaceFactoryTest.h
+++ b/Framework/Geometry/test/SurfaceFactoryTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTSURFACEFACTORY__
-#define MANTID_TESTSURFACEFACTORY__
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -85,5 +84,4 @@ private:
     TS_ASSERT_THROWS_NOTHING(pv.write(output));
     return output.str();
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/SurfaceTest.h b/Framework/Geometry/test/SurfaceTest.h
index 1250a8bdbae6b5132bcac2d109056ad3cb6435a2..0f257f9cd4106bea1d364ec079d817b2306add9e 100644
--- a/Framework/Geometry/test/SurfaceTest.h
+++ b/Framework/Geometry/test/SurfaceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTSURFACE__
-#define MANTID_TESTSURFACE__
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -61,5 +60,3 @@ private:
     return output.str();
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/SymmetryElementFactoryTest.h b/Framework/Geometry/test/SymmetryElementFactoryTest.h
index 9af13028c0dc94b34dc537e6db5acdcd4fe8db6e..dd5032c359016d01e80c0dd16d98f2c822de1255 100644
--- a/Framework/Geometry/test/SymmetryElementFactoryTest.h
+++ b/Framework/Geometry/test/SymmetryElementFactoryTest.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_SYMMETRYELEMENTFACTORYTEST_H_
-#define MANTID_GEOMETRY_SYMMETRYELEMENTFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -424,5 +423,3 @@ private:
     friend class SymmetryElementFactoryTest;
   };
 };
-
-#endif /* MANTID_GEOMETRY_SYMMETRYELEMENTFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/SymmetryElementTest.h b/Framework/Geometry/test/SymmetryElementTest.h
index 42c0ae97380c98ce4a5f7c97f949a62d90eb2554..241e11a15311d8126c3d4840781e336f43cbbf2a 100644
--- a/Framework/Geometry/test/SymmetryElementTest.h
+++ b/Framework/Geometry/test/SymmetryElementTest.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_SYMMETRYELEMENTTEST_H_
-#define MANTID_GEOMETRY_SYMMETRYELEMENTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -183,5 +182,3 @@ private:
   };
   GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
-
-#endif /* MANTID_GEOMETRY_SYMMETRYELEMENTTEST_H_ */
diff --git a/Framework/Geometry/test/SymmetryOperationFactoryTest.h b/Framework/Geometry/test/SymmetryOperationFactoryTest.h
index 3331d6263c99c9761020e30bb4fa6caea977ce2f..780772fc8407b80403eb7e7d56915b5cc44a2f9e 100644
--- a/Framework/Geometry/test/SymmetryOperationFactoryTest.h
+++ b/Framework/Geometry/test/SymmetryOperationFactoryTest.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_SYMMETRYOPERATIONFACTORYTEST_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORYTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -155,5 +154,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATIONFACTORYTEST_H_ */
diff --git a/Framework/Geometry/test/SymmetryOperationSymbolParserTest.h b/Framework/Geometry/test/SymmetryOperationSymbolParserTest.h
index 1619daa3d6363e8bb7649b8a981c5bb7d50d85cc..4a66e00fee970fe29551b2b01ea58a74542cbba8 100644
--- a/Framework/Geometry/test/SymmetryOperationSymbolParserTest.h
+++ b/Framework/Geometry/test/SymmetryOperationSymbolParserTest.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_SYMMETRYOPERATIONSYMBOLPARSERTEST_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATIONSYMBOLPARSERTEST_H_
+#pragma once
 
 #include "MantidKernel/Timer.h"
 #include <cxxtest/TestSuite.h>
@@ -80,5 +79,3 @@ private:
     ~TestableSymmetryOperationSymbolParser() {}
   };
 };
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATIONSYMBOLPARSERTEST_H_ */
diff --git a/Framework/Geometry/test/SymmetryOperationTest.h b/Framework/Geometry/test/SymmetryOperationTest.h
index f5974139b60849db824ebdf56b878138f59a1b46..a4799432c67383a30b5087a0fdcf2764b3eb4dd6 100644
--- a/Framework/Geometry/test/SymmetryOperationTest.h
+++ b/Framework/Geometry/test/SymmetryOperationTest.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_SYMMETRYOPERATIONTEST_H_
-#define MANTID_GEOMETRY_SYMMETRYOPERATIONTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -468,5 +467,3 @@ private:
 
   std::vector<V3D> m_allHkl;
 };
-
-#endif /* MANTID_GEOMETRY_SYMMETRYOPERATIONTEST_H_ */
diff --git a/Framework/Geometry/test/TorusTest.h b/Framework/Geometry/test/TorusTest.h
index dbee2f014ffd478083c7703249e38299590bc092..235d307c76fb04fe0b2ccbf9ec18bcbe2968589b 100644
--- a/Framework/Geometry/test/TorusTest.h
+++ b/Framework/Geometry/test/TorusTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTTORUS__
-#define MANTID_TESTTORUS__
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -129,5 +128,4 @@ public:
   //		TS_ASSERT_THROWS_NOTHING(pv.write(output));
   //		return output.str();
   //	}
-};
-#endif
+};
\ No newline at end of file
diff --git a/Framework/Geometry/test/TrackTest.h b/Framework/Geometry/test/TrackTest.h
index 97a6ae1e7d771006bbb850c69d300b632e3a4686..c0a0740a988475ed954c3d376754f7b97d18b0ae 100644
--- a/Framework/Geometry/test/TrackTest.h
+++ b/Framework/Geometry/test/TrackTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTTRACK__
-#define MANTID_TESTTRACK__
+#pragma once
 
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidGeometry/Objects/CSGObject.h"
@@ -136,5 +135,3 @@ public:
     TS_ASSERT_EQUALS(B.nonComplete(), 0);
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/TripleTest.h b/Framework/Geometry/test/TripleTest.h
index 9d5f048b64cd10ea204d9919b1bab2a170e6a226..6a0378afbd8e93d2673c927591fa9ea3105971ec 100644
--- a/Framework/Geometry/test/TripleTest.h
+++ b/Framework/Geometry/test/TripleTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TESTTRIPLE__
-#define MANTID_TESTTRIPLE__
+#pragma once
 
 #include "MantidGeometry/Math/Triple.h"
 #include "MantidKernel/Logger.h"
@@ -92,5 +91,3 @@ public:
     TS_ASSERT(!(A > B));
   }
 };
-
-#endif
diff --git a/Framework/Geometry/test/UnitCellTest.h b/Framework/Geometry/test/UnitCellTest.h
index 3df60ce0344fb01a230b73586ab6e782ff627cde..e847892c8a3abb9e059c2eddbb0b1ddf6ab47af2 100644
--- a/Framework/Geometry/test/UnitCellTest.h
+++ b/Framework/Geometry/test/UnitCellTest.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_UNITCELLTEST_H_
-#define MANTID_GEOMETRY_UNITCELLTEST_H_
+#pragma once
 
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/System.h"
@@ -172,5 +171,3 @@ public:
     TS_ASSERT_DELTA(precisionLimit.c(), precisionLimitOther.c(), 1e-9);
   }
 };
-
-#endif /* MANTID_GEOMETRY_UNITCELLTEST_H_ */
diff --git a/Framework/Geometry/test/V3RTest.h b/Framework/Geometry/test/V3RTest.h
index afe3adaf9499106d3e2e66e73ea4dac466b54755..99956e23fe2d413de0d119060fdb0fd1aa319c78 100644
--- a/Framework/Geometry/test/V3RTest.h
+++ b/Framework/Geometry/test/V3RTest.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_V3RTEST_H_
-#define MANTID_GEOMETRY_V3RTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -441,5 +440,3 @@ public:
     TS_ASSERT_EQUALS(approximations[2], 0.75);
   }
 };
-
-#endif /* MANTID_GEOMETRY_V3RTEST_H_ */
diff --git a/Framework/Geometry/test/XMLInstrumentParameterTest.h b/Framework/Geometry/test/XMLInstrumentParameterTest.h
index 7e08c4c1377891c6d32f7ecf6094fa976e6b52a4..5fd1bca81306062f5d5a4b4595aa886d3b2fe2fd 100644
--- a/Framework/Geometry/test/XMLInstrumentParameterTest.h
+++ b/Framework/Geometry/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 MANTID_GEOMETRY_XMLLOGFILETEST_H_
-#define MANTID_GEOMETRY_XMLLOGFILETEST_H_
+#pragma once
 
 #include "MantidGeometry/Instrument/XMLInstrumentParameter.h"
 #include "MantidKernel/Exception.h"
@@ -184,5 +183,3 @@ public:
     TS_ASSERT_EQUALS(testPar.m_description, "test string. Long test string.");
   }
 };
-
-#endif /* MANTID_GEOMETRY_XMLLOGFILETEST_H_ */