diff --git a/TestBeam/TBEvent/CMakeLists.txt b/TestBeam/TBEvent/CMakeLists.txt
index ebdc3bd3a8d5c378cedc08a3a0f94d2b53320c36..bc1dff15c48c838bb80eb46fd9fc2b4377e8cf8c 100644
--- a/TestBeam/TBEvent/CMakeLists.txt
+++ b/TestBeam/TBEvent/CMakeLists.txt
@@ -7,9 +7,9 @@ atlas_subdir( TBEvent )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
-                          Control/SGTools
+                          Control/AthenaKernel
+                          Control/AthLinks
+                          Control/AthContainers
                           GaudiKernel
                           LArCalorimeter/LArRawEvent )
 
@@ -24,12 +24,12 @@ atlas_add_library( TBEvent
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} DataModel SGTools GaudiKernel LArRawEvent
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers AthenaKernel GaudiKernel LArRawEvent
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( TBEventDict
                       TBEvent/TBEventDict.h
                       TBEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel SGTools GaudiKernel LArRawEvent TBEvent )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers GaudiKernel LArRawEvent TBEvent )
 
diff --git a/TestBeam/TBEvent/TBEvent/TBADCRaw.h b/TestBeam/TBEvent/TBEvent/TBADCRaw.h
index 9709a07efaf18311a3cdcd8b442a49670b8f5d90..41ac3b2414abce2dc1332daf2f66bba4830d9eb5 100755
--- a/TestBeam/TBEvent/TBEvent/TBADCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBADCRaw.h
@@ -7,8 +7,8 @@
 
 
 #include "TBEvent/TBBeamDetector.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <string>
 
diff --git a/TestBeam/TBEvent/TBEvent/TBADCRawCont.h b/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
index 3e89ae2c7d06ebcf59c87a90c29b2e9bd88b2ecf..90a1a33bd6dbaa8d800c7dcc54b6713ff7287843 100755
--- a/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
@@ -5,8 +5,8 @@
 #ifndef TBADCRAWCONT_H
 #define TBADCRAWCONT_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBEvent/TBADCRaw.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBBPC.h b/TestBeam/TBEvent/TBEvent/TBBPC.h
index 22ca5c1156f4dd896b30fde5601ff2f3fc34f89c..c124631826b3b0193a89b92c97da6d98d80d82cf 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPC.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPC.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 #include "TBEvent/TBBeamDetector.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCCont.h b/TestBeam/TBEvent/TBEvent/TBBPCCont.h
index 78d15bebde82f8c3c1185f57ae3defb6dec979e2..6baee79cf4680255013050e503cfeeb978820a2c 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBBPC.h"
 
 #ifndef TBBPCCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCRaw.h b/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
index c427bfffabcb7432601a5b9a67928ffe8969fd18..2069c5f87bcd7e6342bcd27a6ce8044676df865f 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
@@ -22,7 +22,7 @@
 #include "TBEvent/TBTDCRawCont.h"
 #include "TBEvent/TBADCRawCont.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h b/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
index 5270d7cb13c32d5d9c33127c2099c8425815f699..d35a3014d3ea4d9a3eb97c38c39b31be368adec8 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBBPCRaw.h"
 
 #ifndef TBBPCRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBEventInfo.h b/TestBeam/TBEvent/TBEvent/TBEventInfo.h
index 80fa2a6c7ace302df86e42f28200a105c86cab42..519ce4bc97080e98d28ce9c5039eef1ca6e6bae5 100755
--- a/TestBeam/TBEvent/TBEvent/TBEventInfo.h
+++ b/TestBeam/TBEvent/TBEvent/TBEventInfo.h
@@ -13,7 +13,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <string>
 
diff --git a/TestBeam/TBEvent/TBEvent/TBHit.h b/TestBeam/TBEvent/TBEvent/TBHit.h
index d630c1372908e9573a77b53c30550d357b515392..9919ec0e20f508ff3b97375e50203a3fdc073fb3 100755
--- a/TestBeam/TBEvent/TBEvent/TBHit.h
+++ b/TestBeam/TBEvent/TBEvent/TBHit.h
@@ -12,8 +12,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-//#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+//#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBEvent/TBBeamDetector.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBHitCont.h b/TestBeam/TBEvent/TBEvent/TBHitCont.h
index de00e2be7cdf763fb763b1e198c532b4fc277e39..1d5752dcfdb7f65b6c3099880ed69f3b9734a931 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBEvent/TBHit.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBHitPlane.h b/TestBeam/TBEvent/TBEvent/TBHitPlane.h
index 37a0eb51842c9e0b1ee0d1f1c93c133c45eaa10a..6255b245fd411816c2b658f1f0877c3e9ba83b1e 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitPlane.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitPlane.h
@@ -9,7 +9,7 @@
 This class is used to store hit information from BPC & MWPC for one plane. The modivation was to create a track object using both BPC data & MWPC data but given that the MWPC is plane specific (zx plane and yx plane) we have to make a linear fit on each plane with the correct hit objects.
 */
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBBeamDetector.h"
 
 class TBHitPlane 
