diff --git a/corsika/detail/modules/qgsjetII/InteractionModel.inl b/corsika/detail/modules/qgsjetII/InteractionModel.inl
index 3d5209d8ee81fb4e41e00fe95155e3fdffcb6185..0b9bb370ac0cfb32721b9c9718cf7fe1c4c1d700 100644
--- a/corsika/detail/modules/qgsjetII/InteractionModel.inl
+++ b/corsika/detail/modules/qgsjetII/InteractionModel.inl
@@ -8,11 +8,13 @@
 
 #include <corsika/modules/qgsjetII/InteractionModel.hpp>
 
-#include <corsika/framework/geometry/QuantityVector.hpp>
 #include <corsika/framework/geometry/FourVector.hpp>
+#include <corsika/framework/geometry/Point.hpp>
+
 #include <corsika/modules/qgsjetII/ParticleConversion.hpp>
 #include <corsika/modules/qgsjetII/QGSJetIIFragmentsStack.hpp>
 #include <corsika/modules/qgsjetII/QGSJetIIStack.hpp>
+
 #include <corsika/framework/utility/COMBoost.hpp>
 
 #include <sstream>
diff --git a/corsika/modules/sibyll/InteractionModel.hpp b/corsika/modules/sibyll/InteractionModel.hpp
index 91b4c98a9a1f437f5949d04b90b5be5a46ba1b93..16b71369627e832e2e195eb3f0355a39511423b9 100644
--- a/corsika/modules/sibyll/InteractionModel.hpp
+++ b/corsika/modules/sibyll/InteractionModel.hpp
@@ -11,7 +11,6 @@
 #include <corsika/framework/core/ParticleProperties.hpp>
 #include <corsika/framework/core/PhysicalUnits.hpp>
 #include <corsika/framework/random/RNGManager.hpp>
-#include <corsika/framework/utility/COMBoost.hpp>
 #include <tuple>
 
 namespace corsika::sibyll {
diff --git a/tests/modules/testSibyll.cpp b/tests/modules/testSibyll.cpp
index 9bad95c2f67ad13bf72af8113bd303c5775333fb..957ddac0fe3cde92357934ac0d9f60961b6f0b87 100644
--- a/tests/modules/testSibyll.cpp
+++ b/tests/modules/testSibyll.cpp
@@ -269,11 +269,7 @@ TEST_CASE("SibyllInterface", "modules") {
                                 MomentumVector(cs, {0_eV, 0_eV, 0_eV}));
     model.doInteraction(view, pid, Code::Oxygen, P4, targetP4);
     CrossSectionType const cx = model.getCrossSection(pid, Code::Oxygen, P4, targetP4);
-    // Felix, are those changes OK? Below are the checks before refactory-2020
-    // CHECK(length / 1_g * 1_cm * 1_cm == Approx(44.2).margin(.1));
-    // CHECK(view.getSize() == 11);
-    CHECK(cx / 1_mb == Approx(1100).margin(100)); // this is not physics validation
-    // CHECK(view.getSize() == 20); // also sibyll not stable wrt. to compiler changes
+    CHECK(cx / 1_mb == Approx(1100).margin(100));   // this is not physics validation
     CHECK(view.getSize() == Approx(40).margin(30)); // this is not physics validation
   }
 }