diff --git a/TestBeam/TBDetDescr/CMakeLists.txt b/TestBeam/TBDetDescr/CMakeLists.txt
index 4c0e60e44a942b4f5e3f250407ed14ea3ec50313..54cdcb7961a5a1e2bfda2e8d7b39bbb59e2afcd2 100644
--- a/TestBeam/TBDetDescr/CMakeLists.txt
+++ b/TestBeam/TBDetDescr/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( TBDetDescr )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
-                          Control/SGTools
+                          Control/AthenaKernel
+                          Control/AthContainers
                           DetectorDescription/GeoPrimitives
                           PRIVATE
                           GaudiKernel )
@@ -24,12 +23,12 @@ atlas_add_library( TBDetDescr
                    PUBLIC_HEADERS TBDetDescr
                    INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} DataModel SGTools GeoPrimitives
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthContainers GeoPrimitives
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
 
 atlas_add_dictionary( TBDetDescrDict
                       TBDetDescr/TBDetDescrDict.h
                       TBDetDescr/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} DataModel SGTools GeoPrimitives GaudiKernel TBDetDescr )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthContainers GeoPrimitives GaudiKernel TBDetDescr )
 
diff --git a/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h b/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
index 16bb98f4cba318a080515f36aa8cf554a87212a7..22b3a1b6319913d368bc22741cf10621d63a3cf2 100755
--- a/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
+++ b/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
@@ -9,7 +9,7 @@
 #ifndef TBDetDescrManager_H
 #define TBDetDescrManager_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBDetDescr/TBElement.h"
 class TBElementContainer;
diff --git a/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h b/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
index 2411ca8888f38c3c6fac39f19b4f1bd01b8e7f3a..848dc3bcaeb35a360f70c99bb4dd7c7a119a6df1 100755
--- a/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
+++ b/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
@@ -9,8 +9,8 @@
 #ifndef TBElementContainer_H
 #define TBElementContainer_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBDetDescr/TBElement.h"