diff --git a/Control/StoreGate/StoreGate/DataHandle.h b/Control/StoreGate/StoreGate/DataHandle.h
index e19a0ddea97a5073d39c0166401760d3cfcadbdd..a10e18499d22a7d92dfa66daa9a541471d2df75c 100644
--- a/Control/StoreGate/StoreGate/DataHandle.h
+++ b/Control/StoreGate/StoreGate/DataHandle.h
@@ -10,10 +10,10 @@
 #ifndef STOREGATE_DATAHANDLE_H
 #define STOREGATE_DATAHANDLE_H
 
-#include "SGTools/DataBucket.h"
-#include "SGTools/ProxyMap.h"
+#include "AthenaKernel/DataBucket.h"
 #include "AthenaKernel/IResetable.h"
 #include "AthenaKernel/IProxyDict.h"
+#include "SGTools/ProxyMap.h"
 #include "SGTools/DataProxy.h"
 #include "SGTools/DataHandleBase.h"
 #include <iterator>
diff --git a/Control/StoreGate/StoreGate/DataHandle.icc b/Control/StoreGate/StoreGate/DataHandle.icc
index e389d8536443c22b48bbafd059325ba5f511c2b2..050326cc38a91d702771645bc868c17e6b413b7e 100644
--- a/Control/StoreGate/StoreGate/DataHandle.icc
+++ b/Control/StoreGate/StoreGate/DataHandle.icc
@@ -1,13 +1,13 @@
 /* -*- C++ -*- */
 
 /*
-  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 STOREGATE_DATAHANDLE_ICC
 #define STOREGATE_DATAHANDLE_ICC
 
-#include "SGTools/DataBucketBase.h"
+#include "AthenaKernel/DataBucketBase.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CONSTRUCTORS
diff --git a/Control/StoreGate/StoreGate/ReadHandle.h b/Control/StoreGate/StoreGate/ReadHandle.h
index 2e5cc957a7f3d9f8df5990b0edb8e1b3236d7019..8ae39d142b2743087deaa1961184d173663b8bbe 100644
--- a/Control/StoreGate/StoreGate/ReadHandle.h
+++ b/Control/StoreGate/StoreGate/ReadHandle.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ReadHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
@@ -19,7 +19,7 @@
 #include "StoreGate/VarHandleBase.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "StoreGate/WriteHandleKey.h"
-#include "SGTools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "GaudiKernel/EventContext.h"
 #include <string>
 
diff --git a/Control/StoreGate/StoreGate/ReadHandle.icc b/Control/StoreGate/StoreGate/ReadHandle.icc
index 11e4a71c12de951309c6d4991f475fe5bad7445e..6344f0d9ce494d6576f9a7a1392d471154faa5a8 100644
--- a/Control/StoreGate/StoreGate/ReadHandle.icc
+++ b/Control/StoreGate/StoreGate/ReadHandle.icc
@@ -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
 */
 
 // $Id: ReadHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -15,7 +15,7 @@
 
 
 #include "StoreGate/exceptions.h"
