diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
index 97885a00bd897d51965b4bb56986a3c33cc6e663..65e6c072fadd80f36826e9fab77e3b733e3f80b2 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
@@ -8,10 +8,7 @@
 
 #include "ALFA_SimEv/ALFA_Hit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<ALFA_Hit> ALFA_HitCollection;
 typedef AtlasHitsVector<ALFA_Hit>::iterator ALFA_HitIter;
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
index 5293ef12d449b0988eaa73a484eedc10ea3ffbad..cc85110b237f851f0cd28fa3b4412536e47dd41e 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
@@ -8,10 +8,7 @@
 
 #include "ALFA_SimEv/ALFA_ODHit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<ALFA_ODHit> ALFA_ODHitCollection;
 typedef AtlasHitsVector<ALFA_ODHit>::iterator ALFA_ODHitIter;
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
index c1df210c6591b3601d8e7fca6d24c9a33dd28118..27a77bc306af963f3c1b9e41b0c70070127eac7d 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( ALFA_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( ALFA_SimEv
                    src/*.cxx
                    PUBLIC_HEADERS ALFA_SimEv
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES SGTools HitManagement
+                   LINK_LIBRARIES AthenaKernel HitManagement
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
 
 atlas_add_dictionary( ALFA_SimEvDict
                       ALFA_SimEv/ALFA_SimEvDict.h
                       ALFA_SimEv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement GaudiKernel ALFA_SimEv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} HitManagement GaudiKernel ALFA_SimEv )