diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt b/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt
index 1913081ff44708e035457212af00e992432b0e12..f27f17e594ae1cfae4a247b21446be9e086a6d81 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( IOVDbTestConditions )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/AthenaPOOL/AthenaPoolUtilities )
 
 # External dependencies:
@@ -23,12 +22,12 @@ atlas_add_library( IOVDbTestConditions
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} SGTools AthenaPoolUtilities
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel AthenaPoolUtilities
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( IOVDbTestConditionsDict
                       IOVDbTestConditions/IOVDbTestConditionsDict.h
                       IOVDbTestConditions/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} SGTools AthenaPoolUtilities IOVDbTestConditions )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaPoolUtilities IOVDbTestConditions )
 
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h
index 77ceda9a506bb483a98f9684c3d7166612b3fd78..042f9cf6131e33ae5decd0f4437d8f34598634d4 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.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
 */
 
 /***************************************************************************
@@ -14,7 +14,7 @@
 #ifndef IOVDBTEST_AMDB_CORRECTION_H
 #define IOVDBTEST_AMDB_CORRECTION_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CLHEP/Geometry/Point3D.h"
 
 class IOVDbTestAmdbCorrection{
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h
index 2a577c3392043ec60d62b789423096e81aa9bbf0..a24f72aed893a87b27919cba59b2dd7c259e9638 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.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 @@
 //<doc><file>	$Id: IOVDbTestMDTEleMap.h,v 1.5 2006-03-26 17:26:30 schaffer Exp $
 //<version>	$Name: not supported by cvs2svn $
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include<string>
 
 #define DIGIT 0
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h
index e91ffd319cbb932e79da4e8f485ec306e6f18cbe..308d235489c29ac3185cb9171e94d4b78d635a7c 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.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 IOVDBTESTCONDITIONS_IOVDBTESTMDTELEMAPCOLL_H
@@ -7,7 +7,7 @@
 
 #include "AthenaPoolUtilities/CondMultChanCollection.h"
 #include "IOVDbTestConditions/IOVDbTestMDTEleMap.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 /**This typedef represents a collection of IOVDbTestMDTEleMap objects. 
 It is a DataVector. It can be saved