diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h b/AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h
index 540975ccc95e39264679833c73cb09ad7cb4654d..4cd26f718cf07451935649f105c5b66adaa80511 100755
--- a/AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h
@@ -39,7 +39,7 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
 };
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(BeamPipeDetectorManager, 119561103, 1)
 #endif
 
diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
index 60964ae54c07e03f83948ad59569b94b3718f0b2..87f8b8aa5b4f7fb06561e67af728cd164db2b29e 100644
--- a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
                           DetectorDescription/GeoModel/GeoModelKernel
                           DetectorDescription/GeoModel/GeoModelUtilities
                           PRIVATE
-                          Control/CLIDSvc
                           Control/SGTools
                           Control/StoreGate
                           Control/AthenaKernel
diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx b/AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx
index c9c8d9e3376c8581a192580160099cc4a3850787..a43f42349b477dca5c8fdf80664ab8f37ab3c549 100755
--- a/AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx
@@ -15,7 +15,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"
-#include "CLIDSvc/tools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
 BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type,