diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
index a136c56a89173beb862e01ab62beda0efd9f194d..f96cfa344304b089c97de6ffe3dd13f07258c9c2 100644
--- a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( BeamPipeGeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
PRIVATE
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt b/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
index f3f521bb90748c59cf462b28b5ca5601788f861e..b3d9e54616c961917e9e00beac6a3f44354541ef 100644
--- a/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( CavernInfraGeoModel )
atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
PRIVATE
diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt b/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
index fe9ed7453dc9044f5880c5e50e596f09439bd806..ced411e4e23491089549ec07a87812d91e5d73d2 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces )
# External dependencies:
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
index 83c0402742a6af990c9d56747fca7b73511cd448..71b84b587b99b986aecc852a819e8cec9dc1f833 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/SGTools
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
LArCalorimeter/LArGeoModel/LArReadoutGeometry
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
index 41c3300f646125a29f0d03fc8ec2635e1bdc4c71..b2e3648e0f9801a64a898faf42e01a6b1b12fc3f 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
Control/CLIDSvc
Control/SGTools
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
index 7bd44e675e183c8eb5b9348d3cb33904b2526fc7..f85461ce3a4948757eea21353c9e3a7eb2b59ea5 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
PRIVATE
diff --git a/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt b/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
index 178b14395f78efc2b81d68ade59a233cd0715ea1..c8d260fdff39672901c1152850c4334521ad7d89 100644
--- a/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaKernel
Control/CxxUtils
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel )
diff --git a/DetectorDescription/GeometryDBSvc/CMakeLists.txt b/DetectorDescription/GeometryDBSvc/CMakeLists.txt
index f793912b78672bcd9caa8260472d06f4e6b087db..a3386da0c546bd027ca7d4198fac6d86a1d920b5 100644
--- a/DetectorDescription/GeometryDBSvc/CMakeLists.txt
+++ b/DetectorDescription/GeometryDBSvc/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( GeometryDBSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
GaudiKernel
PRIVATE
Control/AthenaBaseComps )
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
index 41be619d6e8781f3eeb1e2d408cd146274a67bee..8e095d42412133d40045af0d377c0a86b2d1cbc1 100644
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
index 8c2d277431a4c3cb89611a904e087482f3acd74f..51ad33c8c4272f824fc178825be9dd924983f058 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
index 7c33de040642612aa9fcb806dbbbde91bb6f8d1f..a0215460308a76d78d0431ae696c032f9fe9e16c 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces )
# External dependencies:
diff --git a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
index 189d846f7e1a722a4083891c7d81e41abb2aab2f..1b31e3ecd88a833a800e4bcaa69290c9ffa15ad6 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( TrigPSC )
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
HLT/Trigger/TrigControl/TrigKernel
Tools/PathResolver
Trigger/TrigConfiguration/TrigConfBase )
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt b/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
index 187fdb0973cfd3c1c355f8507037b6018a48c05e..420c094f73f4448c84e26c24dc0db6d56c2ed3b0 100644
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
+++ b/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs(
Tracking/TrkAlignment/TrkAlignGenTools
Tracking/TrkAlignment/TrkAlignInterfaces
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsServices/CMakeLists.txt
index 9a6a216e67c40cd404554f510fe9fcd17bc98856..d62404557cd7f24b1222ac36729dc9718dbc644d 100644
--- a/InnerDetector/InDetConditions/PixelConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs(
PRIVATE
Control/SGTools
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
Database/CoralDB
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsServices/CMakeLists.txt
index 8a6088484c03ca4bb427faedf007c5bd24140f9c..99abbcbfa282a12693d17681c4a38a95769d61e1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/CxxUtils
Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
Database/RegistrationServices
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
index 7adf3324d3a99793f6f8e76eb499ab46361c9a9f..a2079dc56ec6281abdb0b35d9a93623f2a7a2403 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
Event/EventInfo
Event/xAOD/xAODEventInfo
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
InnerDetector/InDetConditions/SCT_ConditionsServices
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
index 7470723cea8e8b01b56571d722d95dc2d7d80822..5e629ca4b09e44f6d435dd755ad8fefcca0af63d 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
Database/RegistrationServices
DetectorDescription/DetDescrCond/DetDescrConditions
DetectorDescription/GeoModel/GeoModelInterfaces
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
index 5f42914345c6df2dfaaa5533c2cd89078aaeb263..1fe7dcd1a3d3ce50f9886db1652ab39d7537b59d 100644
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelUtilities )
# External dependencies:
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
index 2f29b8b42a6176bdc1646d8575b5e2692a99637a..1c947a898eafadb64b5475774110afc1d3308572 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelUtilities )
# External dependencies:
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
index 49b13467b9fb2af405a48e9d2e365339d7862f5a..a9dee220a6c22bf163046db9298db0b833738160 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( InDetGeoModelUtils )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel
PRIVATE
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
index 2ef81c6fa2a01c537062bacb686ca3c66b0a43b4..f7ba6255c5804139ef9369aa8c5cbd130ad5a076 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( InDetServMatGeoModel )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
index c65a52241fe0b94f24faacb1c836110ec143b97f..6be57eed88d1aa1b1393b9cb9fe30c19099a44f9 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs(
PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
index 83543e762ff3cee05ffd6f8c12ec2fadf61ea76f..29405be03be483055b6eaf3ee8e46b1ccf7a1d78 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( SCT_GeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
index 7c67b3e240aba72d15fcbc615accbc78cb6ab91c..ebd2bab8ba9612772586ca6b205bd1620062b96f 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( SCT_SLHC_GeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelUtilities
DetectorDescription/Identifier
GaudiKernel
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
index c3cfed4033b1ba1c05b558a906345ea254e33252..e10692e721591da78247e3b155e75e11ca240d07 100644
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( TRT_GeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
InnerDetector/InDetConditions/TRT_ConditionsServices
diff --git a/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
index 79bc57d46c342f9d0f1bd706055bd24a9ecb4048..29fb60266c2d7dbc6211ca3383389c24fb0d16ec 100644
--- a/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( InDetRecExample )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/AthenaCommon
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
TestPolicy )
# External dependencies:
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt b/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
index d0efa394dec96f51e251fd2128ebee29a74d97b0..ede481a27daba95fb05bbbc6757875e9b64cc8ce 100644
--- a/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( InDetSLHC_Example )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/AthenaCommon
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
TestPolicy )
# External dependencies:
diff --git a/LArCalorimeter/LArCondUtils/CMakeLists.txt b/LArCalorimeter/LArCondUtils/CMakeLists.txt
index 459fedd0677d8b873951f44863d50dbb59d51754..1fb9e19f96377fcc5d26a3a8e080e970ee2bf8ea 100644
--- a/LArCalorimeter/LArCondUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArCondUtils/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloIdentifier
Calorimeter/CaloGeoHelpers
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
Database/RegistrationServices
Event/EventInfo
LArCalorimeter/LArCabling
diff --git a/LArCalorimeter/LArDetDescr/CMakeLists.txt b/LArCalorimeter/LArDetDescr/CMakeLists.txt
index 0441c2d8440d6052a52ff3ad52d3a43a06ec8d05..b49269de187b58ab9046b6d54e45ec1291bc8576 100644
--- a/LArCalorimeter/LArDetDescr/CMakeLists.txt
+++ b/LArCalorimeter/LArDetDescr/CMakeLists.txt
@@ -19,7 +19,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloIdentifier
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
DetectorDescription/GeoPrimitives )
diff --git a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
index 131c389a95d76fda14e2ef6944bbeb388ed94550..7eb1b312b3b27131afed3ac461a2b469b32c3216 100644
--- a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
LArCalorimeter/LArGeoModel/LArGeoCode
Control/AthenaKernel
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
index 77bec6a06dd3b3f90c42790186980878d38594a4..7ebb3a1d830f9de8918803b8de1e4df82577b583 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PRIVATE
LArCalorimeter/LArGeoModel/LArReadoutGeometry
Control/AthenaKernel
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel
Tools/PathResolver )
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
index b8a03fc74f870a6ce18d19402e57f8ae7f394a81..53e269aa59ff762aa10fc1c80b80eb3582eb310b 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/CxxUtils
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
DetectorDescription/Identifier
diff --git a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
index 713f43de41c05089b30387d59da09fb70d23da91..ed5aec6204ab7f9cb1876d17265edcd6eb64a8ab 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaKernel
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel
Calorimeter/CaloG4Sim
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
index ea2cf466106d743f8c6c4bc4a25959a0cec2ce27..92c6afff69fbafbdc2e347acc78676061c35046d 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloG4Sim
Control/AthenaKernel
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/Identifier
GaudiKernel
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
index 967f47ae7e3eaf8e1eb22f2df4e0905c6a9a811a..42ba96c45ba6f03f9f41a644ce2ac2b62e8e3d4e 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/DetDescrCond/DetDescrConditions
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
index 7a539564065df25dd30b6d66b75aa5d444e28270..c3661e59011558b308d92b7db4ab2a5bdf911fed 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArGeoCode
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
index 5a8cedb8974807258785384489e7f06c77ca026d..92304b5376cc9574b170867f53e9f0e5a7e11a1b 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( LArGeoCode )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
index 30c7dd5d6461c155fa86f186a69c6583d1ae6b09..9821db9d1d78aeac5e515b3642a2cc7d7050d669 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( LArGeoEndcap )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
LArCalorimeter/LArGeoModel/LArGeoFcal
LArCalorimeter/LArGeoModel/LArGeoHec
diff --git a/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
index b2ea88fbed1391af8c33f6d288d045111b3f873b..0a00338f74cf9e034f9a73771d647b1993bdc55b 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( LArGeoFcal )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
PRIVATE
Control/StoreGate
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
index 32d78c6f21d63a306c071ce4308caa3629fd888b..47df10bf735dd13b66ed473d860dd3130f646517 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArReadoutGeometry
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel
LArCalorimeter/LArG4/LArG4RunControl
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
index 892893c67cd53fc27f84ba3703a42fc4dad209b5..e038e2c30053069b0544b5b4ee23e0beb5e3441b 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArReadoutGeometry
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel
LArCalorimeter/LArG4/LArG4RunControl
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
index deb64ed322202675f03a34febbe5521c07c20aa6..785d0034c2b78ce6bb61ce49f19e8bc00d949b7e 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloDetDescr
Control/AthContainers
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
GaudiKernel
LArCalorimeter/LArG4/LArG4RunControl
LArCalorimeter/LArGeoModel/LArGeoCode
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
index bbadb5b3dafdd067dcae506fdeb1194bc5c3f144..f2148b5f9b75db6b62ac7e2c828fbd0180af0a8d 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/CxxUtils
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
index 7adfbbdafc221aceaf4616afe8bf8594a07baaec..4579a38e6111f7291311cdbc93a4906e781f1632 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( LArGeoHec )
atlas_depends_on_subdirs( PRIVATE
Control/AthenaKernel
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
diff --git a/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/CMakeLists.txt
index 9982427326b7f8ee7a53fdc8ec1257e1538be10f..13ef3387f2a6041734f1d26dee6d39b1d3f9154e 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( LArGeoMiniFcal )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
index 4a3dbb776ecb84bfd6238f095c96ba2729a1c26d..51cb8349e23e9d74ae103bf4ca586e629b411f4f 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArGeoCode
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
GaudiKernel )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
index 9e0397980963b71455a575d5a2d6e8f2b0c69b43..67d9e242c93af854964481bf179966b75933c065 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArReadoutGeometry
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoSpecialShapes
GaudiKernel
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
index 29294bd7e8a0b2ccb3e84de8e94a4d49c267ed86..aa5d1a29e515774d8954889c5e5b861fd0b04959 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArGeoModel/LArHV
PRIVATE
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel )
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/CMakeLists.txt b/MuonSpectrometer/Amdcsimrec/AmdcDb/CMakeLists.txt
index c5b749ae459ab4f004c89051ec75a3190a3a429b..d0b97e918c88f9aebec9783cf7b273fc3d9ee2f5 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/CMakeLists.txt
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( AmdcDb )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
GaudiKernel
PRIVATE
Control/StoreGate
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/CMakeLists.txt b/MuonSpectrometer/Amdcsimrec/AmdcOracle/CMakeLists.txt
index 1a66efc3134f48c37f0d84044a6ed0c8205ed876..6cba1efab06dce57a1beb0fad5c157ec34bec776 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/CMakeLists.txt
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
GaudiKernel
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
MuonSpectrometer/Amdcsimrec/AmdcDb )
# External dependencies:
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
index 8284622417587811f16b3eb4e0e5067fbd8e27cd..52a55b90b05e167fc03801168f4f417c0f124692 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/SGTools
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/Identifier
MuonSpectrometer/MuonAlignment/MuonAlignmentData
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
index 400631766d5d78be8c6a29b44aa0189e331dbac7..f5c7f67068f2b24a271531eaed96f89029556d63 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/HitManagement
PRIVATE
Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeometryDBSvc
Event/EventInfo
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
index 7613a98c6da2daff56be8d9f4994faf8a6356e9a..a3e67f036b3236d59f2dce5acf50da8a2f5fe7aa 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
MuonSpectrometer/MuonSimEvent
Simulation/HitManagement
PRIVATE
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
Event/xAOD/xAODEventInfo
Generators/GeneratorObjects
diff --git a/MuonSpectrometer/MuonGMdbObjects/CMakeLists.txt b/MuonSpectrometer/MuonGMdbObjects/CMakeLists.txt
index 322a4629f2105bf8df3264ef43cca7ad788a0bfa..73e7c73cc6062a7b197e941cd6229969965ad0ad 100644
--- a/MuonSpectrometer/MuonGMdbObjects/CMakeLists.txt
+++ b/MuonSpectrometer/MuonGMdbObjects/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( MuonGMdbObjects )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
- Database/AthenaPOOL/RDBAccessSvc )
+ Database/RDBAccessSvc )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
diff --git a/MuonSpectrometer/MuonGeoModel/CMakeLists.txt b/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
index 0047d9b7e2fa15b4f75dcc78da42e990a3b0c6f5..24a0da40e45205f4a5d9a66d6d7572e6104c4aa1 100644
--- a/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
+++ b/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
@@ -20,7 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
Database/AthenaPOOL/AthenaPoolUtilities
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/AGDD/AGDDKernel
DetectorDescription/IdDictDetDescr
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/CMakeLists.txt
index d37c2f3880cf9f2658482d079a8a58a425d88d4f..daf696c5358958aeed120cc58aa54597ef035c7a 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PRIVATE
Control/AthContainers
Control/AthenaBaseComps
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
Database/CoolConvUtilities
Database/CoraCool
DetectorDescription/GeoModel/GeoModelInterfaces
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index fb4108ede21f257591865e5370ad70bf66fac133..be8c497c257134ad10bef7e852fc94b69db1e6f7 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -79,7 +79,6 @@
+ Database/AthenaPOOL/EventSelectorAthenaPool
+ Database/AthenaPOOL/OutputStreamAthenaPool
+ Database/AthenaPOOL/PoolSvc
-+ Database/AthenaPOOL/RDBAccessSvc
+ Database/AthenaPOOL/RootConversions
+ Database/AthenaPOOL/RootFileTools
+ Database/AthenaPOOL/StlAthenaPoolCnv
diff --git a/TileCalorimeter/TileDetDescr/CMakeLists.txt b/TileCalorimeter/TileDetDescr/CMakeLists.txt
index 94e84a71958171592041c97d1c902ba2c0ecce21..5460aeae96e923fe37374c48f56652f4e4397608 100644
--- a/TileCalorimeter/TileDetDescr/CMakeLists.txt
+++ b/TileCalorimeter/TileDetDescr/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/Identifier
PRIVATE
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
index 76d15b0031ebc2586a15f3305c08a91c3e5e89ab..171238bc87cddcfa2c813d2b3ca81e602563a7c7 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloSimEvent
Control/CxxUtils
Control/StoreGate
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
diff --git a/TileCalorimeter/TileGeoModel/CMakeLists.txt b/TileCalorimeter/TileGeoModel/CMakeLists.txt
index d27e4c90d3f30649d19b019d3114cd707b49a7c1..b65e008ec0ee4621b2a092b419e7d9447e62c63d 100644
--- a/TileCalorimeter/TileGeoModel/CMakeLists.txt
+++ b/TileCalorimeter/TileGeoModel/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloIdentifier
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/RDBAccessSvc
+ Database/RDBAccessSvc
GaudiKernel
TileCalorimeter/TileConditions
TileCalorimeter/TileIdentifier )