diff --git a/COAST/COASTProcess.h b/COAST/COASTProcess.h
index 0d1895e6e96804a090bd2dad80308a9b8cac278d..5e61b73726aee7be8a1d4751c06c58b4ccfe2185 100644
--- a/COAST/COASTProcess.h
+++ b/COAST/COASTProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_coast_coastprocess_h_
-#define _include_corsika_coast_coastprocess_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/ContinuousProcess.h>
@@ -42,5 +41,3 @@ namespace corsika::coast {
   };
 
 } // namespace corsika::coast
-
-#endif
diff --git a/COAST/COASTStack.h b/COAST/COASTStack.h
index d1000a93706323e0655ff46dae0631e608be73e1..b3d6aad5440446dd3e844c6e8056b1d2788da47d 100644
--- a/COAST/COASTStack.h
+++ b/COAST/COASTStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_coaststack_h_
-#define _include_coaststack_h_
+#pragma once
 
 #include <corsika/coast/ParticleConversion.h>
 #include <corsika/particles/ParticleProperties.h>
@@ -188,5 +187,3 @@ namespace corsika::coast {
   typedef corsika::stack::Stack<COASTStackImpl, ParticleInterface> COASTStack;
 
 } // namespace corsika::coast
-
-#endif
diff --git a/COAST/ParticleConversion.h b/COAST/ParticleConversion.h
index f6f65e497d87865bdcae4ceed2142c1747fdb546..65155d80b7c8b1e3e183d026bc62a1d6409a4057 100644
--- a/COAST/ParticleConversion.h
+++ b/COAST/ParticleConversion.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_processes_sibyll_particles_h_
-#define _include_processes_sibyll_particles_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 
@@ -210,5 +209,3 @@ namespace corsika::coast {
   corsika::particles::Code ConvertFromCoast(CoastCode pCode);
 
 } // namespace corsika::coast
-
-#endif
diff --git a/Environment/BaseExponential.h b/Environment/BaseExponential.h
index 331a09c33b79ce5f40285b3bb91609b6cf1b9a9d..112b624269f597ece456babca69879a78fa8e48e 100644
--- a/Environment/BaseExponential.h
+++ b/Environment/BaseExponential.h
@@ -9,8 +9,7 @@
  * the license.
  */
 
-#ifndef _include_Environment_BaseExponential_h_
-#define _include_Environment_BaseExponential_h_
+#pragma once
 
 #include <corsika/geometry/Line.h>
 #include <corsika/geometry/Point.h>
@@ -114,4 +113,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-#endif
diff --git a/Environment/DensityFunction.h b/Environment/DensityFunction.h
index 992f1b8549c6b010a792fa1879a7cc310036e680..810a30495aeec1e368b024a6a449195a31a7dacd 100644
--- a/Environment/DensityFunction.h
+++ b/Environment/DensityFunction.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_environment_DensityFunction_h_
-#define _include_environment_DensityFunction_h_
+#pragma once
 
 #include <corsika/environment/LinearApproximationIntegrator.h>
 #include <corsika/geometry/Line.h>
@@ -36,5 +35,3 @@ namespace corsika::environment {
     }
   };
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/Environment.h b/Environment/Environment.h
index 4c731ed48fa881e253ddc979677e4639292cb91e..f0505dfa8d183a8be6301c64b59774d9069c813d 100644
--- a/Environment/Environment.h
+++ b/Environment/Environment.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_environment_Environment_h
-#define _include_environment_Environment_h
+#pragma once
 
 #include <corsika/environment/IMediumModel.h>
 #include <corsika/environment/VolumeTreeNode.h>
@@ -68,5 +67,3 @@ namespace corsika::environment {
   // using SetupEnvironment = Environment<corsika::setup::IEnvironmentModel>;
 
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/FlatExponential.h b/Environment/FlatExponential.h
index 84a613a572bb0e8f04a96ace5f4c306bbab0a311..2bc9c888088e3c62121674fa9c181b0143c68ff8 100644
--- a/Environment/FlatExponential.h
+++ b/Environment/FlatExponential.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_Environment_FlatExponential_h_
-#define _include_Environment_FlatExponential_h_
+#pragma once
 
 #include <corsika/environment/BaseExponential.h>
 #include <corsika/environment/NuclearComposition.h>
@@ -67,4 +66,3 @@ namespace corsika::environment {
     }
   };
 } // namespace corsika::environment
-#endif
diff --git a/Environment/HomogeneousMedium.h b/Environment/HomogeneousMedium.h
index 264482878157a588045574823ae311954fe58d0e..e2dbf53d293f3b5fcaec24338e345cfc69bb57fb 100644
--- a/Environment/HomogeneousMedium.h
+++ b/Environment/HomogeneousMedium.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_HomogeneousMedium_h_
-#define _include_HomogeneousMedium_h_
+#pragma once
 
 #include <corsika/environment/NuclearComposition.h>
 #include <corsika/geometry/Line.h>
@@ -59,4 +58,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-#endif
diff --git a/Environment/IMediumModel.h b/Environment/IMediumModel.h
index b8cda38c3e2688fdd0f8096ddbaeba7884266fd6..0ed276f5c325aff04a88f29e625a2ab58c6fb8f3 100644
--- a/Environment/IMediumModel.h
+++ b/Environment/IMediumModel.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_IMediumModel_h
-#define _include_IMediumModel_h
+#pragma once
 
 #include <corsika/environment/NuclearComposition.h>
 #include <corsika/geometry/Line.h>
@@ -40,5 +39,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/InhomogeneousMedium.h b/Environment/InhomogeneousMedium.h
index 6c61c7849b47afb8f86c8af18cbf8401d9d3de3c..c92c90b9d07821bb888850b68a9b0e06c4dcc632 100644
--- a/Environment/InhomogeneousMedium.h
+++ b/Environment/InhomogeneousMedium.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_environment_InhomogeneousMedium_h_
-#define _include_environment_InhomogeneousMedium_h_
+#pragma once
 
 #include <corsika/environment/NuclearComposition.h>
 #include <corsika/geometry/Line.h>
@@ -57,4 +56,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-#endif
diff --git a/Environment/LinearApproximationIntegrator.h b/Environment/LinearApproximationIntegrator.h
index ba84ac28720b03acf94362f5ca1e6195b81c0f60..19c39de244c3d8b078e81d8a73fb40dfc05349d6 100644
--- a/Environment/LinearApproximationIntegrator.h
+++ b/Environment/LinearApproximationIntegrator.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_environment_LinearApproximationIntegrator_h_
-#define _include_environment_LinearApproximationIntegrator_h_
+#pragma once
 
 #include <limits>
 
@@ -53,5 +52,3 @@ namespace corsika::environment {
     }
   };
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/NameModel.h b/Environment/NameModel.h
index 458c07819e75c6553c6fda4235bd445605218ec6..d3fa608fe1e566c16243f06b8310b6585ff86560 100644
--- a/Environment/NameModel.h
+++ b/Environment/NameModel.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_NameModel_h
-#define _include_NameModel_h
+#pragma once
 
 #include <string>
 #include <utility>
@@ -23,5 +22,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/NuclearComposition.h b/Environment/NuclearComposition.h
index 4c2a4f6705c4d1cf74403934acd39c151cc38cdf..e62ccb2cff13912cdb29b6302acda599bfbc0901 100644
--- a/Environment/NuclearComposition.h
+++ b/Environment/NuclearComposition.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_NuclearComposition_h
-#define _include_NuclearComposition_h
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/units/PhysicalUnits.h>
@@ -131,5 +130,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-
-#endif
diff --git a/Environment/SlidingPlanarExponential.h b/Environment/SlidingPlanarExponential.h
index fdbde0f4e1d3257ba73768ea1e4d123e6ee6fbbc..6217b5510547f17c2d4000c9808ef42cb6b1b680 100644
--- a/Environment/SlidingPlanarExponential.h
+++ b/Environment/SlidingPlanarExponential.h
@@ -9,8 +9,7 @@
  * the license.
  */
 
