diff --git a/Control/StoreGateBindings/src/PyThinning.cxx b/Control/StoreGateBindings/src/PyThinning.cxx
index 88bfa41f458cc8957a7bec2634e5747544862f73..2eb8bf473443262a42735a7dc994369749845700 100755
--- a/Control/StoreGateBindings/src/PyThinning.cxx
+++ b/Control/StoreGateBindings/src/PyThinning.cxx
@@ -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
 */
 
 #include "Python.h"
@@ -13,12 +13,10 @@
 #include "GaudiKernel/DataObject.h"
 #include "AthenaKernel/IThinningHdlr.h"
 #include "AthenaKernel/ISlimmingHdlr.h"
+#include "AthenaKernel/DataBucketBase.h"
+#include "AthenaKernel/BaseInfo.h"
 #include "AthenaKernel/IThinningSvc.h"
 
-// SGTools includes
-#include "SGTools/DataBucketBase.h"
-#include "SGTools/BaseInfo.h"
-
 // ROOT includes
 #include "TClass.h"
 #include "TClassRef.h"
diff --git a/Control/StoreGateBindings/src/SgPyDataModel.h b/Control/StoreGateBindings/src/SgPyDataModel.h
index 8bf568b65257ddda6289b4a8c669a01719fdfb7c..f0cec6844de96a5adcc21b0f02338b0bbd519131 100644
--- a/Control/StoreGateBindings/src/SgPyDataModel.h
+++ b/Control/StoreGateBindings/src/SgPyDataModel.h
@@ -18,13 +18,11 @@
 #include "GaudiKernel/DataObject.h"
 #include "AthenaKernel/IClassIDSvc.h"
 #include "AthenaKernel/IDictLoaderSvc.h"
+#include "AthenaKernel/DataBucketBase.h"
+#include "AthenaKernel/BaseInfo.h"
 
 extern CLID PyCLID;
 
-// SGTools includes
-#include "SGTools/DataBucketBase.h"
-#include "SGTools/BaseInfo.h"
-
 // ROOT includes
 #include "TClass.h"
 #include "TClassEdit.h"
diff --git a/Control/StoreGateBindings/src/StoreGatePyExt.cxx b/Control/StoreGateBindings/src/StoreGatePyExt.cxx
index d324cb17b787bed5ea26715111c9110975cbd7f0..106bf55d7c5daab2fbd97451a44f562d29d745f9 100755
--- a/Control/StoreGateBindings/src/StoreGatePyExt.cxx
+++ b/Control/StoreGateBindings/src/StoreGatePyExt.cxx
@@ -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
 */
 
 #include "StoreGateBindings/StoreGatePyExt.h"
@@ -14,11 +14,11 @@
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/DataObject.h"
 #include "AthenaKernel/IClassIDSvc.h"
+#include "AthenaKernel/DataBucketBase.h"
+#include "AthenaKernel/BaseInfo.h"
+#include "AthenaKernel/ClassID_traits.h"
 
 // SGTools includes
-#include "SGTools/DataBucketBase.h"
-#include "SGTools/BaseInfo.h"
-#include "SGTools/ClassID_traits.h"
 #include "SGTools/BuiltinsClids.h"
 
 // ROOT includes