diff --git a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
index f66f3c824b612d3c0891c1b71a7fc18ca5103f85..3507c4fdf71549eab5b409cc235fd7689fcf3db6 100644
--- a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
+++ b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( DBDataModel )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
-                          Control/SGTools
+                          Control/AthenaKernel
+                          Control/AthContainers
                           PRIVATE
                           Database/APR/CollectionBase )
 
@@ -21,12 +20,12 @@ atlas_add_library( DBDataModel
                    src/*.cxx
                    PUBLIC_HEADERS DBDataModel
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES DataModel SGTools
+                   LINK_LIBRARIES AthContainers 
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CollectionBase )
 
 atlas_add_dictionary( DBDataModelDict
                       DBDataModel/DBDataModelDict.h
                       DBDataModel/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel SGTools CollectionBase DBDataModel )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers CollectionBase DBDataModel )
 
diff --git a/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h b/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
index 98d92d254fbabb43b2370acb19a1c01a0ed7457d..5db99805f65458e3de47f33a4c9e5a35a8d04222 100644
--- a/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
+++ b/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
@@ -10,7 +10,7 @@
  *  @author Peter van Gemmeren <gemmeren@anl.gov>
  **/
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include <string>
 #include <map>
@@ -32,7 +32,7 @@ public: // Constructor and Destructor
 
 typedef DataVector<CollectionMetadata> CollectionMetadataContainer;
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(CollectionMetadata, 1253814833, 1)
 CLASS_DEF(CollectionMetadataContainer, 1296887519, 1)
 #endif