diff --git a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
index 870e79e6e4c40fea8fd99c8a9d638777b27ecda8..9108375ac40b7f4a4e95eda1ae49164cf6a359ab 100644
--- a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
@@ -37,7 +37,7 @@ atlas_add_component( AthenaRootComps
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} SGTools AthenaBaseComps AthenaKernel DataModelRoot RootUtils RootUtilsPyROOT StoreGateLib SGtests CollectionBase CollectionUtilities FileCatalog PersistencySvc AthenaRootKernel PersistentDataModel EventInfo GaudiKernel xAODRootAccess xAODEventInfo)
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} SGTools AthenaBaseComps AthenaKernel DataModelRoot RootUtils RootUtilsPyROOT StoreGateLib SGtests CollectionBase CollectionUtilities FileCatalog PersistencySvc AthenaRootKernel PersistentDataModel EventInfo GaudiKernel xAODRootAccess xAODEventInfo PoolSvcLib )
 
 # Install files from the package:
 atlas_install_headers( AthenaRootComps )
diff --git a/Database/RDBAccessSvc/CMakeLists.txt b/Database/RDBAccessSvc/CMakeLists.txt
index 79aa169bedc368443526907062c7863b96fa9af2..f97d7b69c4e769af70e5d4416eaf4e7c37c50a96 100644
--- a/Database/RDBAccessSvc/CMakeLists.txt
+++ b/Database/RDBAccessSvc/CMakeLists.txt
@@ -42,7 +42,7 @@ atlas_add_executable( geomdb2sqlite
 atlas_add_executable( geomdb2oracle
                       replicator/geomdb2oracle.cpp
                       INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} RDBAccessSvcLib )
+                      LINK_LIBRARIES ${CORAL_LIBRARIES} RDBAccessSvcLib CxxUtils )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
index c474b2c6dfd54e7da02862920cf9dc4576accf71..808246c5476f4c7c5711e7a72b303f25049408e9 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_component( GeoModelSvc
                      src/RDBMaterialManager.cxx
                      src/components/GeoModelSvc_entries.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests GeoModelUtilities EventInfo GaudiKernel )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests GeoModelUtilities EventInfo GaudiKernel RDBAccessSvcLib EventInfoMgtLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Event/xAOD/xAODCore/CMakeLists.txt b/Event/xAOD/xAODCore/CMakeLists.txt
index b33c2003d626d1213999342d63531898d997470c..33da3a97c20e228eb8d4a947ed3d6e96bd4de726 100644
--- a/Event/xAOD/xAODCore/CMakeLists.txt
+++ b/Event/xAOD/xAODCore/CMakeLists.txt
@@ -75,11 +75,11 @@ atlas_add_test( ut_xaodcore_safedeepcopy_test
 
 atlas_add_test( ut_xaodcore_auxcontainerbase_test
    SOURCES test/ut_xaodcore_auxcontainerbase_test.cxx
-   LINK_LIBRARIES AthContainers xAODCore )
+   LINK_LIBRARIES AthContainers xAODCore TestTools )
 
 atlas_add_test( ut_xaodcore_auxinfobase_test
    SOURCES test/ut_xaodcore_auxinfobase_test.cxx
-   LINK_LIBRARIES AthContainers xAODCore )
+   LINK_LIBRARIES AthContainers xAODCore TestTools )
 
 atlas_add_test( ut_xaodcore_shallowcopy_test
    SOURCES test/ut_xaodcore_shallowcopy.cxx
diff --git a/Event/xAOD/xAODEventInfo/CMakeLists.txt b/Event/xAOD/xAODEventInfo/CMakeLists.txt
index fec4b88e6f3a3184d2d14f012d9a8a92c56331c3..8d096f0b68e16c1314c01041f37209b63f8e7980 100644
--- a/Event/xAOD/xAODEventInfo/CMakeLists.txt
+++ b/Event/xAOD/xAODEventInfo/CMakeLists.txt
@@ -47,11 +47,11 @@ atlas_add_test( ut_xaodeventinfo_subevent_test
 
 atlas_add_test( ut_xaodeventinfo_eventauxinfo_test
    SOURCES test/ut_xaodeventinfo_eventauxinfo_test.cxx
-   LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
+   LINK_LIBRARIES AthLinks xAODCore xAODEventInfo TestTools )
 
 atlas_add_test( ut_xaodeventinfo_eventinfoauxcontainer_v1_test
    SOURCES test/ut_xaodeventinfo_eventinfoauxcontainer_v1_test.cxx
-   LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
+   LINK_LIBRARIES AthLinks xAODCore xAODEventInfo TestTools )
 
 atlas_add_test( ut_xaodeventinfo_eventinfo_v1_test
    SOURCES test/ut_xaodeventinfo_eventinfo_v1_test.cxx