diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/CMakeLists.txt
index a4d0363a372ad5101b1e86553de0ce06b197e94f..e0bb85f31e49dc9d57719f87752f2a1f163a6fb9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/CMakeLists.txt
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/CMakeLists.txt
@@ -23,28 +23,25 @@ atlas_depends_on_subdirs( PUBLIC
                           PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
                           Reconstruction/Jet/JetInterface
                           Reconstruction/Jet/BoostedJetTaggers
+                          Reconstruction/Jet/JetCalibTools
                           Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
                           Tracking/TrkExtrapolation/TrkExInterfaces
                           )
 
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
-atlas_add_library( DerivationFrameworkFlavourTagLib
-                   src/*.cxx
-                   NO_PUBLIC_HEADERS
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel
-                   PRIVATE_LINK_LIBRARIES AthenaBaseComps xAODCore xAODJet xAODPFlow xAODTracking xAODTrigger xAODTruth JetInterface TrkExInterfaces BoostedJetTaggersLib)
+atlas_add_library(   DerivationFrameworkFlavourTagLib
+                     src/*.cxx
+                     LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODCore xAODJet xAODPFlow
+                     xAODTracking xAODTrigger xAODTruth JetInterface TrkExInterfaces
+                     BoostedJetTaggersLib JetCalibToolsLib )
 
 atlas_add_component( DerivationFrameworkFlavourTag
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps xAODCore xAODJet xAODPFlow xAODTracking xAODTrigger JetInterface BoostedJetTaggersLib DerivationFrameworkFlavourTagLib )
+                     LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODCore xAODJet xAODPFlow
+                     xAODTracking xAODTrigger xAODTruth JetInterface TrkExInterfaces
+                     BoostedJetTaggersLib JetCalibToolsLib DerivationFrameworkFlavourTagLib )
 
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
-