diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/CMakeLists.txt
index 0d8f2528c5206099a35fce1cbdb1b1b6328996a1..221d2fad0d98890625da946922a47c9a1769907e 100644
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/CMakeLists.txt
@@ -1,38 +1,8 @@
-################################################################################
-# Package: InDetAmbiTrackSelectionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetAmbiTrackSelectionTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   Control/AthenaKernel
-   GaudiKernel
-   Tracking/TrkEvent/TrkRIO_OnTrack
-   Tracking/TrkEvent/TrkTrack
-   Tracking/TrkTools/TrkToolInterfaces
-   Tracking/TrkValidation/TrkValInterfaces
-   PRIVATE
-   Control/AthContainers
-   Control/CxxUtils
-   Control/StoreGate
-   InnerDetector/InDetDetDescr/InDetIdentifier
-   InnerDetector/InDetDetDescr/PixelGeoModel
-   InnerDetector/InDetRecEvent/InDetPrepRawData
-   InnerDetector/InDetRecTools/InDetRecToolInterfaces
-   Tracking/TrkDetDescr/TrkDetElementBase
-   Tracking/TrkDetDescr/TrkSurfaces
-   Tracking/TrkEvent/TrkCaloClusterROI
-   Tracking/TrkEvent/TrkMeasurementBase
-   Tracking/TrkEvent/TrkPrepRawData
-   Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-   Tracking/TrkEvent/TrkTrackSummary 
-   Tracking/TrkEvent/TrkParameters
-   Tracking/TrkFitter/TrkFitterInterfaces)
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core MathCore )
 
@@ -41,7 +11,7 @@ atlas_add_component( InDetAmbiTrackSelectionTool
    InDetAmbiTrackSelectionTool/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
    LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkRIO_OnTrack
-   TrkTrack TrkToolInterfaces TrkValInterfaces AthContainers CxxUtils StoreGateLib
-   InDetIdentifier InDetPrepRawData InDetRecToolInterfaces TrkDetElementBase
+   TrkTrack TrkToolInterfaces AthContainers CxxUtils StoreGateLib
+   InDetIdentifier InDetPrepRawData InDetRecToolInterfaces TrkDetElementBase TrkEventUtils
    TrkSurfaces TrkCaloClusterROI TrkMeasurementBase TrkPrepRawData
    TrkPseudoMeasurementOnTrack TrkTrackSummary TrkParameters PixelGeoModelLib TrkFitterInterfaces)
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetAssociationTools/CMakeLists.txt
index 12c507091b8d6ba37afcf738fbd4fa771c1c2ff2..839cd9ba398ddce34a03de957e21c12cea553996 100644
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetAssociationTools/CMakeLists.txt
@@ -1,33 +1,10 @@
-################################################################################
-# Package: InDetAssociationTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetAssociationTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack )
-
 # Component(s) in the package:
 atlas_add_component( InDetAssociationTools
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps Identifier GaudiKernel InDetPrepRawData TrkPrepRawData TrkToolInterfaces AtlasDetDescr InDetIdentifier InDetRIO_OnTrack TrkDetElementBase TrkRIO_OnTrack TrkTrack TrkEventUtils )
-
-# Install files from the package:
-atlas_install_headers( InDetAssociationTools )
-
+                     LINK_LIBRARIES AthenaBaseComps Identifier GaudiKernel InDetPrepRawData TrkPrepRawData TrkToolInterfaces AtlasDetDescr InDetIdentifier InDetRIO_OnTrack InDetReadoutGeometry StoreGateLib TrkDetElementBase TrkRIO_OnTrack TrkTrack TrkEventUtils )
diff --git a/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/CMakeLists.txt
index b4e81d934322cd3a1660f120a8ecb2502a7689c5..00c34aca4f9ceadee6bae0bfbf7fa32d0c817fff 100644
--- a/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/CMakeLists.txt
@@ -1,10 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Package: InDetBoundaryCheckTool
 