-#ifndef _include_Environment_SlidingPlanarExponential_h_
-#define _include_Environment_SlidingPlanarExponential_h_
+#pragma once
 
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/NuclearComposition.h>
@@ -74,4 +73,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-#endif
diff --git a/Environment/VolumeTreeNode.h b/Environment/VolumeTreeNode.h
index d996758625969d82860ab8638c7e4e64328381a2..2eceee06caf1d3dfbfa84e83b79c1ff9a954fdfd 100644
--- a/Environment/VolumeTreeNode.h
+++ b/Environment/VolumeTreeNode.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_VolumeTreeNode_H
-#define _include_VolumeTreeNode_H
+#pragma once
 
 #include <corsika/environment/IMediumModel.h>
 #include <corsika/geometry/Volume.h>
@@ -135,5 +134,3 @@ namespace corsika::environment {
   };
 
 } // namespace corsika::environment
-
-#endif
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index e7d2cafb3851d20e90615732235268e4f0ae0618..18cf1cbba0c26e77fa00a32cec32d39794334f3f 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_cascade_Cascade_h_
-#define _include_corsika_cascade_Cascade_h_
+#pragma once
 
 #include <corsika/environment/Environment.h>
 #include <corsika/process/ProcessReturn.h>
@@ -332,5 +331,3 @@ namespace corsika::cascade {
   }; // namespace corsika::cascade
 
 } // namespace corsika::cascade
-
-#endif
diff --git a/Framework/Cascade/testCascade.h b/Framework/Cascade/testCascade.h
index ac7a290f179c7a8578bd5d4455f26e8c0adf2db4..1d380aee390f0a710f88075566d3734f963c46b5 100644
--- a/Framework/Cascade/testCascade.h
+++ b/Framework/Cascade/testCascade.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Framework_Cascade_testCascade_h
-#define _Framework_Cascade_testCascade_h
+#pragma once
 
 #include <corsika/environment/Environment.h>
 #include <corsika/setup/SetupStack.h>
@@ -40,5 +39,3 @@ using TestCascadeStackView =
 #elif defined(__GNUC__) || defined(__GNUG__)
 using TestCascadeStackView = corsika::stack::MakeView<TestCascadeStack>::type;
 #endif
-
-#endif
diff --git a/Framework/Geometry/BaseTrajectory.h b/Framework/Geometry/BaseTrajectory.h
index 3654db64d05f654a1808f5214081222359526ac1..42dd55339e0105f8899f60a9e60ec79ba2ebe3b0 100644
--- a/Framework/Geometry/BaseTrajectory.h
+++ b/Framework/Geometry/BaseTrajectory.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_BASETRAJECTORY_H
-#define _include_BASETRAJECTORY_H
+#pragma once
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/Vector.h>
@@ -60,5 +59,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/BaseVector.h b/Framework/Geometry/BaseVector.h
index e8c9857eb40e1a2e70347517cdcb1456fae595c8..e2de575eae14a1b24a6aa014fb5afbfbbc7c7f55 100644
--- a/Framework/Geometry/BaseVector.h
+++ b/Framework/Geometry/BaseVector.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_BASEVECTOR_H_
-#define _include_BASEVECTOR_H_
+#pragma once
 
 #include <corsika/geometry/CoordinateSystem.h>
 #include <corsika/geometry/QuantityVector.h>
@@ -35,5 +34,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/CoordinateSystem.h b/Framework/Geometry/CoordinateSystem.h
index 614c76da9d2f32925fa9d8c18828196fbbe8f19f..b0257c39ed5ca880242387c9d843382e8cea11a6 100644
--- a/Framework/Geometry/CoordinateSystem.h
+++ b/Framework/Geometry/CoordinateSystem.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_COORDINATESYSTEM_H_
-#define _include_COORDINATESYSTEM_H_
+#pragma once
 
 #include <corsika/geometry/QuantityVector.h>
 #include <corsika/units/PhysicalUnits.h>
@@ -121,5 +120,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index cae2d6f8593bce130df4a78ca6c1088db02dd5bb..8f3eadfe6adc50e5f781891d5f6a48b0eca83c0e 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_framework_geometry_fourvector_h_
-#define _include_corsika_framework_geometry_fourvector_h_
+#pragma once
 
 #include <corsika/geometry/Vector.h>
 #include <corsika/units/PhysicalUnits.h>
@@ -216,5 +215,3 @@ namespace corsika::geometry {
   }
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h
index 120522db20789f6f377a1f911ac9fd33e4a393f4..2686e01f7191e6da350ffcd0f46f1a51833fe298 100644
--- a/Framework/Geometry/Helix.h
+++ b/Framework/Geometry/Helix.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_HELIX_H_
-#define _include_HELIX_H_
+#pragma once
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/Vector.h>
@@ -73,5 +72,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Line.h b/Framework/Geometry/Line.h
index b1d00fe81b76a29a596e0d99aedcb9cc76d19516..eca0ad59e034115c5da174be7fa4ec6c841464b9 100644
--- a/Framework/Geometry/Line.h
+++ b/Framework/Geometry/Line.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_LINETRAJECTORY_H
-#define _include_LINETRAJECTORY_H
+#pragma once
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/Vector.h>
@@ -50,5 +49,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Plane.h b/Framework/Geometry/Plane.h
index f82e883a5ebcf5c56f3dc16a8dc6c47b8567a93a..3575dde93a43ed91b5557752deb17226b67638b3 100644
--- a/Framework/Geometry/Plane.h
+++ b/Framework/Geometry/Plane.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_Framework_Geometry_Plane_h_
-#define _include_Framework_Geometry_Plane_h_
+#pragma once
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/Vector.h>
@@ -41,5 +40,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h
index 4b7e121e7994e5b5313944dd66df7b68a8a36a99..7c59024d74b6ca3ecfb8fb6b6f9c194746491fc7 100644
--- a/Framework/Geometry/Point.h
+++ b/Framework/Geometry/Point.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_POINT_H_
-#define _include_POINT_H_
+#pragma once
 
 #include <corsika/geometry/BaseVector.h>
 #include <corsika/geometry/QuantityVector.h>
@@ -75,5 +74,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/QuantityVector.h b/Framework/Geometry/QuantityVector.h
index 0b3776464e0cdeadce5cec17bd770ce9eab452ee..bc9180757a8aeb758efeed393e2e3f8599d32fc5 100644
--- a/Framework/Geometry/QuantityVector.h
+++ b/Framework/Geometry/QuantityVector.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_QUANTITYVECTOR_H_
-#define _include_QUANTITYVECTOR_H_
+#pragma once
 
 #include <corsika/units/PhysicalUnits.h>
 
@@ -139,5 +138,3 @@ namespace corsika::geometry {
   }
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/RootCoordinateSystem.h b/Framework/Geometry/RootCoordinateSystem.h
index ac47ba9c4773ece9fec9873e4d0f6d14df03018d..4ccd5673ddc7a9b4430e3c6ab8fcbced2ac6902b 100644
--- a/Framework/Geometry/RootCoordinateSystem.h
+++ b/Framework/Geometry/RootCoordinateSystem.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_geometry_rootcoordinatesystem_h_
-#define _include_corsika_geometry_rootcoordinatesystem_h_
+#pragma once
 
 #include <corsika/utl/Singleton.h>
 
