diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
index 3b12264e08169d590ff0cd9024b840a1daabb5f5..2315a986e6df9b2bb388927a31f2a8c2dc9386a0 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/CMakeLists.txt
@@ -28,7 +28,6 @@ atlas_add_library( AthenaPoolExampleConverter
                    LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolExampleData AthenaPoolUtilities DataModelAthenaPoolLib AthenaPoolCnvSvcLib )
 
 atlas_add_poolcnv_library( AthenaPoolExampleConverterPoolCnv
-                           src/*.cxx
                            FILES AthenaPoolExampleData/ExampleHitContainer.h AthenaPoolExampleData/ExampleTrackContainer.h
                            INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                            LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModelAthenaPoolLib AthenaPoolExampleData AthenaPoolUtilities AthenaPoolCnvSvcLib AthenaPoolExampleConverter )
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/CMakeLists.txt b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/CMakeLists.txt
index 949344ed5064f68ab80f0d53a4648e1778f530aa..4dd785bd3dd3de1b095597ff08bfbef02e4b4fdb 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/CMakeLists.txt
@@ -21,18 +21,17 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( tdaq-common )
 
-# Component(s) in the package:
-atlas_add_component( AFP_ByteStream2RawCnv
-                     src/*.cxx
-                     src/components/*.cxx
-                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}  AthenaBaseComps AthContainers AFP_RawEv)
-
 atlas_add_library( AFP_ByteStream2RawCnvLib
 		   src/*.cxx
 	           PUBLIC_HEADERS AFP_ByteStream2RawCnv
                    INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}  AthenaBaseComps AthContainers AFP_RawEv)
+                   LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}  AthenaBaseComps AthContainers AFP_RawEv ByteStreamCnvSvcBaseLib )
+
+# Component(s) in the package:
+atlas_add_component( AFP_ByteStream2RawCnv
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}  AthenaBaseComps AthContainers AFP_RawEv AFP_ByteStream2RawCnvLib )
 
 # Install files from the package:
 atlas_install_headers( AFP_ByteStream2RawCnv )