diff --git a/Algorithms/MaterialMapping/src/GeantinoRecording.cpp b/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
index bdab5aa4c9b7c719a7a521b8da3b349ce145f1e7..58bccd937a96fa8a608fb93b5756dc0d5beb05f7 100644
--- a/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
+++ b/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
@@ -14,8 +14,8 @@
 
 FW::GeantinoRecording::GeantinoRecording(
     const FW::GeantinoRecording::Config& cnf,
-    std::unique_ptr<const Acts::Logger> logger)
-  : FW::BareAlgorithm("GeantinoRecording", level),
+    Acts::Logging::Level level)
+  : FW::BareAlgorithm("GeantinoRecording", level)
   , m_cfg(cnf)
   , m_runManager(std::make_unique<G4RunManager>())
 {
diff --git a/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp b/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
index 0a4aae5a02f46b1f4a059e7b84c7832aba17b378..b078401c0c2663f2ebf1a333b71048bbcb0167bd 100644
--- a/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
+++ b/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
@@ -17,7 +17,7 @@ FW::G4::MMPrimaryGeneratorAction::MMPrimaryGeneratorAction(
     G4int           randomSeed1,
     G4int           randomSeed2)
   : G4VUserPrimaryGeneratorAction()
-  , fParticleGun(0)
+  , fParticleGun(nullptr)
 {
   // configure the run
   if(fgInstance) {
diff --git a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
index 02b1d4cc03d38caecd6acee454ca80c02533e727..a6d0c77c7b8fe6456b1eef3966cec35aa48cf7c8 100644
--- a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
+++ b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
@@ -1,9 +1,7 @@
 #include "ACTFW/Plugins/Pythia8/TPythia8Generator.hpp"
-
 #include <TClonesArray.h>
 #include <TDatabasePDG.h>
 #include <TParticle.h>
-#include <TPythia8.h>
 #include <TSystem.h>
 
 #include <ACTS/Utilities/Units.hpp>
diff --git a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
index b181e7c626a5fc3167d34708313ab8051345339d..4278e7c6a9f1dea8e9d012c5060ff6c0baefd53b 100644
--- a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
+++ b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
@@ -12,8 +12,7 @@
 #include "ACTS/EventData/ParticleDefinitions.hpp"
 #include "ACTS/Utilities/Logger.hpp"
 #include "ACTFW/Readers/IReaderT.hpp"
-
-class TPythia8;
+#include <TPythia8.h>
 
 namespace FW {
 namespace Pythia8 {
diff --git a/Plugins/Pythia8/CMakeLists.txt b/Plugins/Pythia8/CMakeLists.txt
index 47f86e98b3f04d9d99c4f2288c1fd91292624ef1..7081107c066e766688b2cbae5186469c2aee91bc 100644
--- a/Plugins/Pythia8/CMakeLists.txt
+++ b/Plugins/Pythia8/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_library(ACTFWPluginPythia8 SHARED ACTFW/Plugins/Pythia8/TPythia8Generator.cpp)
 target_include_directories(ACTFWPluginPythia8 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
 target_include_directories(ACTFWPluginPythia8 PUBLIC ${ROOT_INCLUDE_DIRS})
-target_include_directories(ACTFWPluginPythia8 PRIVATE ${PYTHIA8_INCLUDEDIR})
+target_include_directories(ACTFWPluginPythia8 PUBLIC ${PYTHIA8_INCLUDEDIR})
 target_link_libraries(ACTFWPluginPythia8 PUBLIC ACTS::ACTSCore ACTFramework)
 target_link_libraries(ACTFWPluginPythia8 PUBLIC ${ROOT_LIBRARIES})
 target_link_libraries(ACTFWPluginPythia8 PRIVATE -L${PYTHIA8_LIBRARYDIR})