diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
index 9c1914d4fbcc86fadafb4336a06b2ef2a41c78a8..ddab67665eaa12b80d99632f3d1a99b2d4f95339 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_library( InDetConversionFinderToolsLib
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces Particle TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks InDetPrepRawData TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces )
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks InDetPrepRawData TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
 
 atlas_add_component( InDetConversionFinderTools
                      src/components/*.cxx
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
index 2c4f20cb57adc48280c6011f2e0975fd725f578e..d13d0b338d6244abf49871b11fb4c4386ea17379 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
@@ -8,12 +8,14 @@ atlas_subdir( ElectronPhotonFourMomentumCorrection )
 
 # Environment specific extra dependencies:
 set( extra_dep )
+set( extra_libs )
 if( XAOD_STANDALONE )
    set( extra_dep Control/xAODRootAccess )
 else()
    set( extra_dep Control/AthenaBaseComps
       Control/AthAnalysisBaseComps
       GaudiKernel )
+   set( extra_libs AthAnalysisBaseCompsLib )
 endif()
 
 # Declare the package's dependencies:
@@ -49,7 +51,7 @@ atlas_add_library( ElectronPhotonFourMomentumCorrectionLib
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
    LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODCaloEvent xAODEgamma
    xAODEventInfo PATInterfaces EgammaAnalysisInterfacesLib PATCoreLib egammaUtils
-   egammaMVACalibAnalysisLib xAODTruth
+   egammaMVACalibAnalysisLib xAODTruth ${extra_libs}
    PRIVATE_LINK_LIBRARIES xAODTracking xAODMetaData egammaLayerRecalibTool
    PathResolver )
 
diff --git a/Reconstruction/egamma/egammaMVACalib/CMakeLists.txt b/Reconstruction/egamma/egammaMVACalib/CMakeLists.txt
index 65284af0c5d22bc0c17438fbce653776ffae397f..44b718d49f1f6aaf44b88081fc11f2a368b7afe4 100644
--- a/Reconstruction/egamma/egammaMVACalib/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaMVACalib/CMakeLists.txt
@@ -7,12 +7,14 @@ atlas_subdir( egammaMVACalib )
 
 # Extra dependencies for Athena capable builds:
 set( extra_dep )
+set( extra_libs )
 if( XAOD_STANDALONE )
    set( extra_dep Control/xAODRootAccess)
 else()
    set( extra_dep 
 	GaudiKernel 
 	Reconstruction/egamma/egammaInterfaces)
+   set( extra_libs egammaInterfacesLib )
 endif()
 
 
@@ -36,7 +38,7 @@ atlas_add_library( egammaMVACalibLib
    egammaMVACalib/*.h Root/*.cxx
    PUBLIC_HEADERS egammaMVACalib
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODCaloEvent xAODEgamma xAODTracking)
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODCaloEvent xAODEgamma xAODTracking ${extra_libs} )
 
 if( NOT XAOD_STANDALONE )
 atlas_add_component( egammaMVACalib