diff --git a/Event/xAOD/xAODJetCnv/CMakeLists.txt b/Event/xAOD/xAODJetCnv/CMakeLists.txt
index a9b0bfcd3483dfb522356f151e02783916819857..ebe42202f99268948a68dd4a93b6caea76a25e7c 100644
--- a/Event/xAOD/xAODJetCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODJetCnv/CMakeLists.txt
@@ -17,14 +17,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           Reconstruction/Jet/JetEvent )
 
+atlas_add_library( xAODJetCnvLib
+                   xAODJetCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODJetCnv
+                   LINK_LIBRARIES GaudiKernel xAODJet xAODBase AthLinks )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODJetCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthLinks xAODBase xAODJet GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests JetEvent )
+                     LINK_LIBRARIES xAODJetCnvLib xAODJet GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests JetEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODJetCnv )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
index f6f7e7ccf0302abf29810d0f6663c603295f387e..1d0af5f488d40a17d955444145ab2968c27076fa 100644
--- a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
@@ -14,14 +14,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Trigger/TrigEvent/TrigCaloEvent )
 
+atlas_add_library( xAODTrigCaloCnvLib
+                   xAODTrigCaloCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODTrigCaloCnv
+                   LINK_LIBRARIES GaudiKernel xAODTrigCalo )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODTrigCaloCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
+                     LINK_LIBRARIES xAODTrigCaloCnvLib xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODTrigCaloCnv )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
index 308b52bd4fdfe76b29536daa9941a67046da7929..f5a08b0976a4f1fbd1898fcced17e1cba6adec77 100644
--- a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
@@ -18,14 +18,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/FourMomUtils
                           Trigger/TrigEvent/TrigMuonEvent )
 
+atlas_add_library( xAODTrigMuonCnvLib
+                   xAODTringMuonCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODTrigMuonCnv
+                   LINK_LIBRARIES GaudiKernel xAODTrigMuon xAODMuon xAODTracking )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODTrigMuonCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
+                     LINK_LIBRARIES xAODTrigMuonCnvLib xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODTrigMuonCnv )
 atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py )
 atlas_install_joboptions( share/addEFMuonxAODCnv_jobOptions.py share/runEFMuonAODCnvAlg_topOptions.py )