diff --git a/include/GarlicClusterVarsGenericObject.hh b/include/GarlicClusterVarsGenericObject.hh
index 003e29d..e19f93d 100644
--- a/include/GarlicClusterVarsGenericObject.hh
+++ b/include/GarlicClusterVarsGenericObject.hh
@@ -11,7 +11,7 @@ class GarlicClusterVarsGenericObject {
 
 public:
   GarlicClusterVarsGenericObject() {
-    _genObj = new LCGenericObjectImpl(NINT, NFLOAT, 0);
+    _genObj = new lcio::LCGenericObjectImpl(NINT, NFLOAT, 0);
     for (int i=0; i<NINT; i++) _genObj->setIntVal(i, -999);
     for (int i=0; i<NFLOAT; i++) _genObj->setFloatVal(i, -999);
   }
@@ -20,7 +20,7 @@ public:
     assert(obj->getNInt()==NINT);
     assert(obj->getNFloat()==NFLOAT);
     assert(obj->getNDouble()==0);
-    _genObj = new LCGenericObjectImpl(NINT, NFLOAT, 0);
+    _genObj = new lcio::LCGenericObjectImpl(NINT, NFLOAT, 0);
     for (int i=0; i<NINT; i++) _genObj->setIntVal( i, obj->getIntVal(i) );
     for (int i=0; i<NFLOAT; i++) _genObj->setFloatVal( i, obj->getFloatVal(i) );
   }
diff --git a/include/GarlicGeometryParameters.hh b/include/GarlicGeometryParameters.hh
index 67f026b..746ba52 100644
--- a/include/GarlicGeometryParameters.hh
+++ b/include/GarlicGeometryParameters.hh
@@ -55,7 +55,7 @@ public:
   }
 
   void Set_barrelStaveDir (std::vector< std::vector < float > > gg) {_barrelStaveDir=gg;}
-  void Set_defaultDecoder (CellIDDecoder<CalorimeterHit>* dec) {_defaultDecoder=dec;}
+  void Set_defaultDecoder (lcio::CellIDDecoder<lcio::CalorimeterHit>* dec) {_defaultDecoder=dec;}
 
   void Set_absorberRadiationLength (float x0) {_absorberRadiationLength=x0;}
 
@@ -94,7 +94,7 @@ public:
   float * Get_positionEndcapLayer () {return _positionEndcapLayer;}
 
   std::vector< std::vector < float > > Get_barrelStaveDir () {return _barrelStaveDir;}
-  CellIDDecoder<CalorimeterHit>* Get_defaultDecoder () {return _defaultDecoder;}
+  lcio::CellIDDecoder<lcio::CalorimeterHit>* Get_defaultDecoder () {return _defaultDecoder;}
 
 private:
 
@@ -136,7 +136,7 @@ private:
 
   std::vector< std::vector < float > > _barrelStaveDir;
 
-  CellIDDecoder<CalorimeterHit>* _defaultDecoder;
+  lcio::CellIDDecoder<lcio::CalorimeterHit>* _defaultDecoder;
 
   void init() {
     _rOfBarrel=-999;
diff --git a/src/GarlicClusterAlgos.cc b/src/GarlicClusterAlgos.cc
index c8f31b7..627728e 100644
--- a/src/GarlicClusterAlgos.cc
+++ b/src/GarlicClusterAlgos.cc
@@ -25,6 +25,8 @@ using std::endl;
 #include "GarlicExtendedCluster.hh"
 #include "GarlicExtendedHit.hh"
 
+using namespace lcio;
+
 std::map <CalorimeterHit*, bool> GarlicClusterAlgos::getSeeds(GarlicExtendedCluster* preClus) {
 
   float energyCutMip = GarlicAlgorithmParameters::Instance().GetSeedHitEnergyCut();
diff --git a/src/GarlicExtendedCluster.cc b/src/GarlicExtendedCluster.cc
index 22b0f15..5bd43dd 100644
--- a/src/GarlicExtendedCluster.cc
+++ b/src/GarlicExtendedCluster.cc
@@ -32,6 +32,8 @@ using std::max;
 using std::cout;
 using std::endl;
 
+using namespace lcio;
+
 int GarlicExtendedCluster::counter=0;