diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
index a0215460308a76d78d0431ae696c032f9fe9e16c..98759e89f8448d0100e1430897301422ffda632d 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/AthenaKernel
-                          Control/CLIDSvc
                           Control/SGTools
                           Control/StoreGate
                           Database/RDBAccessSvc
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/LUCID_GeoModel/LUCID_DetectorManager.h b/ForwardDetectors/LUCID/LUCID_GeoModel/LUCID_GeoModel/LUCID_DetectorManager.h
index 7bf1f6bcb4731ae4e14142259172fc7e8c497ed2..bae394d6dea1f258b5ec93ccfd26fcf6653e67dc 100755
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/LUCID_GeoModel/LUCID_DetectorManager.h
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/LUCID_GeoModel/LUCID_DetectorManager.h
@@ -30,7 +30,7 @@ class LUCID_DetectorManager: public GeoVDetectorManager {
 }; 
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 CLASS_DEF(LUCID_DetectorManager, 115078776, 1)
 #endif
 
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorTool.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorTool.cxx
index cb156ca3ad72eb8dfc161779245b424217187d91..880a960efa355b656b0b9af9c96c25e461ffcd43 100755
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorTool.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorTool.cxx
@@ -16,7 +16,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"
-#include "CLIDSvc/tools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
 LUCID_DetectorTool::LUCID_DetectorTool(const std::string& type,