diff --git a/source/include/marlin/Exceptions.h b/source/include/marlin/Exceptions.h
index 7958d4a..4b7016a 100644
--- a/source/include/marlin/Exceptions.h
+++ b/source/include/marlin/Exceptions.h
@@ -19,6 +19,7 @@ namespace marlin{
     ParseException() {  /*no_op*/ ; } 
   public: 
     virtual ~ParseException() noexcept { /*no_op*/; } 
+    ParseException( const ParseException& e ) = default ;
 
     ParseException( std::string text ){
       message = "marlin::ParseException: " + text ;
diff --git a/source/include/marlin/Parser.h b/source/include/marlin/Parser.h
index d55903e..82f1cfe 100644
--- a/source/include/marlin/Parser.h
+++ b/source/include/marlin/Parser.h
@@ -113,9 +113,6 @@ class LCTokenizer{
 
   } 
 
-  ~LCTokenizer(){
-  }
-  
   std::vector<std::string> & result()  { 
     
     return _tokens ; 
diff --git a/source/include/marlin/PatchCollections.h b/source/include/marlin/PatchCollections.h
index 5f25106..ff68905 100644
--- a/source/include/marlin/PatchCollections.h
+++ b/source/include/marlin/PatchCollections.h
@@ -9,9 +9,6 @@
 #include <utility>  // pair
 #include <memory>
 
-using namespace lcio ;
-using namespace marlin ;
-
 namespace UTIL{
   class CheckCollections ;
 }
@@ -56,13 +53,13 @@ namespace marlin {
 
     /** Called for every run.
      */
-    virtual void processRunHeader( LCRunHeader* run ) ;
+    virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
 
     /** Called for every event - the working horse.
      */
-    virtual void processEvent( LCEvent * evt ) ;
+    virtual void processEvent( EVENT::LCEvent * evt ) ;
 
-    virtual void check( LCEvent * evt ) ;
+    virtual void check( EVENT::LCEvent * evt ) ;
 
 //    virtual void modifyEvent( LCEvent *evt ) ;
 
@@ -75,7 +72,7 @@ namespace marlin {
 
   protected:
 
-    StringVec _colList{};
+    EVENT::StringVec _colList{};
     Vector _patchCols{};
     bool _parseFiles = false ;
 
diff --git a/source/include/marlin/Statusmonitor.h b/source/include/marlin/Statusmonitor.h
index 56eb1b1..e88293b 100644
--- a/source/include/marlin/Statusmonitor.h
+++ b/source/include/marlin/Statusmonitor.h
@@ -5,8 +5,6 @@
 #include "lcio.h"
 #include <string>
 
-using namespace marlin ;
-
   /** Simple processor for writing out a status message every n-th event.
    *
    *  <h4>Input - Prerequisites</h4>
@@ -18,7 +16,7 @@ using namespace marlin ;
    * @author A.Sailer CERN
    * @version $Id:$
    */
-class Statusmonitor : public Processor {
+class Statusmonitor : public marlin::Processor {
   
  public:
   
diff --git a/source/include/marlin/StdHepReader.h b/source/include/marlin/StdHepReader.h
index 9c57163..4176cec 100644
--- a/source/include/marlin/StdHepReader.h
+++ b/source/include/marlin/StdHepReader.h
@@ -3,8 +3,6 @@
 
 #include "marlin/DataSourceProcessor.h"
 
-using namespace lcio ;
-
 
 namespace marlin{
   
diff --git a/source/include/marlin/TestProcessor.h b/source/include/marlin/TestProcessor.h
index 98da20e..1274938 100644
--- a/source/include/marlin/TestProcessor.h
+++ b/source/include/marlin/TestProcessor.h
@@ -4,8 +4,6 @@
 #include "Processor.h"
 #include "lcio.h"
 
-using namespace lcio ;
-
 
 namespace marlin {
   
@@ -39,14 +37,14 @@ namespace marlin {
     
     /** Called for every run.
      */
-    virtual void processRunHeader( LCRunHeader* run ) ;
+    virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
     
     /** Called for every event - the working horse.
      */
-    virtual void processEvent( LCEvent * evt ) ; 
+    virtual void processEvent( EVENT::LCEvent * evt ) ; 
     
     
-    virtual void check( LCEvent * evt ) ; 
+    virtual void check( EVENT::LCEvent * evt ) ; 
     
     
     /** Called after data processing for clean up.
diff --git a/source/include/marlin/XMLParser.h b/source/include/marlin/XMLParser.h
index 0028820..24c76b0 100644
--- a/source/include/marlin/XMLParser.h
+++ b/source/include/marlin/XMLParser.h
@@ -137,9 +137,6 @@ namespace marlin{
 
       } 
 
-      ~LCTokenizer(){
-      }
-  
       std::vector<std::string> & result()  { 
     
 	return _tokens ; 
diff --git a/source/src/StdHepReader.cc b/source/src/StdHepReader.cc
index 8bfed05..0072efa 100644
--- a/source/src/StdHepReader.cc
+++ b/source/src/StdHepReader.cc
@@ -10,6 +10,8 @@
 #include "UTIL/LCTOOLS.h"
 
 
+using namespace lcio ;
+
 namespace marlin{
 
 
diff --git a/source/src/TestProcessor.cc b/source/src/TestProcessor.cc
index 6fe647d..4e08f99 100644
--- a/source/src/TestProcessor.cc
+++ b/source/src/TestProcessor.cc
@@ -8,6 +8,8 @@
 
 #include "streamlog/streamlog.h"
 
+using namespace lcio ;
+
 namespace marlin{