diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/CMakeLists.txt
index 290523743c78b8fb704aefc6fccd47e472640213..55af873789a362160aacdb8fde53e448aa6cd371 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/CMakeLists.txt
@@ -1,29 +1,13 @@
-################################################################################
-# Package: InDetTrigAmbiguitySolver
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigAmbiguitySolver )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/AthenaKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigAmbiguitySolver
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib AthenaKernel TrkEventPrimitives TrkParameters TrkToolInterfaces TrigParticle )
+                     LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel TrigInterfacesLib TrigNavigationLib TrkEventPrimitives TrkEventUtils TrkParameters TrkToolInterfaces TrkTrack )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigAmbiguitySolver )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/CMakeLists.txt
index ed81280408e9c9802a0a5475e5ad9105b5cd69f3..e0af36bbc546175df21daa500fe8eafb4a237e49 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/CMakeLists.txt
@@ -1,34 +1,13 @@
-################################################################################
-# Package: InDetTrigExtensProcessor
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigExtensProcessor )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkFitter/TrkFitterUtils
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/StoreGate
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkFitter/TrkFitterInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigExtensProcessor
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkEventPrimitives TrkTrack TrkFitterUtils TrigInterfacesLib StoreGateLib SGtests TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkFitterInterfaces TrkToolInterfaces TrigParticle )
+                     LINK_LIBRARIES GaudiKernel TrkEventPrimitives TrkTrack TrkFitterUtils TrigInterfacesLib TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkFitterInterfaces TrkToolInterfaces )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigExtensProcessor )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/CMakeLists.txt
index a576d062fc53588080af116b29aa2d69e36dfc2f..904c87859bb0097e78a553f2cd043c659978ce6a 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/CMakeLists.txt
@@ -1,42 +1,13 @@
-################################################################################
-# Package: InDetTrigParticleCreation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigParticleCreation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/IRegionSelector
-                          DetectorDescription/IdDictDetDescr
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODTracking
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          Reconstruction/Particle
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrackLink
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigTools/TrigTimeAlgs )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigParticleCreation
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib AthenaKernel AtlasDetDescr IRegionSelector IdDictDetDescr Identifier xAODTracking InDetIdentifier Particle TrkParameters TrkParticleBase TrkTrackSummary VxVertex TrkToolInterfaces TrigParticle TrigSteeringEvent TrigTimeAlgsLib )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel AtlasDetDescr CxxUtils GaudiKernel IdDictDetDescr Identifier InDetIdentifier Particle StoreGateLib TrigInterfacesLib TrigNavigationLib TrigSteeringEvent TrigTimeAlgsLib TrkEventUtils TrkParameters TrkParticleBase TrkToolInterfaces TrkTrack TrkTrackLink TrkTrackSummary VxVertex xAODTracking )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigParticleCreation )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/CMakeLists.txt
index 54830581fbcfb9cc1dc0ac744b90f3b3f78c85a6..c1955d20de2736c89f86ef45070e3e2b4fb4321b 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/CMakeLists.txt
@@ -1,48 +1,13 @@
-################################################################################
-# Package: InDetTrigPrepRawDataFormat
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigPrepRawDataFormat )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/IRegionSelector
-                          Event/ByteStreamCnvSvcBase
-                          Event/EventContainers
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/PixelConditionsTools
-                          InnerDetector/InDetConditions/InDetByteStreamErrors
-                          InnerDetector/InDetConditions/SCT_ConditionsTools
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRecTools/SiClusterizationTool
-                          InnerDetector/InDetRecTools/TRT_DriftCircleTool
-                          InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces
-                          InnerDetector/InDetConditions/PixelConditionsData
-                          InnerDetector/InDetConditions/SCT_ConditionsData
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigTools/TrigTimeAlgs )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigPrepRawDataFormat
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES Identifier GaudiKernel InDetPrepRawData TrigInterfacesLib AthenaKernel StoreGateLib SGtests AtlasDetDescr IRegionSelector InDetByteStreamErrors ByteStreamCnvSvcBaseLib TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetRawData SiClusterizationToolLib TrkTrack TrigSteeringEvent TrigTimeAlgsLib PixelConditionsToolsLib TRT_DriftCircleToolLib InDetTrigToolInterfacesLib PixelConditionsData SCT_ConditionsData )
+                     LINK_LIBRARIES AthenaKernel AtlasDetDescr ByteStreamCnvSvcBaseLib EventContainers GaudiKernel IRegionSelector Identifier InDetByteStreamErrors InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRawData InDetReadoutGeometry InDetTrigToolInterfacesLib PixelConditionsData SCT_ConditionsData SiClusterizationToolLib StoreGateLib TRT_ConditionsServicesLib TRT_DriftCircleToolLib TRT_ReadoutGeometry TrigInterfacesLib TrigSteeringEvent TrigTimeAlgsLib )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigPrepRawDataFormat )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt
index dbea24520c3939ddfec39c0bbb93e64262738ea4..f4fa07682ccf5e2b1f9c555f607201a783dddca3 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/CMakeLists.txt
@@ -1,34 +1,13 @@
-################################################################################
-# Package: InDetTrigPriVxFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigPriVxFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/StoreGate
-                          Event/EventPrimitives
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          InnerDetector/InDetConditions/InDetBeamSpotService
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-			  Tracking/TrkEvent/TrkTrackLink
-                          Event/xAOD/xAODTracking
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigPriVxFinder
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrigInterfacesLib StoreGateLib SGtests EventPrimitives InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack VxVertex TrigParticle xAODTracking InDetBeamSpotServiceLib MagFieldConditions )
+                     LINK_LIBRARIES AthContainers EventPrimitives GaudiKernel InDetBeamSpotServiceLib InDetRecToolInterfaces MagFieldConditions TrigInterfacesLib TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkTrackLink VxVertex xAODTracking )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigPriVxFinder )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/CMakeLists.txt
index 5ee1a07c24dca00e9ab72b2fad4469d7afa114aa..b2b0072d5b375c1e2cb643c2e0fbb60c1459ebba 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/CMakeLists.txt
@@ -1,38 +1,10 @@
-################################################################################
-# Package: InDetTrigRawDataProvider
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigRawDataProvider )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces
-                          PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/IRegionSelector
-                          Event/ByteStreamCnvSvcBase
-                          InnerDetector/InDetConditions/InDetByteStreamErrors
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/PixelCabling
-                          InnerDetector/InDetDetDescr/SCT_Cabling
-                          InnerDetector/InDetDetDescr/TRT_Cabling
-                          InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
-                          InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv
-                          InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          Trigger/TrigEvent/TrigSteeringEvent )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigRawDataProvider
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRawData AthenaKernel StoreGateLib SGtests IRegionSelector ByteStreamCnvSvcBaseLib InDetByteStreamErrors InDetIdentifier SCT_CablingLib TrigSteeringEvent PixelCablingLib InDetTrigToolInterfacesLib SCT_RawDataByteStreamCnvLib PixelRawDataByteStreamCnvLib TRT_ConditionsServicesLib TRT_CablingLib TRT_RawDataByteStreamCnvLib )
-
-# Install files from the package:
-atlas_install_headers( InDetTrigRawDataProvider )
-
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRawData AthenaKernel IRegionSelector ByteStreamCnvSvcBaseLib InDetByteStreamErrors InDetIdentifier SCT_CablingLib TrigSteeringEvent InDetTrigToolInterfacesLib SCT_RawDataByteStreamCnvLib PixelRawDataByteStreamCnvLib TRT_ConditionsServicesLib TRT_CablingLib TRT_RawDataByteStreamCnvLib )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/CMakeLists.txt
index c8a45d6f944cbe51f9c103bc7ffdad6531512014..42e21ceb6b44e6c8f07ea92720a96e9f526018f3 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/CMakeLists.txt
@@ -1,25 +1,10 @@
-################################################################################
-# Package: InDetTrigTrackCollectionMerger
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigTrackCollectionMerger )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigTrackCollectionMerger
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib TrkToolInterfaces TrigParticle )
-
-# Install files from the package:
-atlas_install_headers( InDetTrigTrackCollectionMerger )
-
+                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib TrkToolInterfaces )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/CMakeLists.txt
index 65fc117fdd16bd47f0b5914fee638ccb90289b25..42c13f38a605eb388e469ef39af50a896c6ca470 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/CMakeLists.txt
@@ -1,27 +1,10 @@
-################################################################################
-# Package: InDetTrigTrackPRD_Association
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigTrackPRD_Association )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigSteer/TrigInterfaces
-                          Trigger/TrigTools/TrigTimeAlgs
-                          Tracking/TrkEvent/TrkEventUtils
-                          PRIVATE
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigTrackPRD_Association
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkToolInterfaces TrigInterfacesLib TrigTimeAlgsLib TrkTrack TrigParticle TrkEventUtils)
-
-# Install files from the package:
-atlas_install_headers( InDetTrigTrackPRD_Association )
-
+                     LINK_LIBRARIES GaudiKernel TrkToolInterfaces TrigInterfacesLib TrigNavigationLib TrigTimeAlgsLib TrkTrack TrkEventUtils )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/CMakeLists.txt
index b68ab0673a2516fd87faebb1bc7f325858464f07..2ec31f7f6987a64eb15bfd425756acb311eb9ac9 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/CMakeLists.txt
@@ -1,54 +1,17 @@
-################################################################################
-# Package: InDetTrigTrackResidualMonitor
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigTrackResidualMonitor )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthContainers
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkValidation/TrkValEvent
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/CxxUtils
-                          DetectorDescription/IdDictDetDescr
-                          InnerDetector/InDetAlignTools/InDetAlignGenTools
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Tracking/TrkTools/TrkTrackSummaryTool
-                          Tracking/TrkValidation/TrkValTools
-                          Trigger/TrigEvent/TrigParticle )
-
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core Hist )
 
 # Component(s) in the package:
 atlas_add_component( InDetTrigTrackResidualMonitor
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthContainers AtlasDetDescr Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkEventPrimitives TrkParameters TrkTrack TrkValEvent TrigSteeringEvent TrigInterfacesLib IdDictDetDescr InDetIdentifier MagFieldInterfaces TrkGeometry TrkSurfaces TrkMaterialOnTrack TrkMeasurementBase TrkRIO_OnTrack TrkTrackSummary TrkExInterfaces TrkToolInterfaces TrigParticle TrkValToolsLib InDetAlignGenToolsLib )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasDetDescr CxxUtils GaudiKernel IdDictDetDescr InDetAlignGenToolsLib InDetIdentifier InDetReadoutGeometry MagFieldInterfaces TrigInterfacesLib TrkEventPrimitives TrkExInterfaces TrkGeometry TrkMaterialOnTrack TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces TrkTrack TrkTrackSummary TrkValToolsLib )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigTrackResidualMonitor )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/CMakeLists.txt
index 5b9ad59ab0fd3cf17984f281b4be7e72715ccdcd..5ec301afcd5cc22cf1109a4bd4c445b431c1c6e5 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/CMakeLists.txt
@@ -1,25 +1,10 @@
-################################################################################
-# Package: InDetTrigTrackSlimmer
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigTrackSlimmer )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigTrackSlimmer
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib TrkToolInterfaces TrigParticle )
-
-# Install files from the package:
-atlas_install_headers( InDetTrigTrackSlimmer )
-
+                     LINK_LIBRARIES GaudiKernel TrkTrack TrigInterfacesLib TrkToolInterfaces )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/CMakeLists.txt
index 2afd6e6a43c04a8be86d986ed24d521d1a7b7d27..6cdd652fe9ec03f79e452629811b989ae33780b3 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/CMakeLists.txt
@@ -1,34 +1,13 @@
-################################################################################
-# Package: InDetTrigTruthAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( InDetTrigTruthAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          Tracking/TrkEvent/TrkTruthData
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/AthLinks
-                          Control/StoreGate
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetTruth/InDetTruthInterfaces
-                          Reconstruction/Particle
-                          Reconstruction/ParticleTruth
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( InDetTrigTruthAlgs
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel InDetSimData TrkTruthData TrigInterfacesLib AthLinks StoreGateLib SGtests InDetPrepRawData Particle ParticleTruth TrkTrack TrkToolInterfaces TrigParticle InDetTruthInterfaces )
+                     LINK_LIBRARIES GaudiKernel InDetSimData TrkTruthData TrigInterfacesLib AthLinks InDetPrepRawData Particle ParticleTruth TrkTrack TrkToolInterfaces InDetTruthInterfaces )
 
 # Install files from the package:
