diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
index cfa4187c0c4f3fbcc15ad4bb9278d59dc2f1e2b2..2858398f07ce244b27492ec9c4877a06fa0ffcc0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
@@ -3,8 +3,6 @@
 */
 
 
-#include "StoreGate/StoreGate.h"
-
 static const int MAX_nCon = 128;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
index 820420dafa2b2d09f7d01f150e4f55280e7ba1c6..b0dbf985ebed79c324be36bb714ed6ea4551f901 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.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
 */
 
 //====================================================================
@@ -20,7 +20,7 @@
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventType.h"
 #include "EventInfo/EventID.h"
-#include "StoreGate/StoreGate.h" 
+#include "StoreGate/StoreGateSvc.h" 
 
 #include "TChain.h"
 
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGNTUPProxyLoader.h b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGNTUPProxyLoader.h
index 38ac3258df035d574424392dbae72dc3f1e55024..b1f90bd9600a730e03aa721542b57a2f55858ab7 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGNTUPProxyLoader.h
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGNTUPProxyLoader.h
@@ -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
 */
 
 /////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 #include "ExpressionEvaluation/IProxyLoader.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "SGTools/StlVectorClids.h"
 #include "SGTools/BuiltinsClids.h"
 
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGxAODProxyLoader.h b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGxAODProxyLoader.h
index 25038fcf45fc70712bea9a66f35395de16537a85..42ea4ffaec5a742a68d65f27aaa5fb03182f9172 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGxAODProxyLoader.h
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/ExpressionEvaluation/SGxAODProxyLoader.h
@@ -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
 */
 
 /////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 #include "ExpressionEvaluation/xAODVariableProxyLoaders.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "SGTools/StlVectorClids.h"
 #include "SGTools/BuiltinsClids.h"
 
diff --git a/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h b/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h
index fe4177b729a9d3d90cb1d4ef0be791f9f5425511..1293a612bfdda097e15602abece41bbba8b8c550 100644
--- a/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h
+++ b/PhysicsAnalysis/DPDUtils/DPDUtils/DPDTagTool.h
@@ -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
 */
 
 #ifndef DPDTAGTOOL_H
@@ -15,7 +15,6 @@
 
 #include "GaudiKernel/Algorithm.h"
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "TagEvent/TagFragmentCollection.h"
 #include "AthenaPoolUtilities/AthenaAttributeSpecification.h"
diff --git a/Reconstruction/MissingETGoodness/src/EtmissGoodnessManagerAlg.cxx b/Reconstruction/MissingETGoodness/src/EtmissGoodnessManagerAlg.cxx
index eda6a8f0bce151b672b8800bbe3ec265ed69a164..ab6185ca334a6fad845ec157164265485978819e 100644
--- a/Reconstruction/MissingETGoodness/src/EtmissGoodnessManagerAlg.cxx
+++ b/Reconstruction/MissingETGoodness/src/EtmissGoodnessManagerAlg.cxx
@@ -1,11 +1,10 @@
 /*
-  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 "MissingETGoodness/EtmissGoodnessManagerAlg.h"
 
-#include "StoreGate/StoreGate.h"
 #include "xAODEventInfo/EventInfo.h"
 
 #include "MissingETGoodness/EtmissGoodnessManager.h"