diff --git a/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
index 0c0de6de450a4a4d2fd7245603e848594c053f25..5e6bb4d9d4ef90d9a89f1c54b65b73414ae92929 100644
--- a/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
@@ -1,16 +1,8 @@
-# $Id: CMakeLists.txt 782748 2016-11-07 13:28:06Z will $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # The name of the package:
 atlas_subdir( AsgAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODBase
-   Event/xAOD/xAODEventInfo
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-
 # External(s):
 find_package( ROOT COMPONENTS Core )
 
diff --git a/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/CMakeLists.txt
index 433fbbee59ce15dde01410a0a7556cfe79495472..b1a0b9bf3a210ef158bd7c33db2dbf00f75784ae 100644
--- a/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/CMakeLists.txt
@@ -1,30 +1,17 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( EgammaAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODEgamma
-   PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces 
-   PhysicsAnalysis/AnalysisCommon/PATCore
-)
-
-# External(s):
-find_package( ROOT COMPONENTS Core )
-
 # Component(s) in the package:
 atlas_add_library( EgammaAnalysisInterfacesLib
    EgammaAnalysisInterfaces/*.h
    INTERFACE
    PUBLIC_HEADERS EgammaAnalysisInterfaces
-   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma PATInterfaces PATCoreLib AsgAnalysisInterfaces )
+   LINK_LIBRARIES AsgTools xAODCaloEvent xAODEgamma xAODTracking PATInterfaces PATCoreLib )
 
 atlas_add_dictionary( EgammaAnalysisInterfacesDict
    EgammaAnalysisInterfaces/EgammaAnalysisInterfacesDict.h
    EgammaAnalysisInterfaces/selection.xml
    LINK_LIBRARIES EgammaAnalysisInterfacesLib )
 
-
diff --git a/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/EgammaAnalysisInterfaces/IAsgElectronChargeIDSelectorTool.h b/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/EgammaAnalysisInterfaces/IAsgElectronChargeIDSelectorTool.h
index da1817cb6778ced9a14d77640d97e7496642802d..8ce728b9cfc722b611d87080d1a7bc7a50ac7917 100644
--- a/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/EgammaAnalysisInterfaces/IAsgElectronChargeIDSelectorTool.h
+++ b/PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/EgammaAnalysisInterfaces/IAsgElectronChargeIDSelectorTool.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
 */
 
 
@@ -17,7 +17,6 @@
 #include "PATCore/IAsgSelectionTool.h"
 #include "xAODEgamma/ElectronFwd.h"
 #include "xAODEgamma/EgammaFwd.h"
-#include "GaudiKernel/EventContext.h"
 
 class IAsgElectronChargeIDSelectorTool : virtual public IAsgSelectionTool
 {
diff --git a/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
index f66377acc4698afa16361d8be73dfd72ba3e78bd..1dc90a79f6d21ce0b2f869fd837eaf55f20e5b90 100644
--- a/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
@@ -1,23 +1,14 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( FTagAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODBTagging
-   Event/xAOD/xAODJet
-   PhysicsAnalysis/AnalysisCommon/PATCore
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces
-   PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
-   PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency )
-
 # Component(s) in the package:
 atlas_add_library( FTagAnalysisInterfacesLib
    FTagAnalysisInterfaces/*.h
    INTERFACE
    PUBLIC_HEADERS FTagAnalysisInterfaces
-   LINK_LIBRARIES AsgTools xAODBTagging xAODJet PATCoreLib CalibrationDataInterfaceLib )
+   LINK_LIBRARIES AsgTools xAODBTaggingEfficiencyLib xAODJet PATCoreLib PATInterfaces CalibrationDataInterfaceLib )
 
 atlas_add_dictionary( FTagAnalysisInterfacesDict
    FTagAnalysisInterfaces/FTagAnalysisInterfacesDict.h
diff --git a/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
index c79c2eeeafc863e3b5a97fd5e6f8004d37cf981d..8b613510a9dcf0748127da3076c3d68feafd5554 100644
--- a/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
@@ -1,13 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( JetAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-    PUBLIC
-    Control/AthToolSupport/AsgTools
-    Event/xAOD/xAODJet
-    PhysicsAnalysis/AnalysisCommon/PATCore )
-
 # Component(s) in the package:
 atlas_add_library( JetAnalysisInterfacesLib
    JetAnalysisInterfaces/*.h
diff --git a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
index 5c24a36f64ce6ac973bac967831ac9f9be9818ef..f24b154e6c8981d7341870a9c319215cbacc022a 100644
--- a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( MuonAnalysisInterfaces )
 
diff --git a/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
index 9bca6b5e8fec958a0851efe4fadef89ab6416e0a..2fe7f4299902c0a39a5b3beb0899c5bc1869e4cc 100644
--- a/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
@@ -1,12 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( PMGAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-
 # Component(s) in the package:
 atlas_add_library( PMGAnalysisInterfacesLib
    PMGAnalysisInterfaces/*.h
diff --git a/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
index e54346078a7c82a4fbe99d048f6a40c3303ff87f..f777f52a6605c7e277f16a0c6de7f61fbfefabf7 100644
--- a/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
@@ -1,26 +1,14 @@
-# copied from AsgAnalysisInterfaces
-	
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 # The name of the package:
 atlas_subdir( TriggerAnalysisInterfaces )
 
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODEgamma
-   Event/xAOD/xAODMuon
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-	
-# External(s):
-find_package( ROOT COMPONENTS Core )
-	
 # Component(s) in the package:
 atlas_add_library( TriggerAnalysisInterfaces
    TriggerAnalysisInterfaces/*.h
    INTERFACE
    PUBLIC_HEADERS TriggerAnalysisInterfaces
-   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon PATInterfaces )
+   LINK_LIBRARIES AsgTools xAODEgamma xAODMuon PATInterfaces )
 
 atlas_add_dictionary( TriggerAnalysisInterfacesDict
    TriggerAnalysisInterfaces/TriggerAnalysisInterfacesDict.h