diff --git a/LArCalorimeter/LArElecCalib/CMakeLists.txt b/LArCalorimeter/LArElecCalib/CMakeLists.txt
index b4fb1ced73423da2f95804d6d17d3022c9fcecd2..18646e099f0393d1dc74a3d251c0d89706e63b06 100644
--- a/LArCalorimeter/LArElecCalib/CMakeLists.txt
+++ b/LArCalorimeter/LArElecCalib/CMakeLists.txt
@@ -9,8 +9,6 @@ atlas_subdir( LArElecCalib )
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloIdentifier
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           DetectorDescription/Identifier
                           GaudiKernel
                           LArCalorimeter/LArIdentifier )
@@ -24,7 +22,7 @@ atlas_add_dictionary( LArElecCalibDict
                       LArElecCalib/LArElecCalibDict.h
                       LArElecCalib/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaKernel SGTools Identifier GaudiKernel LArIdentifier )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaKernel Identifier GaudiKernel LArIdentifier )
 
 # Install files from the package:
 atlas_install_headers( LArElecCalib )
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
index 66dae9af4458f9136a446f7716ea0af58d63d85d..e7ba923a99f43166f4e94aff60392f518b2f732f 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //Dear emacs, this is -*-c++-*-
 #ifndef LARELECCALIB_ILARAUTOCORR_H
 #define LARELECCALIB_ILARAUTOCORR_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArVectorProxy.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
index 51be574a548237911c5ba2095fad0f00a1bf0379..b0b48fb88d3fc4377c71168a71e137f5f2987090 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARCABLEATTENUATION_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
index 7c5e1f1fde5dadeaece03f10b2c723fdfbae70c7..15af1c95c5be1b503e8deac96dbd8728038e95a1 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
@@ -1,12 +1,12 @@
 /*
-  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 LARCONDITIONS_ILARCABLELENGTH_H
 #define LARCONDITIONS_ILARCABLELENGTH_H
 
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
index 61a3137623c70422bae09dfc1b504fc00601ae67..3822a878a7f5ac12293271320998809591c6f27f 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARCALIPULSEPARAMS_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h
index 7b3078d3d01abaa96e9cef55dc639adf8f31ed3c..5414715e7367c35a34c11763ac4defaa76f22858 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.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 LARCONDITIONS_ILARDAC2UA_H
 #define LARCONDITIONS_ILARDAC2UA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
index 157f4b6e7fa07b6350888f5cbdcabb949d954b54..e6bdefd19ac40a705667e7ea55140eb1c3f2b5c9 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARDETCELLPARAMS_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 
 class ILArDetCellParams {
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h
index a38b9a7c5545f3a17d6829a059242ccd27928581..4cf43c45c051081fd94845db0cb05ebe8410852e 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.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 LARCONDITIONS_ILAREMEC_CPHI_H
 #define LARCONDITIONS_ILAREMEC_CPHI_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h
index 3aeca4f3e537bdb89e231708681540c640541f99..e29aa7740631bc0c6d5e0607904e60346d515df1 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.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 LARCONDITIONS_ILAREMEC_HVALPHA_H
 #define LARCONDITIONS_ILAREMEC_HVALPHA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h
index 2520080f87adbac82fd81f016d079de791986243..45dd6c1e6db4dfb023de4ad141557807e6e2a9ea 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.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 LARCONDITIONS_ILAREMEC_HVBETA_H
 #define LARCONDITIONS_ILAREMEC_HVBETA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
index 8bcb2e9944101c2fb086d3e9c024684153fec3a9..5826a64690b53b9b2e504c8e94bdaeb1d094a2b0 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
@@ -1,12 +1,12 @@
 /*
-  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 ILARFEBTIMEOFFSET_H
 #define ILARFEBTIMEOFFSET_H
 
 #include "Identifier/HWIdentifier.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArFEBTimeOffset {
  public:
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h
index b871c57865421ba71533b15a4498d36cab0fbaef..1abbc3542c8ed5002c5032b568f9cf9d85afb2d0 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.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 ILARGLOBALTIMEOFFSET_H
 #define ILARGLOBALTIMEOFFSET_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArGlobalTimeOffset {
  public:
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h
index d33a5966ff1b6f237fe29e28934d3667ecc954af..696e2a1b466eaae13dc7d98662ad4ac6e2220c4a 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.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 LARELECCALIB_ILARH6OSCILLATION_H
 #define LARELECCALIB_ILARH6OSCILLATION_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h
index 5dc2ba4a8d9ecfa198fe53c90588fc06946af4cc..c24e83ada54319f4b48d5d2b837957dda1d2b738 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.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 LARCONDITIONS_ILARHVSCALRCORR_H
 #define LARCONDITIONS_ILARHVSCALRCORR_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h
index 9981a6add6b3e64e5887e1f18ca2254a6c6383bb..429f26d9ca4790e176661d8ba906b5249357028f 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.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 LARCONDITIONS_ILARMINBIAS_H
 #define LARCONDITIONS_ILARMINBIAS_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h
index d4a25ee173d6de3eb2764cdb9f42a2aa3a0c28db..de3af2a52b5ae6587faac33a6e9dbdc1707944bc 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.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 LARCONDITIONS_ILARMINBIASAVERAGE_H
 #define LARCONDITIONS_ILARMINBIASAVERAGE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h
index 8a8179e6ca5f555d7af80c6e9d79ace5cce31e7c..d00e1cd2530d6b064f9c184ff476594b14009f2e 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.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 LARCONDITIONS_ILARMPHYSOVERMCAL_H
 #define LARCONDITIONS_ILARMPHYSOVERMCAL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h
index 315736c43d918771d74d51b6fc205951c1c6f893..acc894823485acb559e055fba319a6efcf94a2bc 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.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 LARELECCALIB_ILARNOISE_H
 #define LARELECCALIB_ILARNOISE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h
index 1dcfb447315ed998c8ae8c20ce4e78784278a391..b495fd625e3e3d20f0e50030c9a2b93625c5f330 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.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 LARELECCALIB_ILAROFC_H
 #define LARELECCALIB_ILAROFC_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArVectorProxy.h"
 #include "Identifier/HWIdentifier.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h
index bd42e4f6db61f4836d21446bf9e9f51c3d05ccb9..6ef1cd620d64513006d3ad8af99f11bf8bb77e36 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.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 LARELECCALIB_ILARPEDESTAL_H
 #define LARELECCALIB_ILARPEDESTAL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h
index f8187936e483de021f116bb512c051afb24881a3..604885dfe4002e65a2939ebaefe6b543fc522978 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.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 LARCONDITIONS_ILARPHYSCALITDIFF_H
 #define LARCONDITIONS_ILARPHYSCALITDIFF_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 
 class Identifier;
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h
index 1c35751c63df522c4a8eacd2b3f0041f5a0df7e6..586c92692e7e124a5504b5c029bfbcada8e1a3a1 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.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 LARCONDITIONS_ILARRAMP_H
 #define LARCONDITIONS_ILARRAMP_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArVectorProxy.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h
index f65875aeb3bec038022abdff7e097137542b5ffd..9ef64980057975b8cede0fdc4edeb0630cba2c20 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.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 LARCONDITIONS_ILARRINJ_H
 #define LARCONDITIONS_ILARRINJ_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h
index 45946c8073a6afe48c850ba2bc2a0acdc4025b1f..dbd9b39368f7a06d9183dfa1620c322bce295d7b 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.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 LARCONDITIONS_ILARSHAPE_H
 #define LARCONDITIONS_ILARSHAPE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArVectorProxy.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
index 6f535e8573c8906e105cd4e2c34d74e50cf84d2c..352ac2bd507ef4ca75f254806f181e389eccfe81 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARTDRIFT_H
@@ -7,7 +7,7 @@
 
 class HWIdentifier;
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArTdrift {
 /** This class defines the interface for accessing Tdrift
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h
index cdec3701fe0dfd7749fb333c357be3d5ba4b9c27..adbbbd856c23c1951e13d8554819d51ecaa9e3d4 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.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 LARCONDITIONS_ILARTSHAPER_H
 #define LARCONDITIONS_ILARTSHAPER_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class Identifier;
 class HWIdentifier;
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
index 93e476e9f5ad3425f8a9f8abe0ba9665dd0eded6..01408d91ded3bddb5a22218e540c195fa8594465 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARWAVEDERIVEDQUANTITIES_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h
index b1353025b6bb429af9aed860d065242351d56fff..60c6b7eedbf3f74df0bd7fbe284eb6e666604569 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.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 LARCONDITIONS_ILARFSAMPL_H
 #define LARCONDITIONS_ILARFSAMPL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h
index b4046e099278910c6946f9bc022bbbd35acab814..d78b4ea7426fa29535b07ad75598a993c37989bb 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.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 LARCONDITIONS_ILARUA2MEV_H
 #define LARCONDITIONS_ILARUA2MEV_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"