diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 577ea416648e3a9f16249af51d485b5bd1b9063e..6eb662ec40f0e858a003e66498a8c67c77bdfe41 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -38,8 +38,6 @@
 #include <corsika/units/PhysicalUnits.h>
 #include <corsika/utl/CorsikaFenv.h>
 
-#include <corsika/stack/history/HistoryObservationPlane.hpp>
-
 #include <iomanip>
 #include <iostream>
 #include <limits>
@@ -209,9 +207,8 @@ int main(int argc, char** argv) {
   process::longitudinal_profile::LongitudinalProfile longprof{showerAxis};
 
   Plane const obsPlane(showerCore, Vector<dimensionless_d>(rootCS, {0., 0., 1.}));
-  //~ process::observation_plane::ObservationPlane observationLevel(obsPlane,
-  //~ "particles.dat");
-  corsika::history::HistoryObservationPlane observationLevel{stack, obsPlane};
+  process::observation_plane::ObservationPlane observationLevel(obsPlane,
+                                                                "particles.dat");
 
   process::UrQMD::UrQMD urqmd;
   process::interaction_counter::InteractionCounter urqmdCounted{urqmd};
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 9865263330b023e2828a6c7d0eb9e067cd911bfb..7353b9a84c00e4279573296454dfaa0dd593d909 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -16,7 +16,7 @@
 #include <corsika/random/UniformRealDistribution.h>
 #include <corsika/stack/SecondaryView.h>
 #include <corsika/units/PhysicalUnits.h>
-#include <corsika/history/EventType.hpp>
+#include <corsika/stack/history/EventType.hpp>
 
 #include <corsika/logging/Logging.h>
 
diff --git a/Processes/ParticleCut/ParticleCut.cc b/Processes/ParticleCut/ParticleCut.cc
index 69a0216e22e7e42d9aa89ee68360ec2b3081e0e3..1616f6248740d7b8e6f23a8c31405f57fff16eb8 100644
--- a/Processes/ParticleCut/ParticleCut.cc
+++ b/Processes/ParticleCut/ParticleCut.cc
@@ -95,7 +95,6 @@ namespace corsika::process {
         } else {
           ++particle; // next entry in SecondaryView
         }
-        ++p; // next entry in SecondaryView
       }
       return EProcessReturn::eOk;
     }
diff --git a/Stack/History/Event.hpp b/Stack/History/Event.hpp
index c569a577f62b8614197fcc1178f84bf8097e2679..de613116406dad9fffd564052f9f42094ac199ff 100644
--- a/Stack/History/Event.hpp
+++ b/Stack/History/Event.hpp
@@ -10,9 +10,8 @@
 
 #include <corsika/logging/Logging.h>
 #include <corsika/particles/ParticleProperties.h>
+#include <corsika/stack/history/EventType.hpp>
 #include <corsika/stack/history/SecondaryParticle.hpp>
-#include <corsika/logging/Logging.h>
-#include <corsika/history/EventType.hpp>
 
 #include <iostream>
 #include <memory>