@@ -41,5 +40,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Sphere.h b/Framework/Geometry/Sphere.h
index 894309f22a78d718fb34ce54f124d626e484d0d1..bc8c9282507e28b6daefdd503310bb1d16514585 100644
--- a/Framework/Geometry/Sphere.h
+++ b/Framework/Geometry/Sphere.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_SPHERE_H_
-#define _include_SPHERE_H_
+#pragma once
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/Volume.h>
@@ -36,5 +35,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Trajectory.h b/Framework/Geometry/Trajectory.h
index 559dbd562694a6a38cc150fab71bee52059b9062..71135d4c82e81d51bb93eb497906147828da01c3 100644
--- a/Framework/Geometry/Trajectory.h
+++ b/Framework/Geometry/Trajectory.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_TRAJECTORY_H
-#define _include_TRAJECTORY_H
+#pragma once
 
 #include <corsika/geometry/Line.h>
 #include <corsika/geometry/Point.h>
@@ -56,5 +55,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Vector.h b/Framework/Geometry/Vector.h
index 64a5e8df2ed8178788893ff36344f0006ff308df..927c36180d42408e25f0778bf9356e1f95eede01 100644
--- a/Framework/Geometry/Vector.h
+++ b/Framework/Geometry/Vector.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_VECTOR_H_
-#define _include_VECTOR_H_
+#pragma once
 
 #include <corsika/geometry/BaseVector.h>
 #include <corsika/geometry/QuantityVector.h>
@@ -182,5 +181,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Geometry/Volume.h b/Framework/Geometry/Volume.h
index 7f82fa1621b1219d70413c3576c88db8f62702c9..a51219110f695822b32e251416ae1d655a17b3a9 100644
--- a/Framework/Geometry/Volume.h
+++ b/Framework/Geometry/Volume.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_VOLUME_H_
-#define _include_VOLUME_H_
+#pragma once
 
 #include <corsika/geometry/Point.h>
 
@@ -25,5 +24,3 @@ namespace corsika::geometry {
   };
 
 } // namespace corsika::geometry
-
-#endif
diff --git a/Framework/Logging/BufferedSink.h b/Framework/Logging/BufferedSink.h
index 5b2b3a62ae40ce505c682cc704e9428a7f5821fe..ae9bc080f61514b0c8ae6b4b9ff135775eb70723 100644
--- a/Framework/Logging/BufferedSink.h
+++ b/Framework/Logging/BufferedSink.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_BufferedSink_h_
-#define _include_BufferedSink_h_
+#pragma once
 
 namespace corsika::logging {
 
@@ -76,5 +75,3 @@ namespace corsika::logging {
 
   } // namespace sink
 } // namespace corsika::logging
-
-#endif
diff --git a/Framework/Logging/Logger.h b/Framework/Logging/Logger.h
index 15ebe3c54f521f0112d0a61bf80d14521903808c..cceff44f96b2d8d6b8d03cca13e2e8abed04355e 100644
--- a/Framework/Logging/Logger.h
+++ b/Framework/Logging/Logger.h
@@ -14,8 +14,7 @@
    Everything around logfile generation and text output.
  */
 
-#ifndef _include_logger_h_
-#define _include_logger_h_
+#pragma once
 
 #include <iosfwd>
 #include <sstream>
@@ -86,5 +85,3 @@ namespace corsika::logging {
 #define LOG(__LOGGER, ...)                                                           \
   __LOGGER.Log(__LOGGER.GetName(), __FILE__, ":", __LINE__, " (", __func__, ") -> ", \
                __VA_ARGS__);
-
-#endif
diff --git a/Framework/Logging/MessageOff.h b/Framework/Logging/MessageOff.h
index 691824be0100c9a9123ae4c538241830553073ae..ccdc92e6f5eff637fd66ebb0c59221cb6f88f217 100644
--- a/Framework/Logging/MessageOff.h
+++ b/Framework/Logging/MessageOff.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_MessageOff_h_
-#define _include_MessageOff_h_
+#pragma once
 
 namespace corsika::logging {
 
@@ -26,5 +25,3 @@ namespace corsika::logging {
   };
 
 } // namespace corsika::logging
-
-#endif
diff --git a/Framework/Logging/MessageOn.h b/Framework/Logging/MessageOn.h
index 0b013a6350b95afdd1bb6ef5a43ab34ef47b7a92..c7b2e8d02f0094699f800ef5c89f4a4ac50cf328 100644
--- a/Framework/Logging/MessageOn.h
+++ b/Framework/Logging/MessageOn.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_MessageOn_h_
-#define _include_MessageOn_h_
+#pragma once
 
 namespace corsika::logging {
 
@@ -66,5 +65,3 @@ namespace corsika::logging {
   };
 
 } // namespace corsika::logging
-
-#endif
diff --git a/Framework/Logging/NoSink.h b/Framework/Logging/NoSink.h
index 866d35601d8805da00884df2fac551acb4cf7bdd..0f4be8914b88b5e70d7f3193873efcb04aae880c 100644
--- a/Framework/Logging/NoSink.h
+++ b/Framework/Logging/NoSink.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_NoSink_h_
-#define _include_NoSink_h_
+#pragma once
 
 namespace corsika::logging {
 
@@ -22,5 +21,3 @@ namespace corsika::logging {
 
   } // namespace sink
 } // namespace corsika::logging
-
-#endif
diff --git a/Framework/Logging/Sink.h b/Framework/Logging/Sink.h
index 28c768d6f425a25515dfeeff0065df9b9e628643..c050f22427cd15ef6e3295706e3ed0855711c771 100644
--- a/Framework/Logging/Sink.h
+++ b/Framework/Logging/Sink.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_Sink_h_
-#define _include_Sink_h_
+#pragma once
 
 namespace corsika::logging {
 
@@ -43,5 +42,3 @@ namespace corsika::logging {
 
   } // namespace sink
 } // namespace corsika::logging
-
-#endif
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index baafb57e754014f10ff9741d91af00fd1427f0fe..c0be35879896bba8aaf4825fbb22157160b40d0f 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -14,8 +14,7 @@
    Interface to particle properties
  */
 
-#ifndef _include_corsika_particles_ParticleProperties_h_
-#define _include_corsika_particles_ParticleProperties_h_
+#pragma once
 
 #include <array>
 #include <cstdint>
@@ -157,5 +156,3 @@ namespace corsika::particles {
   }
 
 } // namespace corsika::particles
-
-#endif
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 31b7f5384a57f2f8d56ccd34913e12b371f29017..bf3c26e2242b59b42630e76830cd31dc6d27ea1c 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_baseprocess_h_
-#define _include_corsika_baseprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <type_traits>
@@ -41,5 +40,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const BaseProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/BoundaryCrossingProcess.h b/Framework/ProcessSequence/BoundaryCrossingProcess.h
index 7ca73cb3644fb70ecdb09bb356d3773feba14762..cf3eb6223a6f83d72adf64d8e5c6dc7240f569c0 100644
--- a/Framework/ProcessSequence/BoundaryCrossingProcess.h
+++ b/Framework/ProcessSequence/BoundaryCrossingProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_processes_BoundaryCrossingProcess_h_
-#define _include_corsika_processes_BoundaryCrossingProcess_h_
+#pragma once
 
 #include <corsika/environment/Environment.h>
 #include <corsika/process/ProcessReturn.h>