-#include "SGTools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include <stdexcept>
 
 
diff --git a/Control/StoreGate/StoreGate/ReadHandleKey.h b/Control/StoreGate/StoreGate/ReadHandleKey.h
index bda5e6e89df14efe6fec0eb11d419f5b7d26be96..6ff0e105e6e89cd416df52e72ebad7293f09c93c 100644
--- a/Control/StoreGate/StoreGate/ReadHandleKey.h
+++ b/Control/StoreGate/StoreGate/ReadHandleKey.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -18,7 +18,7 @@
 
 
 #include "StoreGate/VarHandleKey.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 namespace SG {
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h
index dddb9177f89e37d73a12c7b23ce5ec4aace46fda..dad4274b1ebb5776c5a48c023a025b303ebb54f7 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.h
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 
 /*
-  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 STOREGATE_STOREGATESVC_H
@@ -10,7 +10,7 @@
 //FIXME the CLASS_DEF header is not needed here but was added to work around
 //bad include statements in client code: when using CLASS_DEF put the
 //include below in your header file!
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 //HIVE wrapper implementation
 //base classes
@@ -1098,13 +1098,13 @@ public:
   }  
 
   /// DEPRECATED put a dobj pointer in a bucket as appropriate
-  /// see tools/StorableConversion.h for replacement
+  /// see AthenaKernel/StorableConversion.h for replacement
   template <typename T>
   static 
   DataObject* SG_DEPRECATED asStorable(T* pDObj);
 
   /// DEPRECATED gets a dobj pointer from a bucket as appropriate
-  /// see tools/StorableConversion.h for replacement
+  /// see AthenaKernel/StorableConversion.h for replacement
   template <typename T>
   static 
   bool SG_DEPRECATED fromStorable(DataObject* pObject, T*& pData);
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.icc b/Control/StoreGate/StoreGate/StoreGateSvc.icc
index d54b3bf394d0acfb3b290458154de26e82716a62..3b3829fe3a520973c98f2d9595ccf48fef6f7cc7 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.icc
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.icc
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file StoreGateSvc.icc
@@ -1068,14 +1068,14 @@ StoreGateSvc::retrieve(const DataHandle<T>& chbegin,
 }
 
 /// DEPRECATED put a dobj pointer in a bucket as appropriate
-/// see tools/StorableConversion.h for replacement
+/// see AthenaKernel/StorableConversion.h for replacement
 template <typename T>
 DataObject* 
 StoreGateSvc::asStorable(T* pDObj) {
   return SG::asStorable(pDObj);
 }
 /// DEPRECATED gets a dobj pointer from a bucket as appropriate
-/// see tools/StorableConversion.h for replacement
+/// see AthenaKernel/StorableConversion.h for replacement
 template <typename T> 
 bool 
 StoreGateSvc::fromStorable(DataObject* pObject, T*& pData) {
diff --git a/Control/StoreGate/StoreGate/UpdateHandle.icc b/Control/StoreGate/StoreGate/UpdateHandle.icc
index 378ac3760000fb64f38abf89ae3eb37e6d2d048b..ae5ce6992ee7acaf2520b9cd1a34d6118c5c259d 100644
--- a/Control/StoreGate/StoreGate/UpdateHandle.icc
+++ b/Control/StoreGate/StoreGate/UpdateHandle.icc
@@ -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
 */
 
 // $Id: UpdateHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -15,7 +15,7 @@
 
 
 #include "StoreGate/exceptions.h"
-#include "SGTools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include <stdexcept>
 
 
diff --git a/Control/StoreGate/StoreGate/UpdateHandleKey.h b/Control/StoreGate/StoreGate/UpdateHandleKey.h
index 127b643dadc5e206f21e17c712e3aacc9e05cc19..db701c9d43505355ad940626f0456b271024aabf 100644
--- a/Control/StoreGate/StoreGate/UpdateHandleKey.h
+++ b/Control/StoreGate/StoreGate/UpdateHandleKey.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -18,7 +18,7 @@
 
 
 #include "StoreGate/VarHandleKey.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 namespace SG {
diff --git a/Control/StoreGate/StoreGate/VarHandleBase.h b/Control/StoreGate/StoreGate/VarHandleBase.h
index 618ddbdef21f95d9b845d8f1b645e2d89b632d44..6654a9d29cb726547c7af617c95fe0f9d6d461a4 100644
--- a/Control/StoreGate/StoreGate/VarHandleBase.h
+++ b/Control/StoreGate/StoreGate/VarHandleBase.h
@@ -24,13 +24,13 @@
 #include "AthenaKernel/IProxyDict.h"
 #include "AthenaKernel/IResetable.h"
 #include "AthenaKernel/StoreID.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/EventContext.h"
 
 // SGTools includes
 #include "SGTools/DataProxy.h"
 #include "SGTools/ProxyMap.h"
