diff --git a/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt b/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt
index 82a50fd075fbb36069719d2b84eae2ee5489effa..d5939e71ce2b035217fc4483872b38b1e0280f58 100644
--- a/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt
+++ b/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt
@@ -1,19 +1,10 @@
-################################################################################
-# Package: TrkMeasurementUpdator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( KalmanParameterUpdator )
 
-
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_library( KalmanParameterUpdatorLib
                    src/*.cxx
                    PUBLIC_HEADERS KalmanParameterUpdator
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives TrkEventPrimitives TrkParameters)
-
-
+                   LINK_LIBRARIES EventPrimitives TrkEventPrimitives TrkParameters )
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt b/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
index 5dd8e5f99c3487842e6372aa02c8ffe180ed4871..a85c15f7c98d628643c0d3e30581cfc8e1e328cd 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
@@ -1,30 +1,11 @@
-################################################################################
-# Package: TrkAmbiguityProcessor
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkAmbiguityProcessor )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkEvent/TrkTruthData
-                          Tracking/TrkFitter/TrkFitterInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkValidation/TrkValInterfaces
-                          Tracking/TrkExtrapolation/TrkExInterfaces          )
-
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core )
 
 # Component(s) in the package:
 atlas_add_component( TrkAmbiguityProcessor
@@ -36,6 +17,5 @@ atlas_add_component( TrkAmbiguityProcessor
                      src/TrackScoringTool.cxx
                      src/TrackSelectionProcessorTool.cxx
                      src/components/*.cxx
-                     PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaBaseComps  GaudiKernel InDetRecToolInterfaces InDetPrepRawData TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces TrkToolInterfaces TrkValInterfaces TrkExInterfaces)
-
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps GaudiKernel InDetIdentifier InDetRecToolInterfaces InDetPrepRawData TrkEventPrimitives TrkEventUtils TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkFitterInterfaces TrkToolInterfaces TrkExInterfaces )
diff --git a/Tracking/TrkTools/TrkAssociationTools/CMakeLists.txt b/Tracking/TrkTools/TrkAssociationTools/CMakeLists.txt
index 9f7c78914dc9158167b6d8ebc6ed3f77fd606a13..0c97c9c5234fbfc866a0cdef7ea69c7d2f0662d8 100644
--- a/Tracking/TrkTools/TrkAssociationTools/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkAssociationTools/CMakeLists.txt
@@ -1,32 +1,10 @@
-################################################################################
-# Package: TrkAssociationTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkAssociationTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkEvent/TrkEventUtils
-			  MuonSpectrometer/MuonIdHelpers
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-			  Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkTrack )
-
 # Component(s) in the package:
 atlas_add_component( TrkAssociationTools
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces AtlasDetDescr Identifier GaudiKernel TrkDetElementBase TrkEventUtils TrkRIO_OnTrack TrkCompetingRIOsOnTrack MuonIdHelpersLib TrkTrack TrkEventUtils StoreGateLib )
-
-# Install files from the package:
-atlas_install_headers( TrkAssociationTools )
-
+                     LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces GaudiKernel TrkDetElementBase TrkEventUtils TrkRIO_OnTrack TrkCompetingRIOsOnTrack MuonIdHelpersLib TrkTrack TrkEventUtils StoreGateLib )
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/CMakeLists.txt b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/CMakeLists.txt
index 68348b5934f5fa7b2c118ac7cdcb3462fe004b11..a04d34a38cc72f623a78339462dc436b09ca11e5 100644
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/CMakeLists.txt
@@ -1,37 +1,16 @@
-################################################################################
-# Package: TrkCompetingRIOsOnTrackTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkCompetingRIOsOnTrackTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkRIO_OnTrack )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Gpad Graf )
-
 atlas_add_library( TrkCompetingRIOsOnTrackToolLib
                    TrkCompetingRIOsOnTrackTool/*.h
                    INTERFACE
                    PUBLIC_HEADERS TrkCompetingRIOsOnTrackTool
-                   LINK_LIBRARIES GaudiKernel AthenaKernel TrkToolInterfaces TrkParameters )
+                   LINK_LIBRARIES GaudiKernel AthenaBaseComps TrkToolInterfaces TrkParameters )
 
 # Component(s) in the package:
 atlas_add_component( TrkCompetingRIOsOnTrackTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} TrkCompetingRIOsOnTrackToolLib AthenaBaseComps TrkToolInterfaces AtlasDetDescr TrkSurfaces TrkCompetingRIOsOnTrack TrkEventUtils TrkPrepRawData TrkRIO_OnTrack )
-
+                     LINK_LIBRARIES GaudiKernel TrkCompetingRIOsOnTrackToolLib AthenaBaseComps TrkToolInterfaces AtlasDetDescr TrkSurfaces TrkCompetingRIOsOnTrack TrkEventUtils TrkParameters TrkPrepRawData TrkRIO_OnTrack )
diff --git a/Tracking/TrkTools/TrkMaterialProvider/CMakeLists.txt b/Tracking/TrkTools/TrkMaterialProvider/CMakeLists.txt
index 922d47f5cf90b0e757bf5d2c30b8ac848d877096..aab922e131e59d52ed1ab5ac6e6244f6b519df08 100644
--- a/Tracking/TrkTools/TrkMaterialProvider/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkMaterialProvider/CMakeLists.txt
@@ -1,35 +1,8 @@
-################################################################################
-# Package: TrkMaterialProvider
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkMaterialProvider )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/Identifier
-                          Event/EventPrimitives
-                          GaudiKernel
-                          Reconstruction/MuonIdentification/MuidEvent
-                          Reconstruction/MuonIdentification/MuidInterfaces
-                          Reconstruction/MuonIdentification/muonEvent
-                          Reconstruction/RecoTools/RecoToolInterfaces
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -38,7 +11,7 @@ atlas_add_component( TrkMaterialProvider
                      src/TrkMaterialProviderTool.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces AtlasDetDescr Identifier EventPrimitives GaudiKernel MuidEvent MuidInterfaces muonEvent RecoToolInterfaces TrkEventUtils TrkMaterialOnTrack MagFieldElements MagFieldConditions )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces AtlasDetDescr Identifier EventPrimitives GaudiKernel MuidEvent MuidInterfaces muonEvent RecoToolInterfaces TrkEventUtils TrkMaterialOnTrack MagFieldConditions )
 
 # Install files from the package:
 atlas_install_headers( TrkMaterialProvider )
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/CMakeLists.txt b/Tracking/TrkTools/TrkMeasurementUpdator/CMakeLists.txt
index fed2d9e6ed651d4ca746388989ccacb886e57c64..e8223b9a364f6a1640b64efccc282e6bd88929c6 100644
--- a/Tracking/TrkTools/TrkMeasurementUpdator/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/CMakeLists.txt
@@ -1,31 +1,14 @@
-################################################################################
-# Package: TrkMeasurementUpdator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkMeasurementUpdator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces )
-
 # External dependencies:
-find_package( Eigen )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_component( TrkMeasurementUpdator
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives TrkParameters TrkToolInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkMeasurementUpdator )
-
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives TrkParameters TrkToolInterfaces )
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/CMakeLists.txt b/Tracking/TrkTools/TrkMeasurementUpdator_xk/CMakeLists.txt
index d6d6e6b43b96c9e482b3fddab3e903dab56bd669..34904cab610242c93b56efa00456987502598356 100644
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkMeasurementUpdator_xk/CMakeLists.txt
@@ -1,26 +1,10 @@
-################################################################################
-# Package: TrkMeasurementUpdator_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkMeasurementUpdator_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkPatternParameters )
-
 # Component(s) in the package:
 atlas_add_component( TrkMeasurementUpdator_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces GaudiKernel TrkEventPrimitives TrkParameters TrkPatternParameters )
-
-# Install files from the package:
-atlas_install_headers( TrkMeasurementUpdator_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces TrkEventPrimitives TrkParameters TrkPatternParameters )
diff --git a/Tracking/TrkTools/TrkParticleCreator/CMakeLists.txt b/Tracking/TrkTools/TrkParticleCreator/CMakeLists.txt
index 8355ea9b10c6168a0a1bbab0119f62280fc07800..3217ea7dd3de420bd8d01323f5acf458b56ef676 100644
--- a/Tracking/TrkTools/TrkParticleCreator/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkParticleCreator/CMakeLists.txt
@@ -1,53 +1,16 @@
-################################################################################
-# Package: TrkParticleCreator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkParticleCreator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthContainers
-   Control/AthenaBaseComps
-   Event/EventPrimitives
-   Event/xAOD/xAODTracking
-   GaudiKernel
-   InnerDetector/InDetDetDescr/InDetIdentifier
-   InnerDetector/InDetDetDescr/PixelGeoModel
-   MagneticField/MagFieldInterfaces
-   MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces
-   Reconstruction/RecoTools/ITrackToVertex
-   Tracking/TrkEvent/TrkEventPrimitives
-   Tracking/TrkEvent/TrkParameters
-   Tracking/TrkEvent/TrkParticleBase
-   Tracking/TrkEvent/TrkTrack
-   Tracking/TrkEvent/TrkTrackSummary
-   Tracking/TrkExtrapolation/TrkExInterfaces
-   Tracking/TrkTools/TrkToolInterfaces
-   PRIVATE
-   Control/AthContainers
-   DetectorDescription/AtlasDetDescr
-   DetectorDescription/GeoPrimitives
-   DetectorDescription/IdDictDetDescr
-   InnerDetector/InDetConditions/BeamSpotConditionsData
-   InnerDetector/InDetRecEvent/InDetPrepRawData
-   InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-   Reconstruction/Particle
-   Tracking/TrkDetDescr/TrkSurfaces
-   Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-   Tracking/TrkEvent/VxVertex
-   MagneticField/MagFieldElements
-   MagneticField/MagFieldConditions)
-
 # Component(s) in the package:
 atlas_add_library( TrkParticleCreatorLib
    TrkParticleCreator/*.h
    INTERFACE
    PUBLIC_HEADERS TrkParticleCreator
-   LINK_LIBRARIES TrkToolInterfaces AthenaBaseComps GaudiKernel TrkParticleBase
-   TrkParameters TrkTrackSummary TrkTrack TrkEventPrimitives
-   MuonRecToolInterfaces TrkTrackSummary xAODTracking AthContainers
+   LINK_LIBRARIES ITrackToVertex TrkToolInterfaces AthenaBaseComps GaudiKernel TrkParticleBase
+   TrkParameters TrkTrackSummary TrkTrack TrkEventPrimitives MagFieldConditions MagFieldElements
+   MuonRecToolInterfaces TrkExInterfaces TrkTrackSummary xAODTracking AthContainers
    EventPrimitives InDetIdentifier PixelGeoModelLib )
 
 atlas_add_component( TrkParticleCreator
@@ -56,6 +19,6 @@ atlas_add_component( TrkParticleCreator
    GaudiKernel InDetIdentifier MuonRecToolInterfaces TrkEventPrimitives
    TrkParameters TrkParticleBase TrkTrack TrkTrackSummary TrkToolInterfaces
    AthContainers AtlasDetDescr GeoPrimitives IdDictDetDescr InDetPrepRawData
-   InDetRIO_OnTrack MagFieldInterfaces Particle ITrackToVertex TrkSurfaces
+   InDetRIO_OnTrack Particle ITrackToVertex TrkSurfaces
    TrkPseudoMeasurementOnTrack VxVertex TrkExInterfaces PixelGeoModelLib
    TrkParticleCreatorLib MagFieldElements MagFieldConditions BeamSpotConditionsData )
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/CMakeLists.txt b/Tracking/TrkTools/TrkRIO_OnTrackCreator/CMakeLists.txt
index bb50a2f5ea1a4c8aedbb72512bbef7c7f5e5d8c0..f7d85bcbdf4b7d1d419111ece9bd5628e42a5ff3 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/CMakeLists.txt
@@ -1,37 +1,13 @@
-################################################################################
-# Package: TrkRIO_OnTrackCreator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkRIO_OnTrackCreator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Event/EventPrimitives
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-			  PRIVATE
-			  Control/CxxUtils
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkRIO_OnTrack )
-
 # Component(s) in the package:
 atlas_add_component( TrkRIO_OnTrackCreator
                      src/*.cxx
                      src/components/*.cxx
-		     LINK_LIBRARIES AthenaBaseComps AthenaKernel EventPrimitives GaudiKernel TrkParameters TrkToolInterfaces CxxUtils AthenaPoolUtilities AtlasDetDescr Identifier xAODEventInfo InDetIdentifier InDetRIO_OnTrack MuonRIO_OnTrack TrkPrepRawData TrkRIO_OnTrack )
+		             LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib TrkParameters TrkToolInterfaces CxxUtils AthenaPoolUtilities AtlasDetDescr Identifier InDetRIO_OnTrack MuonRIO_OnTrack TrkPrepRawData TrkRIO_OnTrack )
 
 # Install files from the package:
-atlas_install_headers( TrkRIO_OnTrackCreator )
 atlas_install_joboptions( share/*.py )
-
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/CMakeLists.txt b/Tracking/TrkTools/TrkResidualPullCalculator/CMakeLists.txt
index 4450e5019c836f033e95b671616d4ff62194af07..9faf094a35b758030c0d94f94c987a1e90c4596d 100644
--- a/Tracking/TrkTools/TrkResidualPullCalculator/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkResidualPullCalculator/CMakeLists.txt
@@ -1,29 +1,14 @@
-################################################################################
-# Package: TrkResidualPullCalculator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkResidualPullCalculator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          Event/EventPrimitives
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkTools/TrkToolInterfaces )
-
+# External dependencies:
 find_package( Eigen )
 
 # Component(s) in the package:
 atlas_add_component( TrkResidualPullCalculator
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps AtlasDetDescr EventPrimitives GaudiKernel TrkEventPrimitives TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkToolInterfaces )
-
+                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AtlasDetDescr EventPrimitives GaudiKernel TrkEventPrimitives TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkToolInterfaces TrkTrack )
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/CMakeLists.txt b/Tracking/TrkTools/TrkTrackFieldIntegralTools/CMakeLists.txt
index 40e7fc55320669eea5e5523dcce1d758f89b3a0c..77ddf09b2792592804a779f5e6146a851d278b63 100644
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkTrackFieldIntegralTools/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: TrkTrackFieldIntegralTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkTrackFieldIntegralTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkTools/TrkToolInterfaces )
-
 # Component(s) in the package:
 atlas_add_component( TrkTrackFieldIntegralTools
                      src/*.cxx
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/CMakeLists.txt b/Tracking/TrkTools/TrkTrackSlimmingTool/CMakeLists.txt
index df63fde5363285d73b52e01f3242dde8f8fd62b3..d6f3c1021a41ebc12076b08f10cf29066728c7b5 100644
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/CMakeLists.txt
@@ -1,35 +1,10 @@
-################################################################################
-# Package: TrkTrackSlimmingTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkTrackSlimmingTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-			  Tracking/TrkTools/TrkToolInterfaces
-			  Control/CxxUtils
-			  PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          GaudiKernel
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary )
-
 # Component(s) in the package:
 atlas_add_component( TrkTrackSlimmingTool
                      src/*.cxx
                      src/components/*.cxx
-		     LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces CxxUtils AtlasDetDescr GaudiKernel TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkTrackSummary )
-
-# Install files from the package:
-atlas_install_headers( TrkTrackSlimmingTool )
-
+		             LINK_LIBRARIES AthenaBaseComps TrkToolInterfaces CxxUtils AtlasDetDescr TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkTrackSummary )
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/CMakeLists.txt b/Tracking/TrkTools/TrkTruthCreatorTools/CMakeLists.txt
index 398833ee9b02e9482809c32e5f9cb06286aa4064..9038cc311979115597beaad89ed37e325b079038 100644
--- a/Tracking/TrkTools/TrkTruthCreatorTools/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/CMakeLists.txt
@@ -1,38 +1,11 @@
-################################################################################
-# Package: TrkTruthCreatorTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkTruthCreatorTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthLinks
-                          Control/AthContainers
-                          DetectorDescription/AtlasDetDescr
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkTruthData
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack )
-
-# External dependencies:
-
 # Component(s) in the package:
 atlas_add_component( TrkTruthCreatorTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS 
                      LINK_LIBRARIES AtlasHepMCLib AthenaBaseComps AthLinks AthContainers AtlasDetDescr GaudiKernel TrkEventUtils TrkTruthData TrkToolInterfaces GeneratorObjects TrkCompetingRIOsOnTrack TrkMeasurementBase TrkPrepRawData TrkRIO_OnTrack TrkTrack )
-
-# Install files from the package:
-atlas_install_headers( TrkTruthCreatorTools )
-
diff --git a/Tracking/TrkTools/TrkTruthToTrack/CMakeLists.txt b/Tracking/TrkTools/TrkTruthToTrack/CMakeLists.txt
index 561b0a10527785747cd2d5841847229c343ac19b..968e052d9a17bb14a005818a8b6cd9d3de59c9a3 100644
--- a/Tracking/TrkTools/TrkTruthToTrack/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkTruthToTrack/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: TrkTruthToTrack
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrkTruthToTrack )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          Event/xAOD/xAODTruth
-                          Simulation/G4Sim/TrackRecord
-                          Tracking/TrkExtrapolation/TrkExInterfaces 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( HepPDT )
 
@@ -25,8 +11,4 @@ atlas_add_component( TrkTruthToTrack
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel TrackRecordLib TrkParameters TrkToolInterfaces xAODTruth TrkExInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkTruthToTrack )
-
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel StoreGateLib TrackRecordLib TrkParameters TrkToolInterfaces xAODTruth TrkExInterfaces )