@@ -31,5 +30,3 @@ namespace corsika::process {
   template <class T>
   std::true_type is_process_impl(BoundaryCrossingProcess<T> const* impl);
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 13ee20752c74d03035dde2124f4d048c628b133b..37ac71adbc4b98638de2912cf4e7001ac0c5faca 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_continuousprocess_h_
-#define _include_corsika_continuousprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <corsika/units/PhysicalUnits.h>
@@ -45,5 +44,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const ContinuousProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/DecayProcess.h b/Framework/ProcessSequence/DecayProcess.h
index 2f1131dca957a1240bf121754000673387f0150a..ce7b554953accf84c204a4962d09c7ae4dbe6260 100644
--- a/Framework/ProcessSequence/DecayProcess.h
+++ b/Framework/ProcessSequence/DecayProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_decayprocess_h_
-#define _include_corsika_decayprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <corsika/setup/SetupTrajectory.h>
@@ -50,5 +49,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const DecayProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/InteractionProcess.h b/Framework/ProcessSequence/InteractionProcess.h
index a932be90eec9e1566255fcc36c02e7dd42b988fa..8268dc2fbb1aaa5a293205e7925227e111355960 100644
--- a/Framework/ProcessSequence/InteractionProcess.h
+++ b/Framework/ProcessSequence/InteractionProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_interactionprocess_h_
-#define _include_corsika_interactionprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <corsika/setup/SetupTrajectory.h>
@@ -51,5 +50,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const InteractionProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/ProcessReturn.h b/Framework/ProcessSequence/ProcessReturn.h
index 2684dade53d638a0588a0e6ec9fefa0ad70a004b..ce6701030f3a301a74d4919513933ed74017e1de 100644
--- a/Framework/ProcessSequence/ProcessReturn.h
+++ b/Framework/ProcessSequence/ProcessReturn.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_ProcessReturn_h_
-#define _include_ProcessReturn_h_
+#pragma once
 
 namespace corsika::process {
 
@@ -39,5 +38,3 @@ namespace corsika::process {
   }
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index 35fa6dae14301213e428a4ddf2585535e6f810cd..12cfae778f3c3dbce2e98ce7377b10876a322732 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_ProcessSequence_h_
-#define _include_ProcessSequence_h_
+#pragma once
 
 #include <corsika/process/BaseProcess.h>
 #include <corsika/process/BoundaryCrossingProcess.h>
@@ -342,5 +341,3 @@ namespace corsika::process {
   template <typename A, typename B>
   struct is_process_sequence<corsika::process::ProcessSequence<A, B>> : std::true_type {};
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/ProcessSignature.h b/Framework/ProcessSequence/ProcessSignature.h
index 0fb3abd9ceec074c78c22431822bb475b8899872..68b2889b1da3eb951a7ca909b8e01e112ffafaac 100644
--- a/Framework/ProcessSequence/ProcessSignature.h
+++ b/Framework/ProcessSequence/ProcessSignature.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_process_processsignature_h_
-#define _include_process_processsignature_h_
+#pragma once
 
 #define FORCE_SIGNATURE(nameTrait, nameMethod, signatureMethod)                \
   template <typename U>                                                        \
@@ -27,5 +26,3 @@
   }
 
 // FORCE_SIGNATURE(thisMustBeDefined, T::thisMustBeDefined, int(*)(void));
-
-#endif
diff --git a/Framework/ProcessSequence/SecondariesProcess.h b/Framework/ProcessSequence/SecondariesProcess.h
index 8422012cb90958484fae6e2b0b8134f798eae0c8..ff9567ccc121810efb8ae3bb390bca9c15442b36 100644
--- a/Framework/ProcessSequence/SecondariesProcess.h
+++ b/Framework/ProcessSequence/SecondariesProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_secondariesprocess_h_
-#define _include_corsika_secondariesprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <corsika/setup/SetupTrajectory.h>
@@ -43,5 +42,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const SecondariesProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/ProcessSequence/StackProcess.h b/Framework/ProcessSequence/StackProcess.h
index 2b2c9fcd0effcb16bf59b3d51708f8e1991edc8f..61c51e3393d3d58b11b48df9fe777689ec47d559 100644
--- a/Framework/ProcessSequence/StackProcess.h
+++ b/Framework/ProcessSequence/StackProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_stackprocess_h_
-#define _include_corsika_stackprocess_h_
+#pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
 #include <corsika/setup/SetupTrajectory.h>
@@ -62,5 +61,3 @@ namespace corsika::process {
   std::true_type is_process_impl(const StackProcess<T>* impl);
 
 } // namespace corsika::process
-
-#endif
diff --git a/Framework/Random/ExponentialDistribution.h b/Framework/Random/ExponentialDistribution.h
index 46b12a6391e21e27877827ccec59b1532734f2f6..4c58c8869a326638cb4b0cb6ffae4395d6e51851 100644
--- a/Framework/Random/ExponentialDistribution.h
+++ b/Framework/Random/ExponentialDistribution.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_ExponentialDistribution_h
-#define _include_ExponentialDistribution_h
+#pragma once
 
 #include <corsika/units/PhysicalUnits.h>
 #include <random>
@@ -34,5 +33,3 @@ namespace corsika::random {
   };
 
 } // namespace corsika::random
-
-#endif
diff --git a/Framework/Random/RNGManager.h b/Framework/Random/RNGManager.h
index 5d17a930483f003a8d92397ee055401d8739ac16..b2bedf33d021320e2fa423ebcdb9e94da196b6a5 100644
--- a/Framework/Random/RNGManager.h
+++ b/Framework/Random/RNGManager.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_RNGManager_h_
-#define _include_RNGManager_h_
+#pragma once
 
 #include <corsika/utl/Singleton.h>
 
@@ -72,4 +71,3 @@ namespace corsika::random {
   };
 
 } // namespace corsika::random
-#endif
diff --git a/Framework/Random/UniformRealDistribution.h b/Framework/Random/UniformRealDistribution.h
index 7f96bea92acc97a62e4730e53f9a70e55c5bc49b..53c28bfbf361ae10b60ada35caf7ccc68ab81a8b 100644
--- a/Framework/Random/UniformRealDistribution.h
+++ b/Framework/Random/UniformRealDistribution.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_UniformRealDistribution_h
-#define _include_UniformRealDistribution_h
+#pragma once
 
 #include <corsika/units/PhysicalUnits.h>
 #include <random>
@@ -38,5 +37,3 @@ namespace corsika::random {
   };
 
 } // namespace corsika::random
