diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/CMakeLists.txt b/InnerDetector/InDetValidation/InDetTrackSplitterTool/CMakeLists.txt
index d73460bb3dcb8d1484c44c7ec022d3abd4cd79d4..6934a6aa2f9c4a6f59e98c9eb8bcf26bd2fe51fc 100644
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/CMakeLists.txt
@@ -25,13 +25,16 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( Eigen )
 
+atlas_add_library( InDetTrackSplitterToolLib
+                   CInDetTrackSplitterTool/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS InDetTrackSplitterTool
+                   LINK_LIBRARIES GaudiKernel TrkTrack AthenaBaseComps )
+
 # Component(s) in the package:
 atlas_add_component( InDetTrackSplitterTool
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel TrkTrack GeoPrimitives EventPrimitives InDetIdentifier InDetRIO_OnTrack TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMeasurementBase TrkPseudoMeasurementOnTrack TrkFitterInterfaces )
-
-# Install files from the package:
-atlas_install_headers( InDetTrackSplitterTool )
+                     LINK_LIBRARIES ${EIGEN_LIBRARIES} InDetTrackSplitterToolLib GeoPrimitives EventPrimitives InDetIdentifier InDetRIO_OnTrack TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMeasurementBase TrkPseudoMeasurementOnTrack TrkFitterInterfaces )
 
diff --git a/MuonSpectrometer/MuonCnv/MuonPrdSelector/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonPrdSelector/CMakeLists.txt
index b9a9823d63a4e95988de2634fa66e4aa3f78f967..1609374190c9fc1ab2641ab0cc32acb4bf04785f 100644
--- a/MuonSpectrometer/MuonCnv/MuonPrdSelector/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonPrdSelector/CMakeLists.txt
@@ -18,13 +18,18 @@ atlas_depends_on_subdirs( PUBLIC
                           MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
                           MuonSpectrometer/MuonIdHelpers )
 
+atlas_add_library( MuonPrdSelectorLib
+                   MuonPrdSelector/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonPrdSelector
+                   LINK_LIBRARIES GaudiKernel MuonCalibToolsLib MuonCalibIdentifier Identifier AthenaBaseComps MuonCalibToolsLib MuonIdHelpersLib MuonPrepRawData )
+
 # Component(s) in the package:
 atlas_add_component( MuonPrdSelector
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel MuonCalibIdentifier MuonCalibToolsLib MuonPrepRawData MuonReadoutGeometry MuonIdHelpersLib )
+                     LINK_LIBRARIES MuonPrdSelectorLib StoreGateLib SGtests MuonReadoutGeometry )
 
 # Install files from the package:
-atlas_install_headers( MuonPrdSelector )
 atlas_install_joboptions( share/*.py )