diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
index c58c4001456266700bfcd1a92e745d120d496c39..8a75e528309d69961caeeac4f2870aecda13c953 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( TrigDecisionMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES AthenaBaseComps EventInfo GaudiKernel StoreGateLib TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDecisionEvent TrigOutputHandlingLib TrigSteeringEvent TrigSteeringLib TrigT1Result xAODEventInfo xAODTrigger )
+                     LINK_LIBRARIES AthenaBaseComps EventInfo GaudiKernel TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDecisionEvent TrigOutputHandlingLib TrigSteeringEvent TrigSteeringLib TrigT1Result xAODEventInfo xAODTrigger )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
index eb1a4e9c9200257493ca98739eca8ab64cec5170..0b17947b0f460676f8c752dbb864826db747a327 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
@@ -33,7 +33,6 @@
 // core stuff
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ToolHandle.h"
-#include "StoreGate/StoreGate.h"
 
 // trigger/configuration stuff
 #include "TrigDecisionEvent/TrigDecision.h"
diff --git a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
index 9ff61e1eeb169030a2dde3e8b018bb6ed51a3c06..9fb2ee44be097472d20448d48f3708a6582f822f 100644
--- a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( TrigBSExtraction )
 atlas_add_component( TrigBSExtraction
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps CaloEvent GaudiKernel JetEvent Particle StoreGateLib TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSerializeCnvSvcLib TrigSteeringEvent TrigStorageDefinitions TrkTrack egammaEvent tauEvent xAODBTagging xAODBTaggingCnvLib xAODCaloEvent xAODCaloEventCnvLib xAODEgamma xAODEgammaCnvLib xAODJet xAODJetCnvLib xAODMuon xAODTau xAODTauCnvLib xAODTracking xAODTrackingCnvLib xAODTrigBphys xAODTrigBphysCnvLib xAODTrigCalo xAODTrigCaloCnvLib xAODTrigMinBias xAODTrigMinBiasCnvLib xAODTrigMissingET xAODTrigMissingETCnvLib xAODTrigMuon xAODTrigMuonCnvLib xAODTrigger xAODTriggerCnvLib )
+                     LINK_LIBRARIES AthenaBaseComps CaloEvent GaudiKernel JetEvent Particle TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSerializeCnvSvcLib TrigSteeringEvent TrigStorageDefinitions TrkTrack egammaEvent tauEvent xAODBTagging xAODBTaggingCnvLib xAODCaloEvent xAODCaloEventCnvLib xAODEgamma xAODEgammaCnvLib xAODJet xAODJetCnvLib xAODMuon xAODTau xAODTauCnvLib xAODTracking xAODTrackingCnvLib xAODTrigBphys xAODTrigBphysCnvLib xAODTrigCalo xAODTrigCaloCnvLib xAODTrigMinBias xAODTrigMinBiasCnvLib xAODTrigMissingET xAODTrigMissingETCnvLib xAODTrigMuon xAODTrigMuonCnvLib xAODTrigger xAODTriggerCnvLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigBSExtraction.h b/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigBSExtraction.h
index 3870a62418ba2c7883b2174806b8e2591433b588..4d1e6fd174b62179c2bf072b4dca00bb8ef62a26 100755
--- a/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigBSExtraction.h
+++ b/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigBSExtraction.h
@@ -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
 */
 
 #ifndef TRIGBSEXTRACTION_TRIGBSEXTRACTION_H
@@ -10,7 +10,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "TrigNavigation/Navigation.h"
-#include "StoreGate/StoreGate.h"
 
 namespace HLT {  
   class HLTResult;
diff --git a/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigHLTtoxAODConversion.h b/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigHLTtoxAODConversion.h
index 8361a7af8ff6919c895ef184261f6569f53e7d88..d4121d29a1aa7872984a51a9d119c98f2a8c618b 100755
--- a/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigHLTtoxAODConversion.h
+++ b/Trigger/TrigEvent/TrigBSExtraction/TrigBSExtraction/TrigHLTtoxAODConversion.h
@@ -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
 */
 
 #ifndef TRIGBSEXTRACTION_TRIGHLTTOXAODCONVERSION_H
@@ -10,7 +10,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "TrigNavigation/Navigation.h"
-#include "StoreGate/StoreGate.h"
 #include "TrigBSExtraction/TrigBStoxAODTool.h"
 
 
diff --git a/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx
index 9f6dadf8a9ef2b8b2488405816ca40bebcfe211a..d21668b37d30addd139229739c04e9e76bee4c81 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.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
 */
 
 
@@ -8,7 +8,6 @@
 #include <iterator>
 #include "GaudiKernel/ClassID.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "AthLinks/ElementLinkVector.h"
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
index 31c83d0627ee15c9ab1ca5391c1b85c9193610e0..b6770661227ac2ae95c1d285c51db1ac7c044cc1 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.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 "iostream"
@@ -8,7 +8,6 @@
 #include "TestTools/initGaudi.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "TrigNavigation/Holder.h"
 #include "TrigNavigation/Holder.icc"
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
index ccb85e1d99e66dcad1fec2252a8872936b0701d9..e013de3fbeafaacb69467a9df3adad8ba15b9551 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
@@ -8,7 +8,6 @@
 #include "TestTools/initGaudi.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "TrigNavigation/Holder.h"
 #include "TrigNavigation/Holder.icc"
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx
index 41f5708c44c3f2878d3de153d5bf118b2f6c6f1a..b54c2e893bf2fff71495952e421f2c2ce61bb122 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Registration_test.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 <sys/time.h>
@@ -7,7 +7,6 @@
 #include <iterator>
 #include "GaudiKernel/ClassID.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/getMessageSvc.h"
 
diff --git a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
index 62543b63f7ac199d2b8ef706715aff5f109d1bd1..d2aaa51bf1a854b1b6f5b571be6fb882d9a28d17 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
@@ -1,10 +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 "GaudiKernel/ClassID.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/getMessageSvc.h"
 
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloClusterTool.cxx b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloClusterTool.cxx
index 6094deeb0719dc6ee74dcd62bd9fb08b287e3ec9..4d2d441209441266d91a54bd7fdb30e6bd89e885 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloClusterTool.cxx
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloClusterTool.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 "TrigCaloMonitoring/HLTCaloClusterTool.h"
@@ -9,8 +9,6 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloEvent/CaloClusterContainer.h"
-#include "StoreGate/StoreGate.h" 
-#include "StoreGate/DataHandle.h" 
 #include "egammaEvent/EMShower.h"
 #include "egammaEvent/PhotonContainer.h"
 #include "TH1F.h"
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
index 25810048b1e68b1b4d277dbc9ac89b44b14769c6..576b23a54aa0907c9bf95faf224149e0df6ad8c4 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 
 /*
-  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 "TrigHLTResultByteStream/HLTResultByteStreamCnv.h"
@@ -19,7 +19,7 @@
 
 #include "TrigSteeringEvent/HLTResult.h"
 
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/CLASS_DEF.h"
 
 // Tool