-
-#endif
diff --git a/Framework/StackInterface/CombinedStack.h b/Framework/StackInterface/CombinedStack.h
index 42f2f78d82c1fcb94b578e168d9ed7463ba77ceb..ee3409e79aadd2891e0ddae5b74f365a31422b03 100644
--- a/Framework/StackInterface/CombinedStack.h
+++ b/Framework/StackInterface/CombinedStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_stack_combinedstack_h_
-#define _include_stack_combinedstack_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/stack/Stack.h>
@@ -173,5 +172,3 @@ namespace corsika::stack {
   using CombinedStack = Stack<CombinedStackImpl<Stack1Impl, Stack2Impl>, _PI>;
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h
index 78a4c867c7a91752765ca29cb84a9dad2d6b9617..dfd4afc7c1e2ef75149de70764742d10febed2f8 100644
--- a/Framework/StackInterface/ParticleBase.h
+++ b/Framework/StackInterface/ParticleBase.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_particleBase_h_
-#define _include_particleBase_h_
+#pragma once
 
 #include <type_traits>
 
@@ -106,5 +105,3 @@ namespace corsika::stack {
   };
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index a1dd4240924f6851efb2b64be431a0ed8ae632e9..091c889546bf8f4e8e2e7ea5d19bdd01b7292999 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_stack_secondaryview_h_
-#define _include_corsika_stack_secondaryview_h_
+#pragma once
 
 #include <corsika/stack/Stack.h>
 
@@ -246,5 +245,3 @@ namespace corsika::stack {
 #endif
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index c5c78ad8bb901f6f39e9577b91009fcb2b35a9ec..0e19a243178d22584fc60561d97ff03fa05e2ab0 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_Stack_h__
-#define _include_Stack_h__
+#pragma once
 
 #include <corsika/stack/StackIteratorInterface.h>
 // must be after StackIteratorInterface
@@ -240,5 +239,3 @@ namespace corsika::stack {
   };
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Framework/StackInterface/StackIteratorInterface.h b/Framework/StackInterface/StackIteratorInterface.h
index 16c08f03e9419a8bdf01ee2e1038a930abe64448..4b0c283a174b8829c1d9b990dacef3db8872d474 100644
--- a/Framework/StackInterface/StackIteratorInterface.h
+++ b/Framework/StackInterface/StackIteratorInterface.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_StackIteratorinterface_h__
-#define _include_StackIteratorinterface_h__
+#pragma once
 
 #include <corsika/stack/ParticleBase.h>
 
@@ -286,5 +285,3 @@ namespace corsika::stack {
   }; // end class ConstStackIterator
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Framework/StackInterface/testTestStack.h b/Framework/StackInterface/testTestStack.h
index d7a9e7b437db49a7401d165706aa2ca4945b9137..c2b309b0699191ddae3f3bd13d4e84e998a09733 100644
--- a/Framework/StackInterface/testTestStack.h
+++ b/Framework/StackInterface/testTestStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_stack_testTestStack_h_
-#define _include_corsika_stack_testTestStack_h_
+#pragma once
 
 #include <corsika/stack/Stack.h>
 #include <tuple>
@@ -94,5 +93,3 @@ public:
   void SetData(const double v) { GetStackData().SetData(GetIndex(), v); }
   double GetData() const { return GetStackData().GetData(GetIndex()); }
 };
-
-#endif
diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h
index da86bbd1edc3564badee1dedfd0bf7ead7d2ad4f..cd1463dd35d42ff43738fdf921016a39282b7067 100644
--- a/Framework/Units/PhysicalConstants.h
+++ b/Framework/Units/PhysicalConstants.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef INCLUDE_PHYSICAL_CONSTANTS_H
-#define INCLUDE_PHYSICAL_CONSTANTS_H
+#pragma once
 
 #include <phys/units/quantity.hpp>
 
@@ -66,5 +65,3 @@ namespace corsika::units::constants {
   // etc.
 
 } // namespace corsika::units::constants
-
-#endif // PHYS_UNITS_PHYSICAL_CONSTANTS_HPP_INCLUDED
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index e701928f8cc38b3fca6e91a2de3bbee12e02861a..cb753cd53dac635aae2bc34f984e18b082951e60 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_PhysicalUnits_h_
-#define _include_PhysicalUnits_h_
+#pragma once
 
 #include <corsika/units/PhysicalConstants.h>
 
@@ -163,5 +162,3 @@ namespace phys {
     } // namespace literals
   }   // namespace units
 } // namespace phys
