diff --git a/TileCalorimeter/TileEvent/CMakeLists.txt b/TileCalorimeter/TileEvent/CMakeLists.txt
index f98e91da40e3e728c42055f565ac740fafb65b14..25327702689dcc9e7373526b46ebafc157ecd02f 100644
--- a/TileCalorimeter/TileEvent/CMakeLists.txt
+++ b/TileCalorimeter/TileEvent/CMakeLists.txt
@@ -8,8 +8,8 @@ atlas_subdir( TileEvent )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloEvent
-                          Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthenaKernel
+                          Control/AthContainers
                           Control/StoreGate
                           DetectorDescription/Identifier
                           Event/EventContainers
@@ -30,12 +30,12 @@ atlas_add_library( TileEvent
                    src/Tile*.cxx
                    PUBLIC_HEADERS TileEvent
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES CaloEvent DataModel Identifier GaudiKernel TileIdentifier TileSimEvent StoreGateLib SGtests TileConditionsLib CaloDetDescrLib EventContainers
+                   LINK_LIBRARIES CaloEvent AthContainers Identifier GaudiKernel TileIdentifier TileSimEvent StoreGateLib SGtests TileConditionsLib CaloDetDescrLib EventContainers
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier SGTools )
 
 atlas_add_dictionary( TileEventDict
                       TileEvent/TileEventDict.h
                       TileEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent DataModel StoreGateLib SGtests Identifier GaudiKernel TileConditionsLib TileIdentifier TileSimEvent CaloDetDescrLib CaloIdentifier SGTools TileEvent EventContainers )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent AthContainers StoreGateLib SGtests Identifier GaudiKernel TileConditionsLib TileIdentifier TileSimEvent CaloDetDescrLib CaloIdentifier SGTools TileEvent EventContainers )
 
diff --git a/TileCalorimeter/TileEvent/TileEvent/MBTSCollisionTime.h b/TileCalorimeter/TileEvent/TileEvent/MBTSCollisionTime.h
index f15630d7fcd1cfd1e447b9118b7734d34a134476..0a9cd8e69ccf87efe6330f0716db65d9ff1d4186 100644
--- a/TileCalorimeter/TileEvent/TileEvent/MBTSCollisionTime.h
+++ b/TileCalorimeter/TileEvent/TileEvent/MBTSCollisionTime.h
@@ -14,7 +14,7 @@
    
 */
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class MBTSCollisionTime 
 {
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileContainer.h
index 53a07de8eb008e69854a534a4ef45e5148f5b7a7..b700baa2ce0721508c23551db3631039abc62c92 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileContainer.h
@@ -20,8 +20,8 @@
 #ifndef TILEEVENT_TILECONTAINER_H
 #define TILEEVENT_TILECONTAINER_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 // #include "TileEvent/TileDeposit.h"
 #include "TileEvent/TileCell.h"
 #include "TileEvent/TileTTL1.h"
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileCosmicMuon.h b/TileCalorimeter/TileEvent/TileEvent/TileCosmicMuon.h
index 643055183489a5d3ffecd6b6ff072f67dac68f26..194f8b0efb08111dc5223e3a313b573d0262bc55 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileCosmicMuon.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileCosmicMuon.h
@@ -11,7 +11,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "Identifier/IdentifierHash.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 
 /**
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileLaserObject.h b/TileCalorimeter/TileEvent/TileEvent/TileLaserObject.h
index c3867035e807ea64b67d2c4c6d736df64a630078..8cfba9b9cf679bc4c6389638dc0765c19223b96d 100644
--- a/TileCalorimeter/TileEvent/TileEvent/TileLaserObject.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileLaserObject.h
@@ -23,7 +23,7 @@
 #include "TileEvent/TileLaserPLC.h"
 #include "TileEvent/TileLasCalib.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 /*static const CLID CLID_TileLaser = 2940;*/
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileMu.h b/TileCalorimeter/TileEvent/TileEvent/TileMu.h
index 54c985239142f83ed4301177ec4afbe0ba83935a..eed434ea58047306b123793f287ad1409ac21134 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileMu.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileMu.h
@@ -12,7 +12,7 @@
 #ifndef TILEMU_H
 #define TILEMU_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 #include <vector>
 
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
index dc1e4917bf671eb658fc84318aabffb7dcfa9e21..cb785a1fb6a1233bcd47d4892cfa07f957edc286 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
@@ -23,8 +23,8 @@
 #ifndef TILEEVENT_TILERAWDATACOLLECTION_H
 #define TILEEVENT_TILERAWDATACOLLECTION_H
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "Identifier/Identifier.h"
 // #include "TileEvent/TileRoI_ID.h"
 
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.h
index 1cb3b4f090f8ff7760b8f3c46757254ab0a63f6b..ccc0946ea967b0104c99e4a68b9458509ae2d11a 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataContainer.h
@@ -22,7 +22,7 @@
 #define TILEEVENT_TILERAWDATACONTAINER_H
 
 #include "EventContainers/IdentifiableContainer.h" 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TileIdentifier/TileRawChannelUnit.h"
 #include "TileIdentifier/TileFragHash.h"
 #include "TileEvent/TileRawDataCollection.h"
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileTrigger.h b/TileCalorimeter/TileEvent/TileEvent/TileTrigger.h
index 581b3227238a8d094e2583fdfb17a9f55b247366..b515f331642d8dda8bb73aae618d95622a0299ea 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileTrigger.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileTrigger.h
@@ -31,7 +31,7 @@
 
 #ifndef TILETRIGGER_H
 #define TILETRIGGER_H
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "Identifier/Identifier.h"
 #include <vector>
diff --git a/TileCalorimeter/TileEvent/cmt/requirements b/TileCalorimeter/TileEvent/cmt/requirements
index cb84b7e48941b6a914975ffb4be903be569e9223..b1eb4bd48899bb77d2dab34a3e5d250ababc7f01 100755
--- a/TileCalorimeter/TileEvent/cmt/requirements
+++ b/TileCalorimeter/TileEvent/cmt/requirements
@@ -5,8 +5,8 @@ author Evgueni Berdnikov <Evgueni.Berdnikov@cern.ch>
 
 use AtlasPolicy		AtlasPolicy-*
 use GaudiInterface	GaudiInterface-*	External
-use CLIDSvc		CLIDSvc-*		Control
-use DataModel		DataModel-*		Control
+use AthenaKernel	AthenaKernel-*		Control
+use AthContainers	AthContainers-*		Control
 use StoreGate		StoreGate-*		Control
 use Identifier		Identifier-*		DetectorDescription
 use EventContainers	EventContainers-*	Event