-#include "SGTools/StorableConversions.h"
 #include "SGTools/BuiltinsClids.h"
 #include "SGTools/StlVectorClids.h"
 #include "SGTools/StlMapClids.h"
@@ -600,7 +600,7 @@ namespace SG {
 } /* namespace SG */
 
 // For the ConditionHandles
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/CondCont.h"
 CLASS_DEF( CondContBase , 34480459 , 1 )
 
diff --git a/Control/StoreGate/StoreGate/WriteHandle.icc b/Control/StoreGate/StoreGate/WriteHandle.icc
index 81502357d36077883df34c058aeff7660921461a..29b3e2e27aa4b46cbf791b79ef23132dd86c21bc 100644
--- a/Control/StoreGate/StoreGate/WriteHandle.icc
+++ b/Control/StoreGate/StoreGate/WriteHandle.icc
@@ -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
 */
 
 // $Id: WriteHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -15,7 +15,7 @@
 
 
 #include "StoreGate/exceptions.h"
-#include "SGTools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "AthenaKernel/errorcheck.h"
 #include <stdexcept>
 
diff --git a/Control/StoreGate/StoreGate/WriteHandleKey.h b/Control/StoreGate/StoreGate/WriteHandleKey.h
index 29691104e2697d867dc15a85d9d7a80e43979db0..cb7b4d809187ccf7d161bdb1cdad75c6c3def172 100644
--- a/Control/StoreGate/StoreGate/WriteHandleKey.h
+++ b/Control/StoreGate/StoreGate/WriteHandleKey.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -18,7 +18,7 @@
 
 
 #include "StoreGate/VarHandleKey.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 namespace SG {
diff --git a/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
index 9e4d6896715d27f1b9d366c0fbac07951112d9b5..47b5bacef723f0a32b88f999dc8f8a118defaada 100644
--- a/Control/StoreGate/StoreGate/tools/SGImplSvc.h
+++ b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 
 /*
-  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 STOREGATE_SGIMPLSVC_H
@@ -10,7 +10,7 @@
 //FIXME the CLASS_DEF header is not needed here but was added to work around
 //bad include statements in client code: when using CLASS_DEF put the
 //include below in your header file!
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 //base classes
 #include "GaudiKernel/IIncidentListener.h"
diff --git a/Control/StoreGate/StoreGate/tools/StorableConversions.h b/Control/StoreGate/StoreGate/tools/StorableConversions.h
deleted file mode 100644
index a3c491a858f5b7a813f88344f0f65138255ccf02..0000000000000000000000000000000000000000
--- a/Control/StoreGate/StoreGate/tools/StorableConversions.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- C++ -*- */
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef STOREGATE_TOOLS_STORABLECONVERSIONS_H
-# define STOREGATE_TOOLS_STORABLECONVERSIONS_H
-
-/** @file StorableConversions.h
- * @brief  TEMPORARY forwarding to SGTools
- * @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration
- *$Id: StorableConversions.h,v 1.7 2003-04-02 23:12:21 calaf Exp $      
- */
-# warning deprecated include file: forwarding to SGTools/StorableConversions.h
-#ifndef SGTOOLS_STORABLECONVERSIONS_H
-# include "SGTools/StorableConversions.h"
-#endif
-
-#endif // TOOLS_STORABLECONVERSIONS_H
diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
index 243da2c1452424298b1e8920d700c83fe156c212..3735b927820e76b9c8b94ddd27abb1354617992c 100644
--- a/Control/StoreGate/src/SGImplSvc.cxx
+++ b/Control/StoreGate/src/SGImplSvc.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 <algorithm>
@@ -32,7 +32,7 @@
 #include "GaudiKernel/StatusCode.h"
 #include "GaudiKernel/DataHistory.h"
 #include "SGTools/CurrentEventStore.h"
-#include "SGTools/DataBucketBase.h"
+#include "AthenaKernel/DataBucketBase.h"
 #include "SGTools/DataProxy.h"
 #include "SGTools/DataStore.h"
 #include "SGTools/StringPool.h"
