diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/CMakeLists.txt b/PhysicsAnalysis/AssociationBuilder/AssociationComps/CMakeLists.txt
index e03385c2eaf74a039fe306fbdb811ef6f7bc042c..5b2c05c73c92663c36fc42addc8e02e1b896a761 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/CMakeLists.txt
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/CMakeLists.txt
@@ -1,43 +1,13 @@
-################################################################################
-# Package: AssociationComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AssociationComps )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloEvent
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Control/AthLinks
-                          Control/Navigation
-                          Control/StoreGate
-                          Event/EventKernel
-                          Event/FourMomUtils
-                          Event/NavFourMom
-                          GaudiKernel
-                          PhysicsAnalysis/AssociationBuilder/AssociationKernel
-                          Reconstruction/Jet/JetEvent
-                          Reconstruction/MuonIdentification/muonEvent
-                          Reconstruction/egamma/egammaEvent
-                          Reconstruction/tauEvent
-                          Trigger/TrigAnalysis/TrigObjectMatching
-                          Trigger/TrigEvent/TrigCaloEvent
-                          Trigger/TrigEvent/TrigMuonEvent
-                          Trigger/TrigEvent/TrigParticle )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CLHEP )
-
 # Component(s) in the package:
 atlas_add_component( AssociationComps
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthenaBaseComps AthContainers AthLinks Navigation StoreGateLib SGtests EventKernel FourMomUtils NavFourMom GaudiKernel AssociationKernel JetEvent muonEvent egammaEvent tauEvent TrigObjectMatchingLib TrigCaloEvent TrigMuonEvent TrigParticle )
+                     LINK_LIBRARIES CaloEvent AthenaKernel AthenaBaseComps AthContainers AthLinks Navigation EventKernel FourMomUtils NavFourMom GaudiKernel AssociationKernel JetEvent muonEvent egammaEvent tauEvent TrigObjectMatchingLib TrigCaloEvent TrigMuonEvent TrigParticle )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationKernel/CMakeLists.txt b/PhysicsAnalysis/AssociationBuilder/AssociationKernel/CMakeLists.txt
index 74ba4d49ae6670ab5607d42acabd4c3df26bd82a..58dfb919ceaf9333b93a7b222ba953a8056b43a9 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationKernel/CMakeLists.txt
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationKernel/CMakeLists.txt
@@ -1,21 +1,10 @@
-################################################################################
-# Package: AssociationKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AssociationKernel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthLinks
-                          Event/EventKernel
-                          Event/NavFourMom
-                          GaudiKernel )
-
 # Component(s) in the package:
 atlas_add_library( AssociationKernel
                    src/*.cxx
                    PUBLIC_HEADERS AssociationKernel
                    LINK_LIBRARIES AthenaBaseComps AthLinks EventKernel NavFourMom GaudiKernel )
-