diff --git a/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h b/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
index c83e7c52e4e3e1ccb0c56bf8899332055d54d570..4c8466f02789cdcd5cde2a258204b037867650c4 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
@@ -5,8 +5,8 @@
 #ifndef TBHITPLANECONT_H
 #define TBHITPLANECONT_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBEvent/TBHitPlane.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h b/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
index c06d7cd8f48029e8c27ad77e0ba6ea09fe2c5879..ce1cea6f3de3fa1bba198e3860c5cddeae60579f 100755
--- a/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
+++ b/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
@@ -4,7 +4,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #ifndef TBIDENTIFIEDPARTICLE
 #define TBIDENTIFIEDPARTICLE 
diff --git a/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h b/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
index e4cc76477fc247c1b89136ed4a71133ed73c5129..4c69236340e184752c72f95bb3b4c98ef920c4ab 100755
--- a/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
+++ b/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
@@ -12,8 +12,8 @@
 #ifndef TBLARCALIBDIGITCONTAINER_H
 #define TBLARCALIBDIGITCONTAINER_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "LArRawEvent/LArCalibDigit.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h b/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
index a934be04c47816e82691694dacc7226b8bd18060..151ced8da9eacdc01abcf6c9bc09304b2eefecd8 100755
--- a/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
+++ b/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
@@ -19,8 +19,8 @@
 #ifndef TBLARDIGITCONTAINER_H
 #define TBLARDIGITCONTAINER_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "LArRawEvent/LArDigit.h"
 
 /**
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPC.h b/TestBeam/TBEvent/TBEvent/TBMWPC.h
index c9a11b90c9a04751faa89cc6a66f093c4536e98b..ab7d947072130c364f03bd0cb13831f7dc4dee36 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPC.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPC.h
@@ -17,8 +17,8 @@
 
 #include <vector>
 #include "GaudiKernel/MsgStream.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBBeamDetector.h"
 
 
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCCont.h b/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
index df4ce47b91d5c9d5108f2647454481efe318b648..c423b923329941f3e675149a3d3540f41223b2ad 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBMWPC.h"
 
 #ifndef TBMWPCCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h b/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
index d5df1c2bbc40b9c6798429378b2e10f0f4b12933..0a2951a1efb3cc6adc0602cf1e53bafb164a522b 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
@@ -13,8 +13,8 @@
 
 #include <string>
 #include <vector>
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TBEvent/TBBeamDetector.h"
 
 
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h b/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
index 6436db0227b09ec4211304d6a2b8a44de210788a..c8a580e6fe7f402b10291a4bbeaeede4cbe1733e 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
@@ -3,8 +3,8 @@
 */
 
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBMWPCRaw.h"
 
 #ifndef TBMWPCRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBPhase.h b/TestBeam/TBEvent/TBEvent/TBPhase.h
index 6bd3facfb9c0bf56343b2575ac6135519b07de82..48173c915febb9ffa59699b18b8190ff5eab91e8 100755
--- a/TestBeam/TBEvent/TBEvent/TBPhase.h
+++ b/TestBeam/TBEvent/TBEvent/TBPhase.h
@@ -13,7 +13,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <math.h>
 
 
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillator.h b/TestBeam/TBEvent/TBEvent/TBScintillator.h
index d653de3149614637dff36cd1ed7532a62499defd..90927b6e1262d9207dbf44381a9ba3e64cd6e2f5 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillator.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillator.h
@@ -17,7 +17,7 @@
 
 #include "TBEvent/TBBeamDetector.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h b/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
index e89873299baa98ebb6870a22252e77abe2ba0df3..2b3f6c4377044368a19fa01b4c909170d0e1defe 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBScintillator.h"
 
 
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h b/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
index 9aecef570daad91850c7b674c06baa476d4f4252..e560ffffeb852f2901bade24422894801ae1b557 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
@@ -18,8 +18,8 @@
 #include "TBEvent/TBBeamDetector.h"
 #include "TBEvent/TBTDCRawCont.h"
 #include "TBEvent/TBADCRawCont.h"