-atlas_install_headers( InDetTrigTruthAlgs )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
index d012fba339c814b8b4e8c74808a8c8e36700cc27..12c4f27b4b77bf2ff4e330796715ba7fa52a320e 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
@@ -1,42 +1,13 @@
-################################################################################
-# Package: SiTrigSPSeededTrackFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiTrigSPSeededTrackFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/IRegionSelector
-                          Event/EventPrimitives
-                          InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkEventUtils
-                          Trigger/TrigEvent/TrigInDetEvent
-                          Trigger/TrigEvent/TrigParticle
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigTools/TrigTimeAlgs )
-
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_component( SiTrigSPSeededTrackFinder
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrigInterfacesLib AthenaKernel GeoPrimitives IRegionSelector EventPrimitives SiSPSeededTrackFinderData InDetRecToolInterfaces TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkTrack TrigInDetEvent TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkEventUtils )
+                     LINK_LIBRARIES GaudiKernel TrigInterfacesLib TrigNavigationLib AthenaKernel GeoPrimitives IRegionSelector EventPrimitives SiSPSeededTrackFinderData InDetRecToolInterfaces TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkTrack TrigInDetEvent TrigSteeringEvent TrigTimeAlgsLib TrkEventUtils )
 
 # Install files from the package:
-atlas_install_headers( SiTrigSPSeededTrackFinder )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/CMakeLists.txt
index 264ac0f79ea32d291009e4b192a95f4a02d7d047..f9ba88ca67c3d0f71165ebb0575905a4ca0953b8 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/CMakeLists.txt
@@ -1,39 +1,15 @@
-################################################################################
-# Package: SiTrigSpacePointFormation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SiTrigSpacePointFormation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Trigger/TrigSteer/TrigInterfaces
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/IRegionSelector
-                          Event/EventPrimitives
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetRecAlgs/SiSpacePointFormation
-                          InnerDetector/InDetRecTools/SiSpacePointTool
-                          InnerDetector/InDetTrigRecTools/InDetTrigToolInterfaces
-                          Tracking/TrkEvent/TrkSpacePoint
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          Trigger/TrigTools/TrigTimeAlgs )
-
 include_directories(src)
 
 # Component(s) in the package:
 atlas_add_component( SiTrigSpacePointFormation
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES Identifier GaudiKernel InDetPrepRawData TrigInterfacesLib AthenaBaseComps IRegionSelector EventPrimitives InDetIdentifier InDetReadoutGeometry SiSpacePointFormationLib SiSpacePointToolLib TrkSpacePoint TrigSteeringEvent TrigTimeAlgsLib InDetTrigToolInterfacesLib )
+                     LINK_LIBRARIES AthenaBaseComps BeamSpotConditionsData EventPrimitives GaudiKernel IRegionSelector Identifier InDetIdentifier InDetPrepRawData InDetReadoutGeometry InDetTrigToolInterfacesLib SiSpacePointFormationLib SiSpacePointToolLib StoreGateLib TrigInterfacesLib TrigSteeringEvent TrigTimeAlgsLib TrkSpacePoint )
 
 # Install files from the package:
