diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
index 66db56d1712e0db0bac87a7e48a57f0cdeae26ab..70345e4854a4f0248c1d4de16253d6271c953366 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
@@ -19,7 +19,6 @@ void compare (const HepMcParticleLink& p1,
   assert ( p1.isValid() == p2.isValid() );
   assert ( p1.barcode() == p2.barcode() );
   assert ( p1.eventIndex() == p2.eventIndex() );
-  assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
   assert ( p1.cptr() == p2.cptr() );
   assert ( p1 == p2 );
 }
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
index a19cee19c9f65aa3d1868585ea7506dafae35625..6a34ed6d855eb5e7663a2d7b208879728af2372d 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
@@ -18,7 +18,6 @@ void compare (const HepMcParticleLink& p1,
   assert ( p1.isValid() == p2.isValid() );
   assert ( p1.barcode() == p2.barcode() );
   assert ( p1.eventIndex() == p2.eventIndex() );
-  assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
   assert ( p1.cptr() == p2.cptr() );
   assert ( p1 == p2 );
 }
diff --git a/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MMSimHitCollection.h b/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MMSimHitCollection.h
index bd295579773686ac4f1d21490578bab61ffaafbb..01eff9db99ebcc9a2d862ec16bfa7f93ab99e734 100644
--- a/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MMSimHitCollection.h
+++ b/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MMSimHitCollection.h
@@ -8,10 +8,7 @@
 #include "MuonSimEvent/MMSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AthenaHitsVector<MMSimHit> OldMMSimHitCollection;