diff --git a/source/include/marlin/MemoryMonitor.h b/source/include/marlin/MemoryMonitor.h
index 8f8190a..bd24655 100644
--- a/source/include/marlin/MemoryMonitor.h
+++ b/source/include/marlin/MemoryMonitor.h
@@ -8,9 +8,6 @@
 #include "stdio.h"
 #include "string.h"
 
-using namespace lcio ;
-using namespace marlin ;
-
 
 /** MemoryMonitor is a memory monitoring application for Marlin
  *  <h4>Input - Prerequisites</h4>
@@ -24,7 +21,7 @@ using namespace marlin ;
  * @author N. Nikiforou, CERN,
  */
 
-class MemoryMonitor : public Processor {
+class MemoryMonitor : public marlin::Processor {
 		
 public:
 	
@@ -36,13 +33,13 @@ class MemoryMonitor : public Processor {
 	virtual void init() ;
 	
 	// Called at the beginning of every run
-	virtual void processRunHeader( LCRunHeader* run ) ;
+       virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
 	
 	// Run over each event - the main algorithm
-	virtual void processEvent( LCEvent * evt ) ;
+        virtual void processEvent( EVENT::LCEvent * evt ) ;
 	
   // Run at the end of each event
-	virtual void check( LCEvent * evt ) ;
+        virtual void check( EVENT::LCEvent * evt ) ;
 	
 	// Called at the very end for cleanup, histogram saving, etc.
 	virtual void end() ;
diff --git a/test/marlintest/include/TestEventModifier.h b/test/marlintest/include/TestEventModifier.h
index ec8de1b..ea7ff74 100644
--- a/test/marlintest/include/TestEventModifier.h
+++ b/test/marlintest/include/TestEventModifier.h
@@ -8,10 +8,6 @@
 #include <string>
 
 
-using namespace lcio ;
-using namespace marlin ;
-
-
 /**  Example processor for marlin.
  * 
  *  If compiled with MARLIN_USE_AIDA 
@@ -29,7 +25,7 @@ using namespace marlin ;
  * @version $Id: TestEventModifier.h,v 1.4 2005-10-11 12:57:39 gaede Exp $ 
  */
 
-class TestEventModifier : public Processor, public EventModifier {
+class TestEventModifier : public marlin::Processor, public marlin::EventModifier {
   
  public:
   
@@ -56,14 +52,14 @@ class TestEventModifier : public Processor, public EventModifier {
   
   /** 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/test/marlintest/include/TestProcessorEventSeeder.h b/test/marlintest/include/TestProcessorEventSeeder.h
index 6e252dc..6912cf6 100644
--- a/test/marlintest/include/TestProcessorEventSeeder.h
+++ b/test/marlintest/include/TestProcessorEventSeeder.h
@@ -10,9 +10,6 @@
 #include <map>
 #include <vector>
 
-using namespace lcio ;
-using namespace marlin ;
-
 
 /**  test processor for testing the uniquie event seeding functionality of the ProcessorEventSeeder service in Marlin.
  * 
@@ -20,7 +17,7 @@ using namespace marlin ;
  * @author S. J. Aplin, DESY
  */
 
-class TestProcessorEventSeeder : public Processor {
+class TestProcessorEventSeeder : public marlin::Processor {
   
  public:
   
@@ -42,14 +39,14 @@ class TestProcessorEventSeeder : public Processor {
   
   /** 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.