diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
index e481d1c23ad8e626a320bcd17bdca0cd3909a23c..6fa74fd3844b2ed02ab00c70d874d6c3233666e9 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
@@ -9,7 +9,6 @@ atlas_subdir( CaloIdCnv )
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloIdentifier
                           Control/AthenaKernel
-                          Control/SGTools
                           DetectorDescription/DetDescrCnvSvc
                           PRIVATE
                           Control/StoreGate
@@ -20,7 +19,7 @@ atlas_depends_on_subdirs( PUBLIC
 # Component(s) in the package:
 atlas_add_component( CaloIdCnv
                      src/*.cxx
-                     LINK_LIBRARIES CaloIdentifier AthenaKernel SGTools DetDescrCnvSvcLib StoreGateLib SGtests IdDictDetDescr Identifier GaudiKernel )
+                     LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib SGtests IdDictDetDescr Identifier GaudiKernel )
 
 # Install files from the package:
 atlas_install_headers( CaloIdCnv )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc
index 19334fd4759a55a2d585ff0337a2ac3c0faf4179..881b8a3b0ce5dd5afac433c9dc623765dbd4b844 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -11,7 +11,7 @@
  */
 
 
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "AthenaKernel/errorcheck.h"
 
 
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx
index c3e9aa190618a6c0b7c0e0fa9e0e8e1b2f69e3fb..4e83551ecb5e4b559e57a64d788d21337448c2c0 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -15,7 +15,7 @@
 #include "IdDictDetDescr/IdDictManager.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "SGTools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "Identifier/IdHelper.h"
 #include "AthenaKernel/IClassIDSvc.h"
 #include "AthenaKernel/errorcheck.h"