diff --git a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
index 17c6cd3fe57c87505b9af43874b4501b6b7deaa1..c26de7f1366ef51660626c6a0cffd5bd33a4c47b 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
+++ b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
@@ -8,9 +8,7 @@
 #include "AFP_SimEv/AFP_SIDSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif //__CINT__
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<AFP_SIDSimHit> AFP_SIDSimHitCollection;
 typedef AtlasHitsVector<AFP_SIDSimHit>::iterator AFP_SIDSimHitIter;
diff --git a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
index 5534ce24af25559bb19efa1cd204bff8614383f1..607238e0e9db0827b04504c1f1aa9d5c5b526ece 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
+++ b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
@@ -9,9 +9,7 @@
 #include "AFP_SimEv/AFP_TDSimHit.h"
 #include "HitManagement/AtlasHitsVector.h"
 
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif //__CINT__
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<AFP_TDSimHit> AFP_TDSimHitCollection;
 typedef AtlasHitsVector<AFP_TDSimHit>::iterator AFP_TDSimHitIter;
diff --git a/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt b/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
index f75234f2963abceae80a1f5cd6311409f4c59094..6abfa8636b6388389c7d013a0bb5d66532cd4ab6 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( AFP_SimEv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Simulation/HitManagement
                           PRIVATE
                           GaudiKernel )
@@ -21,12 +20,12 @@ atlas_add_library( AFP_SimEv
                    src/*.cxx
                    PUBLIC_HEADERS AFP_SimEv
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES SGTools HitManagement
+                   LINK_LIBRARIES HitManagement
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
 
 atlas_add_dictionary( AFP_SimEvDict
                       AFP_SimEv/AFP_SimEvDict.h
                       AFP_SimEv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement GaudiKernel AFP_SimEv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} HitManagement GaudiKernel AFP_SimEv )