diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1ce75dec668430b73414ad83e15e3a4edea9ac4..022493b44b60e6257ce7fd755f94b6acb3f3d3a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,11 +190,6 @@ option (WITH_HISTORY "Flag to switch on/off HISTORY" ON)
 set (Python_ADDITIONAL_VERSIONS 3)
 find_package (PythonInterp 3 REQUIRED)
 
-#+++++++++++++++++++++++++++++
-# get phys_units
-#
-find_package (PhysUnits REQUIRED)
-
 
 #+++++++++++++++++++++++++++++
 # CORSIKA8
@@ -211,7 +206,6 @@ target_include_directories (
 target_link_libraries (
   CORSIKA8
   INTERFACE
-  PhysUnits
   CONAN_PKG::eigen
   CONAN_PKG::spdlog
   CONAN_PKG::boost
diff --git a/corsika/detail/framework/utility/CorsikaFenvFallback.inl b/corsika/detail/framework/utility/CorsikaFenvFallback.inl
index 825cd63516d6cdea5bb095a2df3bc9d8c184f7ff..473b6a27928fb5f5307297420942c8f485357717 100644
--- a/corsika/detail/framework/utility/CorsikaFenvFallback.inl
+++ b/corsika/detail/framework/utility/CorsikaFenvFallback.inl
@@ -12,7 +12,7 @@
 extern "C" {
 #warning No enabling/disabling of floating point exceptions - platform needs better implementation
 
-inline int feenableexcept(int /*excepts*/) { return -1; }
+inline int feenableexcept(int /*excepts*/) throw() { return -1; }
 
-inline int fedisableexcept(int /*excepts*/) { return -1; }
+inline int fedisableexcept(int /*excepts*/) throw() { return -1; }
 }
diff --git a/corsika/detail/framework/utility/CorsikaFenvOSX.inl b/corsika/detail/framework/utility/CorsikaFenvOSX.inl
index 06b17451c64a1adbbbda9a5b046f634eea2d287d..5b8ed554dff42edbf3fee45d7321434fb13b06b8 100644
--- a/corsika/detail/framework/utility/CorsikaFenvOSX.inl
+++ b/corsika/detail/framework/utility/CorsikaFenvOSX.inl
@@ -28,7 +28,7 @@
 
 extern "C" {
 
-int feenableexcept(int excepts) {
+int feenableexcept(int excepts) throw() {
   static fenv_t fenv;
   int new_excepts = excepts & FE_ALL_EXCEPT;
   // previous masks
@@ -44,7 +44,7 @@ int feenableexcept(int excepts) {
   return fesetenv(&fenv) ? -1 : old_excepts;
 }
 
-int fedisableexcept(int excepts) {
+int fedisableexcept(int excepts) throw() {
   static fenv_t fenv;
   int new_excepts = excepts & FE_ALL_EXCEPT;
   // all previous masks
diff --git a/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl b/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
index c57267525342b26205ddc3d8737252e8dbde6673..3ddd6d6cee6c2129e1a2cdfc83e038538b4bfd3e 100644
--- a/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
+++ b/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
@@ -52,7 +52,7 @@ namespace corsika {
       direction =
           direction + direction.cross(magneticfield) * steplength * k; // Second Movement
       position = position + direction * steplength / 2;
-      auto steplength_true = steplength * (1.0 + (double)direction.getNorm()) / 2;
+      auto const steplength_true = steplength * (1 + direction.getNorm()) / 2;
       return std::make_tuple(position, direction.normalized(), steplength_true);
     }
 
diff --git a/corsika/framework/core/PhysicalUnits.hpp b/corsika/framework/core/PhysicalUnits.hpp
index 185a65fceb1903fadc6850efdb6bcccda93df53d..82373acc9057817ccde077ad93adac8f3584360b 100644
--- a/corsika/framework/core/PhysicalUnits.hpp
+++ b/corsika/framework/core/PhysicalUnits.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 // the templated static-unit package we use:
-#include <phys/units/io.hpp>
-#include <phys/units/quantity.hpp>
+#include <corsika/framework/units/io.hpp>
+#include <corsika/framework/units/quantity.hpp>
 
 #include <corsika/framework/core/PhysicalConstants.hpp>
 
diff --git a/corsika/framework/random/RNGManager.hpp b/corsika/framework/random/RNGManager.hpp
index 775d62570114d11b1148ade910e520ee66e7841a..9fb217f24d710724383b77c9971de74158d79cde 100644
--- a/corsika/framework/random/RNGManager.hpp
+++ b/corsika/framework/random/RNGManager.hpp
@@ -33,7 +33,7 @@ namespace corsika {
     typedef std::map<std::string, prng_type> streams_type;
     typedef std::map<std::string, std::seed_seq> seeds_type;
 
-    RNGManager(RNGManager const&) = default;
+    RNGManager(RNGManager const&) = delete; // since it is a singleton
 
     RNGManager& operator=(RNGManager const&) = delete;
 
diff --git a/externals/phys_units/phys/units/io.hpp b/corsika/framework/units/io.hpp
similarity index 76%
rename from externals/phys_units/phys/units/io.hpp
rename to corsika/framework/units/io.hpp
index 9bb53384206c6676cc0c546477e1bdb57c791fe5..f250a36af1a2103fcfb07928eef0faa5ec6a2c52 100644
--- a/externals/phys_units/phys/units/io.hpp
+++ b/corsika/framework/units/io.hpp
@@ -16,9 +16,9 @@
 #ifndef PHYS_UNITS_IO_HPP_INCLUDED
 #define PHYS_UNITS_IO_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
-#include "phys/units/quantity_io_engineering.hpp"
-#include "phys/units/quantity_io_symbols.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io_engineering.hpp"
+#include "corsika/framework/units/quantity_io_symbols.hpp"
 
 #endif // PHYS_UNITS_IO_HPP_INCLUDED
 
diff --git a/externals/phys_units/phys/units/io_output.hpp b/corsika/framework/units/io_output.hpp
similarity index 91%
rename from externals/phys_units/phys/units/io_output.hpp
rename to corsika/framework/units/io_output.hpp
index f9095a92dbb982c9bbbac73925ad768ec0836868..c2786ad1581c32ed7611ffde3d6b0d14706f57d8 100644
--- a/externals/phys_units/phys/units/io_output.hpp
+++ b/corsika/framework/units/io_output.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_IO_OUTPUT_HPP_INCLUDED
 #define PHYS_UNITS_IO_OUTPUT_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 #endif // PHYS_UNITS_IO_OUTPUT_HPP_INCLUDED
 
diff --git a/externals/phys_units/phys/units/io_output_eng.hpp b/corsika/framework/units/io_output_eng.hpp
similarity index 90%
rename from externals/phys_units/phys/units/io_output_eng.hpp
rename to corsika/framework/units/io_output_eng.hpp
index 47bc2e2e81311ca4e07a7c933abb204902ee5887..d4f709acd281cc191b54787a0c3cce08d547fc38 100644
--- a/externals/phys_units/phys/units/io_output_eng.hpp
+++ b/corsika/framework/units/io_output_eng.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_IO_ENG_HPP_INCLUDED
 #define PHYS_UNITS_IO_ENG_HPP_INCLUDED
 
-#include "phys/units/quantity_io_engineering.hpp"
+#include "corsika/framework/units/quantity_io_engineering.hpp"
 
 #endif // PHYS_UNITS_IO_ENG_HPP_INCLUDED
 
diff --git a/externals/phys_units/phys/units/io_symbols.hpp b/corsika/framework/units/io_symbols.hpp
similarity index 90%
rename from externals/phys_units/phys/units/io_symbols.hpp
rename to corsika/framework/units/io_symbols.hpp
index b91666ee9f99e65ab8320e236546e4d139e40909..adeaf7f2ae3dfc4c815da3db10c3589a539044bf 100644
--- a/externals/phys_units/phys/units/io_symbols.hpp
+++ b/corsika/framework/units/io_symbols.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_IO_SYMBOLS_HPP_INCLUDED
 #define PHYS_UNITS_IO_SYMBOLS_HPP_INCLUDED
 
-#include "phys/units/quantity_io_symbols.hpp"
+#include "corsika/framework/units/quantity_io_symbols.hpp"
 
 #endif // PHYS_UNITS_IO_SYMBOLS_HPP_INCLUDED
 
diff --git a/externals/phys_units/phys/units/other_units.hpp b/corsika/framework/units/other_units.hpp
similarity index 99%
rename from externals/phys_units/phys/units/other_units.hpp
rename to corsika/framework/units/other_units.hpp
index 3e6c35540afbf7f79ffcb1a1d8045a88240b24b9..4ba5df3d8919e06d8cae67add482cb761ae77229 100644
--- a/externals/phys_units/phys/units/other_units.hpp
+++ b/corsika/framework/units/other_units.hpp
@@ -29,7 +29,7 @@
 #ifndef PHYS_UNITS_OTHER_UNITS_HPP_INCLUDED
 #define PHYS_UNITS_OTHER_UNITS_HPP_INCLUDED
 
-#include "phys/units/quantity.hpp"
+#include "corsika/framework/units/quantity.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/physical_constants.hpp b/corsika/framework/units/physical_constants.hpp
similarity index 97%
rename from externals/phys_units/phys/units/physical_constants.hpp
rename to corsika/framework/units/physical_constants.hpp
index 131dfb03c1ee8497254f7d39f50bc3373136331d..ae098428cd1ee18ef94cced81ca53c008585982e 100644
--- a/externals/phys_units/phys/units/physical_constants.hpp
+++ b/corsika/framework/units/physical_constants.hpp
@@ -22,7 +22,7 @@
 #ifndef PHYS_UNITS_PHYSICAL_CONSTANTS_HPP_INCLUDED
 #define PHYS_UNITS_PHYSICAL_CONSTANTS_HPP_INCLUDED
 
-#include "phys/units/quantity.hpp"
+#include "corsika/framework/units/quantity.hpp"
 
 namespace phys {
   namespace units {
diff --git a/externals/phys_units/phys/units/quantity.hpp b/corsika/framework/units/quantity.hpp
similarity index 98%
rename from externals/phys_units/phys/units/quantity.hpp
rename to corsika/framework/units/quantity.hpp
index 970773d598ec4e076467fb990c9fdb610b9c936f..3e897cfc80151beebdd2fb700af35fd27ae94e47 100644
--- a/externals/phys_units/phys/units/quantity.hpp
+++ b/corsika/framework/units/quantity.hpp
@@ -31,6 +31,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <utility> // std::declval
+#include <type_traits>
 
 /// namespace phys.
 
@@ -358,6 +359,21 @@ namespace phys {
       static constexpr quantity zero() { return quantity{value_type(0.0)}; }
       //    static constexpr quantity zero = quantity{ value_type( 0.0 ) };
 
+      /**
+       * We also define "infinity" for each type.
+       *
+       * RU, Do 7. Jan 02:10:18 CET 2021
+       */
+      static constexpr quantity infinity() {
+        return quantity{value_type(std::numeric_limits<value_type>::infinity())};
+      }
+
+      template <typename _dim = dimension_type,
+                std::enable_if_t<std::is_same_v<_dim, dimensionless_d>, bool> = true>
+      operator double() const {
+        return m_value;
+      }
+
     private:
       /**
        * private initializing constructor.
@@ -471,7 +487,7 @@ namespace phys {
 
       template <typename D, typename X, typename Y>
       friend constexpr bool operator>=(quantity<D, X> const& x, quantity<D, Y> const& y);
-    };
+    }; // namespace units
 
     // helper to check whether some type is a quantity
     template <typename TNonQuantityType>
diff --git a/externals/phys_units/phys/units/quantity_io.hpp b/corsika/framework/units/quantity_io.hpp
similarity index 99%
rename from externals/phys_units/phys/units/quantity_io.hpp
rename to corsika/framework/units/quantity_io.hpp
index e94ffab36c1d0c84556cd326353aa1c6eb5d6881..db32e911b85e64feacb7df6428db5e8e30de60d5 100644
--- a/externals/phys_units/phys/units/quantity_io.hpp
+++ b/corsika/framework/units/quantity_io.hpp
@@ -22,7 +22,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_HPP_INCLUDED
 
-#include "phys/units/quantity.hpp"
+#include "corsika/framework/units/quantity.hpp"
 
 #include <algorithm>
 #include <iosfwd>
diff --git a/externals/phys_units/phys/units/quantity_io_ampere.hpp b/corsika/framework/units/quantity_io_ampere.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_ampere.hpp
rename to corsika/framework/units/quantity_io_ampere.hpp
index a21e8c255546f36170859ba42cdd038a9866274c..98477e1f324260c6c3da41d66c7b3391215df900 100644
--- a/externals/phys_units/phys/units/quantity_io_ampere.hpp
+++ b/corsika/framework/units/quantity_io_ampere.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_AMPERE_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_AMPERE_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_becquerel.hpp b/corsika/framework/units/quantity_io_becquerel.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_becquerel.hpp
rename to corsika/framework/units/quantity_io_becquerel.hpp
index deaf47c3fe4010e170a32dab3bcb94464e89dcd4..cab3454760b918f8fd1fa27518be7fc63be6ffc9 100644
--- a/externals/phys_units/phys/units/quantity_io_becquerel.hpp
+++ b/corsika/framework/units/quantity_io_becquerel.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_BECQUEREL_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_BECQUEREL_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_candela.hpp b/corsika/framework/units/quantity_io_candela.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_candela.hpp
rename to corsika/framework/units/quantity_io_candela.hpp
index 8814dbb2d15a3a39aa932ce022ad125af9e763ed..cdb7694a309e023073d6657dcd1c121ddc1b73f6 100644
--- a/externals/phys_units/phys/units/quantity_io_candela.hpp
+++ b/corsika/framework/units/quantity_io_candela.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_CANDELA_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_CANDELA_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_celsius.hpp b/corsika/framework/units/quantity_io_celsius.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_celsius.hpp
rename to corsika/framework/units/quantity_io_celsius.hpp
index fc769a4d465bd535bf05e95e61c1ec615d79ffa1..cc145ecdfe073814c089e8a746c357a8ee189813 100644
--- a/externals/phys_units/phys/units/quantity_io_celsius.hpp
+++ b/corsika/framework/units/quantity_io_celsius.hpp
@@ -17,7 +17,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_CELSIUS_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_CELSIUS_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_coulomb.hpp b/corsika/framework/units/quantity_io_coulomb.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_coulomb.hpp
rename to corsika/framework/units/quantity_io_coulomb.hpp
index 0f140d78ddcd5188c349ef351b483fde385296a5..8fcc4af30c771196fc6034affc5fdbeaccc2cea6 100644
--- a/externals/phys_units/phys/units/quantity_io_coulomb.hpp
+++ b/corsika/framework/units/quantity_io_coulomb.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_COULOMB_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_COULOMB_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_dimensionless.hpp b/corsika/framework/units/quantity_io_dimensionless.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_dimensionless.hpp
rename to corsika/framework/units/quantity_io_dimensionless.hpp
index 1d1ca57e7816c934e243614b25d14df491c0a1b4..254dac4d1934e0590fb5832046cf42e565ee4523 100644
--- a/externals/phys_units/phys/units/quantity_io_dimensionless.hpp
+++ b/corsika/framework/units/quantity_io_dimensionless.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_DIMENSIONLESS_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_DIMENSIONLESS_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_engineering.hpp b/corsika/framework/units/quantity_io_engineering.hpp
similarity index 98%
rename from externals/phys_units/phys/units/quantity_io_engineering.hpp
rename to corsika/framework/units/quantity_io_engineering.hpp
index 0423f5acad4a7305fd28aba4115eef94a2edca1d..16b4be8f59ddc8f9676604063054029fb894913e 100644
--- a/externals/phys_units/phys/units/quantity_io_engineering.hpp
+++ b/corsika/framework/units/quantity_io_engineering.hpp
@@ -23,7 +23,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_ENGINEERING_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_ENGINEERING_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 #include <cmath>
 #include <iomanip>
diff --git a/externals/phys_units/phys/units/quantity_io_farad.hpp b/corsika/framework/units/quantity_io_farad.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_farad.hpp
rename to corsika/framework/units/quantity_io_farad.hpp
index fcd0c445b9c97535f289424657c510f38398b5d4..aa56f6f6c088fb1f6999d6f5040be868aa5f71cb 100644
--- a/externals/phys_units/phys/units/quantity_io_farad.hpp
+++ b/corsika/framework/units/quantity_io_farad.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_FARAD_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_FARAD_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_gray.hpp b/corsika/framework/units/quantity_io_gray.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_gray.hpp
rename to corsika/framework/units/quantity_io_gray.hpp
index 769110dd996ac24baad837a03deab21d7d4ed12b..5e5300b26e37f179303a813d0bc751023c18d03c 100644
--- a/externals/phys_units/phys/units/quantity_io_gray.hpp
+++ b/corsika/framework/units/quantity_io_gray.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_GRAY_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_GRAY_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_henry.hpp b/corsika/framework/units/quantity_io_henry.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_henry.hpp
rename to corsika/framework/units/quantity_io_henry.hpp
index d1e733637f4fc3918b3427634f502bded79f2620..34e8989e0983ac9cb13f53bd3e2d2f0de8ead106 100644
--- a/externals/phys_units/phys/units/quantity_io_henry.hpp
+++ b/corsika/framework/units/quantity_io_henry.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_HENRY_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_HENRY_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_hertz.hpp b/corsika/framework/units/quantity_io_hertz.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_hertz.hpp
rename to corsika/framework/units/quantity_io_hertz.hpp
index 3695e5435be67ce0fcbd7cdc8d96dcdd000522e0..a3ffff728392d6f768988f234e0ec33c89baee91 100644
--- a/externals/phys_units/phys/units/quantity_io_hertz.hpp
+++ b/corsika/framework/units/quantity_io_hertz.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_HERTZ_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_HERTZ_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_joule.hpp b/corsika/framework/units/quantity_io_joule.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_joule.hpp
rename to corsika/framework/units/quantity_io_joule.hpp
index 33f26c5847f7710b0bbf10e781ad2af159dc5734..817f2fe05487f231efdeaa035a4f8091f0865791 100644
--- a/externals/phys_units/phys/units/quantity_io_joule.hpp
+++ b/corsika/framework/units/quantity_io_joule.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_JOULE_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_JOULE_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_kelvin.hpp b/corsika/framework/units/quantity_io_kelvin.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_kelvin.hpp
rename to corsika/framework/units/quantity_io_kelvin.hpp
index 24dfa48b2462761c9b73882349c2529420af0224..164206219b04f25df356c9c56a43d164e69c5478 100644
--- a/externals/phys_units/phys/units/quantity_io_kelvin.hpp
+++ b/corsika/framework/units/quantity_io_kelvin.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_KELVIN_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_KELVIN_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_kilogram.hpp b/corsika/framework/units/quantity_io_kilogram.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_kilogram.hpp
rename to corsika/framework/units/quantity_io_kilogram.hpp
index 375cdc51841044dd8513bbb3b351448975018395..fdb333229b440a5df0584ad1bf8254383658f064 100644
--- a/externals/phys_units/phys/units/quantity_io_kilogram.hpp
+++ b/corsika/framework/units/quantity_io_kilogram.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_KILOGRAM_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_KILOGRAM_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_lumen.hpp b/corsika/framework/units/quantity_io_lumen.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_lumen.hpp
rename to corsika/framework/units/quantity_io_lumen.hpp
index f5443b5003be3a881540d9fb2aa134ebf4871b5f..f4d53d3fbb19bdd4f12b70ade4aeda829819abd0 100644
--- a/externals/phys_units/phys/units/quantity_io_lumen.hpp
+++ b/corsika/framework/units/quantity_io_lumen.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_LUMEN_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_LUMEN_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_lux.hpp b/corsika/framework/units/quantity_io_lux.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_lux.hpp
rename to corsika/framework/units/quantity_io_lux.hpp
index 98a8d9e4b208e7775635158114ed0dd278953cf9..cbaf2986764663a1e040eb763aba6b25452732e7 100644
--- a/externals/phys_units/phys/units/quantity_io_lux.hpp
+++ b/corsika/framework/units/quantity_io_lux.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_LUX_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_LUX_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_meter.hpp b/corsika/framework/units/quantity_io_meter.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_meter.hpp
rename to corsika/framework/units/quantity_io_meter.hpp
index 4b537d5020af4d0b1d0bd978a851bf3ad4ef1ee8..3a5ebd9cf948cab0acf68a9315c6930d13398d3b 100644
--- a/externals/phys_units/phys/units/quantity_io_meter.hpp
+++ b/corsika/framework/units/quantity_io_meter.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_METER_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_METER_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_mole.hpp b/corsika/framework/units/quantity_io_mole.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_mole.hpp
rename to corsika/framework/units/quantity_io_mole.hpp
index cd3b184dc778a10a0e684e10089f7f79d547c07a..4007e4328c2faf1a9e82272e31dbb98fa2d3ab83 100644
--- a/externals/phys_units/phys/units/quantity_io_mole.hpp
+++ b/corsika/framework/units/quantity_io_mole.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_MOLE_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_MOLE_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_newton.hpp b/corsika/framework/units/quantity_io_newton.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_newton.hpp
rename to corsika/framework/units/quantity_io_newton.hpp
index 4a7505e6cfdaffa7c1355cd0ea2ab231ac01023c..7599315b5299ba640ae6f6e5cf53bc1e342165e2 100644
--- a/externals/phys_units/phys/units/quantity_io_newton.hpp
+++ b/corsika/framework/units/quantity_io_newton.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_NEWTON_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_NEWTON_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_ohm.hpp b/corsika/framework/units/quantity_io_ohm.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_ohm.hpp
rename to corsika/framework/units/quantity_io_ohm.hpp
index 84d33c7eb04f2881a4c47b863419482d4f1364ec..2bfce23d0c0841696344dc0c398154412077ad16 100644
--- a/externals/phys_units/phys/units/quantity_io_ohm.hpp
+++ b/corsika/framework/units/quantity_io_ohm.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_OHM_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_OHM_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_pascal.hpp b/corsika/framework/units/quantity_io_pascal.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_pascal.hpp
rename to corsika/framework/units/quantity_io_pascal.hpp
index 011e3da402bd1f86b8421e223cecfee7135c2ee9..a8b8968367d1382a93f71ef9b2b9dc5338fceef5 100644
--- a/externals/phys_units/phys/units/quantity_io_pascal.hpp
+++ b/corsika/framework/units/quantity_io_pascal.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_PASCAL_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_PASCAL_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_radian.hpp b/corsika/framework/units/quantity_io_radian.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_radian.hpp
rename to corsika/framework/units/quantity_io_radian.hpp
index 780e1bcea63edc83d70fff365b87e9b29df75e26..56f69f3b13ab587303b5673ef4817221fac56fbe 100644
--- a/externals/phys_units/phys/units/quantity_io_radian.hpp
+++ b/corsika/framework/units/quantity_io_radian.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_RADIAN_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_RADIAN_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_second.hpp b/corsika/framework/units/quantity_io_second.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_second.hpp
rename to corsika/framework/units/quantity_io_second.hpp
index 31edd4dea8706dd3070e34b58232b577d89b3464..6f4b8dca3304b504af997c342585e354b3dda227 100644
--- a/externals/phys_units/phys/units/quantity_io_second.hpp
+++ b/corsika/framework/units/quantity_io_second.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_SECOND_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_SECOND_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_siemens.hpp b/corsika/framework/units/quantity_io_siemens.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_siemens.hpp
rename to corsika/framework/units/quantity_io_siemens.hpp
index 34f145de25e1995a6450dd7cb907e0e1ede8691b..13e9d4e3417ee9095c8420677ff52a23673c8664 100644
--- a/externals/phys_units/phys/units/quantity_io_siemens.hpp
+++ b/corsika/framework/units/quantity_io_siemens.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_SIEMENS_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_SIEMENS_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_sievert.hpp b/corsika/framework/units/quantity_io_sievert.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_sievert.hpp
rename to corsika/framework/units/quantity_io_sievert.hpp
index 971ca1559daef7cf9363235b3e3a31972aa665ae..ef7c0b9946b94440f9d260b1b734577258959a5d 100644
--- a/externals/phys_units/phys/units/quantity_io_sievert.hpp
+++ b/corsika/framework/units/quantity_io_sievert.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_SIEVERT_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_SIEVERT_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_speed.hpp b/corsika/framework/units/quantity_io_speed.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_speed.hpp
rename to corsika/framework/units/quantity_io_speed.hpp
index 7a6f631812cefeafe28e661482706a2925985f75..544cd27f64c40ce63ee6e3b37646a7279f23705d 100644
--- a/externals/phys_units/phys/units/quantity_io_speed.hpp
+++ b/corsika/framework/units/quantity_io_speed.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_SPEED_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_SPEED_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_steradian.hpp b/corsika/framework/units/quantity_io_steradian.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_steradian.hpp
rename to corsika/framework/units/quantity_io_steradian.hpp
index 87a977e5acd94c6ea67004df40878a20fd51a4ec..037bd0d300efc34267e557138ef3c7c6c42b0886 100644
--- a/externals/phys_units/phys/units/quantity_io_steradian.hpp
+++ b/corsika/framework/units/quantity_io_steradian.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_STERADIAN_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_STERADIAN_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/corsika/framework/units/quantity_io_symbols.hpp b/corsika/framework/units/quantity_io_symbols.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..7b302dec0b50523932cc8cc74fed6345bef32613
--- /dev/null
+++ b/corsika/framework/units/quantity_io_symbols.hpp
@@ -0,0 +1,57 @@
+/**
+ * \file quantity_io_symbols.hpp
+ *
+ * \brief   load all available unit names and symbols.
+ * \author  Martin Moene
+ * \date    7 September 2013
+ * \since   1.0
+ *
+ * Copyright 2013 Universiteit Leiden. All rights reserved.
+ * This code is provided as-is, with no warrantee of correctness.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
+#define PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
+
+#include "corsika/framework/units/quantity_io_ampere.hpp"
+//prefer Hertz
+//#include "corsika/framework/units/quantity_io_becquerel.hpp"
+#include "corsika/framework/units/quantity_io_candela.hpp"
+//prefer kelvin
+//#include "corsika/framework/units/quantity_io_celsius.hpp"
+#include "corsika/framework/units/quantity_io_coulomb.hpp"
+#include "corsika/framework/units/quantity_io_dimensionless.hpp"
+#include "corsika/framework/units/quantity_io_farad.hpp"
+//prefer sievert
+//#include "corsika/framework/units/quantity_io_gray.hpp"
+#include "corsika/framework/units/quantity_io_joule.hpp"
+#include "corsika/framework/units/quantity_io_henry.hpp"
+#include "corsika/framework/units/quantity_io_hertz.hpp"
+#include "corsika/framework/units/quantity_io_kelvin.hpp"
+#include "corsika/framework/units/quantity_io_kilogram.hpp"
+//prefer Cd base unit
+//#include "corsika/framework/units/quantity_io_lumen.hpp"
+#include "corsika/framework/units/quantity_io_lux.hpp"
+#include "corsika/framework/units/quantity_io_meter.hpp"
+#include "corsika/framework/units/quantity_io_newton.hpp"
+#include "corsika/framework/units/quantity_io_ohm.hpp"
+#include "corsika/framework/units/quantity_io_pascal.hpp"
+#include "corsika/framework/units/quantity_io_radian.hpp"
+#include "corsika/framework/units/quantity_io_second.hpp"
+#include "corsika/framework/units/quantity_io_siemens.hpp"
+#include "corsika/framework/units/quantity_io_sievert.hpp"
+#include "corsika/framework/units/quantity_io_speed.hpp"
+#include "corsika/framework/units/quantity_io_steradian.hpp"
+#include "corsika/framework/units/quantity_io_tesla.hpp"
+#include "corsika/framework/units/quantity_io_volt.hpp"
+#include "corsika/framework/units/quantity_io_watt.hpp"
+#include "corsika/framework/units/quantity_io_weber.hpp"
+
+#endif // PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
+
+/*
+ * end of file
+ */
diff --git a/externals/phys_units/phys/units/quantity_io_tesla.hpp b/corsika/framework/units/quantity_io_tesla.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_tesla.hpp
rename to corsika/framework/units/quantity_io_tesla.hpp
index fc4e651c621c0044081fc49b85c248cdbf29e570..04ea10fcd3e6fb89263ea946e34978293bfe3ad0 100644
--- a/externals/phys_units/phys/units/quantity_io_tesla.hpp
+++ b/corsika/framework/units/quantity_io_tesla.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_TESLA_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_TESLA_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_volt.hpp b/corsika/framework/units/quantity_io_volt.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_volt.hpp
rename to corsika/framework/units/quantity_io_volt.hpp
index baacf39074fe062925c8b69f4ae9c7793186dd76..0957b513ba5f4155f277dd63e8c54dcc21634fdc 100644
--- a/externals/phys_units/phys/units/quantity_io_volt.hpp
+++ b/corsika/framework/units/quantity_io_volt.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_VOLT_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_VOLT_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_watt.hpp b/corsika/framework/units/quantity_io_watt.hpp
similarity index 94%
rename from externals/phys_units/phys/units/quantity_io_watt.hpp
rename to corsika/framework/units/quantity_io_watt.hpp
index 7e616c706490e274ae413fd18a5f1f8f200394a8..8dd317e605a6f839256e240f4fd0cf58bb797270 100644
--- a/externals/phys_units/phys/units/quantity_io_watt.hpp
+++ b/corsika/framework/units/quantity_io_watt.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_WATT_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_WATT_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/externals/phys_units/phys/units/quantity_io_weber.hpp b/corsika/framework/units/quantity_io_weber.hpp
similarity index 95%
rename from externals/phys_units/phys/units/quantity_io_weber.hpp
rename to corsika/framework/units/quantity_io_weber.hpp
index 95ab616758e31f0443c6b5891af4300893427f21..600c3f8f55d58d727d9c17502261c59f25e2f90f 100644
--- a/externals/phys_units/phys/units/quantity_io_weber.hpp
+++ b/corsika/framework/units/quantity_io_weber.hpp
@@ -16,7 +16,7 @@
 #ifndef PHYS_UNITS_QUANTITY_IO_WEBER_HPP_INCLUDED
 #define PHYS_UNITS_QUANTITY_IO_WEBER_HPP_INCLUDED
 
-#include "phys/units/quantity_io.hpp"
+#include "corsika/framework/units/quantity_io.hpp"
 
 namespace phys { namespace units {
 
diff --git a/corsika/framework/utility/CorsikaFenv.hpp b/corsika/framework/utility/CorsikaFenv.hpp
index f3be6389cc865415017a98478470fef98d666774..13482b988ed925a54a142bd958741b232818eba3 100644
--- a/corsika/framework/utility/CorsikaFenv.hpp
+++ b/corsika/framework/utility/CorsikaFenv.hpp
@@ -16,8 +16,8 @@
  */
 extern "C" {
 
-int feenableexcept(int excepts);
-int fedisableexcept(int excepts);
+int feenableexcept(int excepts) throw();
+int fedisableexcept(int excepts) throw();
 }
 
 #ifdef CORSIKA_HAS_FEENABLEEXCEPT
diff --git a/corsika/media/FlatExponential.hpp b/corsika/media/FlatExponential.hpp
index 704e69b4516dc80ead4938301d48801b2cccca96..a33c76496fb89d80b9a0e7a5747b6578bb5c9698 100644
--- a/corsika/media/FlatExponential.hpp
+++ b/corsika/media/FlatExponential.hpp
@@ -42,10 +42,10 @@ namespace corsika {
     NuclearComposition const& getNuclearComposition() const override;
 
     GrammageType getIntegratedGrammage(setup::Trajectory const& line,
-                                       LengthType to) const;
+                                       LengthType to) const override;
 
     LengthType getArclengthFromGrammage(setup::Trajectory const& line,
-                                        GrammageType grammage) const;
+                                        GrammageType grammage) const override;
 
   private:
     DirectionVector const axis_;
diff --git a/externals/phys_units/phys/units/quantity_io_symbols.hpp b/externals/phys_units/phys/units/quantity_io_symbols.hpp
deleted file mode 100644
index 41dc6189b484a3824e8146d676025c996728cb50..0000000000000000000000000000000000000000
--- a/externals/phys_units/phys/units/quantity_io_symbols.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * \file quantity_io_symbols.hpp
- *
- * \brief   load all available unit names and symbols.
- * \author  Martin Moene
- * \date    7 September 2013
- * \since   1.0
- *
- * Copyright 2013 Universiteit Leiden. All rights reserved.
- * This code is provided as-is, with no warrantee of correctness.
- *
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
-#define PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
-
-#include "phys/units/quantity_io_ampere.hpp"
-//prefer Hertz
-//#include "phys/units/quantity_io_becquerel.hpp"
-#include "phys/units/quantity_io_candela.hpp"
-//prefer kelvin
-//#include "phys/units/quantity_io_celsius.hpp"
-#include "phys/units/quantity_io_coulomb.hpp"
-#include "phys/units/quantity_io_dimensionless.hpp"
-#include "phys/units/quantity_io_farad.hpp"
-//prefer sievert
-//#include "phys/units/quantity_io_gray.hpp"
-#include "phys/units/quantity_io_joule.hpp"
-#include "phys/units/quantity_io_henry.hpp"
-#include "phys/units/quantity_io_hertz.hpp"
-#include "phys/units/quantity_io_kelvin.hpp"
-#include "phys/units/quantity_io_kilogram.hpp"
-//prefer Cd base unit
-//#include "phys/units/quantity_io_lumen.hpp"
-#include "phys/units/quantity_io_lux.hpp"
-#include "phys/units/quantity_io_meter.hpp"
-#include "phys/units/quantity_io_newton.hpp"
-#include "phys/units/quantity_io_ohm.hpp"
-#include "phys/units/quantity_io_pascal.hpp"
-#include "phys/units/quantity_io_radian.hpp"
-#include "phys/units/quantity_io_second.hpp"
-#include "phys/units/quantity_io_siemens.hpp"
-#include "phys/units/quantity_io_sievert.hpp"
-#include "phys/units/quantity_io_speed.hpp"
-#include "phys/units/quantity_io_steradian.hpp"
-#include "phys/units/quantity_io_tesla.hpp"
-#include "phys/units/quantity_io_volt.hpp"
-#include "phys/units/quantity_io_watt.hpp"
-#include "phys/units/quantity_io_weber.hpp"
-
-#endif // PHYS_UNITS_QUANTITY_IO_SYMBOLS_HPP_INCLUDED
-
-/*
- * end of file
- */
diff --git a/tests/modules/testParticleCut.cpp b/tests/modules/testParticleCut.cpp
index 81414e5ece1f0a47d8160f8277c07bc3db06f02b..52907dd2110e07b2622e639883be76abcefe6c08 100644
--- a/tests/modules/testParticleCut.cpp
+++ b/tests/modules/testParticleCut.cpp
@@ -54,7 +54,7 @@ TEST_CASE("ParticleCut", "[processes]") {
         Code::Proton, Eabove, MomentumVector(rootCS, {0_GeV, 0_GeV, 0_GeV}),
         Point(rootCS, 0_m, 0_m, 0_m), 0_ns));
     // view on secondary particles
-    SecondaryView view(particle);
+    setup::StackView view(particle);
     // ref. to primary particle through the secondary view.
     // only this way the secondary view is populated
     auto projectile = view.getProjectile();
@@ -107,7 +107,7 @@ TEST_CASE("ParticleCut", "[processes]") {
         std::make_tuple(Code::Proton, Eabove,
                         MomentumVector(rootCS, {0_GeV, 0_GeV, 0_GeV}), point0, 0_ns));
     // view on secondary particles
-    SecondaryView view(particle);
+    setup::StackView view(particle);
     // ref. to primary particle through the secondary view.
     // only this way the secondary view is populated
     auto projectile = view.getProjectile();