diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 09766d9582104b4c1639749c5c8de72af06df7d4..2f4bd7dabd90807502147b4e7bf55b99dbea0cf8 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -42,7 +42,6 @@
 #include <iostream>
 #include <limits>
 #include <string>
-#include <typeinfo>
 
 using namespace corsika;
 using namespace corsika::process;
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 5527fdc4acbe8cc0c2ef0814c79b435686598504..cef4c2de3a2c11c4f89f02a39ed0cade441df8fe 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -32,7 +32,6 @@
 #include <cassert>
 #include <cmath>
 #include <limits>
-#include <type_traits>
 
 /**
  * The cascade namespace assembles all objects needed to simulate full particles cascades.
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index 418575b07df02d09b236f504f97ddb32980f224f..2ea2b28d42616f07545742d2589528680cd2658c 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -12,7 +12,6 @@
 #include <corsika/units/PhysicalUnits.h>
 
 #include <iostream>
-#include <type_traits>
 
 namespace corsika::geometry {
 
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index d184e7544257a2bdf700a3d267495e4d34d7f862..d217aa50ba2299136cd8358293be1eb35964e5dd 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -17,7 +17,6 @@
 #include <array>
 #include <cstdint>
 #include <iosfwd>
-#include <type_traits>
 
 #include <corsika/units/PhysicalUnits.h>
 
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 8249d1472efd1d80187f7d3ae8b0f82935750881..533068893a20e0ee55904d5b5ac18662c3fa6ccf 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <corsika/process/ProcessReturn.h> // for convenience
-#include <type_traits>
 
 namespace corsika::process {
 
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index 7555f1800a720d81855edecbd4e3f83728cd444a..ea125461368ae712407070ac56b6d993dff62ea4 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -20,7 +20,6 @@
 
 #include <cmath>
 #include <limits>
-#include <type_traits>
 
 namespace corsika::process {
 
diff --git a/Framework/Random/testRandom.cc b/Framework/Random/testRandom.cc
index 14971167d1517e8cef0dfc2a3860f86f25e1c386..d9053f74d63b49a39e24470c052b97970f573b02 100644
--- a/Framework/Random/testRandom.cc
+++ b/Framework/Random/testRandom.cc
@@ -15,7 +15,6 @@
 #include <iostream>
 #include <limits>
 #include <random>
-#include <type_traits>
 
 using namespace corsika::random;
 
diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h
index b5c19bca9a067ce3c179ced1dcaacb34a98820f1..e372b768ef5f04d50bf4129222e8987ef0a5f7b9 100644
--- a/Framework/StackInterface/ParticleBase.h
+++ b/Framework/StackInterface/ParticleBase.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <type_traits>
 
 namespace corsika::stack {
 
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index 6903aabd675bd166fc7871552397c315cfd50b11..d91ac679f5786d86831f080bfb922898184b8d3f 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -14,7 +14,6 @@
 
 #include <stdexcept>
 #include <string>
-#include <type_traits>
 #include <vector>
 
 /**