diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
index 3c5aba13481ce913e2a1578548d703c35dde1bcb..b80a8b0b6652b66c15dd57344b7dddce6184e216 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
@@ -39,13 +39,13 @@ atlas_add_library( InDetBeamSpotFinderLib
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTracking GaudiKernel
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces  )
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTracking GaudiKernel TrigAnalysisInterfaces
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces )
 
 atlas_add_component( InDetBeamSpotFinder
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTracking GaudiKernel AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces  InDetBeamSpotFinderLib )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTracking GaudiKernel AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces InDetBeamSpotFinderLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/LArCalorimeter/LArCalibUtils/CMakeLists.txt b/LArCalorimeter/LArCalibUtils/CMakeLists.txt
index 301d3d181dcf751dad80dd9e400a39f131a38062..459654c622a378537fc584f9d4163d1f61aeb76a 100644
--- a/LArCalorimeter/LArCalibUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArCalibUtils/CMakeLists.txt
@@ -44,7 +44,7 @@ atlas_add_component( LArCalibUtils
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRawUtilsLib LArRecConditions LArRecUtilsLib LArCablingLib TBEvent CaloDetDescrLib AthenaPoolUtilities xAODEventInfo LArBadChannelToolLib LArCOOLConditions LArSimEvent )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRawUtilsLib LArRecConditions LArRecUtilsLib LArCablingLib TBEvent CaloDetDescrLib AthenaPoolUtilities xAODEventInfo LArBadChannelToolLib LArCOOLConditions LArSimEvent TrigAnalysisInterfaces )
 
 # Install files from the package:
 atlas_install_headers( LArCalibUtils )