-atlas_install_headers( SiTrigSpacePointFormation )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/CMakeLists.txt
index 060721a6645eb70509ac459e777b7ffeba314391..8af28e34a4d01bd22fb9b233b0453e1a365c376c 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/CMakeLists.txt
@@ -1,26 +1,13 @@
-################################################################################
-# Package: TRT_TrigTrackExtensionAlg
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrigTrackExtensionAlg )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Trigger/TrigSteer/TrigInterfaces
-                          PRIVATE
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigEvent/TrigParticle )
-
 # Component(s) in the package:
 atlas_add_component( TRT_TrigTrackExtensionAlg
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel TrigInterfacesLib InDetRecToolInterfaces TrkTrack TrigParticle )
+                     LINK_LIBRARIES GaudiKernel TrigInterfacesLib InDetRecToolInterfaces TrkTrack )
 
 # Install files from the package:
-atlas_install_headers( TRT_TrigTrackExtensionAlg )
 atlas_install_python_modules( python/*.py )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/CMakeLists.txt
index d26f4efdb3aa9ca6fd62c261f0d1b8727ff4312a..12ba6215bd45286d44986ff8a13d767100a29e0a 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/CMakeLists.txt
@@ -1,29 +1,13 @@
-################################################################################
-# Package: TRT_TrigTrackSegmentsFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TRT_TrigTrackSegmentsFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces
-                          Trigger/TrigSteer/TrigInterfaces
-                          Trigger/TrigTools/TrigTimeAlgs
-                          PRIVATE
-                          DetectorDescription/IRegionSelector
-                          Tracking/TrkEvent/TrkSegment
-                          Trigger/TrigEvent/TrigParticle
-                          Trigger/TrigEvent/TrigSteeringEvent )
-
 # Component(s) in the package:
 atlas_add_component( TRT_TrigTrackSegmentsFinder
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel InDetRecToolInterfaces TrigInterfacesLib TrigTimeAlgsLib IRegionSelector TrkSegment TrigParticle TrigSteeringEvent )
+                     LINK_LIBRARIES GaudiKernel InDetRecToolInterfaces TrigInterfacesLib TrigTimeAlgsLib IRegionSelector TrkSegment TrigSteeringEvent )
 
 # Install files from the package:
-atlas_install_headers( TRT_TrigTrackSegmentsFinder )
 atlas_install_python_modules( python/*.py )
-