diff --git a/k4MarlinWrapper/k4MarlinWrapper/converters/Lcio2EDM4hep.h b/k4MarlinWrapper/k4MarlinWrapper/converters/Lcio2EDM4hep.h
index b4e2f8d4..ffe44232 100644
--- a/k4MarlinWrapper/k4MarlinWrapper/converters/Lcio2EDM4hep.h
+++ b/k4MarlinWrapper/k4MarlinWrapper/converters/Lcio2EDM4hep.h
@@ -19,14 +19,9 @@
 #ifndef K4MARLINWRAPPER_LCIO2EDM4HEP_H
 #define K4MARLINWRAPPER_LCIO2EDM4HEP_H
 
-// GAUDI
 #include <Gaudi/Property.h>
 #include <GaudiKernel/AlgTool.h>
 
-// k4FWCore
-#include <k4FWCore/PodioDataSvc.h>
-
-// Converter Interface
 #include "k4MarlinWrapper/converters/IEDMConverter.h"
 
 #include <lcio.h>
@@ -43,10 +38,11 @@ namespace EVENT {
   class LCCollection;
 }
 
+class PodioDataSvc;
+
 class Lcio2EDM4hepTool : public AlgTool, virtual public IEDMConverter {
 public:
   Lcio2EDM4hepTool(const std::string& type, const std::string& name, const IInterface* parent);
-  ~Lcio2EDM4hepTool() override = default;
   StatusCode initialize() final;
   StatusCode finalize() final;
 
diff --git a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
index 078d6479..c843c4a5 100644
--- a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
+++ b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
@@ -28,6 +28,7 @@
 
 #include <k4FWCore/DataHandle.h>
 #include <k4FWCore/MetaDataHandle.h>
+#include <k4FWCore/PodioDataSvc.h>
 
 #include "GaudiKernel/AnyDataWrapper.h"