diff --git a/Trigger/TrigAnalysis/TrigAnalysisInterfaces/CMakeLists.txt b/Trigger/TrigAnalysis/TrigAnalysisInterfaces/CMakeLists.txt
index 8351aaf4c01f686e4f1545ceae3290e795d6ac9e..f639b571eab8016367073a7976181f6cf652def2 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisInterfaces/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigAnalysisInterfaces/CMakeLists.txt
@@ -1,16 +1,8 @@
-# $Id: CMakeLists.txt 762065 2016-07-15 07:15:23Z krasznaa $
-################################################################################
-# Package: TrigAnalysisInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigAnalysisInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools )
-
 # Component(s) in the package:
 atlas_add_library( TrigAnalysisInterfaces
    TrigAnalysisInterfaces/*.h
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/CMakeLists.txt b/Trigger/TrigAnalysis/TrigDecisionTool/CMakeLists.txt
index 2a289508a2138321c78d7d4e9832d6ef9eee3608..9e8c30ef31e6aadf3bbbb13232d7f5509bc3c99a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/CMakeLists.txt
@@ -1,71 +1,8 @@
-################################################################################
-# Package: TrigDecisionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigDecisionTool )
 
-# Declare the package's dependencies:
-if( XAOD_STANDALONE )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODBase
-      Event/xAOD/xAODTrigger
-      Trigger/TrigConfiguration/TrigConfHLTData
-      Trigger/TrigConfiguration/TrigConfInterfaces
-      Trigger/TrigConfiguration/TrigConfL1Data
-      Trigger/TrigEvent/TrigDecisionInterface
-      Trigger/TrigEvent/TrigRoiConversion
-      Trigger/TrigEvent/TrigNavStructure
-      PRIVATE
-      Trigger/TrigEvent/TrigSteeringEvent )
-elseif( XAOD_ANALYSIS )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Control/StoreGate
-      Event/EventInfo
-      Event/xAOD/xAODBase
-      Event/xAOD/xAODTrigger
-      GaudiKernel
-      Trigger/TrigConfiguration/TrigConfHLTData
-      Trigger/TrigConfiguration/TrigConfInterfaces
-      Trigger/TrigConfiguration/TrigConfL1Data
-      Trigger/TrigEvent/TrigDecisionInterface
-      Trigger/TrigEvent/TrigRoiConversion
-      Trigger/TrigEvent/TrigNavStructure
-      PRIVATE
-      Control/AthenaBaseComps
-      Control/AthenaKernel
-      Trigger/TrigEvent/TrigSteeringEvent )
-else()
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Control/StoreGate
-      Event/EventInfo
-      Event/xAOD/xAODBase
-      Event/xAOD/xAODTrigger
-      GaudiKernel
-      PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-      Trigger/TrigConfiguration/TrigConfHLTData
-      Trigger/TrigConfiguration/TrigConfInterfaces
-      Trigger/TrigConfiguration/TrigConfL1Data
-      Trigger/TrigEvent/TrigDecisionEvent
-      Trigger/TrigEvent/TrigDecisionInterface
-      Trigger/TrigEvent/TrigMuonEvent
-      Trigger/TrigEvent/TrigRoiConversion
-      Trigger/TrigEvent/TrigNavStructure
-      Trigger/TrigEvent/TrigNavigation
-      Trigger/TrigEvent/TrigStorageDefinitions
-      Trigger/TrigSteer/TrigCompositeUtils
-      PRIVATE
-      Control/AthenaBaseComps
-      Control/AthenaKernel
-      Trigger/TrigEvent/TrigSteeringEvent )
-endif()
-
 # External dependencies:
 find_package( Boost )
 find_package( ROOT COMPONENTS Core PyROOT )
@@ -127,6 +64,6 @@ if( NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
 endif()
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( share/checkTriggerEDM.py
    share/checkTriggerProcessingErrors.py )
diff --git a/Trigger/TrigAnalysis/TrigJiveXML/CMakeLists.txt b/Trigger/TrigAnalysis/TrigJiveXML/CMakeLists.txt
index e4c4eaf374093c2e1a6fd869d9a98f07c7d00d93..607100c900e6f60b88cea43eca8943422314fd9e 100644
--- a/Trigger/TrigAnalysis/TrigJiveXML/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigJiveXML/CMakeLists.txt
@@ -1,30 +1,8 @@
-################################################################################
-# Package: TrigJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigJiveXML )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          graphics/JiveXML
-                          PRIVATE
-                          Event/EventInfo
-                          Event/xAOD/xAODTrigL1Calo
-                          Event/xAOD/xAODTrigger
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          Trigger/TrigEvent/TrigInDetEvent
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigT1/TrigT1CaloEvent
-                          Trigger/TrigT1/TrigT1Interfaces )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -33,9 +11,7 @@ atlas_add_component( TrigJiveXML
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkPrepRawData TrigDecisionToolLib JiveXMLLib EventInfo xAODTrigL1Calo xAODTrigger GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData AnalysisTriggerEvent TrigInDetEvent TrigSteeringEvent TrigT1CaloEventLib TrigT1Interfaces )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AnalysisTriggerEvent AthenaBaseComps EventInfo InDetIdentifier InDetPrepRawData JiveXMLLib TrigDecisionToolLib TrigInDetEvent TrigSteeringEvent TrigT1CaloEventLib TrigT1Interfaces TrkPrepRawData xAODTrigL1Calo xAODTrigger )
 
 # Install files from the package:
-atlas_install_headers( TrigJiveXML )
 atlas_install_joboptions( share/*.py )
-
diff --git a/Trigger/TrigAnalysis/TrigMuonMatching/CMakeLists.txt b/Trigger/TrigAnalysis/TrigMuonMatching/CMakeLists.txt
index e69351868e76ab7490155d08178e8623dd3e6cc9..d442aaa8df9ea8d3f455c7a79af3dae454429e5b 100644
--- a/Trigger/TrigAnalysis/TrigMuonMatching/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigMuonMatching/CMakeLists.txt
@@ -1,38 +1,19 @@
-################################################################################
-# Package: TrigMuonMatching
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigMuonMatching )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthToolSupport/AsgTools
-                          Event/xAOD/xAODMuon
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTrigMuon
-                          Event/xAOD/xAODTrigger
-                          GaudiKernel
-                          Trigger/TrigConfiguration/TrigConfxAOD )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TrigMuonMatchingLib
                    src/*.cxx
                    Root/*.cxx
                    PUBLIC_HEADERS TrigMuonMatching
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AsgTools xAODMuon TrigDecisionToolLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTrigMuon xAODTrigger GaudiKernel )
+                   PRIVATE_LINK_LIBRARIES AthenaBaseComps GaudiKernel xAODRootAccess xAODTrigMuon xAODTrigger
+                   LINK_LIBRARIES AsgTools TrigDecisionToolLib xAODMuon )
 
 atlas_add_component( TrigMuonMatching
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODMuon TrigDecisionToolLib AthenaBaseComps xAODTrigMuon xAODTrigger GaudiKernel TrigMuonMatchingLib )
+                     LINK_LIBRARIES TrigMuonMatchingLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigAnalysis/TrigObjectMatching/CMakeLists.txt b/Trigger/TrigAnalysis/TrigObjectMatching/CMakeLists.txt
index cac3fda40f89cc5b8b230d38633a4fe4552e65c7..3ac8ef01bec0158055dd5b9cb7f50d37cf3c76ba 100644
--- a/Trigger/TrigAnalysis/TrigObjectMatching/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigObjectMatching/CMakeLists.txt
@@ -1,51 +1,24 @@
-################################################################################
-# Package: TrigObjectMatching
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigObjectMatching )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          Control/AthContainers
-                          GaudiKernel
-                          Reconstruction/Jet/JetEvent
-                          Reconstruction/egamma/egammaEvent
-                          Reconstruction/tauEvent
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          Trigger/TrigEvent/TrigCaloEvent
-                          Trigger/TrigEvent/TrigMuonEvent
-                          Trigger/TrigEvent/TrigParticle
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          PRIVATE
-                          Event/EventKernel
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          Reconstruction/MuonIdentification/muonEvent )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost COMPONENTS regex )
 
 # Component(s) in the package:
 atlas_add_library( TrigObjectMatchingLib
                    src/*.cxx
                    PUBLIC_HEADERS TrigObjectMatching
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent TrigDecisionToolLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventKernel AnalysisTriggerEvent muonEvent )
+                   LINK_LIBRARIES AnalysisTriggerEvent AthContainers AthenaBaseComps AthenaKernel CxxUtils EventKernel GaudiKernel JetEvent TrigCaloEvent TrigDecisionToolLib TrigMuonEvent TrigParticle TrigSteeringEvent egammaEvent muonEvent tauEvent
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
 
 atlas_add_component( TrigObjectMatching
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigDecisionToolLib TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent EventKernel AnalysisTriggerEvent muonEvent TrigObjectMatchingLib )
+                     LINK_LIBRARIES TrigObjectMatchingLib )
 
 atlas_add_dictionary( TrigObjectMatchingDict
                       TrigObjectMatching/TrigObjectMatchingDict.h
                       TrigObjectMatching/selection.xml
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigDecisionToolLib TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent EventKernel AnalysisTriggerEvent muonEvent TrigObjectMatchingLib )
-
+                      LINK_LIBRARIES TrigObjectMatchingLib )
diff --git a/Trigger/TrigAnalysis/TrigRootAnalysis/CMakeLists.txt b/Trigger/TrigAnalysis/TrigRootAnalysis/CMakeLists.txt
index 57cab8935b1f01e27af4a6df656aedb46df09e31..674c284d156e0c110e4c320ff4e04c3d4c1a105a 100644
--- a/Trigger/TrigAnalysis/TrigRootAnalysis/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigRootAnalysis/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: TrigRootAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigRootAnalysis )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate )
-
 # External dependencies:
 find_package( ROOT COMPONENTS RIO Cint Core Tree MathCore Hist pthread )
 
@@ -28,6 +18,5 @@ atlas_add_library( TrigRootAnalysis
                    ${TrigRootAnalysisDictSource}
                    PUBLIC_HEADERS TrigRootAnalysis
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel )
-
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel
+                   PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib )
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt b/Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt
index 696721f7775e0b0558b6d349ba8189860136371e..721f542a47730349085610269a30ad8d7d2d0ee0 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt
@@ -1,29 +1,8 @@
-# $Id: CMakeLists.txt 780705 2016-10-27 11:45:18Z krasznaa $
-################################################################################
-# Package: TriggerMatchingTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TriggerMatchingTool )
 
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
-   set( extra_deps Control/AthAnalysisBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODBase
-   Trigger/TrigAnalysis/TrigDecisionTool
-   Trigger/TrigEvent/TrigNavStructure
-   PRIVATE
-   Event/FourMomUtils
-   Event/xAOD/xAODTrigger
-   ${extra_deps} )
-
 # External dependencies:
 find_package( Boost )
 find_package( ROOT COMPONENTS Core Hist RIO )
@@ -40,7 +19,7 @@ if( NOT XAOD_STANDALONE )
    atlas_add_component( TriggerMatchingTool
       src/*.h src/*.cxx src/components/*.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-      LINK_LIBRARIES ${ROOT_LIBRARIES} xAODBase GaudiKernel
+      LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel
       AthAnalysisBaseCompsLib TriggerMatchingToolLib )
 endif()
 
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/test/TriggerMatchingTool.xml b/Trigger/TrigAnalysis/TriggerMatchingTool/test/TriggerMatchingTool.xml
deleted file mode 100644
index 410ce2a1082fbea95dadab7912654de43cc24f27..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/test/TriggerMatchingTool.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <?xml version="1.0"?>
-<atn>
-   <TEST name="TestMatchingToolAlg" type="athena" suite="ASGTests">
-      <options_atn>TriggerMatchingTool/TestMatchingToolAlgJobOptions.py || { rm TestMatchingToolAlg.results.root;exit 1; }</options_atn>
-      <timelimit>15</timelimit>
-      <author> Lukas Heinrich </author>
-      <mailto> lukas.heinrich@cern.ch </mailto>
-      <expectations>
-         <errorMessage>FAILURE (ERROR)</errorMessage>
-         <returnValue>0</returnValue>
-      </expectations>
-      <postscript>rootcomp.py --html --atnMode --output rootcomp.TestMatchingToolAlg.results TestMatchingToolAlg.results.root</postscript>
-   </TEST>
-</atn>