diff --git a/k4MarlinWrapper/k4MarlinWrapper/LCEventWrapper.h b/k4MarlinWrapper/k4MarlinWrapper/LCEventWrapper.h
index 8df4b61c..aa04b7c7 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/LCEventWrapper.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/LCEventWrapper.h
@@ -30,8 +30,6 @@ class LCEventWrapper : public DataObject {
 public:
   LCEventWrapper(std::unique_ptr<EVENT::LCEvent>&& theEvent) : m_event(std::move(theEvent)) {}
 
-  ~LCEventWrapper() = default;
-
   EVENT::LCEvent* getEvent() const { return m_event.get(); }
 
 private:
diff --git a/k4MarlinWrapper/k4MarlinWrapper/LcioEventAlgo.h b/k4MarlinWrapper/k4MarlinWrapper/LcioEventAlgo.h
index 20aaad46..7b589613 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/LcioEventAlgo.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/LcioEventAlgo.h
@@ -26,19 +26,17 @@
  */
 
 #include <Gaudi/Algorithm.h>
-#include <GaudiKernel/IEventProcessor.h>
+#include <Gaudi/Property.h>
 
-#include <EVENT/LCIO.h>
-#include <MT/LCReader.h>
-
-#include "k4MarlinWrapper/LCEventWrapper.h"
+namespace MT {
+  class LCReader;
+}
 
 class LcioEvent : public Gaudi::Algorithm {
 public:
   explicit LcioEvent(const std::string& name, ISvcLocator* pSL);
-  virtual ~LcioEvent() = default;
-  virtual StatusCode initialize() override final;
-  virtual StatusCode execute(const EventContext&) const override;
+  StatusCode initialize() override final;
+  StatusCode execute(const EventContext&) const override;
 
 private:
   Gaudi::Property<std::vector<std::string>> m_fileNames{this, "Files", {}};
diff --git a/k4MarlinWrapper/k4MarlinWrapper/LcioEventOutput.h b/k4MarlinWrapper/k4MarlinWrapper/LcioEventOutput.h
index 4a2cb65c..92d42cf1 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/LcioEventOutput.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/LcioEventOutput.h
@@ -24,25 +24,27 @@
 // LCEventOutput: Write out LCIO events using MT writer from LCIO
 ////////////////////////////////////////////
 
-#include <iostream>
-
 #include <Gaudi/Algorithm.h>
+#include <Gaudi/Property.h>
 
 #include <EVENT/LCIO.h>
 #include <IMPL/LCCollectionVec.h>
 #include <IMPL/LCEventImpl.h>
-#include <MT/LCWriter.h>
 #include <lcio.h>
 
-#include "k4MarlinWrapper/LCEventWrapper.h"
+#include <string>
+#include <vector>
+
+namespace MT {
+  class LCWriter;
+}
 
 class LcioEventOutput : public Gaudi::Algorithm {
 public:
   explicit LcioEventOutput(const std::string& name, ISvcLocator* pSL);
-  virtual ~LcioEventOutput() = default;
-  virtual StatusCode initialize() override final;
-  virtual StatusCode execute(const EventContext&) const final;
-  virtual StatusCode finalize() override final;
+  StatusCode initialize() override final;
+  StatusCode execute(const EventContext&) const final;
+  StatusCode finalize() override final;
 
 private:
   MT::LCWriter* m_writer = nullptr;
diff --git a/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h b/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h
index 4a4d344a..9e0ba1b5 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/MarlinProcessorWrapper.h
@@ -19,22 +19,18 @@
 #ifndef K4MARLINWRAPPER_MARLINPROCESSORWRAPPER_H
 #define K4MARLINWRAPPER_MARLINPROCESSORWRAPPER_H
 
-// std
 #include <stack>
 #include <string>
 
-// Gaudi
 #include <Gaudi/Algorithm.h>
 #include <GaudiKernel/IEventProcessor.h>
 #include <GaudiKernel/IRndmEngine.h>
 #include <GaudiKernel/MsgStream.h>
 #include <GaudiKernel/ToolHandle.h>
 
-// LCIO
 #include <EVENT/LCEvent.h>
 #include <EVENT/LCRunHeader.h>
 
-// Marlin
 #include <marlin/EventModifier.h>
 #include <marlin/Exceptions.h>
 #include <marlin/Global.h>
@@ -42,10 +38,8 @@
 #include <marlin/ProcessorMgr.h>
 #include <marlin/StringParameters.h>
 
-// ROOT
 #include <TSystem.h>
 
-// k4MarlinWrapper
 #include "k4MarlinWrapper/converters/IEDMConverter.h"
 
 namespace marlin {
@@ -56,10 +50,9 @@ namespace marlin {
 class MarlinProcessorWrapper : public Gaudi::Algorithm {
 public:
   explicit MarlinProcessorWrapper(const std::string& name, ISvcLocator* pSL);
-  virtual ~MarlinProcessorWrapper() = default;
-  virtual StatusCode execute(const EventContext&) const override final;
-  virtual StatusCode finalize() override final;
-  virtual StatusCode initialize() override final;
+  StatusCode execute(const EventContext&) const override final;
+  StatusCode finalize() override final;
+  StatusCode initialize() override final;
 
 private:
   std::string                m_verbosity = "ERROR";
diff --git a/k4MarlinWrapper/k4MarlinWrapper/TrackingCellIDEncodingSvc.h b/k4MarlinWrapper/k4MarlinWrapper/TrackingCellIDEncodingSvc.h
index 8eacb3b5..c5b3727d 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/TrackingCellIDEncodingSvc.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/TrackingCellIDEncodingSvc.h
@@ -19,11 +19,9 @@
 #ifndef CELLIDSVC_H
 #define CELLIDSVC_H
 
+#include <Gaudi/Property.h>
 #include <GaudiKernel/Service.h>
 
-//LCIO Includes
-#include <UTIL/LCTrackerConf.h>
-
 #include <string>
 
 class IGeoSvc;
@@ -32,7 +30,6 @@ class TrackingCellIDEncodingSvc : public extends<Service, IService> {
 public:
   TrackingCellIDEncodingSvc(const std::string& name, ISvcLocator* svc);
 
-  ~TrackingCellIDEncodingSvc();
   StatusCode initialize() final;
   StatusCode finalize() final;
 
diff --git a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
index a116b279..9e4f5293 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
@@ -21,8 +21,6 @@
 
 #include "k4MarlinWrapper/converters/IEDMConverter.h"
 
-#include <k4FWCore/PodioDataSvc.h>
-
 #include "k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h"
 
 #include <Gaudi/Property.h>
@@ -32,6 +30,8 @@
 #include <string>
 #include <vector>
 
+class PodioDataSvc;
+
 template <typename K, typename V> using ObjMapT = k4EDM4hep2LcioConv::VecMapT<K, V>;
 
 using TrackMap           = ObjMapT<lcio::TrackImpl*, edm4hep::Track>;
@@ -53,7 +53,6 @@ struct CollectionPairMappings;
 class EDM4hep2LcioTool : public AlgTool, virtual public IEDMConverter {
 public:
   EDM4hep2LcioTool(const std::string& type, const std::string& name, const IInterface* parent);
-  ~EDM4hep2LcioTool() override = default;
   StatusCode initialize() override;
   StatusCode finalize() override;
 
diff --git a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
index 1cf7dc01..2f9eb39c 100644
--- a/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
+++ b/k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
@@ -23,6 +23,7 @@
 
 #include "k4FWCore/DataHandle.h"
 #include "k4FWCore/MetaDataHandle.h"
+#include "k4FWCore/PodioDataSvc.h"
 
 #include "GaudiKernel/AnyDataWrapper.h"
 
diff --git a/k4MarlinWrapper/src/components/LcioEventAlgo.cpp b/k4MarlinWrapper/src/components/LcioEventAlgo.cpp
index 6f04d3b3..5394effa 100644
--- a/k4MarlinWrapper/src/components/LcioEventAlgo.cpp
+++ b/k4MarlinWrapper/src/components/LcioEventAlgo.cpp
@@ -17,9 +17,19 @@
  * limitations under the License.
  */
 
-#include "k4MarlinWrapper/LcioEventAlgo.h"
+#include <GaudiKernel/IEventProcessor.h>
+
 #include "k4MarlinWrapper/LCEventWrapper.h"
-#include "k4MarlinWrapper/util/k4MarlinWrapperUtil.h"
+#include "k4MarlinWrapper/LcioEventAlgo.h"
+
+#include "marlin/Global.h"
+#include "marlin/StringParameters.h"
+
+#include <EVENT/LCIO.h>
+#include <MT/LCReader.h>
+
+#include <memory>
+#include <string>
 
 DECLARE_COMPONENT(LcioEvent)
 
diff --git a/k4MarlinWrapper/src/components/LcioEventOutput.cpp b/k4MarlinWrapper/src/components/LcioEventOutput.cpp
index 74b0593e..6e69711a 100644
--- a/k4MarlinWrapper/src/components/LcioEventOutput.cpp
+++ b/k4MarlinWrapper/src/components/LcioEventOutput.cpp
@@ -17,8 +17,14 @@
  * limitations under the License.
  */
 
+#include <MT/LCWriter.h>
+
+#include "k4MarlinWrapper/LCEventWrapper.h"
 #include "k4MarlinWrapper/LcioEventOutput.h"
 
+#include <string>
+#include <vector>
+
 DECLARE_COMPONENT(LcioEventOutput)
 
 LcioEventOutput::LcioEventOutput(const std::string& name, ISvcLocator* pSL) : Gaudi::Algorithm(name, pSL) {}
diff --git a/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp b/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp
index 4d896de6..c596b822 100644
--- a/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp
+++ b/k4MarlinWrapper/src/components/MarlinProcessorWrapper.cpp
@@ -22,6 +22,10 @@
 #include "k4MarlinWrapper/LCEventWrapper.h"
 #include "k4MarlinWrapper/util/k4MarlinWrapperUtil.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 DECLARE_COMPONENT(MarlinProcessorWrapper)
 
 MarlinProcessorWrapper::MarlinProcessorWrapper(const std::string& name, ISvcLocator* pSL)
diff --git a/k4MarlinWrapper/src/components/TrackingCellIDEncodingSvc.cpp b/k4MarlinWrapper/src/components/TrackingCellIDEncodingSvc.cpp
index 45e1b549..83d8e7ed 100644
--- a/k4MarlinWrapper/src/components/TrackingCellIDEncodingSvc.cpp
+++ b/k4MarlinWrapper/src/components/TrackingCellIDEncodingSvc.cpp
@@ -16,9 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <UTIL/LCTrackerConf.h>
+
 #include "k4MarlinWrapper/TrackingCellIDEncodingSvc.h"
 
-// k4fwcore
 #include <k4Interface/IGeoSvc.h>
 
 #include <GaudiKernel/MsgStream.h>
@@ -28,8 +30,6 @@ DECLARE_COMPONENT(TrackingCellIDEncodingSvc);
 TrackingCellIDEncodingSvc::TrackingCellIDEncodingSvc(const std::string& name, ISvcLocator* svc)
     : base_class(name, svc) {}
 
-TrackingCellIDEncodingSvc::~TrackingCellIDEncodingSvc() {}
-
 StatusCode TrackingCellIDEncodingSvc::initialize() {
   try {
     info() << "Looking for GeoSvc with the name" << m_geoSvcName.value() << endmsg;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 42578912..723187ee 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -99,7 +99,7 @@ add_test( event_header_conversion bash -c "k4run ${CMAKE_CURRENT_SOURCE_DIR}/gau
 ExternalData_Add_Target(marlinwrapper_tests)
 
 get_property(test_names DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY TESTS)
-set_tests_properties(${test_names} PROPERTIES ENVIRONMENT 
+set_tests_properties(${test_names} PROPERTIES ENVIRONMENT
 "TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR};LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib64:$ENV{LD_LIBRARY_PATH};PYTHONPATH=${CMAKE_INSTALL_PREFIX}/python:$ENV{PYTHONPATH};EXAMPLE_DIR=${PROJECT_SOURCE_DIR}/k4MarlinWrapper/examples;MARLIN_DLL=$ENV{MARLIN_DLL}:${CMAKE_CURRENT_BINARY_DIR}/libMarlinTestProcessors.so"
 )