diff --git a/TestBeam/TBEventAthenaPool/CMakeLists.txt b/TestBeam/TBEventAthenaPool/CMakeLists.txt
index 80a843e1ba6ff33a5f76d54b3da12b38903df149..138217adcbb2c6980a26d959c4c9fb4e3dae3503 100644
--- a/TestBeam/TBEventAthenaPool/CMakeLists.txt
+++ b/TestBeam/TBEventAthenaPool/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( TBEventAthenaPool )
 atlas_depends_on_subdirs( PUBLIC
                           Database/AthenaPOOL/AthenaPoolUtilities
                           PRIVATE
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           GaudiKernel
                           TestBeam/TBEvent
@@ -19,5 +19,5 @@ atlas_depends_on_subdirs( PUBLIC
 atlas_add_poolcnv_library( TBEventAthenaPoolPoolCnv
                            src/*.cxx
                            FILES TBEvent/TBADCRawCont.h TBEvent/TBBPCCont.h TBEvent/TBBPCRawCont.h TBEvent/TBEventInfo.h TBEvent/TBHitCont.h TBEvent/TBHitPlaneCont.h TBEvent/TBIdentifiedParticle.h TBEvent/TBLArCalibDigitContainer.h TBEvent/TBLArDigitContainer.h TBEvent/TBMWPCCont.h TBEvent/TBMWPCRawCont.h TBEvent/TBPhase.h TBEvent/TBScintillatorCont.h TBEvent/TBScintillatorRawCont.h TBEvent/TBTDC.h TBEvent/TBTDCRawCont.h TBEvent/TBTailCatcher.h TBEvent/TBTailCatcherRaw.h TBEvent/TBTrack.h TBEvent/TBTriggerPatternUnit.h TBEvent/TBTrackInfo.h
-                           LINK_LIBRARIES AthenaPoolUtilities SGTools AthenaPoolCnvSvcLib GaudiKernel TBEvent TBTPCnv )
+                           LINK_LIBRARIES AthenaPoolUtilities AthenaKernel AthenaPoolCnvSvcLib GaudiKernel TBEvent TBTPCnv )
 
diff --git a/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
index dcb91d120d4f233cd4499e4403336b3e01d46178..a9d5bcd9fe4c619317aac320122929e7182725b1 100755
--- a/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBBPCRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
index c9991093a3e73a2ec89e7e770cc88c45770e2cea..cd7d42b4288b078c9fa3bad5429e4e5f20a25037 100755
--- a/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBHitContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
index f4986d0237c9aa28849d767a9e4f5d3f01e79d1e..fc92d25fb0c9c6eb0c6d87f51481f325cdbd213d 100755
--- a/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBHitPlaneContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
index f344f29129624fdd3355de4cedbfa3ed2861f5db..f1e7583631bdaaf8a938ddb1d5cb1f9201986a7d 100755
--- a/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBIdentifiedParticleCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
index 38c4daf054e8b41a69c24a4dd690b50a4acc9b41..379fd8aef95ceb9c104e2d83e72829752f99559b 100755
--- a/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBLArCalibDigitContainerCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
index 0b7f66ad15be58153ef4dd5d9639b3565f5ecf2d..7b99830296d4a0e119869b6e7d342a1e84b02898 100755
--- a/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBMWPCRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
index 2f927a8cbfd7f020902a6ddde7296e6c90e691d0..6f42b25914bbb1209fd8562e7e7ceeee1a8df239 100755
--- a/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBScintillatorRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes
diff --git a/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
index e87b38e848d932e49afa2e254ab736c8f5c8631a..a5537b137e2e58b3296492c448a5cd57fff765b7 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBTailCatcherRawCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes