diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/CMakeLists.txt b/Trigger/TrigTools/TrigT2CaloCalibration/CMakeLists.txt
index 9b7b2ade0cd02c9df156442ff05eaefac7f79f0b..c3d4c42b7004a51ac43167da42bafc1c5e765395 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/CMakeLists.txt
@@ -12,8 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloGeoHelpers
                           Calorimeter/CaloRec
                           Control/AthenaBaseComps
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Control/StoreGate
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Event/xAOD/xAODTrigCalo
@@ -21,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Trigger/TrigEvent/TrigCaloEvent
                           PRIVATE
                           Calorimeter/CaloDetDescr
-                          Control/AthenaKernel
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           Database/RegistrationServices
                           Event/EventInfo )
@@ -34,25 +32,25 @@ atlas_add_library( TrigT2CaloCalibrationLib
                    src/*.cxx
                    PUBLIC_HEADERS TrigT2CaloCalibration
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES CaloConditions CaloGeoHelpers AthenaBaseComps SGTools AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloClusterCorrectionLib CaloRecLib StoreGateLib SGtests CaloDetDescrLib AthenaPoolCnvSvcLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel EventInfo )
+                   LINK_LIBRARIES CaloConditions CaloGeoHelpers AthenaBaseComps AthenaKernel AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloClusterCorrectionLib CaloRecLib StoreGateLib SGtests CaloDetDescrLib AthenaPoolCnvSvcLib
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventInfo )
 
 atlas_add_component( TrigT2CaloCalibration
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps SGTools StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
 
 atlas_add_poolcnv_library( TrigT2CaloCalibrationPoolCnv
                            src/*.cxx
                            FILES TrigT2CaloCalibration/T2CaloJetCalib_dBObj.h
                            INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                           LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps SGTools StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
+                           LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
 
 atlas_add_dictionary( TrigT2CaloCalibrationDict
                       TrigT2CaloCalibration/TrigT2CaloCalibrationDict.h
                       TrigT2CaloCalibration/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps SGTools StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloClusterCorrectionLib CaloConditions CaloGeoHelpers CaloRecLib AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities xAODTrigCalo GaudiKernel TrigCaloEvent CaloDetDescrLib AthenaKernel AthenaPoolCnvSvcLib EventInfo TrigT2CaloCalibrationLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/TrigT2CaloCalibration/T2CaloJetCalib_dBObj.h b/Trigger/TrigTools/TrigT2CaloCalibration/TrigT2CaloCalibration/T2CaloJetCalib_dBObj.h
index 08696dd0dda00b6dffc4808e15ec04a0cf36a776..b9ed207740463eb2ab47fb5d793f5f1ae93d3b5f 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/TrigT2CaloCalibration/T2CaloJetCalib_dBObj.h
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/TrigT2CaloCalibration/T2CaloJetCalib_dBObj.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef T2CALOJETCALIB_DBOBJ_H
 #define T2CALOJETCALIB_DBOBJ_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include<string>
 
 /** @class T2CaloJetCalib_dBObj