diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
index 91c49b4bdda6090564db8c7cffbc2d4ba070af5a..ee7ffa0002b0d10c11522b5310d4192fcc9bf959 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
@@ -32,14 +32,19 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( CLHEP )
 find_package( tdaq-common COMPONENTS eformat_write DataWriter )
 
+atlas_add_library( MuonCSC_CnvToolsLib
+                   MuonCSC_CnvTools/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonCSC_CnvTools
+                   LINK_LIBRARIES GaudiKernel ByteStreamData )
+
 # Component(s) in the package:
 atlas_add_component( MuonCSC_CnvTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier ByteStreamCnvSvcBaseLib EventInfo EventPrimitives CSCcablingLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData TrkSurfaces )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier ByteStreamCnvSvcBaseLib EventInfo EventPrimitives CSCcablingLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData TrkSurfaces MuonCnvToolInterfacesLib CscCalibToolsLib MuonDigToolInterfacesLib MuonCSC_CnvToolsLib )
 
 # Install files from the package:
-atlas_install_headers( MuonCSC_CnvTools )
 atlas_install_joboptions( share/*.py )
 
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/CMakeLists.txt
index f83ba2d660f567874021841d5ed033022325b39e..5eb0e15e44bea4467e1a1015af46b24094ccd032 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/CMakeLists.txt
@@ -30,14 +30,19 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( tdaq-common COMPONENTS eformat_write DataWriter )
 
+atlas_add_library( MuonMDT_CnvToolsLib
+                   MuonMDT_CnvTools/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonMDT_CnvTools
+                   LINK_LIBRARIES GaudiKernel ByteStreamData )
+
 # Component(s) in the package:
 atlas_add_component( MuonMDT_CnvTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps StoreGateLib SGtests AtlasDetDescr Identifier ByteStreamCnvSvcBaseLib MuonMDT_CablingLib MdtCalibSvcLib MuonCalibEvent MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonCablingData GeoModelUtilities )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps StoreGateLib SGtests AtlasDetDescr Identifier ByteStreamCnvSvcBaseLib MuonMDT_CablingLib MdtCalibSvcLib MuonCalibEvent MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonCablingData GeoModelUtilities MuonCnvToolInterfacesLib MuonMDT_CnvToolsLib )
 
 # Install files from the package:
-atlas_install_headers( MuonMDT_CnvTools )
 atlas_install_python_modules( python/*.py )
 
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
index bdd5f35d9efa97135a4505dabaa8c94f962c5920..798c8e11915c2c9c6a4f93c9af1bc5685e3992b5 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
@@ -28,13 +28,16 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( tdaq-common COMPONENTS eformat_write DataWriter )
 
+atlas_add_library( MuonMM_CnvToolsLib
+                   MuonMM_CnvTools/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonMM_CnvTools
+                   LINK_LIBRARIES GaudiKernel )
+
 # Component(s) in the package:
 atlas_add_component( MuonMM_CnvTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps SGTools StoreGateLib SGtests AtlasDetDescr Identifier ByteStreamCnvSvcBaseLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib )
-
-# Install files from the package:
-atlas_install_headers( MuonMM_CnvTools )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps SGTools StoreGateLib SGtests AtlasDetDescr Identifier ByteStreamCnvSvcBaseLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib MuonCnvToolInterfacesLib MuonMM_CnvToolsLib )
 
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
index 7af0639a3644dd074cb05998930fa79effbe48df..1458eeaa972da740800cc5835e61554de040e254 100644
--- a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
@@ -29,14 +29,19 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Eigen )
 find_package( tdaq-common COMPONENTS eformat_write DataWriter )
 
+atlas_add_library( MuonSTGC_CnvToolsLib
+                   MuonSTGC_CnvTools/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonSTGC_CnvTools
+                   LINK_LIBRARIES GaudiKernel )
+
 # Component(s) in the package:
 atlas_add_component( MuonSTGC_CnvTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives TGCcablingInterfaceLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces STgcClusterizationLib )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives TGCcablingInterfaceLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces STgcClusterizationLib MuonCnvToolInterfacesLib MuonSTGC_CnvToolsLib )
 
 # Install files from the package:
-atlas_install_headers( MuonSTGC_CnvTools )
 atlas_install_joboptions( share/*.py )
 
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/CMakeLists.txt
index b895190e04c3fca896bc24a4604445eba18a888f..8dd7824b4d653b623ecec3fa1b57e22e5556ccc5 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/CMakeLists.txt
@@ -28,14 +28,19 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Eigen )
 find_package( tdaq-common COMPONENTS eformat_write DataWriter )
 
+atlas_add_library( MuonTGC_CnvToolsLib
+                   MuonTGC_CnvTools/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonTGC_CnvTools
+                   LINK_LIBRARIES GaudiKernel ByteStreamData )
+
 # Component(s) in the package:
 atlas_add_component( MuonTGC_CnvTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives TGCcablingInterfaceLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives TGCcablingInterfaceLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces MuonCnvToolInterfacesLib MuonTGC_CnvToolsLib )
 
 # Install files from the package:
-atlas_install_headers( MuonTGC_CnvTools )
 atlas_install_joboptions( share/*.py )