diff --git a/Control/StoreGate/src/VarHandleBase.cxx b/Control/StoreGate/src/VarHandleBase.cxx
index 3fc19320d3eeb2341c5a9833bc10c7d205ab1aa3..cee33ccf8b5e5f59492f8694af72ca8200a9d9d4 100644
--- a/Control/StoreGate/src/VarHandleBase.cxx
+++ b/Control/StoreGate/src/VarHandleBase.cxx
@@ -17,8 +17,8 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "StoreGate/exceptions.h"
 
-#include "SGTools/DataBucketBase.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/DataBucketBase.h"
+#include "AthenaKernel/StorableConversions.h"
 
 // fwk includes
 #include "GaudiKernel/MsgStream.h"
diff --git a/Control/StoreGate/test/ActiveStore_test.cxx b/Control/StoreGate/test/ActiveStore_test.cxx
index cce4f36844441d6cd1e89346fd4563bb624c81d1..b0be54800403b1d88d07869a55adb7c5627e501f 100644
--- a/Control/StoreGate/test/ActiveStore_test.cxx
+++ b/Control/StoreGate/test/ActiveStore_test.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
 */
 
 /***************************************************************************
@@ -35,7 +35,7 @@ public:
 };
 
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(Foo, 8101, 1)
 
 int main() {
diff --git a/Control/StoreGate/test/CondHandleKeyArray_test.cxx b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
index a0e2b049f298bbf0e6037e0a2e9934bd3f9264e7..b0bff7968bb4b9a10ceb63f00d9b76a891437875 100644
--- a/Control/StoreGate/test/CondHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
@@ -12,8 +12,8 @@
 #include "StoreGate/CondHandleKeyArray.h"
 #include "StoreGate/exceptions.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "SGTools/DataProxy.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
diff --git a/Control/StoreGate/test/DataHandle_test.cxx b/Control/StoreGate/test/DataHandle_test.cxx
index c5678b80d6fe74c6e11c20b11305949858119144..37bfc845092dc3c87715cdb3c92bddbcaacf4781 100644
--- a/Control/StoreGate/test/DataHandle_test.cxx
+++ b/Control/StoreGate/test/DataHandle_test.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 "TestTools/initGaudi.h"
@@ -37,8 +37,8 @@ typedef std::list<int> IntList;
  * $Id: DataHandle_test.cxx,v 1.15 2008-05-22 22:52:12 calaf Exp $
  ***************************************************************************/
 
-#include "SGTools/CLASS_DEF.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/StorableConversions.h"
 CLASS_DEF(IntList, 8001, 3)
 CLASS_DEF(MyDataObj, 8000, 1)
 
diff --git a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
index 1ec05060abfea64e8eb94af42cdcd1ee3835f337..5bd8eb508f10b6c64fa491630e70e25a2a49aec2 100644
--- a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
@@ -13,7 +13,7 @@
 
 #undef NDEBUG
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "StoreGate/ReadDecorHandleKeyArray.h"
 #include "TestTools/initGaudi.h"
 #include <cassert>
diff --git a/Control/StoreGate/test/ReadDecorHandle_test.cxx b/Control/StoreGate/test/ReadDecorHandle_test.cxx
index 9ffefe508e5dffff0ecd7efd88ad379bb42550a1..abc58278a36b67a0b0488c71710a91bc4805f1de 100644
--- a/Control/StoreGate/test/ReadDecorHandle_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandle_test.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.
  */
 
 // $Id$
@@ -19,7 +19,7 @@
 #include "AthContainers/AuxTypeRegistry.h"
 #include "AthContainers/AuxStoreInternal.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/errorcheck.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
diff --git a/Control/StoreGate/test/ReadHandle_test.cxx b/Control/StoreGate/test/ReadHandle_test.cxx
index 9138d6ddfc0293879e56a641355b6c238f587f22..a84d21e4b107ea3523a76a176c413319a5219534 100644
--- a/Control/StoreGate/test/ReadHandle_test.cxx
+++ b/Control/StoreGate/test/ReadHandle_test.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
 */
 
 // $Id$
