diff --git a/Reconstruction/Particle/CMakeLists.txt b/Reconstruction/Particle/CMakeLists.txt
index a359825c9c08ce8031f4e06d763bd0bebc245f3f..97dc873edd86510ed15efa4ac5616744fea46605 100644
--- a/Reconstruction/Particle/CMakeLists.txt
+++ b/Reconstruction/Particle/CMakeLists.txt
@@ -7,10 +7,10 @@ atlas_subdir( Particle )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthenaKernel
+                          Control/AthContainers
+                          Control/AthLinks
                           Control/Navigation
-                          Control/SGTools
                           Event/EventKernel
                           Event/FourMom
                           GaudiKernel
@@ -29,13 +29,13 @@ atlas_add_library( Particle
                    src/*.cxx
                    PUBLIC_HEADERS Particle
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkTrackSummary VxVertex
+                   LINK_LIBRARIES AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkTrackSummary VxVertex
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( ParticleDict
                       Particle/ParticleDict.h
                       Particle/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkTrackSummary VxVertex Particle
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkTrackSummary VxVertex Particle
                       NAVIGABLES Rec::TrackParticleContainer )
 
diff --git a/Reconstruction/Particle/Particle/TrackParticle.h b/Reconstruction/Particle/Particle/TrackParticle.h
index 889006c8e98f7ea451246836531fa0a4b319ee58..c6013233458fbc41b8eb7bb108380d5b53113f67 100755
--- a/Reconstruction/Particle/Particle/TrackParticle.h
+++ b/Reconstruction/Particle/Particle/TrackParticle.h
@@ -21,7 +21,7 @@
 #include "EventKernel/INavigable4Momentum.h"
 
 // includes for datamembers
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrkTrack/TrackCollection.h"
 #include "VxVertex/VxContainer.h"
 
@@ -33,7 +33,7 @@
 #include "TrkEventPrimitives/FitQuality.h"
 
 #include "TrkParticleBase/TrackParticleBase.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class MsgStream;
 
diff --git a/Reconstruction/Particle/Particle/TrackParticleContainer.h b/Reconstruction/Particle/Particle/TrackParticleContainer.h
index 51f8a8c71fb1b776c25d34c10e575112b5708529..1aca70abffd69ae0b8871793b715fc375cb0f860 100755
--- a/Reconstruction/Particle/Particle/TrackParticleContainer.h
+++ b/Reconstruction/Particle/Particle/TrackParticleContainer.h
@@ -15,8 +15,8 @@
 #ifndef PARTICLE_TRACKPARTICLECONTAINER_H
 #define PARTICLE_TRACKPARTICLECONTAINER_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "Particle/TrackParticle.h"
 // #include "EventKernel/INavigable4Momentum.h"
 // #include "NavFourMom/INavigable4MomentumCollection.h"