diff -u -r1.15 -r1.16
--- StdHepLoader.hh	27 Apr 2007 01:54:33 -0000	1.15
+++ StdHepLoader.hh	31 May 2011 16:41:06 -0000	1.16
@@ -1,11 +1,13 @@

-// $Header: /cvs/lcd/slic/include/StdHepLoader.hh,v 1.15 2007/04/27 01:54:33 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/StdHepLoader.hh,v 1.16 2011/05/31 16:41:06 jeremy Exp $

 
 #ifndef slic_StdhepLoader_hh
 #define slic_StdhepLoader_hh 1
 
 // slic
 #include "Module.hh"

-#include "lStdHep.hh"

+
+// lcio
+#include "UTIL/lStdHep.hh"

 
 // std
 #include <string>

@@ -15,6 +17,8 @@

 class G4PrimaryVertex;
 class G4PrimaryParticle;
 

+using UTIL::lStdHep;
+

 namespace slic
 {
   enum EErrorCode { eEOF = 106 };

diff -u -r1.20 -r1.21
--- StdHepToLcioConvertor.hh	14 May 2008 03:22:59 -0000	1.20
+++ StdHepToLcioConvertor.hh	31 May 2011 16:41:06 -0000	1.21
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/StdHepToLcioConvertor.hh,v 1.20 2008/05/14 03:22:59 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/StdHepToLcioConvertor.hh,v 1.21 2011/05/31 16:41:06 jeremy Exp $

 
 #ifndef SLIC_STDHEPTOLCIOCONVERTOR_HH
 #define SLIC_STDHEPTOLCIOCONVERTOR_HH 1

@@ -6,17 +6,17 @@

 // lcdd
 #include "Module.hh"
 

-// slic
-#include "lStdHep.hh"
-

 // lcio
 #include "IMPL/MCParticleImpl.h"
 #include "EVENT/LCCollection.h"

+#include "UTIL/lStdHep.hh"

 
 // std
 #include <vector>
 #include <cassert>
 

+using UTIL::lStdHep;
+

 namespace slic
 {
 

diff -u -r1.85 -r1.86
--- LcioManager.cc	31 Jan 2011 23:05:22 -0000	1.85
+++ LcioManager.cc	31 May 2011 16:41:06 -0000	1.86
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.85 2011/01/31 23:05:22 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.86 2011/05/31 16:41:06 jeremy Exp $

 #include "LcioManager.hh"
 
 // slic

@@ -12,7 +12,6 @@

 #include "LcioFileNamer.hh"
 #include "TrajectoryManager.hh"
 #include "SlicApplication.hh"

-#include "lStdHep.hh"

 
 // lcdd
 #include "G4CalorimeterHit.hh"

@@ -26,6 +25,7 @@

 #include "IOIMPL/LCFactory.h"
 #include "IO/LCWriter.h"
 #include "UTIL/LCTOOLS.h"

+#include "UTIL/lStdHep.hh"

 
 // geant4
 #include "G4EventManager.hh"

@@ -44,6 +44,7 @@

 using EVENT::MCParticle;
 using EVENT::LCIO;
 using UTIL::LCTOOLS;

+using UTIL::lStdHep;

 
 using std::string;
 

diff -u -r1.19 -r1.20
--- StdHepLoader.cc	6 May 2008 01:44:40 -0000	1.19
+++ StdHepLoader.cc	31 May 2011 16:41:06 -0000	1.20
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.19 2008/05/06 01:44:40 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.20 2011/05/31 16:41:06 jeremy Exp $

 
 #include "StdHepLoader.hh"
 

@@ -12,6 +12,11 @@

 // std
 #include <assert.h>
 

+// lcio
+#include "UTIL/lStdHep.hh"
+
+using UTIL::lStdHep;
+

 namespace slic
 {