-#include "DataModel/ElementLink.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthLinks/ElementLink.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 class TBScintillatorRaw : public TBBeamDetector
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h b/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
index ce26d13f6714d1f31d4dbe6f7cf3ee278f83469c..bc0af31318c404d8d7419181562d4f6ecdcb91ee 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TBEvent/TBScintillatorRaw.h"
 
 #ifndef TBSCINTILLATORRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBTDC.h b/TestBeam/TBEvent/TBEvent/TBTDC.h
index f1b84634f1bbb7c02cbd52ad5b88684daec5e111..f1247868f4968dab94293090f68f0a71e15fe48d 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDC.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDC.h
@@ -5,7 +5,7 @@
 #ifndef TBEVENT_TBTDC_H
 #define TBEVENT_TBTDC_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 /* Author: Walter Lampl, Remi Lafaye */
 /* Contains information from the TDC 
diff --git a/TestBeam/TBEvent/TBEvent/TBTDCRaw.h b/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
index 6308d21f5d90e2ebeb9df9d8e63c0e28278290fb..32d510649a93f6c5092fc25f7c55e8c59c7b64a4 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
@@ -7,8 +7,8 @@
 
 
 #include "TBEvent/TBBeamDetector.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <string>
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h b/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
index 5aebf7a415e71c40e6f49c3b1a200878028691f3..8001443e38dcca83f75235b475ee0ad3fe663165 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
@@ -5,8 +5,8 @@
 #ifndef TBTDCRAWCONT_H
 #define TBTDCRAWCONT_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TBEvent/TBTDCRaw.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTailCatcher.h b/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
index 123478c25a4e0504c4f2a7315d3589aa69d7eb5f..6f5924731ebc76644e0199fe71bb6065bcfbbfb0 100755
--- a/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
+++ b/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
@@ -10,9 +10,9 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "TBEvent/TBBeamDetector.h"
 #include "TBEvent/TBScintillator.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h b/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
index c0b045b1b753538787f36793fe64ea070a9b9701..c419305f2d24c8c29bad030c811a43b9eb518655 100755
--- a/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
@@ -10,9 +10,9 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "TBEvent/TBBeamDetector.h"
 #include "TBEvent/TBScintillatorRaw.h"
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTrack.h b/TestBeam/TBEvent/TBEvent/TBTrack.h
index 5e5b9c78fe6678022a57f36f2ecfbb623aa3009d..6a1315c2c644e21ef7f04d68d2b7456ba87d240a 100755
--- a/TestBeam/TBEvent/TBEvent/TBTrack.h
+++ b/TestBeam/TBEvent/TBEvent/TBTrack.h
@@ -12,7 +12,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <vector>
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTrackInfo.h b/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
index 2a072b135aefb1c8f1f2fefb585382015cceddf2..b936e702e8df5049a8fa999df5d94ebe8dc1b69a 100755
--- a/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
+++ b/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
@@ -11,7 +11,7 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <vector>
 
diff --git a/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h b/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
index 06866354b8ef988ffd6e9a19aecf4e2aa695a3e8..766d6074d1d48f97b536d92dfe2cb80d0d3b468e 100755
--- a/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
+++ b/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
@@ -13,7 +13,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 
diff --git a/TestBeam/TBEvent/src/TBBPCRaw.cxx b/TestBeam/TBEvent/src/TBBPCRaw.cxx
index 1a7f48529c337ad9bb603b32c6b5f1420f3cae85..3e84795807262ee2d091fe092c0be7b8928c631b 100755
--- a/TestBeam/TBEvent/src/TBBPCRaw.cxx
+++ b/TestBeam/TBEvent/src/TBBPCRaw.cxx
@@ -3,7 +3,7 @@
 */
 
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 #include "TBEvent/TBBeamDetector.h"
 #include "TBEvent/TBADCRaw.h"
diff --git a/TestBeam/TBEvent/src/TBTailCatcher.cxx b/TestBeam/TBEvent/src/TBTailCatcher.cxx
index 919d63f000963563077b410c549c9b5a6f1c98fc..9bd7af633f61ad40ed37303926981e4e0fa8ee64 100755
--- a/TestBeam/TBEvent/src/TBTailCatcher.cxx
+++ b/TestBeam/TBEvent/src/TBTailCatcher.cxx
@@ -3,7 +3,7 @@
 */
 
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include "TBEvent/TBBeamDetector.h"
 #include "TBEvent/TBTailCatcher.h"
diff --git a/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx b/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
index 69354712febcb633fe2b4b01545b6b267e2b2a77..36719065a74f1af18049f8a8cd0c92203fec1a95 100755
--- a/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
+++ b/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
@@ -3,7 +3,7 @@
 */
 
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include "TBEvent/TBTailCatcherRaw.h"
 #include "TBEvent/TBScintillator.h"