diff --git a/Event/NavFourMom/CMakeLists.txt b/Event/NavFourMom/CMakeLists.txt
index 44fc45cbb9b1224383c45fe8f27ac18d00271405..ce444189e1bc4bf5897ded917fb7a11e7990d9f8 100644
--- a/Event/NavFourMom/CMakeLists.txt
+++ b/Event/NavFourMom/CMakeLists.txt
@@ -8,7 +8,8 @@ atlas_subdir( NavFourMom )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthLinks
+                          Control/AthContainers
                           Control/Navigation
                           Control/SGTools
                           Event/EventKernel
@@ -26,14 +27,14 @@ atlas_add_library( NavFourMom
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} DataModel Navigation SGTools EventKernel
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation SGTools EventKernel
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} FourMom )
 
 atlas_add_dictionary( NavFourMomDict
                       NavFourMom/NavFourMomDict.h
                       NavFourMom/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom NavFourMom
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation SGTools EventKernel FourMom NavFourMom
                       NAVIGABLES  DataVector<INavigable4Momentum> DataVector<IParticle>
                       DATA_LINKS INav4MomAssocs
                       ELEMENT_LINKS  DataVector<I4Momentum> )
diff --git a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
index 42f06a79ec89705cf99a48756a9e40f72969a44b..736bdc2cf719bfa7c5483580a2b38fe0a6437c13 100644
--- a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
+++ b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
@@ -17,9 +17,7 @@
 
 // Framework includes
 #include "CLIDSvc/CLASS_DEF.h"
-
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EventKernel includes
 #include "EventKernel/I4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INav4MomAssocs.h b/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
index 1de71e6a1b27e117cefd36027113ab341b8627c3..79b6a639d38fe072e0240e751a2be0b4e3355202 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
@@ -13,9 +13,8 @@
 
 // STL includes
 
-// DataModel includes
-#include "DataModel/AssociationMap.h"
-#include "DataModel/DataLink.h"
+#include "AthLinks/AssociationMap.h"
+#include "AthLinks/DataLink.h"
 
 // EventKernel includes
 #include "EventKernel/INavigable4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INav4MomLink.h b/Event/NavFourMom/NavFourMom/INav4MomLink.h
index 4c8e0de402027442be154c16cbffacf37f0af76a..31447ea07af50eedf70e8262af8efc053a810e23 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomLink.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomLink.h
@@ -10,8 +10,7 @@
 #ifndef NAVFOURMOM_INAV4MOMLINK_H
 #define NAVFOURMOM_INAV4MOMLINK_H 1
 
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "NavFourMom/INavigable4MomentumCollection.h"
 
 
diff --git a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
index 974c89b78d703d11856d4bb63a4eec9694f3acf2..ad920bce8a3ae99d87eb52ec5ace98a001013db5 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
@@ -16,8 +16,7 @@
 // STL includes
 #include <vector>
 
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "CLIDSvc/CLASS_DEF.h"
 #include "NavFourMom/INav4MomLink.h"
 #include "EventKernel/INavigable4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
index f68edcefa6fa6f99ccd3da86749448aec369dacd..0f99c65756bed4f7f3bb7a6bd1839a08ae32dc11 100644
--- a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
+++ b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
@@ -12,7 +12,7 @@
 
 #include "CLIDSvc/CLASS_DEF.h"
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include "EventKernel/INavigable4Momentum.h"
 //#include "NavFourMom/I4MomentumContainer.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleContainer.h b/Event/NavFourMom/NavFourMom/IParticleContainer.h
index f32552573cb1182e34217a0e798319ffb9edc987..03c2aa6e7151bfbc21ab2f0acbdf839ac544ce58 100644
--- a/Event/NavFourMom/NavFourMom/IParticleContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleContainer.h
@@ -19,7 +19,7 @@ PURPOSE:  This is a data object, containing a collection of IParticle Objects.
 
 // INCLUDE HEADER FILES:
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "CLIDSvc/CLASS_DEF.h"
 #include "EventKernel/IParticle.h"
 #include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleLink.h b/Event/NavFourMom/NavFourMom/IParticleLink.h
index f809b6786404ca1a8e4253a84c7bbe98144b278f..a904f21e3589a16bc0e680cfe1ebca03255e8ca3 100644
--- a/Event/NavFourMom/NavFourMom/IParticleLink.h
+++ b/Event/NavFourMom/NavFourMom/IParticleLink.h
@@ -10,8 +10,7 @@
 #ifndef NAVFOURMOM_IPARTICLELINK_H
 #define NAVFOURMOM_IPARTICLELINK_H 1
 
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "NavFourMom/IParticleContainer.h"
 
 
diff --git a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
index 28a902efd56e630c0c95f17000c25d87d49226a7..88962af8745a1f98b3e6f174c21f81e46e63d7ce 100644
--- a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
@@ -16,8 +16,7 @@
 // STL includes
 #include <vector>
 
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "CLIDSvc/CLASS_DEF.h"
 #include "EventKernel/IParticle.h"
 #include "NavFourMom/IParticleLink.h"
diff --git a/Event/NavFourMom/cmt/requirements b/Event/NavFourMom/cmt/requirements
index 0ea96df26fb9e6fe8a8604f12f2d726121f9d652..830351f5c744fc7f379569d8bb7a78f03ae4e57c 100644
--- a/Event/NavFourMom/cmt/requirements
+++ b/Event/NavFourMom/cmt/requirements
@@ -7,7 +7,8 @@ use  AtlasPolicy                AtlasPolicy-*
 use  AtlasCLHEP                 AtlasCLHEP-*                    External
 
 use  CLIDSvc                    CLIDSvc-*                       Control
-use  DataModel                  DataModel-*                     Control
+use  AthLinks                   AthLinks-*                      Control
+use  AthContainers              AthContainers-*                 Control
 use  EventKernel                EventKernel-*                   Event
 use  Navigation                 Navigation-*                    Control
 
diff --git a/Event/NavFourMom/src/INav4MomAssocs.cxx b/Event/NavFourMom/src/INav4MomAssocs.cxx
index 680043fa0591edb56156a9e355665baf7a44ead8..86ec2bb31824151856caae8dddf46490e8f15628 100644
--- a/Event/NavFourMom/src/INav4MomAssocs.cxx
+++ b/Event/NavFourMom/src/INav4MomAssocs.cxx
@@ -15,7 +15,7 @@
 // NavFourMom includes
 #include "NavFourMom/INav4MomAssocs.h"
 #include "EventKernel/IParticle.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 /////////////////////////////////////////////////////////////////// 
 // Public methods: