diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt b/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
index 21bf0e51d028136ec3368ff0565355b656a970b0..adff3ee27967271d50fe2546a055b52b1048a0be 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
@@ -8,77 +8,11 @@
 atlas_subdir( SUSYTools )
 
 # Extra dependencies based on the build environment:
-set( extra_deps )
 set( extra_libs )
 if( NOT XAOD_STANDALONE )
-   set( extra_deps GaudiKernel PhysicsAnalysis/POOLRootAccess
-      Control/AthAnalysisBaseComps Control/AthenaBaseComps
-      Control/AthenaKernel )
    set( extra_libs GaudiKernel AthAnalysisBaseCompsLib )
 endif()
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODCore
-   Event/xAOD/xAODEgamma
-   Event/xAOD/xAODEventInfo
-   Event/xAOD/xAODJet
-   Event/xAOD/xAODMissingET
-   Event/xAOD/xAODTrigMissingET
-   Event/xAOD/xAODMuon
-   Event/xAOD/xAODTau
-   Event/xAOD/xAODTracking
-   Event/xAOD/xAODTruth
-   PhysicsAnalysis/AnalysisCommon/AssociationUtils
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces
-   PhysicsAnalysis/AnalysisCommon/PMGTools
-   PhysicsAnalysis/MCTruthClassifier
-   Reconstruction/Jet/JetJvtEfficiency
-   Reconstruction/Jet/JetSubStructureUtils
-   Trigger/TrigAnalysis/TrigDecisionTool
-   PRIVATE
-   AsgExternal/Asg_Test
-   Control/xAODRootAccess
-   Control/AthContainers
-   DataQuality/GoodRunsLists
-   Event/EventPrimitives
-   Event/FourMomUtils
-   Event/xAOD/xAODBTagging
-   Event/xAOD/xAODBase
-   Event/xAOD/xAODCaloEvent
-   Event/xAOD/xAODCutFlow
-   Event/xAOD/xAODPrimitives
-   PhysicsAnalysis/AnalysisCommon/IsolationSelection
-   PhysicsAnalysis/AnalysisCommon/PileupReweighting
-   PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection
-   PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection
-   PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-   PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool
-   PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
-   PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
-   PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-   PhysicsAnalysis/JetMissingEtID/JetSelectorTools
-   PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
-   PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections
-   PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections
-   PhysicsAnalysis/MuonID/MuonSelectorTools
-   PhysicsAnalysis/TauID/TauAnalysisTools
-   Reconstruction/Jet/JetCPInterfaces
-   Reconstruction/Jet/JetCalibTools
-   Reconstruction/Jet/JetInterface
-   Reconstruction/Jet/JetResolution
-   Reconstruction/Jet/JetUncertainties
-   Reconstruction/Jet/JetMomentTools
-   Reconstruction/MET/METInterface
-   Reconstruction/MET/METUtilities
-   Tools/PathResolver
-   Trigger/TrigAnalysis/TriggerMatchingTool
-   Trigger/TrigConfiguration/TrigConfInterfaces
-   Trigger/TrigConfiguration/TrigConfxAOD
-   ${extra_deps} )
-
 # External dependencies:
 find_package( Boost )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
@@ -114,7 +48,7 @@ if( NOT XAOD_STANDALONE )
       AthenaKernel AthAnalysisBaseCompsLib xAODEventInfo xAODMuon xAODPrimitives
       xAODJet xAODBTagging xAODEgamma xAODMissingET xAODTracking xAODTau
       TauAnalysisToolsLib xAODCore AthContainers AsgTools xAODBase xAODCutFlow
-      PATInterfaces PathResolver SUSYToolsLib )
+      PATInterfaces PathResolver SUSYToolsLib MuonAnalysisInterfacesLib JetAnalysisInterfacesLib EgammaAnalysisInterfacesLib )
 endif()
 
 atlas_add_dictionary( SUSYToolsDict
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
index 5f760cd2e6fe515a575dbbcf37f705a39ce6d5a4..bf5e9ae461bbabb299576e4792d401e35797d873 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
@@ -12,13 +12,13 @@
 #include "xAODTracking/TrackParticlexAODHelpers.h"
 
 #include "ElectronPhotonFourMomentumCorrection/IEgammaCalibrationAndSmearingTool.h"
-#include "ElectronEfficiencyCorrection/IAsgElectronEfficiencyCorrectionTool.h"
+#include "EgammaAnalysisInterfaces/IAsgElectronEfficiencyCorrectionTool.h"
 #include "AsgAnalysisInterfaces/IEfficiencyScaleFactorTool.h"
-#include "ElectronPhotonSelectorTools/IAsgElectronIsEMSelector.h"
-#include "ElectronPhotonSelectorTools/IAsgPhotonIsEMSelector.h"
-#include "ElectronPhotonSelectorTools/IAsgElectronLikelihoodTool.h"
-#include "ElectronPhotonShowerShapeFudgeTool/IElectronPhotonShowerShapeFudgeTool.h"
-#include "ElectronPhotonSelectorTools/IEGammaAmbiguityTool.h"
+#include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
+#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
+#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
+#include "EgammaAnalysisInterfaces/IElectronPhotonShowerShapeFudgeTool.h"
+#include "EgammaAnalysisInterfaces/IEGammaAmbiguityTool.h"
 
 #include "IsolationCorrections/IIsolationCorrectionTool.h"
 #include "IsolationSelection/IIsolationSelectionTool.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Photons.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Photons.cxx
index 40e2d3ea9c0cc5cbe34270ba0723d61ee5187908..357eb8ca3835d7c4e2575058cd663cf86d9a522d 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Photons.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Photons.cxx
@@ -12,9 +12,9 @@
 #include "xAODTracking/TrackParticlexAODHelpers.h"
 
 #include "ElectronPhotonFourMomentumCorrection/IEgammaCalibrationAndSmearingTool.h"
-#include "ElectronPhotonSelectorTools/IAsgPhotonIsEMSelector.h"
+#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
 #include "ElectronPhotonShowerShapeFudgeTool/IElectronPhotonShowerShapeFudgeTool.h"
-#include "ElectronPhotonSelectorTools/IEGammaAmbiguityTool.h"
+#include "EgammaAnalysisInterfaces/IEGammaAmbiguityTool.h"
 #include "PhotonEfficiencyCorrection/IAsgPhotonEfficiencyCorrectionTool.h"
 
 #include "IsolationCorrections/IIsolationCorrectionTool.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h b/PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h
index 0fa9676887891befd45fb653be222fd1ec4ee022..c093ab351b8b70b04ef59067382a30094c660c93 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -33,7 +33,7 @@
 
 //#include "AssociationUtils/ORToolBox.h"
 #include "AssociationUtils/ToolBox.h"
-#include "JetJvtEfficiency/IJetJvtEfficiency.h"
+#include "JetAnalysisInterfaces/IJetJvtEfficiency.h"
 #include "JetSubStructureUtils/BosonTag.h"
 
 #include <map>