-# Declare the package name
-atlas_subdir(
-    InDetBoundaryCheckTool
-)
+# Declare the package name:
+atlas_subdir( InDetBoundaryCheckTool )
 
 # Component(s) in the package:
 atlas_add_component(
@@ -12,18 +9,11 @@ atlas_add_component(
     src/*.cxx
     src/components/*.cxx
     LINK_LIBRARIES 
-    AthenaBaseComps 
-    GaudiKernel 
-    TrkParameters 
+    AthenaBaseComps
+    GeoModelInterfaces
+    TrkParameters
     TrkToolInterfaces
-    TrkTrack
     InDetReadoutGeometry
     InDetConditionsSummaryService
     InDetRecToolInterfaces
 )
-
-# Install files from the package:
-atlas_install_headers(
-    InDetBoundaryCheckTool
-)
-
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/CMakeLists.txt
index e753837804c1987856511566c2a5ff3a9c14dd12..08241c1207d891087f5f00e6e3bd805808aa224c 100644
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: InDetCaloClusterROIBuilder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetCaloClusterROIBuilder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloTrackingGeometry
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODEgamma
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkCaloClusterROI
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # Component(s) in the package:
 atlas_add_component( InDetCaloClusterROIBuilder
                      src/*.cxx
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/CMakeLists.txt
index 794088b70409c0c1f7e4015da54885c38b60670d..30741ab96e0e18a2a744af9e7ba6c8cfb9c22a60 100644
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/CMakeLists.txt
@@ -1,28 +1,8 @@
-################################################################################
-# Package: InDetCompetingRIOsOnTrackTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetCompetingRIOsOnTrackTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
-# External dependencies:
-find_package( Eigen )
-
 atlas_add_library( InDetCompetingRIOsOnTrackToolLib
                    InDetCompetingRIOsOnTrackTool/*.h
                    INTERFACE
@@ -33,7 +13,4 @@ atlas_add_library( InDetCompetingRIOsOnTrackToolLib
 atlas_add_component( InDetCompetingRIOsOnTrackTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} InDetCompetingRIOsOnTrackToolLib InDetPrepRawData TrkSurfaces TrkEventPrimitives TrkExInterfaces )
-
-
+                     LINK_LIBRARIES InDetCompetingRIOsOnTrack InDetCompetingRIOsOnTrackToolLib InDetPrepRawData TrkEventPrimitives TrkExInterfaces TrkSurfaces TrkToolInterfaces )
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
index fc81066bb48265e88540844a8ddaad8e6c692a31..af7a23aa9a8d1ac6ea162850e492ef0bdae3cfc6 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: InDetConversionFinderTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetConversionFinderTools )
@@ -15,19 +13,15 @@ atlas_add_library( InDetConversionFinderToolsLib
                    PUBLIC_HEADERS InDetConversionFinderTools
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces Particle TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkVertexSeedFinderUtilsLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks InDetPrepRawData TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack VxVertex
-                   TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces )
+                   LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoPrimitives InDetRecToolInterfaces Particle TrkEventPrimitives TrkExInterfaces TrkParameters TrkParticleBase TrkToolInterfaces TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib xAODTracking
+                    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthLinks InDetPrepRawData TrkMeasurementBase TrkRIO_OnTrack TrkSurfaces VxVertex )
 
 atlas_add_component( InDetConversionFinderTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces Particle TrkEventPrimitives
-                     TrkParameters TrkParticleBase TrkTrack AthLinks InDetPrepRawData TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack VxVertex TrkExInterfaces
-                     TrkToolInterfaces TrkVertexFitterInterfaces InDetConversionFinderToolsLib )
-
+                     LINK_LIBRARIES InDetConversionFinderToolsLib )
 
+# Test(s) in the package:
 atlas_add_test( VertexPointEstimator_test
                 SOURCES test/VertexPointEstimator_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} InDetConversionFinderToolsLib )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} CxxUtils GaudiKernel InDetConversionFinderToolsLib TestTools )
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetDNASeparator/CMakeLists.txt
index 4b52d593683f2833935a97adbaef8ef8cfa5f20c..d4a2a63bf003e0b78022a88033a3e3a4e537f55a 100644
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetDNASeparator/CMakeLists.txt
@@ -1,31 +1,10 @@
-################################################################################
-# Package: InDetDNASeparator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetDNASeparator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkFitter/TrkFitterInterfaces
-                          Tracking/TrkFitter/TrkFitterUtils
-                          PRIVATE
-                          Event/EventPrimitives
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkTrack )
-
 # Component(s) in the package:
 atlas_add_component( InDetDNASeparator
                      src/*.cxx
                      src/components/*.cxx
                      LINK_LIBRARIES AthenaBaseComps TrkMaterialOnTrack TrkParameters TrkFitterInterfaces TrkFitterUtils EventPrimitives GaudiKernel InDetIdentifier TrkSurfaces TrkMeasurementBase TrkTrack )
-
-# Install files from the package:
-atlas_install_headers( InDetDNASeparator )
-
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
index a4391bfad7f2db59cab14f05a0761a49a1be0b0f..0f3c8cc907d11c4bf6f9514e5b2abab77a938f19 100644
--- a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
@@ -1,42 +1,25 @@
-################################################################################
-# Package: InDetEtaDependentCuts
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetEtaDependentCuts )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(  )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          GaudiKernel )
-
 # External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
 find_package( Boost COMPONENTS unit_test_framework )
 
-# tag rootMathLibs was not recognized in automatic conversion in cmt2cmake
-
 # Component(s) in the package:
 atlas_add_component( InDetEtaDependentCuts
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel InDetRecToolInterfaces )
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces )
 
 # Install files from the package:
-atlas_install_headers( InDetEtaDependentCuts )
 atlas_install_joboptions( share/*.txt )
 
+# Test(s) in the package:
 atlas_add_test( InDetEtaDependentCutsSvc_test                
    SOURCES test/InDetEtaDependentCutsSvc_test.cxx 
    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel AthenaBaseComps GaudiKernel TestTools CxxUtils InDetRecToolInterfaces
+   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetRecToolInterfaces TestTools
    POST_EXEC_SCRIPT "nopost.sh" )
 
diff --git a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/CMakeLists.txt
index d5642f3784b7c1432814d5db0534e23e0256c2f3..7fdad69e34a6fb8da1262c765c2edaf7bd6ff15c 100644
--- a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/CMakeLists.txt
@@ -1,36 +1,8 @@
-################################################################################
-# Package: InDetIncSecVxFinderTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetIncSecVxFinderTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-			  Control/AthContainers
-                          Control/CxxUtils
-			  Event/xAOD/xAODTracking
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          PRIVATE
-			  DetectorDescription/GeoPrimitives
-                          Tracking/TrkEvent/TrkTrack
-			  Tracking/TrkEvent/TrkParticleBase
- 			  Tracking/TrkEvent/TrkParameters
-			  Tracking/TrkEvent/TrkEventPrimitives
-			  Tracking/TrkEvent/VxVertex
-			  Tracking/TrkEvent/TrkLinks
-			  Tracking/TrkEvent/TrkTrackLink
-			  Tracking/TrkEvent/TrkTrack
-			  Tracking/TrkDetDescr/TrkSurfaces
-			  Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-			  Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils
-			  Tracking/TrkVertexFitter/TrkVxEdmCnv
-			  Event/EventPrimitives
-			  InnerDetector/InDetConditions/InDetBeamSpotService
-			  InnerDetector/InDetRecTools/InDetTrackSelectionTool )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -39,8 +11,5 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 atlas_add_component( InDetIncSecVxFinderTool
                      src/*.cxx
                      src/components/*.cxx
-		     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthContainers CxxUtils xAODTracking GaudiKernel InDetRecToolInterfaces GeoPrimitives TrkTrack TrkParticleBase TrkParameters TrkEventPrimitives VxVertex TrkLinks TrkTrack TrkSurfaces TrkVertexFitterInterfaces TrkVxEdmCnvLib EventPrimitives InDetTrackSelectionToolLib TrkVertexSeedFinderUtilsLib InDetBeamSpotServiceLib )
-
-# Install files from the package:
-atlas_install_headers( InDetIncSecVxFinderTool )
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthContainers CxxUtils xAODTracking GaudiKernel InDetRecToolInterfaces GeoPrimitives TrkTrack TrkParticleBase TrkParameters TrkEventPrimitives VxVertex TrkLinks TrkTrack TrkTrackLink TrkTrackSummary TrkSurfaces TrkVertexFitterInterfaces EventPrimitives InDetTrackSelectionToolLib TrkVertexSeedFinderUtilsLib InDetBeamSpotServiceLib )
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/CMakeLists.txt
index dee5f008ae5ca86d70aa85c20888031499bc04ec..cd32326b83e7fc6d912c0fef880dd5135c290055 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/CMakeLists.txt
@@ -1,33 +1,10 @@
-################################################################################
-# Package: InDetMultipleVertexSeedFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetMultipleVertexSeedFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          PRIVATE
-                          Event/EventPrimitives
-                          Event/xAOD/xAODTracking
-                          InnerDetector/InDetConditions/InDetBeamSpotService
-                          InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkVertexFitter/TrkVertexFitterInterfaces )
-
 # Component(s) in the package:
 atlas_add_component( InDetMultipleVertexSeedFinder
                      src/*.cxx
                      src/components/*.cxx
                      LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces EventPrimitives xAODTracking InDetMultipleVertexSeedFinderUtilsLib TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces InDetBeamSpotServiceLib )
-
-# Install files from the package:
-atlas_install_headers( InDetMultipleVertexSeedFinder )
-
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/CMakeLists.txt
index 6e5b7564aeb13b7534e46049ad72b85fc396c662..23f0a3d7055c7c0b4ef95fe19b6b239dbfd53f7e 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: InDetMultipleVertexSeedFinderUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetMultipleVertexSeedFinderUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          PRIVATE
-                          Event/EventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
 # Component(s) in the package:
 atlas_add_library( InDetMultipleVertexSeedFinderUtilsLib
                    src/*.cxx
@@ -27,5 +12,4 @@ atlas_add_library( InDetMultipleVertexSeedFinderUtilsLib
 
 atlas_add_component( InDetMultipleVertexSeedFinderUtils
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel EventPrimitives TrkParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces InDetMultipleVertexSeedFinderUtilsLib )
-
+                     LINK_LIBRARIES InDetMultipleVertexSeedFinderUtilsLib )
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/CMakeLists.txt
index 2cdcfe4cd6b858bfcf44e477d8c5bbe4587aac3a..10d10c62cf86caf76dfc9c4329fea45ffeefdf54 100644
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/CMakeLists.txt
@@ -1,54 +1,14 @@
-################################################################################
-# Package: InDetPriVxFinderTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetPriVxFinderTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          PhysicsAnalysis/AnalysisCommon/PATCore
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          Control/CxxUtils
-                          PRIVATE
-                          Control/AthContainers
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          InnerDetector/InDetRecTools/InDetTrackSelectionTool
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkLinks
-                          Tracking/TrkEvent/TrkTrackLink
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkEvent/VxMultiVertex
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-                          Tracking/TrkVertexFitter/TrkVertexFitters)
-
-# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_component( InDetPriVxFinderTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking 
-                     GaudiKernel InDetRecToolInterfaces PATCoreLib TrkParameters TrkParticleBase TrkTrack CxxUtils AthContainers GeoPrimitives 
-                     EventPrimitives TrkSurfaces TrkEventPrimitives TrkLinks TrkTrackSummary VxMultiVertex VxVertex 
-                     TrkVertexFitterInterfaces TrkVertexFittersLib BeamSpotConditionsData StoreGateLib
-                     InDetTrackSelectionToolLib )
-
-# Install files from the package:
-atlas_install_headers( InDetPriVxFinderTool )
-
+                     LINK_LIBRARIES AthContainers AthenaBaseComps BeamSpotConditionsData
+                     EventPrimitives GaudiKernel GeoPrimitives InDetRecToolInterfaces InDetTrackSelectionToolLib
+                     StoreGateLib TrkEventPrimitives TrkLinks TrkParameters TrkParticleBase TrkSurfaces TrkTrack
+                     TrkTrackLink TrkTrackSummary TrkVertexFitterInterfaces TrkVertexFittersLib
+                     VxMultiVertex VxVertex xAODTracking )
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/CMakeLists.txt
index fa0c93cb8d62bfa31be486bd2103f51263f68da1..71dcda326ceb5db74aa1dd11c41ab7bc26881543 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/CMakeLists.txt
@@ -1,35 +1,11 @@
-################################################################################
-# Package: InDetRecToolInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetRecToolInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/IRegionSelector
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/SiSpacePointsSeed
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkSegment
-                          Tracking/TrkEvent/TrkSpacePoint
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/VxVertex )
-
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_library( InDetRecToolInterfaces
+                   InDetRecToolInterfaces/*.h
+                   INTERFACE
                    PUBLIC_HEADERS InDetRecToolInterfaces
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives IRegionSelector Identifier xAODCaloEvent xAODTracking GaudiKernel InDetPrepRawData SiSpacePointsSeed TrkEventPrimitives TrkMeasurementBase TrkParameters TrkParticleBase TrkSegment TrkSpacePoint TrkTrack VxVertex )
-
+                   LINK_LIBRARIES GaudiKernel GeoPrimitives IRegionSelector Identifier InDetPrepRawData MagFieldElements SiSPSeededTrackFinderData SiSpacePointsSeed TrkEventPrimitives TrkMeasurementBase TrkParameters TrkParticleBase TrkSegment TrkSpacePoint TrkTrack VxVertex xAODCaloEvent xAODTracking )
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/CMakeLists.txt
index c2da8e197a796022b49b3bb5e4d40d516aea7a2c..4438932e2a4aed1497a72d5f20b70e237dbbe7fc 100644
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/CMakeLists.txt
@@ -1,22 +1,10 @@
-################################################################################
-# Package: InDetResidualPullCalculators
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetResidualPullCalculators )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces )
-
 # Component(s) in the package:
 atlas_add_component( InDetResidualPullCalculators
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRIO_OnTrack TrkEventPrimitives TrkParameters TrkToolInterfaces )
-
+                     LINK_LIBRARIES AthenaBaseComps InDetRIO_OnTrack TrkEventPrimitives TrkParameters TrkToolInterfaces )
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/CMakeLists.txt
index c6b6855c46273f6b8d7f98a00f117f96e906b138..ce82ce5a4996f80da70c5642fce2b8e071bb38fb 100644
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/CMakeLists.txt
@@ -1,13 +1,10 @@
-################################################################################
-# Package: InDetSVWithMuonTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetSVWithMuonTool )
 
 # External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core MathCore Hist )
 
 atlas_add_library(
     InDetSVWithMuonToolLib
@@ -17,15 +14,20 @@ atlas_add_library(
     PUBLIC_HEADERS
     InDetSVWithMuonTool
 
-    INCLUDE_DIRS
-    ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+    PRIVATE_INCLUDE_DIRS
+    ${ROOT_INCLUDE_DIRS}
 
     LINK_LIBRARIES
-    ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES}
-    AthenaBaseComps GaudiKernel TrkVKalVrtFitterLib xAODTracking
+    AthenaBaseComps
+    GaudiKernel
+    TrkVertexFitterInterfaces
+    xAODTracking
 
     PRIVATE_LINK_LIBRARIES
-    AnalysisUtilsLib xAODBTagging
+    ${ROOT_LIBRARIES}
+    AnalysisUtilsLib
+    TrkVKalVrtFitterLib
+    xAODBTagging
     )
 
 
@@ -35,8 +37,8 @@ atlas_add_component(
     src/components/*.cxx
 
     LINK_LIBRARIES
-    GaudiKernel InDetSVWithMuonToolLib
+    InDetSVWithMuonToolLib
     )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/python/SecVrtWithMuonFinder.py b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/python/SecVrtWithMuonFinder.py
index 8e966843e7990c6b38412dd5a17e79df09651dca..33d72660a5d03c4ecf22209dd45d3735aaafc3ea 100644
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/python/SecVrtWithMuonFinder.py
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/python/SecVrtWithMuonFinder.py
@@ -1,12 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from GaudiKernel.GaudiHandles import *
-from GaudiKernel.Proxy.Configurable import *
-from AthenaCommon.Include  import Include, IncludeError, include
 from AthenaCommon.Logging  import logging
-from AthenaCommon.AppMgr   import ToolSvc
-from AthenaCommon          import CfgMgr
-
 from InDetSVWithMuonTool.InDetSVWithMuonToolConf import InDet__InDetSVWithMuonTool
 
 # define the class
diff --git a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/CMakeLists.txt
index 7dcd6b910717a346f428485c2822b70648a9b2da..3b85813876bd1ce63612b57a92ab23a8ace61767 100644
--- a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/CMakeLists.txt
@@ -1,60 +1,19 @@
-################################################################################
-# Package: InDetSecVtxTrackSelectionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetSecVtxTrackSelectionTool )
 
-# Declare the package's dependencies:
-if( XAOD_STANDALONE )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      PRIVATE
-      Control/xAODRootAccess )
-elseif( XAOD_ANALYSIS )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      GaudiKernel
-      PRIVATE
-      Control/AthenaBaseComps )
-else()
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      GaudiKernel
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      Tracking/TrkEvent/TrkParameters
-      Tracking/TrkTools/TrkToolInterfaces
-      PRIVATE
-      Control/AthenaBaseComps
-      InnerDetector/InDetRecTools/InDetTrackSelectionTool
-      Tracking/TrkEvent/TrkEventPrimitives
-      Tracking/TrkEvent/TrkTrack
-      Tracking/TrkEvent/TrkTrackSummary
-      Tracking/TrkEvent/VxVertex )
-endif()
-
-# External(s):
-find_package( ROOT COMPONENTS Core RIO Hist MathCore )
-
 # Libraries in the package:
 set( extra_libs )
 if( NOT XAOD_ANALYSIS )
-   set( extra_libs TrkParameters GaudiKernel TrkToolInterfaces
+   set( extra_libs InDetTrackSelectionToolLib TrkParameters GaudiKernel TrkToolInterfaces
       PRIVATE_LINK_LIBRARIES TrkTrack TrkEventPrimitives TrkTrackSummary VxVertex )
 endif()
 
 atlas_add_library( InDetSecVtxTrackSelectionToolLib
    InDetSecVtxTrackSelectionTool/*.h Root/*.h Root/*.cxx
    PUBLIC_HEADERS InDetSecVtxTrackSelectionTool
-   LINK_LIBRARIES PATCoreLib xAODTracking ${extra_libs} )
+   LINK_LIBRARIES AsgMessagingLib AsgTools xAODTracking ${extra_libs} )
 
 if( NOT XAOD_STANDALONE )
    set( extra_libs )
@@ -72,6 +31,5 @@ atlas_add_dictionary( InDetSecVtxTrackSelectionToolDict
    InDetSecVtxTrackSelectionTool/selection.xml
    LINK_LIBRARIES InDetSecVtxTrackSelectionToolLib )
 
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
index 2c0ff13b1f580cccdf8bf3804b9f47ee8387a539..70c675b1e22bad6dcf354e7e342055b9fb016e71 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
@@ -1,28 +1,21 @@
-################################################################################
-# Package: InDetSecVxFinderTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetSecVxFinderTool )
 
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core MathCore )
 
 # Component(s) in the package:
 atlas_add_library( InDetSecVxFinderToolLib
                    src/*.cxx
                    PUBLIC_HEADERS InDetSecVxFinderTool
-                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel InDetRecToolInterfaces TrkParameters TrkParticleBase TrkJetVxFitterLib TrkVertexFittersLib TrkVxEdmCnvLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib TrkVertexSeedFinderToolsLib )
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel GeoPrimitives InDetRecToolInterfaces TrkExInterfaces TrkJetVxFitterLib TrkLinks TrkParameters TrkParticleBase TrkToolInterfaces TrkTrackLink TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib VxJetVertex VxVertex xAODTracking
+                   PRIVATE_LINK_LIBRARIES EventPrimitives TrkEventPrimitives TrkNeutralParameters TrkSurfaces TrkTrack TrkVertexFittersLib TrkVertexSeedFinderToolsLib VxSecVertex )
 
 atlas_add_component( InDetSecVxFinderTool
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel InDetRecToolInterfaces TrkParameters TrkParticleBase EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkJetVxFitterLib TrkVertexFitterInterfaces TrkVertexFittersLib TrkVxEdmCnvLib InDetSecVxFinderToolLib TrkVertexSeedFinderToolsLib )
-
+                     LINK_LIBRARIES InDetSecVxFinderToolLib )
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
deleted file mode 100755
index 860b56e4f556369158e3a0830d77b9bb439ec8a3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetSecVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
index e1a88abe1a6c64499af785a0b8d8deb9b4201375..87dd02b8da4a13bf508c33409eaee7afea3f12c7 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
@@ -1,58 +1,17 @@
-################################################################################
-# Package: InDetTestBLayer
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTestBLayer )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          Event/EventPrimitives
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-			  Tracking/TrkExtrapolation/TrkExInterfaces 
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/IdDictDetDescr
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/PixelReadoutGeometry
-                          Reconstruction/Particle
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkTrack
-                          )
-
-# External dependencies:
-find_package( Eigen )
-
-# tag ROOTRooFitLibs was not recognized in automatic conversion in cmt2cmake
-
-# tag ROOTMathLibs was not recognized in automatic conversion in cmt2cmake
-
 # Component(s) in the package:
 atlas_add_library( InDetTestBLayerLib
                    src/*.cxx
                    PUBLIC_HEADERS InDetTestBLayer
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives Identifier EventPrimitives GaudiKernel InDetRecToolInterfaces 
-		   TrkEventPrimitives TrkParameters TrkToolInterfaces TrkExInterfaces 
-                   InDetConditionsSummaryService
-                   PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry Particle 
-		   TrkGeometry TrkSurfaces TrkMeasurementBase TrkTrack )
+                   LINK_LIBRARIES AthenaBaseComps GeoPrimitives Identifier EventPrimitives GaudiKernel InDetRecToolInterfaces
+		           TrkEventPrimitives TrkParameters TrkToolInterfaces TrkExInterfaces InDetConditionsSummaryService
+                   PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetIdentifier InDetReadoutGeometry
+                   PixelReadoutGeometry Particle TrkGeometry TrkSurfaces TrkMeasurementBase TrkTrack )
 
 atlas_add_component( InDetTestBLayer
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives Identifier EventPrimitives 
-		     GaudiKernel InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AtlasDetDescr IdDictDetDescr InDetIdentifier 
-		     InDetReadoutGeometry Particle TrkGeometry TrkSurfaces TrkMeasurementBase TrkTrack TrkExInterfaces InDetTestBLayerLib )
-
+                     LINK_LIBRARIES InDetTestBLayerLib )
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
index 46ccec0d5ed51177b09fb3974b66e1416804b72c..f64aed1106c86a60dd8f0b4b0fc2abba66cb2432 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
@@ -1,53 +1,15 @@
-################################################################################
-# Package: InDetTestPixelLayer
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTestPixelLayer )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/IdDictDetDescr
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/PixelReadoutGeometry
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
-# External dependencies:
-find_package( Eigen )
-
-# tag ROOTRooFitLibs was not recognized in automatic conversion in cmt2cmake
-
-# tag ROOTMathLibs was not recognized in automatic conversion in cmt2cmake
-
 # Component(s) in the package:
 atlas_add_library( InDetTestPixelLayerLib
                    src/*.cxx
                    PUBLIC_HEADERS InDetTestPixelLayer
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel InDetIdentifier InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces InDetConditionsSummaryService
+                   LINK_LIBRARIES AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel InDetIdentifier InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces InDetConditionsSummaryService
                    PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetReadoutGeometry PixelReadoutGeometry TrkGeometry TrkSurfaces TrkMeasurementBase TrkParticleBase TrkTrack TrkTrackSummary TrkExInterfaces )
 
 atlas_add_component( InDetTestPixelLayer
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel InDetIdentifier InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AtlasDetDescr IdDictDetDescr InDetReadoutGeometry TrkGeometry TrkSurfaces TrkMeasurementBase TrkParticleBase TrkTrack TrkTrackSummary TrkExInterfaces InDetTestPixelLayerLib )
-
+                     LINK_LIBRARIES InDetTestPixelLayerLib )
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/CMakeLists.txt
index eaf25ab3a11e2663a5548c99a230148d087a190c..1792a30ea47737627949de3adf0a21a275a348d6 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/CMakeLists.txt
@@ -1,40 +1,10 @@
-################################################################################
-# Package: InDetTrackHoleSearch
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrackHoleSearch )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/Identifier
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkVolumes
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrackHoleSearch
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel TrkEventPrimitives TrkParameters TrkToolInterfaces AtlasDetDescr Identifier InDetReadoutGeometry InDetRecToolInterfaces TrkDetDescrUtils TrkGeometry TrkVolumes TrkEventUtils TrkMeasurementBase TrkTrack TrkTrackSummary TrkExInterfaces InDetConditionsSummaryService )
-
-# Install files from the package:
-atlas_install_headers( InDetTrackHoleSearch )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoModelInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AtlasDetDescr Identifier InDetReadoutGeometry InDetRecToolInterfaces TrkDetDescrUtils TrkGeometry TrkVolumes TrkEventUtils TrkMeasurementBase TrkTrack TrkTrackSummary TrkExInterfaces )
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
index bcb33444dd932ddd4119508644d88a8360c39f81..8ed9972ab588e2922543cb2486d8f59a1242245f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
@@ -1,52 +1,16 @@
-################################################################################
-# Package: InDetTrackScoringTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrackScoringTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkTools/TrkToolInterfaces
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoPrimitives
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkEvent/TrkCaloClusterROI
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-                          Tools/PathResolver
-			  )
-
-
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Eigen )
 find_package( lwtnn )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
-# tag rootMathLibs was not recognized in automatic conversion in cmt2cmake
-
 # Component(s) in the package:
 atlas_add_component( InDetTrackScoringTools
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkEventPrimitives TrkToolInterfaces GeoPrimitives InDetIdentifier InDetRIO_OnTrack InDetRecToolInterfaces TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrkTrackSummary TrkExInterfaces TrkCaloClusterROI MagFieldElements MagFieldConditions BeamSpotConditionsData PathResolver )
-
-# Install files from the package:
-atlas_install_headers( InDetTrackScoringTools )
-
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkEventPrimitives TrkToolInterfaces GeoPrimitives InDetIdentifier InDetRIO_OnTrack InDetRecToolInterfaces StoreGateLib TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrkTrackSummary TrkExInterfaces TrkCaloClusterROI MagFieldElements MagFieldConditions BeamSpotConditionsData PathResolver )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/CMakeLists.txt
index dd495026f16bfeec52fc47bc6db9d84924426714..d4927d48e63a768446fcae970a340656d98c77c5 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/CMakeLists.txt
@@ -1,51 +1,8 @@
-################################################################################
-# Package: InDetTrackSelectionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrackSelectionTool )
 
-# Declare the package's dependencies:
-if( XAOD_STANDALONE )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-      PRIVATE
-      Control/xAODRootAccess )
-elseif( XAOD_ANALYSIS )
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-      GaudiKernel
-      PRIVATE
-      Control/AthenaBaseComps )
-else()
-   atlas_depends_on_subdirs(
-      PUBLIC
-      Control/AthToolSupport/AsgTools
-      Event/xAOD/xAODTracking
-      GaudiKernel
-      PhysicsAnalysis/AnalysisCommon/PATCore
-      PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-      Tracking/TrkEvent/TrkParameters
-      Tracking/TrkExtrapolation/TrkExInterfaces
-      Tracking/TrkTools/TrkToolInterfaces
-      PRIVATE
-      Control/AthenaBaseComps
-      InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-      Tracking/TrkEvent/TrkEventPrimitives
-      Tracking/TrkEvent/TrkRIO_OnTrack
-      Tracking/TrkEvent/TrkTrack
-      Tracking/TrkEvent/TrkTrackSummary
-      Tracking/TrkEvent/VxVertex )
-endif()
-
 # External(s):
 find_package( ROOT COMPONENTS Core RIO Hist MathCore )
 
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
index a768f3b0d44a1ce9ac0ee03dfbd0960d0684ef6c..a2aca36e2ba2e71ad958c97ada569878b80694ee 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
@@ -1,23 +1,14 @@
-################################################################################
-# Package: InDetTrackSelectorTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrackSelectorTool )
 
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_component( InDetTrackSelectorTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AthContainers GeoPrimitives EventPrimitives TRT_ConditionsServicesLib InDetRIO_OnTrack TrkSurfaces TrkParticleBase TrkRIO_OnTrack TrkTrack TrkTrackSummary VxVertex TrkExInterfaces MagFieldElements MagFieldConditions BeamSpotConditionsData )
-
-# Install files from the package:
-atlas_install_headers( InDetTrackSelectorTool )
-
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AthContainers GeoPrimitives EventPrimitives InDetRIO_OnTrack StoreGateLib TrkSurfaces TrkParticleBase TrkRIO_OnTrack TrkTrack TrkTrackSummary VxVertex TrkExInterfaces TRT_ConditionsData MagFieldElements MagFieldConditions BeamSpotConditionsData )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/CMakeLists.txt
index 2afd25bbaa548c4de7b60fffa46076c8a32926e7..5021321042bf352f90936ba84990cd92ba947fe9 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/CMakeLists.txt
@@ -1,36 +1,10 @@
-################################################################################
-# Package: InDetTrackSummaryHelperTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrackSummaryHelperTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkEventUtils )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrackSummaryHelperTool
                      src/*.cxx
                      src/components/*.cxx
                      LINK_LIBRARIES AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib TrkEventPrimitives TrkTrackSummary TrkToolInterfaces Identifier InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces TrkCompetingRIOsOnTrack TrkParameters TrkRIO_OnTrack TrkTrack TrkEventUtils)
-
-# Install files from the package:
-atlas_install_headers( InDetTrackSummaryHelperTool )
-
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
index 2ac549e1961ff29b4c85832db3588cd8b71e4ebd..e2cb0a417caa3e3fa8c1d94c3e211e1bbf80ffd5 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/CMakeLists.txt
@@ -1,65 +1,26 @@
-################################################################################
-# Package: InDetVKalVxInJetTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetVKalVxInJetTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          PRIVATE
-			  Control/AthenaKernel
-                          Tools/PathResolver
-                          DetectorDescription/GeoPrimitives
-                          PhysicsAnalysis/AnalysisCommon/AnalysisUtils
-                          Tracking/TrkEvent/TrkNeutralParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkEvent/VxSecVertex
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-                          Tracking/TrkVertexFitter/TrkVKalVrtFitter
-			  Reconstruction/MVAUtils )
-#InnerDetector/InDetRecTools/InDetMaterialRejTool
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread TMVA )
-
-# Library to link against:
-#atlas_add_library( InDetVKalVxInJetToolLib 
-#                   src/*.cxx  src/components/*.cxx
-#		   PUBLIC_HEADERS InDetVKalVxInJetTool InDetTrkInJetType
-#                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-#                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel 
-#		        InDetRecToolInterfaces TrkVKalVrtFitterLib GeoPrimitives AnalysisUtilsLib TrkNeutralParameters MVAUtils
-#		        TrkParticleBase TrkTrackSummary VxSecVertex VxVertex TrkToolInterfaces TrkVertexFitterInterfaces PathResolver )
+find_package( Boost )
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Hist MathCore Tree RIO  )
 
 # Component(s) in the package:
 atlas_add_component( InDetVKalVxInJetTool 
                      src/*.cxx  src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking PathResolver GaudiKernel 
-		        InDetRecToolInterfaces TrkVKalVrtFitterLib GeoPrimitives AnalysisUtilsLib TrkNeutralParameters MVAUtils
-		        TrkParticleBase TrkTrackSummary VxSecVertex VxVertex TrkToolInterfaces TrkVertexFitterInterfaces PathResolver  )
- 
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AnalysisUtilsLib AthenaBaseComps CxxUtils GaudiKernel GeoPrimitives InDetRecToolInterfaces MVAUtils PathResolver TrkNeutralParameters TrkParticleBase TrkToolInterfaces TrkTrackSummary TrkVKalVrtFitterLib TrkVertexFitterInterfaces VxSecVertex VxVertex xAODTracking xAODTruth )
+
 # Install files from the package:
-atlas_install_headers( InDetVKalVxInJetTool )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.txt )
 
-#This test is temporarily commented in order not to slow down magnetic field migration to condition data.
-#Will be restored later
+# Test(s) in the package:
 atlas_add_test( InDetTrkInJetType_test
-               SOURCES test/InDetTrkInJetType_test.cxx
-               INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-               LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking PathResolver GaudiKernel 
-		InDetRecToolInterfaces TrkVKalVrtFitterLib GeoPrimitives AnalysisUtilsLib TrkNeutralParameters MVAUtils
-		TrkParticleBase TrkTrackSummary VxSecVertex VxVertex TrkToolInterfaces TrkVertexFitterInterfaces PathResolver AthenaKernel
-               LOG_IGNORE_PATTERN "Booking|ClassIDSvc|weight file|create data set info" )
+                SOURCES test/InDetTrkInJetType_test.cxx
+                INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils EventPrimitives GaudiKernel MagFieldConditions TestTools TrkVertexFitterInterfaces xAODTracking
+                LOG_IGNORE_PATTERN "Booking|ClassIDSvc|weight file|create data set info" )
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
index 3a6d71ddcc68be5808f9ff199cc8f7f37d487483..8b221fd247f2907ee782e6c0ce84bbf5841c4e16 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
@@ -1,12 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from GaudiKernel.GaudiHandles import *
-from GaudiKernel.Proxy.Configurable import *
-from AthenaCommon.Include  import Include, IncludeError, include
 from AthenaCommon.Logging  import logging
-from AthenaCommon.AppMgr   import ToolSvc
-from AthenaCommon          import CfgMgr
-
 from InDetVKalVxInJetTool.InDetVKalVxInJetToolConf import InDet__InDetVKalVxInJetTool
 
 # define the class
@@ -14,7 +8,6 @@ class InDetVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
 
     def __init__(self, name = 'InDetVKalVxInJetFinder'  ):        
 
-        from __main__ import ToolSvc
         mlog = logging.getLogger( 'InDetVKalVxInJetFinder::__init__ ' )
         mlog.info("entering")
         #----------------------
@@ -24,6 +17,7 @@ class InDetVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
         SVertexFitterTool = Trk__TrkVKalVrtFitter(name="SVertexFitterTool",
                                                   Extrapolator="Trk::Extrapolator/AtlasExtrapolator"
                                                  )
+        from AthenaCommon.AppMgr import ToolSvc
         ToolSvc += SVertexFitterTool
         #----------------------
         # Secondary vertex finder itself
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt b/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt
index 17b6ac113cf9f0094b71d4bcdf76625639adba2d..402dbc078429e27648f695b6d8ee3e93ba1805c1 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt
@@ -1,52 +1,20 @@
-################################################################################
-# Package: PixelToTPIDTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PixelToTPIDTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   Control/AthenaKernel
-   Control/StoreGate
-   GaudiKernel
-   Tracking/TrkEvent/TrkEventPrimitives
-   PRIVATE
-   Database/AthenaPOOL/AthenaPoolUtilities
-   Database/RegistrationServices
-   DetectorDescription/Identifier
-   Event/EventInfo
-   InnerDetector/InDetConditions/PixelConditionsData
-   InnerDetector/InDetConditions/PixelConditionsTools
-   InnerDetector/InDetDetDescr/InDetIdentifier
-   InnerDetector/InDetDetDescr/PixelGeoModel
-   InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-   Reconstruction/Particle
-   Tools/PathResolver
-   Tracking/TrkDetDescr/TrkSurfaces
-   Tracking/TrkEvent/TrkMeasurementBase
-   Tracking/TrkEvent/TrkParameters
-   Tracking/TrkEvent/TrkRIO_OnTrack
-   Tracking/TrkEvent/TrkTrack
-   Tracking/TrkEvent/TrkTrackSummary
-   Tracking/TrkTools/TrkToolInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS MathCore Core Tree Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_component( PixelToTPIDTool
   PixelToTPIDTool/*.h  src/*.cxx src/components/*.cxx
-  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-  LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES}
-  AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel TrkEventPrimitives
-  AthenaPoolUtilities Identifier EventInfo InDetIdentifier InDetRIO_OnTrack
-  Particle PathResolver TrkSurfaces TrkMeasurementBase TrkParameters
-  TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces PixelGeoModelLib PixelConditionsData )
+  INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+  LINK_LIBRARIES ${CLHEP_LIBRARIES}
+  AthenaBaseComps StoreGateLib GaudiKernel TrkEventPrimitives
+  AthenaPoolUtilities Identifier InDetIdentifier InDetRIO_OnTrack
+  PathResolver TrkSurfaces TrkMeasurementBase TrkParameters
+  TrkRIO_OnTrack TrkTrack TrkToolInterfaces PixelGeoModelLib PixelConditionsData )
 
 # Install files from the package:
 atlas_install_runtime( share/*.txt )
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
index b7e72b85727d07250e97a43f40957baa3d73e767..a933c9c347178fd474185189e8ba003f9287b61b 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
@@ -1,30 +1,10 @@
-################################################################################
-# Package: SeedToTrackConversionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SeedToTrackConversionTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          Tracking/TrkEvent/TrkRIO_OnTrack )
-# External dependencies:
-find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+
 # Component(s) in the package:
 atlas_add_component( SeedToTrackConversionTool
                      src/*.cxx
-                     src/components/*.cxx 
-		     INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-		     LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkTrack TrkExInterfaces TrkToolInterfaces AthenaPoolUtilities InDetPrepRawData SiSPSeededTrackFinderData TrkRIO_OnTrack )
-# Install files from the package:
-atlas_install_headers( SeedToTrackConversionTool )
+                     src/components/*.cxx
+		             LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities GaudiKernel InDetPrepRawData InDetRecToolInterfaces SiSPSeededTrackFinderData StoreGateLib TrkExInterfaces TrkRIO_OnTrack TrkToolInterfaces TrkTrack )
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
index 7b3574e7378a388d1b99978c8dd0991fdde5d6a2..d5d724a7a0399bbf294ded16dc0445bd7b8b0feb 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
@@ -1,20 +1,10 @@
-################################################################################
-# Package: SiClusterOnTrackTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiClusterOnTrackTool )
 
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_component( SiClusterOnTrackTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaPoolUtilities GeoPrimitives GaudiKernel InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkToolInterfaces StoreGateLib SGtests EventPrimitives InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SiClusterizationToolLib TrkSurfaces TrkRIO_OnTrack PixelConditionsData TrkNeuralNetworkUtilsLib TrkEventUtils SCT_ModuleDistortionsLib )
-
-# Install files from the package:
-atlas_install_headers( SiClusterOnTrackTool )
-
+                     LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetReadoutGeometry PixelConditionsData PixelGeoModelLib PixelReadoutGeometry SCT_ModuleDistortionsLib SiClusterizationToolLib StoreGateLib TrkEventUtils TrkParameters TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces )
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
index f9cf31ff72354a4de4e828ced343303d586d214f..cce538a2ded0d823f829e60ba43fb513e2e6dd0f 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
@@ -1,45 +1,8 @@
-################################################################################
-# Package: SiClusterizationTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiClusterizationTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   Control/AthenaKernel
-   DetectorDescription/GeoPrimitives
-   DetectorDescription/Identifier
-   Event/EventPrimitives
-   GaudiKernel
-   InnerDetector/InDetRawEvent/InDetSimData
-   InnerDetector/InDetConditions/BeamSpotConditionsData
-   InnerDetector/InDetConditions/InDetConditionsSummaryService
-   InnerDetector/InDetConditions/InDetCondTools
-   InnerDetector/InDetConditions/PixelConditionsData
-   InnerDetector/InDetDetDescr/PixelCabling
-   InnerDetector/InDetDetDescr/InDetIdentifier
-   InnerDetector/InDetDetDescr/InDetReadoutGeometry
-   InnerDetector/InDetDetDescr/PixelReadoutGeometry
-   InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
-   InnerDetector/InDetRawEvent/InDetRawData
-   InnerDetector/InDetRecEvent/InDetPrepRawData
-   InnerDetector/InDetRecTools/InDetRecToolInterfaces
-   Tracking/TrkEvent/TrkParameters
-   Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils
-   PRIVATE
-   Database/AthenaPOOL/AthenaPoolUtilities
-   Database/AthenaPOOL/PoolSvc
-   Database/APR/FileCatalog
-   DetectorDescription/AtlasDetDescr
-   DetectorDescription/DetDescrCond/DetDescrCondTools
-   InnerDetector/InDetDetDescr/PixelGeoModel
-   Tracking/TrkDetDescr/TrkSurfaces
-   Tracking/TrkEvent/TrkEventPrimitives
-   Tracking/TrkEvent/VxVertex )
-
 # External dependencies:
 find_package( lwtnn )
 find_package( CLHEP )
@@ -53,18 +16,12 @@ atlas_add_library( SiClusterizationToolLib
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives
-   Identifier EventPrimitives GaudiKernel InDetSimData InDetIdentifier
-   InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry InDetRawData InDetPrepRawData InDetRecToolInterfaces InDetConditionsSummaryService
-   TrkParameters TrkNeuralNetworkUtilsLib PixelConditionsData
-   PixelGeoModelLib PixelCablingLib BeamSpotConditionsData
-   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${COOL_LIBRARIES} AthenaPoolUtilities FileCatalog AtlasDetDescr
-   TrkSurfaces TrkEventPrimitives VxVertex PixelGeoModelLib PoolSvcLib DetDescrCondToolsLib stdc++fs)
+   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${LWTNN_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel BeamSpotConditionsData EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRawData InDetReadoutGeometry InDetRecToolInterfaces InDetSimData PixelCablingLib PixelConditionsData PixelGeoModelLib PoolSvcLib StoreGateLib TrkNeuralNetworkUtilsLib TrkParameters TrkSurfaces
+   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrCondToolsLib FileCatalog PixelReadoutGeometry SCT_ReadoutGeometry TrkEventPrimitives VxVertex )
 
 atlas_add_component( SiClusterizationTool
    src/components/*.cxx
-   INCLUDE_DIRS ${COOL_INCLUDE_DIRS}
-   LINK_LIBRARIES ${COOL_LIBRARIES} GaudiKernel PixelConditionsData SiClusterizationToolLib PoolSvcLib )
+   LINK_LIBRARIES SiClusterizationToolLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
index 1a7353bf6a6d7e00b4518094491413a1e273f7ab..637d93d4172539bb4cb90aed6a239f2163a4451a 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
@@ -1,38 +1,10 @@
-################################################################################
-# Package: SiCombinatorialTrackFinderTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiCombinatorialTrackFinderTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkPatternParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkRIO_OnTrack )
-
 # Component(s) in the package:
 atlas_add_component( SiCombinatorialTrackFinderTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSPSeededTrackFinderData InDetRecToolInterfaces TrkGeometry TrkEventPrimitives TrkPatternParameters TrkTrack TrkExInterfaces TrkToolInterfaces InDetRIO_OnTrack TrkSurfaces TrkMaterialOnTrack TrkMeasurementBase TrkRIO_OnTrack )
-
-# Install files from the package:
-atlas_install_headers( SiCombinatorialTrackFinderTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetPrepRawData InDetReadoutGeometry InDetRecToolInterfaces MagFieldConditions SiSPSeededTrackFinderData StoreGateLib TrkExInterfaces TrkGeometry TrkMeasurementBase TrkToolInterfaces TrkTrack )
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
index 7fa20f0660163cc1cc376c433159c4bec7a94215..46cc9170e677c910c2b8806884c9b52d81aa0d95 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
@@ -1,37 +1,10 @@
-################################################################################
-# Package: SiDetElementsRoadTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiDetElementsRoadTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/PixelReadoutGeometry
-			  InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
-			  InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Event/EventInfo
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions )
-
 # Component(s) in the package:
 atlas_add_component( SiDetElementsRoadTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry SiSPSeededTrackFinderData PixelReadoutGeometry SCT_ReadoutGeometry InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces AthenaPoolUtilities EventInfo TrkPrepRawData TrkExInterfaces MagFieldElements MagFieldConditions )
-
-# Install files from the package:
-atlas_install_headers( SiDetElementsRoadTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel InDetReadoutGeometry InDetRecToolInterfaces MagFieldConditions MagFieldElements PixelReadoutGeometry SCT_ReadoutGeometry SiSPSeededTrackFinderData StoreGateLib TrkExInterfaces TrkGeometry TrkParameters TrkPrepRawData TrkSurfaces )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiSpacePointTool/CMakeLists.txt
index cdafafe9487f6cecfd9edb9fbb3e5478037db45c..0c6fb198bad0f8c942c23b5a3da9843ff0a8a7da 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiSpacePointTool/CMakeLists.txt
@@ -1,36 +1,15 @@
-################################################################################
-# Package: SiSpacePointTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiSpacePointTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          PRIVATE
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecEvent/SiSpacePoint
-                          Tracking/TrkEvent/TrkSpacePoint )
-
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_library( SiSpacePointToolLib
                    src/*.cxx
                    PUBLIC_HEADERS SiSpacePointTool
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives InDetPrepRawData
-                   PRIVATE_LINK_LIBRARIES GaudiKernel InDetIdentifier InDetReadoutGeometry SiSpacePoint TrkSpacePoint )
+                   LINK_LIBRARIES AthenaBaseComps GeoPrimitives InDetPrepRawData TrkSpacePoint
+                   PRIVATE_LINK_LIBRARIES InDetIdentifier InDetReadoutGeometry SiSpacePoint )
 
 atlas_add_component( SiSpacePointTool
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives InDetPrepRawData GaudiKernel InDetIdentifier InDetReadoutGeometry SiSpacePoint TrkSpacePoint SiSpacePointToolLib )
-
+                     LINK_LIBRARIES SiSpacePointToolLib )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
index 1a58829af51be174ac5a5282eb831b1baf17e654..e901b6a054ae2bcdc27249279ccfdcf6b16cae9f 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
@@ -1,33 +1,10 @@
-################################################################################
-# Package: SiSpacePointsSeedTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiSpacePointsSeedTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/SiSpacePointsSeed
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkSpacePoint
-                          PRIVATE
-                          Tracking/TrkTools/TrkToolInterfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions)
-
 # Component(s) in the package:
 atlas_add_component( SiSpacePointsSeedTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointsSeed SiSPSeededTrackFinderData InDetRecToolInterfaces TrkSurfaces TrkSpacePoint TrkToolInterfaces MagFieldElements MagFieldConditions BeamSpotConditionsData )
-
-# Install files from the package:
-atlas_install_headers( SiSpacePointsSeedTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps BeamSpotConditionsData GaudiKernel InDetPrepRawData InDetReadoutGeometry InDetRecToolInterfaces MagFieldConditions MagFieldElements SiSPSeededTrackFinderData TrkEventUtils TrkSpacePoint )
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
index 7ecd51106602c068c09f9c483117c67864693d1d..a8168de6c348e629af75879aab9d33c401254e79 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
@@ -1,32 +1,10 @@
-################################################################################
-# Package: SiTrackMakerTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiTrackMakerTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkCaloClusterROI
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions)
-
 # Component(s) in the package:
 atlas_add_component( SiTrackMakerTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkGeometry TrkCaloClusterROI AthenaPoolUtilities InDetPrepRawData SiSPSeededTrackFinderData TrkRIO_OnTrack MagFieldElements MagFieldConditions BeamSpotConditionsData )
-
-# Install files from the package:
-atlas_install_headers( SiTrackMakerTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkGeometry TrkCaloClusterROI InDetPrepRawData SiSPSeededTrackFinderData TrkRIO_OnTrack MagFieldElements MagFieldConditions BeamSpotConditionsData )
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
index 021b579e802d5bbd125412fffdd646d4827f9081..d9b7c05ffe62ce55ebfbc575334d1cb3ce4ed537 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
@@ -1,25 +1,10 @@
-################################################################################
-# Package: SiZvertexTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiZvertexTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          PRIVATE
-                          InnerDetector/InDetRecEvent/SiSpacePointsSeed
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData )
-
 # Component(s) in the package:
 atlas_add_component( SiZvertexTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces SiSpacePointsSeed SiSPSeededTrackFinderData )
-
-# Install files from the package:
-atlas_install_headers( SiZvertexTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel Identifier InDetRecToolInterfaces SiSpacePointsSeed SiSPSeededTrackFinderData VxVertex )
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/CMakeLists.txt
index 258ea53b34eff2fb7ec5d3f66e303982bed03cbe..93fdd83c5e8ac2c0603208e626c4eb555bb2c278 100644
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/CMakeLists.txt
@@ -1,33 +1,10 @@
-################################################################################
-# Package: TRT_DetElementsRoadTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_DetElementsRoadTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions)
-                          
 # Component(s) in the package:
 atlas_add_component( TRT_DetElementsRoadTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces AthenaPoolUtilities TrkExInterfaces MagFieldElements MagFieldConditions)
-
-# Install files from the package:
-atlas_install_headers( TRT_DetElementsRoadTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel GeoModelInterfaces InDetRecToolInterfaces MagFieldConditions MagFieldElements StoreGateLib TRT_ReadoutGeometry TrkExInterfaces TrkGeometry TrkParameters TrkSurfaces )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
index d0073825fa24af143a3969d3b2f465fd12bc0962..140df9273863e878f868bb37fd5adcf8d1d3155b 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
@@ -1,30 +1,10 @@
-################################################################################
-# Package: TRT_DriftCircleOnTrackTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_DriftCircleOnTrackTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          LumiBlock/LumiBlockData
-                          PRIVATE
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecTools/TRT_DriftFunctionTool
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # Component(s) in the package:
 atlas_add_component( TRT_DriftCircleOnTrackTool
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRIO_OnTrack TrkRIO_OnTrack TrkToolInterfaces InDetReadoutGeometry TRT_ReadoutGeometry TrkEventPrimitives TrkRIO_OnTrack LumiBlockData TRT_DriftFunctionToolLib )
-
-# Install files from the package:
-atlas_install_headers( TRT_DriftCircleOnTrackTool )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRIO_OnTrack StoreGateLib TrkRIO_OnTrack TrkToolInterfaces TRT_ReadoutGeometry TrkEventPrimitives TrkRIO_OnTrack LumiBlockData TRT_DriftFunctionToolLib )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
index f7ebb0118e1bd53255016f0ffd9f36e008a9c74d..9fdb18866591368666c4a13972f4ecc7b177562c 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
@@ -1,32 +1,8 @@
-################################################################################
-# Package: TRT_DriftCircleTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_DriftCircleTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkEvent/TrkPrepRawData
-                          PRIVATE
-                          Commission/CommissionEvent
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          LumiBlock/LumiBlockData
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecTools/TRT_DriftFunctionTool )
-
-# External dependencies:
-find_package( Eigen )
-
 atlas_add_library( TRT_DriftCircleToolLib
                    TRT_DriftCircleTool/*.h
                    INTERFACE
@@ -37,7 +13,4 @@ atlas_add_library( TRT_DriftCircleToolLib
 atlas_add_component( TRT_DriftCircleTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} TRT_DriftCircleToolLib  GeoPrimitives EventPrimitives xAODEventInfo InDetIdentifier InDetReadoutGeometry  TRT_DriftFunctionToolLib )
-
-
+                     LINK_LIBRARIES EventPrimitives GaudiKernel GeoPrimitives InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRawData StoreGateLib TRT_ConditionsServicesLib TRT_DriftCircleToolLib TRT_DriftFunctionToolLib TRT_ReadoutGeometry xAODEventInfo )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
index f3741dd7004b7bfa84b84fbf67874453c34690d7..d222fec2dbfaca78a5cbf56e5c65045d928f08ae 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: TRT_DriftFunctionTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_DriftFunctionTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          PRIVATE
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          Event/EventInfo
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetDetDescr/InDetIdentifier )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -32,5 +17,4 @@ atlas_add_component( TRT_DriftFunctionTool
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry GeoModelUtilities EventInfo TRT_ConditionsServicesLib InDetIdentifier TRT_DriftFunctionToolLib )
-
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry GeoModelInterfaces GeoModelUtilities TRT_ConditionsServicesLib InDetIdentifier TRT_DriftFunctionToolLib )
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/CMakeLists.txt
index 0b89b6e0a674ce03d7af8bd2580bdfa2366e5d7b..c74ef1d4367d928934d4ed743ca10ca21f4a31f8 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/CMakeLists.txt
@@ -1,24 +1,21 @@
-################################################################################
-# Package: TRT_ElectronPidTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_ElectronPidTools )
 
 # External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
+find_package( ROOT COMPONENTS Core MathCore )
 
 atlas_add_library( TRT_ElectronPidToolsLib
                    TRT_ElectronPidTools/*.h
                    INTERFACE
                    PUBLIC_HEADERS TRT_ElectronPidTools
-                   LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaKernel TrkTrack InDetRawData TrkParameters InDetRIO_OnTrack TrkToolInterfaces TRT_ConditionsData TrkEventPrimitives TRT_ConditionsServicesLib InDetPrepRawData StoreGateLib TRT_ConditionsData )
+                   LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaKernel TrkTrack InDetRawData TrkParameters TrkToolInterfaces TRT_ConditionsData TrkEventPrimitives TRT_ConditionsServicesLib InDetPrepRawData StoreGateLib TRT_ConditionsData )
 
 # Component(s) in the package:
 atlas_add_component( TRT_ElectronPidTools
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} TRT_ElectronPidToolsLib AthenaPoolUtilities Identifier InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack xAODEventInfo)
-
+                     INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaPoolUtilities GaudiKernel Identifier InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRawData StoreGateLib TRT_ElectronPidToolsLib TRT_ReadoutGeometry TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSurfaces TrkTrack xAODEventInfo )
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/CMakeLists.txt
index 8f8c97138fe5751313403c656a4c7c59980a17cc..1dde67d63c9812e4de888cfaabc2e6b3ace583b0 100644
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/CMakeLists.txt
@@ -1,32 +1,8 @@
-################################################################################
-# Package: TRT_SeededSpacePointFinderTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_SeededSpacePointFinderTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/IRegionSelector
-                          GaudiKernel
-			  Control/StoreGate
-                          InnerDetector/InDetRecEvent/SiSpacePointsSeed
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkSpacePoint
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          DetectorDescription/RoiDescriptor
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -35,8 +11,4 @@ atlas_add_component( TRT_SeededSpacePointFinderTool
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps IRegionSelector GaudiKernel SiSpacePointsSeed InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSpacePoint RoiDescriptor InDetIdentifier InDetPrepRawData TrkSurfaces TrkToolInterfaces TrkEventUtils MagFieldElements MagFieldConditions)
-
-# Install files from the package:
-atlas_install_headers( TRT_SeededSpacePointFinderTool )
-
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData InDetRecToolInterfaces MagFieldConditions MagFieldElements RoiDescriptor SiSpacePointsSeed StoreGateLib TrkEventUtils TrkGeometry TrkSpacePoint TrkSurfaces )
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
index fe90e76b0f22d61ad434498f5f054ba47994ffcf..7413917594a092a92bd01c76cd9c679fa56f5c46 100644
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
@@ -1,33 +1,8 @@
-################################################################################
-# Package: TRT_SeededTrackFinderTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_SeededTrackFinderTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          Control/StoreGate
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          Tracking/TrkEvent/TrkCaloClusterROI
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -36,8 +11,4 @@ atlas_add_component( TRT_SeededTrackFinderTool
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces TrkParameters StoreGateLib SGtests InDetIdentifier InDetPrepRawData InDetRIO_OnTrack SiSPSeededTrackFinderData TrkCaloClusterROI TrkEventPrimitives TrkPseudoMeasurementOnTrack TrkTrack TrkExInterfaces TrkToolInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TRT_SeededTrackFinderTool )
-
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces MagFieldConditions MagFieldElements SiSPSeededTrackFinderData StoreGateLib TrkCaloClusterROI TrkEventPrimitives TrkEventUtils TrkExInterfaces TrkGeometry TrkParameters TrkPseudoMeasurementOnTrack TrkSurfaces TrkToolInterfaces TrkTrack )
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/CMakeLists.txt
index 996ce28a2b30a416193fa3935bd494a064e1faf2..0949493404e102efed679f8fd3f587e8a8003c5f 100644
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/CMakeLists.txt
@@ -1,34 +1,10 @@
-################################################################################
-# Package: TRT_SegmentToTrackTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_SegmentToTrackTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          PRIVATE
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkFitter/TrkFitterInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-			  Tracking/TrkDetDescr/TrkSurfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
 # Component(s) in the package:
 atlas_add_component( TRT_SegmentToTrackTool
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkEventPrimitives InDetIdentifier InDetRIO_OnTrack TrkPseudoMeasurementOnTrack TrkExInterfaces TrkFitterInterfaces TrkToolInterfaces MagFieldElements MagFieldConditions)
-
-# Install files from the package:
-atlas_install_headers( TRT_SegmentToTrackTool )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkEventPrimitives InDetIdentifier InDetRIO_OnTrack TrkPseudoMeasurementOnTrack TrkExInterfaces TrkFitterInterfaces TrkSurfaces TrkToolInterfaces MagFieldElements MagFieldConditions)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/CMakeLists.txt
index 6c28c7b41d971802bd10b73fefc4b565dd8ad571..67cadf1c225a84c94fff17072ca077493c2a1e38 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/CMakeLists.txt
@@ -1,40 +1,10 @@
-################################################################################
-# Package: TRT_TrackExtensionTool_DAF
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrackExtensionTool_DAF )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          Control/StoreGate
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
 # Component(s) in the package:
 atlas_add_component( TRT_TrackExtensionTool_DAF
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetPrepRawData InDetRecToolInterfaces TrkGeometry TrkParameters StoreGateLib SGtests InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry MagFieldInterfaces TrkMeasurementBase TrkTrack TrkExInterfaces TrkToolInterfaces MagFieldElements MagFieldConditions InDetCompetingRIOsOnTrackToolLib )
-
-# Install files from the package:
-atlas_install_headers( TRT_TrackExtensionTool_DAF )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetCompetingRIOsOnTrackToolLib InDetIdentifier InDetPrepRawData InDetRecToolInterfaces MagFieldConditions MagFieldElements TRT_ReadoutGeometry TrkEventUtils TrkExInterfaces TrkGeometry TrkMeasurementBase TrkParameters TrkToolInterfaces TrkTrack )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/CMakeLists.txt
index 6f0286702031aaa6c3564a1094fa29921f64eb60..a51fc7897877f30c998506e56d697e94792bba87 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/CMakeLists.txt
@@ -1,43 +1,10 @@
-################################################################################
-# Package: TRT_TrackExtensionTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrackExtensionTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-			  Control/StoreGate
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkPatternParameters
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkSegment
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions)
-
 # Component(s) in the package:
 atlas_add_component( TRT_TrackExtensionTool_xk
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkEventPrimitives TrkPatternParameters TrkPseudoMeasurementOnTrack TrkSegment TrkExInterfaces TrkToolInterfaces AthenaPoolUtilities InDetRIO_OnTrack TrkSurfaces TrkRIO_OnTrack TrkTrack MagFieldElements MagFieldConditions)
-
-# Install files from the package:
-atlas_install_headers( TRT_TrackExtensionTool_xk )
-
+                     LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities GaudiKernel InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces MagFieldConditions MagFieldElements StoreGateLib TRT_ReadoutGeometry TrkEventPrimitives TrkEventUtils TrkExInterfaces TrkGeometry TrkPatternParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSegment TrkSurfaces TrkToolInterfaces TrkTrack )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/CMakeLists.txt
index 379cb31edc7aa7a047634d7fae7ba0b82459b641..16c835399f4e4c5baf4cdf8e181b2f8852dbcd01 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/CMakeLists.txt
@@ -1,38 +1,11 @@
-################################################################################
-# Package: TRT_TrackHoleSearch
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrackHoleSearch )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigDecisionInterface
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODTracking
-                          Event/EventPrimitives
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
+find_package( ROOT COMPONENTS Core Tree )
 
 atlas_add_library( TRT_TrackHoleSearchLib
                    TRT_TrackHoleSearch/*.h
@@ -45,7 +18,7 @@ atlas_add_component( TRT_TrackHoleSearch
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TRT_TrackHoleSearchLib Identifier EventPrimitives InDetIdentifier InDetRIO_OnTrack TrkSurfaces TrkEventPrimitives TrkEventUtils TrkTrackSummary VxVertex )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} EventPrimitives GaudiKernel Identifier InDetConditionsSummaryService InDetIdentifier InDetRIO_OnTrack StoreGateLib TRT_ConditionsServicesLib TRT_TrackHoleSearchLib TrkEventPrimitives TrkEventUtils TrkExInterfaces TrkParameters TrkSurfaces TrkTrack TrkTrackSummary )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/CMakeLists.txt
index 76cdd26ccced964d7405beba25e3a0cd09f9e3af..82681babf549a693862c650b6ff4fef109b63ea9 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/CMakeLists.txt
@@ -1,41 +1,14 @@
-################################################################################
-# Package: TRT_TrackSegmentsTool_xk
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrackSegmentsTool_xk )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkEventUtils
-                          Tracking/TrkTools/TrkToolInterfaces
-                          PRIVATE
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+find_package( ROOT COMPONENTS Core MathCore Graf )
 
 # Component(s) in the package:
 atlas_add_component( TRT_TrackSegmentsTool_xk
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces TrkGeometry TrkEventPrimitives TrkParameters TrkToolInterfaces EventInfo TrkSurfaces TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkExInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TRT_TrackSegmentsTool_xk )
-
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CxxUtils GaudiKernel GeoModelInterfaces InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces StoreGateLib TRT_ReadoutGeometry TrkEventPrimitives TrkEventUtils TrkExInterfaces TrkGeometry TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces )
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
index 06f807baf05aa72fda842aaed4d8a2af773b11ad..02525c19c43ba6fc3fadcf9c652b38e4d394aae7 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
@@ -1,7 +1,4 @@
-# $Id: CMakeLists.txt 787108 2016-11-29 14:45:15Z krasznaa $
-################################################################################
-# Package: TrackVertexAssociationTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrackVertexAssociationTool )
@@ -14,20 +11,6 @@ else()
    set( extra_deps Control/AthenaBaseComps GaudiKernel )
 endif()
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthContainers
-   Control/AthLinks
-   Control/AthToolSupport/AsgTools
-   Control/AthToolSupport/AsgDataHandles
-   Event/xAOD/xAODCore
-   Event/xAOD/xAODTracking
-   PRIVATE
-   Event/xAOD/xAODEventInfo
-   Tools/PathResolver
-   ${extra_deps} )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Hist RIO )
 find_package( lwtnn REQUIRED )
@@ -37,8 +20,8 @@ atlas_add_library( TrackVertexAssociationToolLib
    Root/*.cxx
    PUBLIC_HEADERS TrackVertexAssociationTool
    INCLUDE_DIRS ${LWTNN_INCLUDE_DIRS}
-   LINK_LIBRARIES AthContainers AthLinks AsgTools xAODCore xAODTracking AsgDataHandlesLib ${LWTNN_LIBRARIES}
-   PRIVATE_LINK_LIBRARIES xAODEventInfo PathResolver )
+   LINK_LIBRARIES AthContainers AthLinks AsgTools xAODCore xAODEventInfo xAODTracking AsgDataHandlesLib ${LWTNN_LIBRARIES}
+   PRIVATE_LINK_LIBRARIES PathResolver )
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( TrackVertexAssociationTool