diff --git a/DDG4/include/DDG4/IoStreams.h b/DDG4/include/DDG4/IoStreams.h
index b221f75c957ae3c89f01b470cf49fae5f3e05bc2..c18c73a87b06a0443e62c807e3e3caa736ed656d 100644
--- a/DDG4/include/DDG4/IoStreams.h
+++ b/DDG4/include/DDG4/IoStreams.h
@@ -27,6 +27,7 @@
 #include <boost/iostreams/detail/ios.hpp>
 #include <boost/iostreams/detail/path.hpp>
 #include <boost/iostreams/positioning.hpp>
+#include <boost/iostreams/stream.hpp>
 
 // Forward declarations
 class TFile;
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index 0c6bcda776e47f2ae80d0c4f07b3b11c8f24805b..69b6c124d02e2ffa7d6799b41e054dc94f30daad 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -17,8 +17,6 @@
 #include "DDG4/Geant4InputAction.h"
 
 // C/C++ include files
-#include <fstream>
-#include <boost/iostreams/stream.hpp>
 
 /// Namespace for the AIDA detector description toolkit
 namespace DD4hep {
@@ -42,7 +40,7 @@ namespace DD4hep {
       //typedef boost::iostreams::stream<dd4hep_file_source<TFile*> > in_stream;
       typedef HepMC::EventStream EventStream;
     protected:
-      in_stream m_input;
+      in_stream    m_input;
       EventStream* m_events;
     public:
       /// Initializing constructor