@@ -16,7 +16,7 @@
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/exceptions.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
 #include "AthenaKernel/errorcheck.h"
diff --git a/Control/StoreGate/test/SGHive_test.cxx b/Control/StoreGate/test/SGHive_test.cxx
index 9e91026a995568b07fd030b796e92c08f7709a3f..e0262012be75fdc18622aeef652b260d9ce6f4c1 100644
--- a/Control/StoreGate/test/SGHive_test.cxx
+++ b/Control/StoreGate/test/SGHive_test.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
 */
 
 /***************************************************************************
@@ -36,7 +36,7 @@ private:
 };
 }
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(SG::Foo, 81010, 1)
   
 
diff --git a/Control/StoreGate/test/SGIterator_test.cxx b/Control/StoreGate/test/SGIterator_test.cxx
index 28f3e5a3a4f0213b3828f3c8d5909561d2d2158d..ebe523b287140839dd5318cea2459712dc148c8e 100644
--- a/Control/StoreGate/test/SGIterator_test.cxx
+++ b/Control/StoreGate/test/SGIterator_test.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
 */
 
 #undef NDEBUG
@@ -9,7 +9,7 @@
 #include "TestTools/expect_exception.h"
 #include "SGTools/TransientAddress.h"
 #include "SGTools/DataProxy.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 #include <algorithm>
 #include <cassert>
@@ -33,7 +33,7 @@ typedef std::list<int> IntList;
  * $Id: SGIterator_test.cxx,v 1.1 2008-09-26 23:37:53 calaf Exp $
  ***************************************************************************/
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(IntList, 8001, 3)
 CLASS_DEF(MyDataObj, 8000, 1)
 
diff --git a/Control/StoreGate/test/SGTiming_test_genV.pl b/Control/StoreGate/test/SGTiming_test_genV.pl
index ab5980e747efe1e92a4fcc123ac564ea07e2d8c6..5eac7379b4a820a25d6d26ec9b80dad4f1e950be 100755
--- a/Control/StoreGate/test/SGTiming_test_genV.pl
+++ b/Control/StoreGate/test/SGTiming_test_genV.pl
@@ -50,7 +50,7 @@ if ($DO_OBJGEN) {
         print OUT "$X\n";
     }
     
-    print OUT "#include \"SGTools/CLASS_DEF.h\"\n";
+    print OUT "#include \"AthenaKernel/CLASS_DEF.h\"\n";
     
     print "generating $n CLIDs: ";
     $i = 1;
diff --git a/Control/StoreGate/test/SGTiming_test_objs.h b/Control/StoreGate/test/SGTiming_test_objs.h
index 601c1555ebe27d38e753f00c0be784bf70344186..ff13d90a60429051f30a6d20b12797e60f4af565 100644
--- a/Control/StoreGate/test/SGTiming_test_objs.h
+++ b/Control/StoreGate/test/SGTiming_test_objs.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 STOREGATE_SGTEST_OBJS_H
@@ -224,7 +224,7 @@ private:
    int m_i{0};
 };
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( SGTObj_ATNGGE , 146467055 , 1 )
 CLASS_DEF( SGTObj_BJBLBR , 10968191 , 1 )
 CLASS_DEF( SGTObj_BKTYOQ , 111600905 , 1 )
diff --git a/Control/StoreGate/test/SGtests.cxx b/Control/StoreGate/test/SGtests.cxx
index 21e7b7ec691a5acad0e1e883c5124a73b9c0dd3d..e1aab95f9d8083c77d1c2c0f57449f85c327e28a 100644
--- a/Control/StoreGate/test/SGtests.cxx
+++ b/Control/StoreGate/test/SGtests.cxx
@@ -90,7 +90,7 @@ SG_BASE (D1, B1);
 
 
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(Base, 8100, 1)
 CLASS_DEF(Foo, 8101, 1)
 CLASS_DEF(Bar, 8107, 1)
