diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
index 01d815b7d0139908ab7d1afa1e5f4ef381da09e5..2da6effab3564b53e8568d2264e2f4440da0528a 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx
@@ -9,9 +9,6 @@
 
 #include "InDetTrigExtensProcessor/InDetTrigExtensProcessor.h"
 
-// Gaudi includes
-#include "StoreGate/StoreGate.h"
-
 //tools
 #include "TrkFitterInterfaces/ITrackFitter.h"
 #include "TrkToolInterfaces/ITrackScoringTool.h"
diff --git a/LArCalorimeter/LArBadChannelTool/src/LArBadChannelDBAlg.cxx b/LArCalorimeter/LArBadChannelTool/src/LArBadChannelDBAlg.cxx
index 1c9b247129db1128f89f5460bb7bbc037b73b25f..1a6447d9886c124907b11bc5fe713c200816196a 100644
--- a/LArCalorimeter/LArBadChannelTool/src/LArBadChannelDBAlg.cxx
+++ b/LArCalorimeter/LArBadChannelTool/src/LArBadChannelDBAlg.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
 */
 
 #include "LArBadChannelTool/LArBadChannelDBAlg.h"
@@ -9,7 +9,6 @@
 #include "CoralBase/Blob.h"
 #include "CoralBase/AttributeListSpecification.h"
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
-#include "StoreGate/StoreGate.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 
 #include "LArBadChannelTool/LArBadChannelDBTools.h"
diff --git a/LArCalorimeter/LArBadChannelTool/src/LArBadFeb2Ascii.cxx b/LArCalorimeter/LArBadChannelTool/src/LArBadFeb2Ascii.cxx
index f971940146ce89a9bdb416ecd8a9b933b94aeb88..5a432d735f97dd641a0b4161b8a43fbc2e099321 100644
--- a/LArCalorimeter/LArBadChannelTool/src/LArBadFeb2Ascii.cxx
+++ b/LArCalorimeter/LArBadChannelTool/src/LArBadFeb2Ascii.cxx
@@ -1,11 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArBadChannelTool/LArBadFeb2Ascii.h"
 
-#include "StoreGate/StoreGate.h"
-
 #include "LArBadChannelTool/LArBadChannelDBTools.h"
 #include "LArIdentifier/LArOnlineID.h"
 #include <fstream>
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx
index f65fd66bef3b7d24960f29f7ec60bb8574065247..c47885e38b9f060d9a75b48cf875c8bb8e18ebac 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataContByteStreamTool.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
 */
 
 #include "LArByteStream/LArRawDataContByteStreamTool.h"
@@ -23,8 +23,6 @@
 #include "GaudiKernel/MsgStream.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 
-#include "StoreGate/StoreGate.h"
-
 // STL stuff
 #include <map> 
 
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx
index f3d677ee9b0e5294efbc9e723eef706c16902332..a88481d19c048aa035e4e827fe84939c949de9aa 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArElectrodeIDDetDescrCnv.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
 */
 
 /***************************************************************************
@@ -7,30 +7,17 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: LArElectrodeIDDetDescrCnv.cxx,v 1.4 2009-02-11 04:50:26 ssnyder Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "LArIdCnv/LArElectrodeIDDetDescrCnv.h"
 
 #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 "LArIdentifier/LArElectrodeID.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 long int
 LArElectrodeIDDetDescrCnv::repSvcType() const
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx
index 341faf9bf489732201b662882ac5edfc9f9fe676..81e8b63528b07f1863294d5daaec3dbbd703032c 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArHVLineIDDetDescrCnv.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
 */
 
 /***************************************************************************
@@ -7,30 +7,17 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: LArHVLineIDDetDescrCnv.cxx,v 1.4 2009-02-11 04:50:26 ssnyder Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "LArIdCnv/LArHVLineIDDetDescrCnv.h"
 
 #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 "LArIdentifier/LArHVLineID.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 long int
 LArHVLineIDDetDescrCnv::repSvcType() const
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx
index 7540c4757b0df5bede52a914e4c412f54d5d104a..62993184fef2ece82cce6f5c68f41122b6a14ef5 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdMgrDetDescrCnv.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
 */
 
 /***************************************************************************
@@ -7,10 +7,6 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: LArIdMgrDetDescrCnv.cxx,v 1.14 2009-02-11 04:50:26 ssnyder Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "LArIdCnv/LArIdMgrDetDescrCnv.h"
 #include "LArIdentifier/LArIdManager.h"
@@ -28,22 +24,13 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"
 
-#include "StoreGate/StoreGate.h" 
+#include "StoreGate/StoreGateSvc.h" 
 
 // Identifier includes
 #include "LArIdentifier/LArOnlineID.h"
 #include "LArIdentifier/LArHVLineID.h"
 #include "LArIdentifier/LArElectrodeID.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 long int
 LArIdMgrDetDescrCnv::repSvcType() const
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx
index e11849d324ac091119c91bd3aade5010f3b1c9a4..452179fcc636672a84314230b2e31d0d8133d702 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnlineIDDetDescrCnv.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
 */
 
 /***************************************************************************
@@ -7,30 +7,17 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: LArOnlineIDDetDescrCnv.cxx,v 1.7 2009-02-11 04:50:26 ssnyder Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "LArIdCnv/LArOnlineIDDetDescrCnv.h"
 
 #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 "LArIdentifier/LArOnlineID.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 long int
 LArOnlineIDDetDescrCnv::repSvcType() const
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx
index 80c50ca3da03f7e5c17fdeecc97fb96b96f78a41..d8cba9ee55b47dc0ad24f115bcb4a55bef338d70 100755
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArOnline_SuperCellIDDetDescrCnv.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
 */
 
 /***************************************************************************
@@ -7,30 +7,17 @@
  -----------------------------------------
  ***************************************************************************/
 
-//<doc><file>	$Id: LArOnline_SuperCellIDDetDescrCnv.cxx,v 1.7 2009-02-11 04:50:26 ssnyder Exp $
-//<version>	$Name: not supported by cvs2svn $
-
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h"
 
 #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 "LArIdentifier/LArOnline_SuperCellID.h"
 
-//<<<<<< PRIVATE DEFINES                                                >>>>>>
-//<<<<<< PRIVATE CONSTANTS                                              >>>>>>
-//<<<<<< PRIVATE TYPES                                                  >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS                                    >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION                                 >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS                                   >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS                                    >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 long int
 LArOnline_SuperCellIDDetDescrCnv::repSvcType() const
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
index a84edad0c163748002d1c14417dd3bf101845529..19a7d0883f365a3f26475d7793cc2f14245a799e 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.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
 */
 
 // ***************************************************************************
@@ -13,7 +13,6 @@
 #include "Gaudi/Property.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/IToolSvc.h"
-#include "StoreGate/StoreGate.h"
 #include <vector>
 
 #include "GeoModelUtilities/StoredPhysVol.h"