diff --git a/InnerDetector/InDetRawEvent/InDetRawData/CMakeLists.txt b/InnerDetector/InDetRawEvent/InDetRawData/CMakeLists.txt
index f6662637a0ef39ad18e46d225f29c77998040aac..2c1dd0d15c82c74e113e7c81f21dbdd7afc54ed3 100644
--- a/InnerDetector/InDetRawEvent/InDetRawData/CMakeLists.txt
+++ b/InnerDetector/InDetRawEvent/InDetRawData/CMakeLists.txt
@@ -9,8 +9,7 @@ atlas_subdir( InDetRawData )
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthContainers
                           Control/AthLinks
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/Identifier
                           Event/EventContainers
                           PRIVATE
@@ -24,12 +23,12 @@ atlas_add_library( InDetRawData
                    src/*.cxx
                    PUBLIC_HEADERS InDetRawData
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthContainers AthLinks SGTools Identifier EventContainers
+                   LINK_LIBRARIES AthenaKernel AthContainers AthLinks Identifier EventContainers
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
 
 atlas_add_dictionary( InDetRawDataDict
                       InDetRawData/InDetRawDataCLASS_DEF.h
                       InDetRawData/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks SGTools Identifier GaudiKernel InDetRawData EventContainers )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks Identifier GaudiKernel InDetRawData EventContainers )
 
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetRawDataContainer.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetRawDataContainer.h
index 13f828ed9500d5a13fb4eed2a6a1887b7ad2c08c..06679175767d9d12f912010a444c8906f85a0729 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetRawDataContainer.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetRawDataContainer.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
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -20,7 +20,7 @@
 #include "EventContainers/IdentifiableContainer.h"
 //Needed Classes
 #include "InDetRawData/InDetRawDataCollection.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 template<class CollectionT>
 class InDetRawDataContainer 
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetTimeCollection.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetTimeCollection.h
index 038be00ec4f337dcb544c7c287710a0670091445..eb4398e12ffa5250af05ee381d4fa2dd3db0df62 100644
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetTimeCollection.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/InDetTimeCollection.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 INDETRAWDATA_INDETTIMECOLLECTION_H
 #define INDETRAWDATA_INDETTIMECOLLECTION_H
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 typedef DataVector< std::pair<uint32_t,  unsigned int > > InDetTimeCollection;
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Collection.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Collection.h
index f2585cbd08fd3e2ab163e9a99503ff712bad383f..14f8f6ef063a8e8af02bd5ca9ddbddac435b4fda 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Collection.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Collection.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_PIXELRDO_COLLECTION_H
 # define INDETRAWDATA_PIXELRDO_COLLECTION_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/Pixel1RawData.h"
 #include "InDetRawData/PixelTB04RawData.h"
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Container.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Container.h
index dbc314d23cdde08bc34f9c635f9a8ef0cdc66e4d..5fb3a590e203f6b1708c605934a16c98bb0bc073 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Container.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/PixelRDO_Container.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_PIXELRDO_CONTAINER_H
 # define INDETRAWDATA_PIXELRDO_CONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataContainer.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/PixelRDORawData.h"
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Collection.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Collection.h
index 7bd57976d35429c0490f3aff75272002120e9d46..01d11ca6d7a478e8151ebdc0c7530414942c8a97 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Collection.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Collection.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_SCT_RDO_COLLECTION_H
 # define INDETRAWDATA_SCT_RDO_COLLECTION_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/SCT1_RawData.h"
 #include "InDetRawData/SCT_TB03_RawData.h"
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Container.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Container.h
index 4d9bf569e611841e71bdfb8908fec9bf2746d435..5b40c546fb3fe0f266fcc481f67624e1e87486f1 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Container.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/SCT_RDO_Container.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_SCT_RDO_CONTAINER_H
 # define INDETRAWDATA_SCT_RDO_CONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataContainer.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/SCT_RDORawData.h"
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Collection.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Collection.h
index 0b70ba4b62572ecbf5161a73208b2963577ef04c..d38a1c33322d8ec7476d6be2a3be658cd07bb254 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Collection.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Collection.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_TRT_RDO_COLLECTION_H
 # define INDETRAWDATA_TRT_RDO_COLLECTION_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/TRT_LoLumRawData.h"
 #include "InDetRawData/TRT_TB04_RawData.h"
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Container.h b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Container.h
index bbe162dd630d7ef9705d90926ceb0f9091748b9c..a63b5fc2f15a123098f161a337182294d1edc069 100755
--- a/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Container.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/InDetRawData/TRT_RDO_Container.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
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 #ifndef INDETRAWDATA_TRT_RDO_CONTAINER_H
 # define INDETRAWDATA_TRT_RDO_CONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetRawData/InDetRawDataContainer.h"
 #include "InDetRawData/InDetRawDataCollection.h"
 #include "InDetRawData/TRT_RDORawData.h"