diff --git a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
index e854e96478fa961edaeb421fc68d3cf1930df47d..3f8b98f691931b9e978855379179be3a3d521084 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
@@ -29,8 +29,6 @@ atlas_depends_on_subdirs(
    LArCalorimeter/LArCabling
    PRIVATE
    Calorimeter/CaloInterface
-   Control/CLIDSvc
-   Control/SGTools
    DetectorDescription/AtlasDetDescr
    DetectorDescription/Identifier
    Event/ByteStreamCnvSvc
@@ -49,7 +47,7 @@ atlas_add_library( LArByteStreamLib
    LArRecConditions LArRecEvent CaloDetDescrLib CaloUtilsLib StoreGateLib
    ByteStreamCnvSvcBaseLib LArRODLib LArRawUtilsLib LArRecUtilsLib LArCablingLib
    ByteStreamCnvSvcLib
-   PRIVATE_LINK_LIBRARIES SGTools AtlasDetDescr Identifier LArRawConditions )
+   PRIVATE_LINK_LIBRARIES AtlasDetDescr Identifier LArRawConditions )
 
 atlas_add_component( LArByteStream
    src/components/*.cxx
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
index 433261bba98a9d382e1a6c36f6c1804665ee52d1..ad84f43c8d184ec1be359edaf87eb14945fe85c4 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h"
@@ -21,7 +21,7 @@
 #include "LArRawEvent/LArAccumulatedCalibDigitContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
index d37117eaeb7a53e82434a8bf088a5cfca15e7f6b..db7e42b94fc682f5f79e0d497ccd17ba0397cba9 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArAccumulatedDigitContByteStreamCnv.h"
@@ -21,7 +21,7 @@
 #include "LArRawEvent/LArAccumulatedDigitContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
index a544a444f453a4d1a4a0200819cf6043d7b48508..1cd8b3e1817900a1ba453786adfd8acef0d337e8 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArCalibDigitContByteStreamCnv.h"
@@ -19,7 +19,7 @@
 #include "LArRawEvent/LArCalibDigitContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
index 7bbe99eb1a9e74136658e84bc67da11460386c0d..d12e94b5758148444204dc98d88478bd5e9afe46 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArDigitContByteStreamCnv.h"
@@ -22,7 +22,7 @@
 #include "LArRawEvent/LArDigitContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
index f165b901ee76d386421d0173400d285253a213a7..911f264ec322f8044f52d02c10d8a81d0c2d1898 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArFebHeaderContByteStreamCnv.h"
@@ -22,7 +22,7 @@
 #include "LArRawEvent/LArFebHeaderContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
index eb4c50dcad106a8440f85979b311717bb79d14ad..5686674e5a4d060f048136fcdceb6d51c9222321 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
@@ -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
 */
 
 #include "LArByteStream/LArRawChannelContByteStreamCnv.h"
@@ -22,7 +22,7 @@
 #include "LArRawEvent/LArDigitContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Tool 
 #include "GaudiKernel/IToolSvc.h"