-
-#endif
diff --git a/Framework/Utilities/Bit.h b/Framework/Utilities/Bit.h
index c3e549028b725e0b13cb26185e9cd177beee38a7..7d5030e0fa61f2308d712d870f42ee1f00eec386 100644
--- a/Framework/Utilities/Bit.h
+++ b/Framework/Utilities/Bit.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_utl_Bit_h_
-#define _corsika_utl_Bit_h_
+#pragma once
 
 /**
   \author Hans Dembinski
@@ -92,5 +91,3 @@ namespace corsika::utl {
   }
 
 } // namespace corsika::utl
-
-#endif
diff --git a/Framework/Utilities/COMBoost.h b/Framework/Utilities/COMBoost.h
index e25d74e828c9140815dd98ec426871d8055a6415..b69202134db8447f2e14ebfd285131c6eb57ff95 100644
--- a/Framework/Utilities/COMBoost.h
+++ b/Framework/Utilities/COMBoost.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_utilties_comboost_h_
-#define _include_corsika_utilties_comboost_h_
+#pragma once
 
 #include <corsika/geometry/CoordinateSystem.h>
 #include <corsika/geometry/FourVector.h>
@@ -98,5 +97,3 @@ namespace corsika::utl {
     geometry::CoordinateSystem const& GetRotatedCS() const;
   };
 } // namespace corsika::utl
-
-#endif
diff --git a/Framework/Utilities/CorsikaFenv.h b/Framework/Utilities/CorsikaFenv.h
index 459be7ff681c5681b9bfb123d192368524728ce1..98a98c84db5cb66dd7140499a522029c2c72e0f8 100644
--- a/Framework/Utilities/CorsikaFenv.h
+++ b/Framework/Utilities/CorsikaFenv.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef CORSIKA_CORSIKAFENV_H
-#define CORSIKA_CORSIKAFENV_H
+#pragma once
 
 #include <cfenv>
 
@@ -22,5 +21,3 @@ extern "C" {
 int feenableexcept(int excepts);
 int fedisableexcept(int excepts);
 }
-
-#endif // CORSIKA_CORSIKAFENV_H
diff --git a/Framework/Utilities/MetaProgramming.h b/Framework/Utilities/MetaProgramming.h
index 1d88cb218482313232e8749c00a637529e639ce1..dfef000e04ddcb29876ab98a2457d11d596696a3 100644
--- a/Framework/Utilities/MetaProgramming.h
+++ b/Framework/Utilities/MetaProgramming.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_utilties_meta_programming_h_
-#define _include_corsika_utilties_meta_programming_h_
+#pragma once
 
 #include <type_traits>
 
@@ -61,5 +60,3 @@ namespace corsika::utl {
   template <class Trait>
   using disable_if = typename std::enable_if<(Trait::value == false)>::type;
 } // namespace corsika::utl
-
-#endif
diff --git a/Framework/Utilities/Singleton.h b/Framework/Utilities/Singleton.h
index 944fbe6f97c68f0574db5ecbf689fc977caf4d5b..e8c3b99b0302798f32b9f445dc0ca478bdc299f9 100644
--- a/Framework/Utilities/Singleton.h
+++ b/Framework/Utilities/Singleton.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_utl_Singleton_h_
-#define _corsika_utl_Singleton_h_
+#pragma once
 
 //#define OFFLINE_USE_GAMMA_SINGLETON
 
@@ -59,5 +58,3 @@ namespace corsika::utl {
   };
 
 } // namespace corsika::utl
-
-#endif
diff --git a/Framework/Utilities/sgn.h b/Framework/Utilities/sgn.h
index 84fca4e550d80f3e9749c513566f80e66b5f15f9..f192d51bfdab504595e4f7dac8eaeaedc70076f7 100644
--- a/Framework/Utilities/sgn.h
+++ b/Framework/Utilities/sgn.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _utilities_sgn_h
-#define _utilities_sgn_h
+#pragma once
 
 namespace corsika::utl {
 
@@ -20,5 +19,3 @@ namespace corsika::utl {
   }
 
 } // namespace corsika::utl
-
-#endif
diff --git a/Processes/EnergyLoss/EnergyLoss.h b/Processes/EnergyLoss/EnergyLoss.h
index 2e8e7955262bc2adf0f15aa6b9ff7ac6b10e1b64..82372dd7807a55c4125bdd9be5e2790381fc3222 100644
--- a/Processes/EnergyLoss/EnergyLoss.h
+++ b/Processes/EnergyLoss/EnergyLoss.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Processes_EnergyLoss_h_
-#define _Processes_EnergyLoss_h_
+#pragma once
 
 #include <corsika/environment/ShowerAxis.h>
 #include <corsika/geometry/Point.h>
@@ -64,5 +63,3 @@ namespace corsika::process::energy_loss {
     return 0.0001_g / square(1_cm);
   });
 } // namespace corsika::process::energy_loss
-
-#endif
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.h b/Processes/HadronicElasticModel/HadronicElasticModel.h
index e9533139b52ed83e3c729ca8025cd435b5a1b92a..4fc92d5d4db66f318ae8f629b98ac2f378389ddc 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.h
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_HadronicElasticInteraction_h
-#define _include_HadronicElasticInteraction_h
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/InteractionProcess.h>
@@ -63,5 +62,3 @@ namespace corsika::process::HadronicElasticModel {
   };
 
 } // namespace corsika::process::HadronicElasticModel
-
-#endif
diff --git a/Processes/InteractionCounter/InteractionCounter.h b/Processes/InteractionCounter/InteractionCounter.h
index a03c528881ce6e3a67f530c1fe170312cd90ce7f..985b3e137c197aa0f5c3cf33548796317d86f848 100644
--- a/Processes/InteractionCounter/InteractionCounter.h
+++ b/Processes/InteractionCounter/InteractionCounter.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_InteractionCounter_h
-#define _corsika_InteractionCounter_h
+#pragma once
 
 #include <corsika/process/InteractionProcess.h>
 #include <corsika/process/ProcessSequence.h>
@@ -63,5 +62,3 @@ namespace corsika::process::interaction_counter {
   };
 
 } // namespace corsika::process::interaction_counter
-
-#endif
diff --git a/Processes/LongitudinalProfile/LongitudinalProfile.h b/Processes/LongitudinalProfile/LongitudinalProfile.h
index 68de7e0a042c71012bbf7da8d9518bc70fda412a..fcf9b246383beb7fa11bd695106b7499571e744c 100644
--- a/Processes/LongitudinalProfile/LongitudinalProfile.h
+++ b/Processes/LongitudinalProfile/LongitudinalProfile.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Processes_track_writer_LongitudinalProfile_h_
-#define _Processes_track_writer_LongitudinalProfile_h_
+#pragma once
 
 #include <corsika/environment/ShowerAxis.h>
 #include <corsika/process/ContinuousProcess.h>
@@ -56,5 +55,3 @@ namespace corsika::process::longitudinal_profile {
   };
 
 } // namespace corsika::process::longitudinal_profile
-
-#endif
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index f02978af7a6a98d3be2b26f3cfb848dafed8b989..18ac43654aaac5000fc8063c15b90c8ee53ba2b3 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Physics_NullModel_NullModel_h_
-#define _Physics_NullModel_NullModel_h_
+#pragma once
 
 #include <corsika/process/BaseProcess.h>
 #include <corsika/units/PhysicalUnits.h>
@@ -33,5 +32,3 @@ namespace corsika::process::null_model {
   };
 
 } // namespace corsika::process::null_model
-
-#endif
diff --git a/Processes/ObservationPlane/ObservationPlane.h b/Processes/ObservationPlane/ObservationPlane.h
index 900b7a5896838dea6f7aa1d0a4ac735b48ed63ac..377d8a1bd82d1996aaacedc2f965f9dd42539b0b 100644
--- a/Processes/ObservationPlane/ObservationPlane.h
+++ b/Processes/ObservationPlane/ObservationPlane.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Processes_ObservationPlane_h_
-#define _Processes_ObservationPlane_h_
+#pragma once
 
 #include <corsika/geometry/Plane.h>
 #include <corsika/process/ContinuousProcess.h>
@@ -46,5 +45,3 @@ namespace corsika::process::observation_plane {
     bool const deleteOnHit_;
   };
 } // namespace corsika::process::observation_plane
-
-#endif
diff --git a/Processes/ParticleCut/ParticleCut.h b/Processes/ParticleCut/ParticleCut.h
index 739a1919ebc20a8c080759baedf4eae5cb942e75..e0c78f8818c51e677b0ce5df673fa8cb3ec7e28a 100644
--- a/Processes/ParticleCut/ParticleCut.h
+++ b/Processes/ParticleCut/ParticleCut.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_process_particle_cut_ParticleCut_h_
-#define _corsika_process_particle_cut_ParticleCut_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/SecondariesProcess.h>
@@ -51,5 +50,3 @@ namespace corsika::process {
     };
   } // namespace particle_cut
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/Pythia/Decay.h b/Processes/Pythia/Decay.h
index 0bce429c4a630d7e9b6c98155c93ad84765417c2..70573a2bfd0e8963d2956a68d712ab66e6fa47d2 100644
--- a/Processes/Pythia/Decay.h
+++ b/Processes/Pythia/Decay.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_process_pythia_decay_h_
-#define _include_corsika_process_pythia_decay_h_
+#pragma once
 
 #include <Pythia8/Pythia.h>
 #include <corsika/particles/ParticleProperties.h>
@@ -79,5 +78,3 @@ namespace corsika::process {
 
   } // namespace pythia
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/Pythia/Interaction.h b/Processes/Pythia/Interaction.h
index 3594358e0b39f528991183b4c414e8edaa3b5828..c75ff030ecf5b98e086e0545a3127e6e92ecf13d 100644
--- a/Processes/Pythia/Interaction.h
+++ b/Processes/Pythia/Interaction.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_process_pythia_interaction_h_
-#define _corsika_process_pythia_interaction_h_
+#pragma once
 
 #include <Pythia8/Pythia.h>
 
@@ -71,5 +70,3 @@ namespace corsika::process::pythia {
   };
 
 } // namespace corsika::process::pythia
-
-#endif
diff --git a/Processes/Pythia/Random.h b/Processes/Pythia/Random.h
index 9a6fb6fc706f3504ce32605ad527e1c7f1e7a3b4..1ebf22c5f645f565c80e16510dadb08b36b8f6f7 100644
--- a/Processes/Pythia/Random.h
+++ b/Processes/Pythia/Random.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_process_pythia_random_h_
-#define _include_corsika_process_pythia_random_h_
+#pragma once
 
 #include <Pythia8/Pythia.h>
 #include <corsika/random/RNGManager.h>
@@ -29,5 +28,3 @@ namespace corsika::process {
 
   } // namespace pythia
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/QGSJetII/Interaction.h b/Processes/QGSJetII/Interaction.h
index 7df95c1517a75722c2f2e7c19cd21baa50694678..09ec576e8bf76c42da21ba35b05996a22d85d55f 100644
--- a/Processes/QGSJetII/Interaction.h
+++ b/Processes/QGSJetII/Interaction.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_process_qgsjetII_interaction_h_
-#define _corsika_process_qgsjetII_interaction_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/InteractionProcess.h>
@@ -65,5 +64,3 @@ namespace corsika::process::qgsjetII {
   };
 
 } // namespace corsika::process::qgsjetII
-
-#endif
diff --git a/Processes/QGSJetII/ParticleConversion.h b/Processes/QGSJetII/ParticleConversion.h
index 352db6b5f8047061c8fffca337d7ce54c62d9477..75c5e46a23a2402dc4e56adff56d583133b19974 100644
--- a/Processes/QGSJetII/ParticleConversion.h
+++ b/Processes/QGSJetII/ParticleConversion.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_processes_qgsjetII_particles_h_
-#define _include_processes_qgsjetII_particles_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 
@@ -96,5 +95,3 @@ namespace corsika::process::qgsjetII {
   }
 
 } // namespace corsika::process::qgsjetII
-
-#endif
diff --git a/Processes/QGSJetII/QGSJetIIFragmentsStack.h b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
index 7704c19fc058ea82198b7a0462467624b5de1c3a..9d5c6a5984810d79ca6140bc97d576bf9883a854 100644
--- a/Processes/QGSJetII/QGSJetIIFragmentsStack.h
+++ b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_qgsjetIIfragmentsstack_h_
-#define _include_qgsjetIIfragmentsstack_h_
+#pragma once
 
 #include <corsika/geometry/RootCoordinateSystem.h>
 #include <corsika/geometry/Vector.h>
@@ -76,5 +75,3 @@ namespace corsika::process::qgsjetII {
       QGSJetIIFragmentsStack;
 
 } // end namespace corsika::process::qgsjetII
-
-#endif
diff --git a/Processes/QGSJetII/QGSJetIIStack.h b/Processes/QGSJetII/QGSJetIIStack.h
index a58f3fe97fa6405530acc6eb9a61023fac2b551f..5d7b6d7c48fcdc585a0321d15d7dfcd11af8ab00 100644
--- a/Processes/QGSJetII/QGSJetIIStack.h
+++ b/Processes/QGSJetII/QGSJetIIStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_qgsjetIIstack_h_
-#define _include_qgsjetIIstack_h_
+#pragma once
 
 #include <corsika/geometry/CoordinateSystem.h>
 #include <corsika/geometry/Vector.h>
@@ -132,5 +131,3 @@ namespace corsika::process::qgsjetII {
   typedef corsika::stack::Stack<QGSJetIIStackData, ParticleInterface> QGSJetIIStack;
 
 } // end namespace corsika::process::qgsjetII
-
-#endif
diff --git a/Processes/QGSJetII/qgsjet-II-04.h b/Processes/QGSJetII/qgsjet-II-04.h
index 3dcb495a3f461e9c983c6b29de922a796d30ea2a..0f4910e598f583a2cccd3a9a99a26de5fa05f590 100644
--- a/Processes/QGSJetII/qgsjet-II-04.h
+++ b/Processes/QGSJetII/qgsjet-II-04.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_qgsjetII_interface_h_
-#define _include_qgsjetII_interface_h_
+#pragma once
 
 #include <string>
 
@@ -101,5 +100,3 @@ double qgsect_(const double& e0n, const int& icz, const int& iap0, const int& ia
  */
 double qgran_(int&);
 }
