diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h b/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
index a866b9e2282e78e3c1ae6fe07bd49c1e6fb423df..672dcf2b152d7f054c8f57519f457a4349d062a8 100755
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
@@ -41,7 +41,7 @@ class ALFA_DetectorManager : public GeoVDetectorManager
 }; 
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 class ALFA_DetectorManager;
 CLASS_DEF(ALFA_DetectorManager, 114886926, 1)
 #endif
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
index 8e095d42412133d40045af0d377c0a86b2d1cbc1..c0c2769378a0326dc50adc486f235bbf86058b3f 100644
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( ALFA_GeoModel )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Database/RDBAccessSvc
                           DetectorDescription/GeoModel/GeoModelInterfaces
@@ -29,7 +27,7 @@ atlas_add_component( ALFA_GeoModel
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools AthenaPoolUtilities GeoModelKernel GeoModelUtilities ALFA_Geometry StoreGateLib SGtests GaudiKernel )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel AthenaPoolUtilities GeoModelKernel GeoModelUtilities ALFA_Geometry StoreGateLib SGtests GaudiKernel )
 
 # Install files from the package:
 atlas_install_headers( ALFA_GeoModel )