diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
index 46da7124a8bb82344d46d4d91a09fe1af4e1caae..7405dcdc31fc652e9506ec37e71857d4c07beb77 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
@@ -10,10 +10,7 @@
 
 #include "CLHEP/Geometry/Point3D.h"
 #include "GeoModelKernel/GeoTransform.h"
-#include "CLIDSvc/CLASS_DEF.h"
-#ifndef __CINT__
-	#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "ALFA_Geometry/ALFA_ConfigParams.h"
 
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
index 51ad33c8c4272f824fc178825be9dd924983f058..3910308730cc145d135044473edac67224ddc31f 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( ALFA_Geometry )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           Database/RDBAccessSvc
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           DetectorDescription/GeoModel/GeoModelKernel
@@ -29,7 +27,7 @@ atlas_add_library( ALFA_Geometry
                    PUBLIC_HEADERS ALFA_Geometry
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel SGTools GeoModelKernel GaudiKernel StoreGateLib SGtests
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel GeoModelKernel GaudiKernel StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES PathResolver )
 
 # Install files from the package: