diff --git a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
index 2451d9f47163c1a8cb230e1e24939a2e70350d7f..d0acae7ff6e12286dd6fbd7e4c610b20b9fa6100 100644
--- a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
+++ b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "FastCaloSimHit/FastHitConv.h"
@@ -18,7 +18,7 @@
 #include "LArSimEvent/LArHit.h"
 #include "LArSimEvent/LArHitContainer.h"
 #include "PileUpTools/PileUpMergeSvc.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "TileConditions/TileInfo.h"
 #include "TileEvent/TileCellContainer.h"
 #include "TileSimEvent/TileHit.h"
diff --git a/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx b/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
index 852fd1910d620342e50485709add228bf795942f..2a71f22faa117a0ce6521ea8158a38d0b48a7d68 100644
--- a/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
+++ b/Simulation/FastShower/FastCaloSimHit/src/FastHitConvertTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
 #include "LArSimEvent/LArHit.h"
 #include "LArSimEvent/LArHitContainer.h"
 #include "PileUpTools/PileUpMergeSvc.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "TileConditions/TileInfo.h"
 #include "TileEvent/TileCellContainer.h"
 #include "TileSimEvent/TileHit.h"
diff --git a/Simulation/G4Utilities/Geo2G4/src/Geo2G4Builder.cxx b/Simulation/G4Utilities/Geo2G4/src/Geo2G4Builder.cxx
index aa5e8f0bc37d1952288e5b4dc1222d951e673cbe..adaa0810e530fea39cea0f3c69c7681aa96352fc 100644
--- a/Simulation/G4Utilities/Geo2G4/src/Geo2G4Builder.cxx
+++ b/Simulation/G4Utilities/Geo2G4/src/Geo2G4Builder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "Geo2G4Builder.h"
@@ -23,7 +23,6 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/Bootstrap.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
 
 #include "G4ReflectionFactory.hh"
 #include "G4LogicalBorderSurface.hh"
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
index 1186c1899a620e73e934db9ede9fb0c28d7f01c9..b33e60c33b2554e4de3b2cce1bea643b361395b5 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileTOFTool.cxx
@@ -1,10 +1,9 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/ReadHandle.h"
 
 #include "TileCalibAlgs/TileTOFTool.h"
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.icc b/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.icc
index e8ebc3ddb9c7eab0dd6d2c68a95a60bf2ae8d8b1..642f35e3b35e234e2f46422ba1abd40ec00ae4c9 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.icc
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.icc
@@ -1,12 +1,11 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // implementation of TileRawDataContainer 
 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
-#include "StoreGate/StoreGate.h"
 #include "Identifier/IdentifierHash.h"
 #include "TileConditions/TileCablingService.h"
 
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
index eaa715aa984e4ad39e2783bc335f5c4d1516c21a..9818c980d1bb770dab0fe0885ef8138a43219b96 100755
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileHWIDDetDescrCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -17,7 +17,7 @@
 #include "DetDescrCnvSvc/DetDescrConverter.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h" 
+#include "StoreGate/StoreGateSvc.h" 
 
 #include "IdDictDetDescr/IdDictManager.h"
 //#include "Identifier/IdentifierHash.h"