diff --git a/InnerDetector/InDetSimEvent/CMakeLists.txt b/InnerDetector/InDetSimEvent/CMakeLists.txt
index 3846808c6843a1ce70a99c81bb9f93767b49a0a9..4370c1aee81a1dea3cd0404de741531244f5d677 100644
--- a/InnerDetector/InDetSimEvent/CMakeLists.txt
+++ b/InnerDetector/InDetSimEvent/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( InDetSimEvent )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
+                          Control/AthenaKernel
                           Control/AthAllocators
-                          Control/SGTools
                           Generators/GeneratorObjects
                           Simulation/HitManagement
                           
@@ -28,12 +27,12 @@ atlas_add_library( InDetSimEvent
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthAllocators SGTools GeneratorObjects HitManagement StoreGateLib SGtests
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthAllocators AthenaKernel GeneratorObjects HitManagement StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} InDetIdentifier )
 
 atlas_add_dictionary( InDetSimEventDict
                       InDetSimEvent/InDetSimEventDict.h
                       InDetSimEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthAllocators SGTools GeneratorObjects HitManagement StoreGateLib SGtests InDetIdentifier InDetSimEvent )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthAllocators GeneratorObjects HitManagement StoreGateLib SGtests InDetIdentifier InDetSimEvent )
 
diff --git a/InnerDetector/InDetSimEvent/InDetSimEvent/SiHitCollection.h b/InnerDetector/InDetSimEvent/InDetSimEvent/SiHitCollection.h
index 90087f4ffdca3b774bb9bd8c2f5d902e365773a9..ca7936f81c764e8e4edf6a3f16821571c56e14ca 100755
--- a/InnerDetector/InDetSimEvent/InDetSimEvent/SiHitCollection.h
+++ b/InnerDetector/InDetSimEvent/InDetSimEvent/SiHitCollection.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SITRACKEREVENT_SIHITCOLLECTION_H
@@ -8,9 +8,7 @@
 #include "InDetSimEvent/SiHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"// for back compatibility
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 typedef AthenaHitsVector<SiHit> SiOldHitCollection;
 
 typedef AtlasHitsVector<SiHit> SiHitCollection;
diff --git a/InnerDetector/InDetSimEvent/InDetSimEvent/TRTHit.h b/InnerDetector/InDetSimEvent/InDetSimEvent/TRTHit.h
index 52d2cd5fcbfd6e25b6efbe366af55181f2f499f7..35c0a9887995d3b8aa49636d9c1d83379b51dca1 100755
--- a/InnerDetector/InDetSimEvent/InDetSimEvent/TRTHit.h
+++ b/InnerDetector/InDetSimEvent/InDetSimEvent/TRTHit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -8,9 +8,7 @@
 
 // Data members classes
 #include "HitManagement/AtlasHitsVector.h"
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 
diff --git a/InnerDetector/InDetSimEvent/InDetSimEvent/TRTUncompressedHitCollection.h b/InnerDetector/InDetSimEvent/InDetSimEvent/TRTUncompressedHitCollection.h
index 8112edd2f8404e0dc14f9174b521258b01f11d87..74c5198f167bc952bba3e50e9412a2e5d7285f81 100755
--- a/InnerDetector/InDetSimEvent/InDetSimEvent/TRTUncompressedHitCollection.h
+++ b/InnerDetector/InDetSimEvent/InDetSimEvent/TRTUncompressedHitCollection.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRTUncompressedHitCollection_hh
@@ -10,9 +10,7 @@
 #include "HitManagement/AtlasHitsVector.h"
 #include "HitManagement/AthenaHitsVector.h"// for back compatibility
 
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 typedef AthenaHitsVector<TRTUncompressedHit> TRTOldUncompressedHitCollection;
 
 typedef AtlasHitsVector<TRTUncompressedHit> TRTUncompressedHitCollection;