diff --git a/Control/StoreGate/test/UpdateHandle_test.cxx b/Control/StoreGate/test/UpdateHandle_test.cxx
index 14b5a3e898795e2b742619a7e575a9085c4f671e..94ebb633746c7dc88b582243bc94af61a73eebd6 100644
--- a/Control/StoreGate/test/UpdateHandle_test.cxx
+++ b/Control/StoreGate/test/UpdateHandle_test.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
 */
 
 // $Id$
@@ -15,7 +15,7 @@
 #include "StoreGate/UpdateHandle.h"
 #include "StoreGate/exceptions.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
 #include "AthenaKernel/errorcheck.h"
diff --git a/Control/StoreGate/test/VarHandleBase_test.cxx b/Control/StoreGate/test/VarHandleBase_test.cxx
index f8a56b5b60524beaf48b2456752c5c6cb6395885..d5326ee113bcf5ec08f68c1007b64a1b00d0dcae 100644
--- a/Control/StoreGate/test/VarHandleBase_test.cxx
+++ b/Control/StoreGate/test/VarHandleBase_test.cxx
@@ -15,11 +15,11 @@
 #include "StoreGate/VarHandleBase.h"
 #include "StoreGate/exceptions.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/StorableConversions.h"
 #include "SGTools/DataProxy.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "AthenaKernel/errorcheck.h"
 #include "AthenaKernel/ExtendedEventContext.h"
 #include "GaudiKernel/ThreadLocalContext.h"
diff --git a/Control/StoreGate/test/VarHandles_test.cxx b/Control/StoreGate/test/VarHandles_test.cxx
index 4100d34db9307367b344c882f072f5d59544bd36..e0cadbb4a79ba2d1ef4fe47bba2db7bef4ce0ba7 100644
--- a/Control/StoreGate/test/VarHandles_test.cxx
+++ b/Control/StoreGate/test/VarHandles_test.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
 */
 
 #undef NDEBUG
@@ -46,7 +46,7 @@ typedef std::list<int> IntList;
  * $Id: VarHandles_test.cxx 781577 2016-11-01 14:41:16Z ssnyder $
  ***************************************************************************/
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(IntList, 8001, 3)
 CLASS_DEF(MyDataObj, 8000, 1)
 
diff --git a/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
index b62874a9674e267af1871a42e0b2e4f9ea944468..0fb732f000965010f0e163da4bd27ad339c9098e 100644
--- a/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandleKeyArray_test.cxx
@@ -13,7 +13,7 @@
 
 #undef NDEBUG
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "StoreGate/WriteDecorHandleKeyArray.h"
 #include "TestTools/initGaudi.h"
 #include <cassert>
diff --git a/Control/StoreGate/test/WriteDecorHandle_test.cxx b/Control/StoreGate/test/WriteDecorHandle_test.cxx
index 98eb7dc8b2b090b1df672a08f5b326be694aa678..97838022445e2d230610d12135800539b0e7fec4 100644
--- a/Control/StoreGate/test/WriteDecorHandle_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandle_test.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.
  */
 
 // $Id$
@@ -19,7 +19,7 @@
 #include "AthContainers/AuxTypeRegistry.h"
 #include "AthContainers/AuxStoreInternal.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/errorcheck.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"
diff --git a/Control/StoreGate/test/WriteHandle_test.cxx b/Control/StoreGate/test/WriteHandle_test.cxx
index 7de7d10b3789d91df267688c2e2d31c4038a1360..34ae4f047207c341b8b8361278cffc5c81cda4d6 100644
--- a/Control/StoreGate/test/WriteHandle_test.cxx
+++ b/Control/StoreGate/test/WriteHandle_test.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
 */
 
 // $Id$
@@ -16,8 +16,8 @@
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/exceptions.h"
 #include "SGTools/TestStore.h"
-#include "SGTools/CLASS_DEF.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "SGTools/DataProxy.h"
 #include "TestTools/initGaudi.h"
 #include "TestTools/expect_exception.h"