diff --git a/Event/xAOD/xAODEgammaCnv/CMakeLists.txt b/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
index cf7cd68e1f012bdde0a62f5d4f91ff2a5688ba53..759b718c60a85fc21801396258b0f35fd72e5f3b 100644
--- a/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODEgammaCnv/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( xAODEgammaCnv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/AthContainers
                           Event/xAOD/xAODEgamma
                           GaudiKernel
                           PRIVATE
@@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
 atlas_add_component( xAODEgammaCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES DataModel xAODEgamma GaudiKernel AthenaBaseComps AthenaKernel FourMom xAODTracking xAODTruth ParticleEvent Particle egammaEvent )
+                     LINK_LIBRARIES AthContainers xAODEgamma GaudiKernel AthenaBaseComps AthenaKernel FourMom xAODTracking xAODTruth ParticleEvent Particle egammaEvent )
 
 # Install files from the package:
 atlas_install_headers( xAODEgammaCnv )
diff --git a/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IElectronCnvTool.h b/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IElectronCnvTool.h
index e9cf695d949568a5710c509bb6ebab02c5911136..3ceb58a4f3c543199057f5c2c850459ee27cdb65 100644
--- a/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IElectronCnvTool.h
+++ b/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IElectronCnvTool.h
@@ -10,7 +10,7 @@
 
 // Gaudi/Athena include(s):
 #include "GaudiKernel/IAlgTool.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EDM include(s):
 #include "xAODEgamma/ElectronContainer.h"
diff --git a/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IPhotonCnvTool.h b/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IPhotonCnvTool.h
index c361aeb994fe51e78d9df28274d68b49820e92ea..1d6b55e4b8244ea423e0319eaa2ce45767e11f34 100644
--- a/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IPhotonCnvTool.h
+++ b/Event/xAOD/xAODEgammaCnv/xAODEgammaCnv/IPhotonCnvTool.h
@@ -10,7 +10,7 @@
 
 // Gaudi/Athena include(s):
 #include "GaudiKernel/IAlgTool.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EDM include(s):
 #include "xAODEgamma/PhotonContainer.h"