-
-#endif
diff --git a/Processes/Sibyll/Decay.h b/Processes/Sibyll/Decay.h
index 96743485308fbfb68e5667cc5b554320749955de..ae05c7bcefb62c05451235178e80985eaa85ce22 100644
--- a/Processes/Sibyll/Decay.h
+++ b/Processes/Sibyll/Decay.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_process_sibyll_decay_h_
-#define _include_corsika_process_sibyll_decay_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/DecayProcess.h>
@@ -88,5 +87,3 @@ namespace corsika::process {
   } // namespace sibyll
 
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/Sibyll/Interaction.h b/Processes/Sibyll/Interaction.h
index ebf4ac22aa465f3bb405e3828d6b647ef0a8bff3..61e8c30ddfff99155a731216ff0b475d0a455074 100644
--- a/Processes/Sibyll/Interaction.h
+++ b/Processes/Sibyll/Interaction.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_process_sibyll_interaction_h_
-#define _corsika_process_sibyll_interaction_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/InteractionProcess.h>
@@ -72,5 +71,3 @@ namespace corsika::process::sibyll {
   };
 
 } // namespace corsika::process::sibyll
-
-#endif
diff --git a/Processes/Sibyll/NuclearInteraction.h b/Processes/Sibyll/NuclearInteraction.h
index 1be24afccb741d5f4c4d96dc59c1be9105c87507..42480b827e7ec2aca3ec2de9509b9f38094d5178 100644
--- a/Processes/Sibyll/NuclearInteraction.h
+++ b/Processes/Sibyll/NuclearInteraction.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_process_sibyll_nuclearinteraction_h_
-#define _corsika_process_sibyll_nuclearinteraction_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/InteractionProcess.h>
@@ -78,5 +77,3 @@ namespace corsika::process::sibyll {
   };
 
 } // namespace corsika::process::sibyll
-
-#endif
diff --git a/Processes/Sibyll/ParticleConversion.h b/Processes/Sibyll/ParticleConversion.h
index 63b06f19d226cd242aeb455520e9c986cd363721..7f11888e9231beb46ecbea1f5143b290be996119 100644
--- a/Processes/Sibyll/ParticleConversion.h
+++ b/Processes/Sibyll/ParticleConversion.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_processes_sibyll_particles_h_
-#define _include_processes_sibyll_particles_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/sibyll/sibyll2.3d.h>
@@ -66,5 +65,3 @@ namespace corsika::process::sibyll {
   corsika::units::si::HEPMassType GetSibyllMass(corsika::particles::Code const);
 
 } // namespace corsika::process::sibyll
-
-#endif
diff --git a/Processes/Sibyll/SibStack.h b/Processes/Sibyll/SibStack.h
index 86956435bacf36b1675a4ecd0deb7359995a48e2..1a9d07b4d7a86791d4a68804fab7fc0057220aba 100644
--- a/Processes/Sibyll/SibStack.h
+++ b/Processes/Sibyll/SibStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_sibstack_h_
-#define _include_sibstack_h_
+#pragma once
 
 #include <corsika/geometry/RootCoordinateSystem.h>
 #include <corsika/geometry/Vector.h>
@@ -148,5 +147,3 @@ namespace corsika::process::sibyll {
   typedef corsika::stack::Stack<SibStackData, ParticleInterface> SibStack;
 
 } // end namespace corsika::process::sibyll
-
-#endif
diff --git a/Processes/Sibyll/nuclib.h b/Processes/Sibyll/nuclib.h
index b3fc2c059d26a1f2fc74b0b6ccd62e4512d6aea6..874678c6346dfb9d293e3e78ab18f8eaf53639f9 100644
--- a/Processes/Sibyll/nuclib.h
+++ b/Processes/Sibyll/nuclib.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_nuclib_interface_h_
-#define _include_nuclib_interface_h_
+#pragma once
 
 extern "C" {
 
@@ -57,4 +56,3 @@ void signuc2_(const int&, const int&, const double&, double&);
 void sigma_mc_(const int&, const int&, const double&, const double&, const int&, double&,
                double&, double&, double&);
 }
-#endif
diff --git a/Processes/Sibyll/sibyll2.3d.h b/Processes/Sibyll/sibyll2.3d.h
index f5893db903924277b60bb461e33720d4a6cafb7a..fc5b1730cbe0c8fff1e3d33faf733931bf595511 100644
--- a/Processes/Sibyll/sibyll2.3d.h
+++ b/Processes/Sibyll/sibyll2.3d.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_sib23d_interface_h_
-#define _include_sib23d_interface_h_
+#pragma once
 //----------------------------------------------
 //  C++ interface for the SIBYLL event generator
 //----------------------------------------------
@@ -105,4 +104,3 @@ double get_sibyll_mass2(int&);
 // phojet random generator setup
 void pho_rndin_(int&, int&, int&, int&);
 }
-#endif
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index 7b6b3aba6bc89475c9f25efb0c1f46df32594064..ab18a81e86fba7dcab3dd0e04c563cdda625e3a3 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Physics_StackInspector_StackInspector_h_
-#define _Physics_StackInspector_StackInspector_h_
+#pragma once
 
 #include <corsika/process/StackProcess.h>
 #include <corsika/setup/SetupTrajectory.h>
@@ -54,5 +53,3 @@ namespace corsika::process {
   } // namespace stack_inspector
 
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/SwitchProcess/SwitchProcess.h b/Processes/SwitchProcess/SwitchProcess.h
index b217af0a5bf27559f084792b78ddcd3d5ffe5c56..786f189c1a9dce98f13891ad8e937e8baa585960 100644
--- a/Processes/SwitchProcess/SwitchProcess.h
+++ b/Processes/SwitchProcess/SwitchProcess.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_SwitchProcess_h
-#define _corsika_SwitchProcess_h
+#pragma once
 
 #include <corsika/process/InteractionProcess.h>
 #include <corsika/process/ProcessSequence.h>
@@ -104,5 +103,3 @@ namespace corsika::process::switch_process {
     }
   };
 } // namespace corsika::process::switch_process
-
-#endif
diff --git a/Processes/TrackWriter/TrackWriter.h b/Processes/TrackWriter/TrackWriter.h
index 0a7054c74c0efc48947fd98f5fdea88224445341..de79c90d407376becf35f0494478cb30fdf35afb 100644
--- a/Processes/TrackWriter/TrackWriter.h
+++ b/Processes/TrackWriter/TrackWriter.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Processes_track_writer_TrackWriter_h_
-#define _Processes_track_writer_TrackWriter_h_
+#pragma once
 
 #include <corsika/process/ContinuousProcess.h>
 #include <corsika/units/PhysicalUnits.h>
@@ -42,5 +41,3 @@ namespace corsika::process::track_writer {
   };
 
 } // namespace corsika::process::track_writer
-
-#endif
diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h
index a50c2dd96137818b41f0f511f52b196f958597cd..943bfa89c609468b3bd14d0b2899a0a2710c0dff 100644
--- a/Processes/TrackingLine/TrackingLine.h
+++ b/Processes/TrackingLine/TrackingLine.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_processes_TrackingLine_h_
-#define _include_corsika_processes_TrackingLine_h_
+#pragma once
 
 #include <corsika/geometry/Line.h>
 #include <corsika/geometry/Plane.h>
@@ -139,5 +138,3 @@ namespace corsika::process {
   } // namespace tracking_line
 
 } // namespace corsika::process
-
-#endif
diff --git a/Processes/TrackingLine/testTrackingLineStack.h b/Processes/TrackingLine/testTrackingLineStack.h
index 8bdf766268ac90a41c52e99aadd30c1679f7d96f..e6a3d7ee84d06ef5854f574529306a0dce93aa0f 100644
--- a/Processes/TrackingLine/testTrackingLineStack.h
+++ b/Processes/TrackingLine/testTrackingLineStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_process_trackinling_teststack_h_
-#define _include_process_trackinling_teststack_h_
+#pragma once
 
 #include <corsika/environment/Environment.h>
 #include <corsika/geometry/Point.h>
@@ -32,5 +31,3 @@ using StackWithGeometryInterface = corsika::stack::CombinedParticleInterface<
 using TestTrackingLineStack = corsika::stack::CombinedStack<
     typename corsika::setup::detail::ParticleDataStack::StackImpl,
     GeometryData<TestEnvironmentType>, StackWithGeometryInterface>;
-
-#endif
diff --git a/Processes/UrQMD/UrQMD.h b/Processes/UrQMD/UrQMD.h
index 47ca573c7da26df346942514c0c6e1799fe7b093..c477df119b536ed1bd54885dbdf0771563c4d8b3 100644
--- a/Processes/UrQMD/UrQMD.h
+++ b/Processes/UrQMD/UrQMD.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _Processes_UrQMD_UrQMD_h
-#define _Processes_UrQMD_UrQMD_h
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/InteractionProcess.h>
@@ -155,5 +154,3 @@ namespace corsika::process::UrQMD {
   particles::Code ConvertFromUrQMD(int vItyp, int vIso3);
 
 } // namespace corsika::process::UrQMD
-
-#endif
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index fc049b189d6c9315ac5745f24df9f424e2085f78..303184bb86c3d39768f6bc2d33b92a427d8d58a7 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_corsika_setup_environment_h_
-#define _include_corsika_setup_environment_h_
+#pragma once
 
 #include <corsika/environment/Environment.h>
 #include <corsika/environment/IMediumModel.h>
@@ -19,5 +18,3 @@ namespace corsika::setup {
   using IEnvironmentModel = environment::IMediumModel;
   using SetupEnvironment = environment::Environment<IEnvironmentModel>;
 } // namespace corsika::setup
-
-#endif
diff --git a/Setup/SetupLogger.h b/Setup/SetupLogger.h
index d3a723d627d9927e88ed07b90dc64024c2683987..939c7d3596c4136257a4df27479943866b041ecb 100644
--- a/Setup/SetupLogger.h
+++ b/Setup/SetupLogger.h
@@ -8,9 +8,6 @@
  * the license.
  */
 
-#ifndef _include_corsika_setup_logger_h_
-#define _include_corsika_setup_logger_h_
+#pragma once
 
 namespace corsika {}
-
-#endif
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index 18d81195cd9d2c5dc93e5e9451cbe00733f5415b..16cdf64abae3750409500f6f08c708832dc2549e 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_setup_setupstack_h_
-#define _corsika_setup_setupstack_h_
+#pragma once
 
 // the basic particle data stack:
 #include <corsika/stack/super_stupid/SuperStupidStack.h>
@@ -151,5 +150,3 @@ namespace corsika::setup {
 #endif
 
 } // namespace corsika::setup
-
-#endif
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index 2b8dd1a3b824aed272db7ce3d6b7e69e9f4838b2..f254aa3666d6a78f758169969cba1bd4be79a0ed 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _corsika_setup_setuptrajectory_h_
-#define _corsika_setup_setuptrajectory_h_
+#pragma once
 
 #include <corsika/geometry/Helix.h>
 #include <corsika/geometry/Line.h>
@@ -59,5 +58,3 @@ namespace corsika::setup {
   };
   */
 } // namespace corsika::setup
-
-#endif
diff --git a/Stack/DummyStack/DummyStack.h b/Stack/DummyStack/DummyStack.h
index a7be951ab1c19c8f32f7fd878adbaa34b8d38eed..d4781e3ee054d032e4d82996e28985ec3e8b533a 100644
--- a/Stack/DummyStack/DummyStack.h
+++ b/Stack/DummyStack/DummyStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_dummystack_h_
-#define _include_dummystack_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/stack/Stack.h>
@@ -67,5 +66,3 @@ namespace corsika::stack {
   } // namespace dummy
 
 } // namespace corsika::stack
-
-#endif
diff --git a/Stack/NuclearStackExtension/NuclearStackExtension.h b/Stack/NuclearStackExtension/NuclearStackExtension.h
index 2c1d38f54644dd7a8ffdaa9bc0e48bd5bfb2b356..8898d15aafb8ce543a1778608bd003b30b5e8227 100644
--- a/Stack/NuclearStackExtension/NuclearStackExtension.h
+++ b/Stack/NuclearStackExtension/NuclearStackExtension.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_stack_nuclearstackextension_h_
-#define _include_stack_nuclearstackextension_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/stack/Stack.h>
@@ -372,5 +371,3 @@ namespace corsika::stack {
 
   } // namespace nuclear_extension
 } // namespace corsika::stack
-
-#endif
diff --git a/Stack/SuperStupidStack/SuperStupidStack.h b/Stack/SuperStupidStack/SuperStupidStack.h
index 31e39dd4541e001aff1cca8cabd988443409efb7..e5d9ad0aef3cacf6e3790b94e656ad71a14f74dc 100644
--- a/Stack/SuperStupidStack/SuperStupidStack.h
+++ b/Stack/SuperStupidStack/SuperStupidStack.h
@@ -8,8 +8,7 @@
  * the license.
  */
 
-#ifndef _include_superstupidstack_h_
-#define _include_superstupidstack_h_
+#pragma once
 
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/stack/Stack.h>
@@ -250,5 +249,3 @@ namespace corsika::stack {
   } // namespace super_stupid
 
 } // namespace corsika::stack
-
-#endif