diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
index 622e47bcccb1f23443d25ce7399faa44aab5e0cf..f9ce27dee28d16ba23ed017c7388885e354f572c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
@@ -9,7 +9,8 @@ atlas_subdir( InDetEventTPCnv )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs(
    PUBLIC
-   Control/DataModel
+   Control/AthAllocators
+   Control/AthLinks
    Control/DataModelAthenaPool
    Control/StoreGate
    Database/AthenaPOOL/AthenaPoolCnvSvc
@@ -46,7 +47,7 @@ atlas_add_tpcnv_library( InDetEventTPCnv
    src/InDetCompetingRIOsOnTrack/*.cxx
    InDetEventTPCnv/InDetLowBetaInfo/*.h src/InDetLowBetaInfo/*.cxx
    PUBLIC_HEADERS InDetEventTPCnv
-   LINK_LIBRARIES DataModel DataModelAthenaPoolLib StoreGateLib
+   LINK_LIBRARIES AthAllocators AthLinks DataModelAthenaPoolLib StoreGateLib
    AthenaPoolCnvSvcLib AthenaPoolUtilities Identifier GaudiKernel
    InDetIdentifier InDetCompetingRIOsOnTrack InDetLowBetaInfo
    InDetPrepRawData InDetRIO_OnTrack TrkEventTPCnv
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
index 932da8ec058612be39d2d0d5612eeb440e5c8002..26443a5fe35cf0d6cc2cef2eee675f0e57a352ab 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
 #include "InDetEventTPCnv/InDetRIO_OnTrack/SiClusterOnTrackCnv_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/PixelClusterContainer.h"
 
 #include "StoreGate/StoreGateSvc.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
index 6fd6b93432a83da1e7507f16986de46b1c349a4c..04426bfe2c81b2ffb25cf68b4c8ca3c5b7fb9851 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
@@ -10,7 +10,7 @@
 #include "InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrack_p2.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/PixelClusterContainer.h"
 
 #include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
index f6bd8c2966b6daacede30be795e7fe4797284d94..643b44be84b49adfe85e33928b3b489fd51daf86 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
 #include "InDetEventTPCnv/InDetRIO_OnTrack/SiClusterOnTrackCnv_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/SCT_ClusterContainer.h"
 
 
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
index cd369b0bad8af6f92490090672143ae5f141a26d..526b584e7414d0513cbaf1b4ba2826bf2d475ff6 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
@@ -9,7 +9,7 @@
 #include "InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrack_p2.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/SCT_ClusterContainer.h"
 
 #include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
index 3718ed577b9d61d3c0c912ca8bb6506b4a29147d..34ae5b1401ea43b189950fa916c6ec3c1f695756 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
 #include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/TRT_DriftCircleContainer.h"
 
 
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
index 49a205d0321dc6c50d1f5ba76bb0ffc6308c6974..d19671f433980dba764c57f260c5c2771613cc9c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
@@ -9,7 +9,7 @@
 #include "InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrack_p2.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "InDetPrepRawData/TRT_DriftCircleContainer.h"
 
 #include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements b/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
index 51f4005764b1b52c02983abedb43ad572df1b50e..d1155c81a3697019a22edfaaf71748062be2a964 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
@@ -7,7 +7,8 @@ public
 use  AtlasPolicy                AtlasPolicy-*                   
 use  AthenaPoolCnvSvc           AthenaPoolCnvSvc-*              Database/AthenaPOOL
 use  AthenaPoolUtilities        AthenaPoolUtilities-*           Database/AthenaPOOL
-use  DataModel                  DataModel-*                     Control
+use  AthAllocators              AthAllocators-*                 Control
+use  AthLinks                   AthLinks-*                      Control
 use  DataModelAthenaPool        DataModelAthenaPool-*           Control
 use  GaudiInterface             GaudiInterface-*                External
 use  Identifier                 Identifier-*                    DetectorDescription
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
index 68c8540c05e3d348ac8d57831cf1a5dd4e957231..bcc3e5ea0f197db46f043d3f62a32ca921fbc2be 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
@@ -27,7 +27,7 @@
 
 
 
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 void InDet::PixelClusterContainerCnv_p1::transToPers(const InDet::PixelClusterContainer* transCont,  InDet::InDetPRD_Container_p1* persCont, MsgStream &log) 
 {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
index 693d3e0237330a1fc302b023df9cdea57f242413..aa5c495a779882dbd825cb99d71a94f55bd0b29c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
@@ -7,7 +7,7 @@
 #include "InDetPrepRawData/PixelClusterContainer.h"
 #include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguities_p1.h"
 #include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.h"
-#include "DataModel/tools/IdentContIndex.h"
+#include "AthLinks/tools/IdentContIndex.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
index 7097de0b6f3610f88d97c28edf00ee09e9c989c3..2906d5e93abdd3a44b4d3ade7120c8dcd4415467 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
@@ -25,7 +25,7 @@
 
 
 
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 void InDet::SCT_ClusterContainerCnv_p1::transToPers(const InDet::SCT_ClusterContainer* transCont,  InDet::InDetPRD_Container_p1* persCont, MsgStream &log) 
 {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
index d90fe78db0bfa88bf20130d6d04b2b13cbe11a24..ee46ba310abd5ccd908e6f2e806f3bacb4090c8b 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
@@ -26,7 +26,7 @@
 
 
 
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 void InDet::TRT_DriftCircleContainerCnv_p1::transToPers(const InDet::TRT_DriftCircleContainer* transCont,  InDet::InDetPRD_Container_p1* persCont, MsgStream &log) 
 {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
index 245dd323ec81e1be865808d0ae87bf072794c8f7..e32a38bdf4c571ee046bd6f9042b4635fa40b392 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p2.h"
 #include "InDetEventTPCnv/PixelClusterContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
index a6981289e27019f7deedb4bcb2cf53f543f41255..92decc31bfd162ae1e7f37d0716f2e6911536e84 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
@@ -13,7 +13,7 @@
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p3.h"
 #include "InDetEventTPCnv/PixelClusterContainerCnv_p3.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
index 517d78113bd3d47ae01cd6bb613a52c595637d24..c80ef83f6d50a7d294b2b75be51360337c3c5faa 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
 #include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetEventTPCnv/InDetPrepRawData/SCT_ClusterCnv_p2.h"
 #include "InDetEventTPCnv/SCT_ClusterContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
index a04293303e33ea4a1c2018c97cb40ccf96bc65a1..f27bc74b1e0a15d575f452dc8c36be7a1beec5b3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
@@ -13,7 +13,7 @@
 #include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetEventTPCnv/InDetPrepRawData/SCT_ClusterCnv_p3.h"
 #include "InDetEventTPCnv/SCT_ClusterContainerCnv_p3.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
index 6c9503b04b8c23bdbc366c7c9aac4a5e8d71dfd6..108c2f3e11e6317757c4a3437fd663a60f7868d2 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
 #include "InDetReadoutGeometry/TRT_DetectorManager.h"
 #include "InDetEventTPCnv/InDetPrepRawData/TRT_DriftCircleCnv_p2.h"
 #include "InDetEventTPCnv/TRT_DriftCircleContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 // Gaudi
 #include "GaudiKernel/ISvcLocator.h"