diff --git a/Trigger/TrigEvent/TrigCaloEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigCaloEvent/CMakeLists.txt
index 9458c430b0a3a6c1faf73497f05570705ab2cf59..0d9bbe572a0e4090f21d9a04e5c5c46cc19b0816 100644
--- a/Trigger/TrigEvent/TrigCaloEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCaloEvent/CMakeLists.txt
@@ -8,10 +8,10 @@ atlas_subdir( TrigCaloEvent )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloGeoHelpers
-                          Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthenaKernel
+                          Control/AthLinks
+                          Control/AthContainers
                           Control/Navigation
-                          Control/SGTools
                           Event/EventKernel
                           Event/FourMom
                           GaudiKernel
@@ -37,26 +37,26 @@ atlas_add_library( TrigCaloEvent
                    src/components/*.cxx
                    PUBLIC_HEADERS TrigCaloEvent
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES CaloGeoHelpers DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrigMissingEtEvent TrigSerializeCnvSvcLib TrigNavigationLib
+                   LINK_LIBRARIES CaloGeoHelpers AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrigMissingEtEvent TrigSerializeCnvSvcLib TrigNavigationLib
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger )
 
 atlas_add_sercnv_library( TrigCaloEventSerCnv
                           FILES TrigCaloEvent/TrigCaloCluster.h TrigCaloEvent/TrigCaloClusterContainer.h TrigCaloEvent/TrigEMCluster.h TrigCaloEvent/TrigEMClusterContainer.h TrigCaloEvent/RingerRings.h TrigCaloEvent/RingerRingsContainer.h TrigCaloEvent/TrigTauCluster.h TrigCaloEvent/TrigTauClusterContainer.h TrigCaloEvent/TrigTauClusterDetails.h TrigCaloEvent/TrigTauClusterDetailsContainer.h TrigCaloEvent/TrigT2Jet.h TrigCaloEvent/TrigT2JetContainer.h TrigCaloEvent/Trig3Momentum.h TrigCaloEvent/TrigT2MbtsBits.h TrigCaloEvent/TrigT2MbtsBitsContainer.h TrigCaloEvent/TrigT2ZdcSignals.h TrigCaloEvent/TrigT2ZdcSignalsContainer.h TrigCaloEvent/TrigRNNOutput.h TrigCaloEvent/TrigRNNOutputContainer.h CaloEvent/CaloCellContainer.h CaloEvent/CaloClusterContainer.h CaloEvent/CaloShowerContainer.h CaloEvent/CaloTowerContainer.h CaloEvent/CaloCellLinkContainer.h
                           INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                          LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent )
+                          LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent )
 
 atlas_add_sercnv_library( TrigCaloEventxAODSerCnv
                           FILES xAODTrigCalo/TrigCaloCluster.h xAODTrigCalo/TrigCaloClusterContainer.h xAODTrigCalo/TrigCaloClusterAuxContainer.h xAODTrigCalo/TrigEMCluster.h xAODTrigCalo/TrigEMClusterContainer.h xAODTrigCalo/TrigEMClusterAuxContainer.h xAODTrigCalo/CaloClusterTrigAuxContainer.h xAODTrigL1Calo/TriggerTower.h xAODTrigL1Calo/TriggerTowerContainer.h xAODTrigL1Calo/TriggerTowerAuxContainer.h xAODTrigRinger/TrigRingerRings.h xAODTrigRinger/TrigRingerRingsContainer.h xAODTrigRinger/TrigRingerRingsAuxContainer.h xAODTrigRinger/TrigRNNOutput.h xAODTrigRinger/TrigRNNOutputContainer.h xAODTrigRinger/TrigRNNOutputAuxContainer.h xAODTrigMinBias/TrigT2MbtsBits.h xAODTrigMinBias/TrigT2MbtsBitsContainer.h xAODTrigMinBias/TrigT2MbtsBitsAuxContainer.h xAODTrigMinBias/TrigT2ZdcSignals.h xAODTrigMinBias/TrigT2ZdcSignalsContainer.h xAODTrigMinBias/TrigT2ZdcSignalsAuxContainer.h xAODCaloEvent/CaloCluster.h xAODCaloEvent/CaloClusterContainer.h xAODCaloEvent/CaloClusterAuxContainer.h xAODHIEvent/HIEventShape.h xAODHIEvent/HIEventShapeContainer.h xAODHIEvent/HIEventShapeAuxContainer.h
                           TYPES_WITH_NAMESPACE xAOD::CaloCluster xAOD::CaloClusterContainer xAOD::CaloClusterAuxContainer xAOD::CaloClusterTrigAuxContainer xAOD::TrigCaloCluster xAOD::TrigCaloClusterContainer xAOD::TrigCaloClusterAuxContainer xAOD::TrigEMCluster xAOD::TrigEMClusterContainer xAOD::TrigEMClusterAuxContainer xAOD::TrigT2MbtsBits xAOD::TrigT2MbtsBitsContainer xAOD::TrigT2MbtsBitsAuxContainer xAOD::TrigRingerRings xAOD::TrigRingerRingsContainer xAOD::TrigRingerRingsAuxContainer xAOD::TrigRNNOutput xAOD::TrigRNNOutputContainer xAOD::TrigRNNOutputAuxContainer xAOD::TrigT2ZdcSignals xAOD::TrigT2ZdcSignalsContainer xAOD::TrigT2ZdcSignalsAuxContainer xAOD::TriggerTower xAOD::TriggerTowerContainer xAOD::TriggerTowerAuxContainer xAOD::HIEventShape xAOD::HIEventShapeContainer xAOD::HIEventShapeAuxContainer
                           CNV_PFX xAOD
                           INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                          LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent )
+                          LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent )
 
 atlas_add_dictionary( TrigCaloEventDict
                       TrigCaloEvent/TrigCaloEventDict.h
                       TrigCaloEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers DataModel Navigation SGTools EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AthLinks AthContainers Navigation AthenaKernel EventKernel FourMom GaudiKernel TrigMissingEtEvent CaloEvent xAODCaloEvent xAODHIEvent xAODTrigCalo xAODTrigL1Calo xAODTrigMinBias xAODTrigRinger TrigSerializeCnvSvcLib TrigNavigationLib TrigCaloEvent
                       DATA_LINKS TrigCaloCluster TrigEMCluster TrigT2Jet TrigTauCluster TrigTauClusterDetails RingerRings TrigRNNOutput
                       ELEMENT_LINKS TrigEMClusterContainer RingerRingsContainer TrigTauClusterContainer TrigTauClusterDetailsContainer TrigRNNOutputContainer )
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRings.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRings.h
index 59b8f26313c1871ba3de98c60e84e268bc5efc79..d53e44e737a71b2d67286aee540ca931b21cc4f8 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRings.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRings.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "GaudiKernel/MsgStream.h"
 
 /**
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRingsContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRingsContainer.h
index 0f3ed86a3edbe397bc1fe04273ddfc2594abb15e..dc60bcb0a6c2254c2c0291b8842decd815880df4 100644
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRingsContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/RingerRingsContainer.h
@@ -5,10 +5,10 @@
 #ifndef TRIGCALOEVENT_RINGERRINGSCONTAINER_H 
 #define TRIGCALOEVENT_RINGERRINGSCONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TrigCaloEvent/RingerRings.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class RingerRingsContainer : public DataVector<RingerRings> { 
 };
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/Trig3Momentum.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/Trig3Momentum.h
index 43614ab7ae6349ab23853c45ffd908d132d951b3..654b3307d170695b747b34a52c15842aefb0cfec 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/Trig3Momentum.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/Trig3Momentum.h
@@ -16,7 +16,7 @@
 #ifndef TRIGCALOEVENT_TRIG3MOMENTUM_H 
 #define TRIGCALOEVENT_TRIG3MOMENTUM_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 #include <stdint.h>
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloCluster.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloCluster.h
index c5dc58ad78b813bc528b05bc334fabc52da0ca44..a964abff077dbb8870791f3f7ac03c694b6e3acc 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloCluster.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloCluster.h
@@ -29,7 +29,7 @@ DATE:		October 17th, 2005
 // t have quantities per sample
 #include "CaloGeoHelpers/CaloSampling.h"
 // CLID for persistency
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 const int MAXSIZE = CaloSampling::CaloSample::Unknown;
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloClusterContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloClusterContainer.h
index 1865a5b11b0a20dfc5a209c24d6f5d2021b96b77..af8ee976b10e07c461016de6177875b649e14f0b 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloClusterContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigCaloClusterContainer.h
@@ -21,8 +21,8 @@ DATE:		May 31st, 2011
 ******************************************************/
 // includes section
 #include "TrigCaloEvent/TrigCaloCluster.h"
-#include "DataModel/DataVector.h"
-#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/BaseInfo.h"
 
 /** Container from TrigCaloCluster type objects.
 	See TrigCaloCluster for more details */
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMCluster.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMCluster.h
index aaac224f5969aab21cce71f358e08f0abc061ca6..47ace2a2b0d3524fc86f2ab01662d900e2cef5c2 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMCluster.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMCluster.h
@@ -23,7 +23,7 @@ DATE:		October 17th, 2005
 ******************************************************/
 // includes section
 #include "TrigCaloEvent/TrigCaloCluster.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 
 /** Class with calibrated variables for egamma clustering.
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMClusterContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMClusterContainer.h
index 1c5e609c5aa35e50d25a22e0cae56a17f26aa26e..ab3607ee30f2c3e68b867c5ba56c6b04f4254812 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMClusterContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigEMClusterContainer.h
@@ -23,8 +23,8 @@ DATE:		October 17th, 2005
 ******************************************************/
 // includes section
 #include "TrigCaloEvent/TrigEMCluster.h"
-#include "DataModel/DataVector.h"
-#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/BaseInfo.h"
 
 /** Container from TrigEMCluster type objects.
 	See TrigEMCluster and T2CaloEgamma
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutput.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutput.h
index 3988c327c14b84fd687f60dcc9a3f1ff72983f27..71652f89c1edb4dd9d6d2afff806ee15cc517c96 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutput.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutput.h
@@ -8,11 +8,11 @@
 
 #include <vector>
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/TrigEMClusterContainer.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 /**
  * This class carries the output of the Neural Network of TrigMultiVarHypo.
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutputContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutputContainer.h
index b7dd3c881fbf004256e56ce10777035434a5999b..a9d37eefd242b85f68454794233aeaf38c3685d9 100644
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutputContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigRNNOutputContainer.h
@@ -5,10 +5,10 @@
 #ifndef TRIGCALOEVENT_TRIGRNNOUTPUTCONTAINER_H 
 #define TRIGCALOEVENT_TRIGRNNOUTPUTCONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TrigCaloEvent/TrigRNNOutput.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigRNNOutputContainer : public DataVector<TrigRNNOutput> { 
 };
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2Jet.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2Jet.h
index 2bb1dc1aa1cfa3b037ed27fd0c5e891e6446f8a4..1bda29cf96159e50ebc82bd273d2837cc8d5947d 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2Jet.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2Jet.h
@@ -16,7 +16,7 @@
 #define TRIGCALOEVENT_TRIGT2JET_H
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "TrigCaloEvent/Trig3Momentum.h"
 #include "FourMom/P4EEtaPhiM.h"
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2JetContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2JetContainer.h
index b43d676009cf9b314feb14572542af73a2f0c754..d0110a22a86e11808dc0fd45bbad8c65055dcaed 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2JetContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2JetContainer.h
@@ -16,10 +16,10 @@ CREATED:  Oct. 05
 
 // INCLUDE HEADER FILES:
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigCaloEvent/TrigT2Jet.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 /** container of TrigT2Jet elements */
 class TrigT2JetContainer : public DataVector<TrigT2Jet> 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBits.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBits.h
index 81d85391367bbf409819847c2432dfca2c7a9692..b1a8a7d1750d38ad43e675c3dec5d7327f19f861 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBits.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBits.h
@@ -5,7 +5,7 @@
 #ifndef TRIGT2MBTSBITS_H
 #define TRIGT2MBTSBITS_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include <vector>
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBitsContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBitsContainer.h
index d9994e44019aca3b5e2dcf2d1f06c967b1a3192b..ee23f22db0b59f828a04058e15fe91b126a6187f 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBitsContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2MbtsBitsContainer.h
@@ -5,10 +5,10 @@
 #ifndef TRIGCALOEVENT_TRIGT2MBTSBITSCONTAINER_H 
 #define TRIGCALOEVENT_TRIGT2MBTSBITSCONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TrigCaloEvent/TrigT2MbtsBits.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigT2MbtsBitsContainer : public DataVector<TrigT2MbtsBits> { }; 
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignals.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignals.h
index a54c87b790bb87167ef07ea488388f3c1c083b12..893b8e06719fb9158cf9981db7b068372d145e34 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignals.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignals.h
@@ -5,7 +5,7 @@
 #ifndef TRIGT2ZDCSIGNALS_H
 #define TRIGT2ZDCSIGNALS_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include <vector>
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignalsContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignalsContainer.h
index dc7d68eb2da83bc4c36919c7e82f163991712280..f933c7a04819620a59705b4c6d1cd4f7efec0d0d 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignalsContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigT2ZdcSignalsContainer.h
@@ -5,10 +5,10 @@
 #ifndef TRIGCALOEVENT_TRIGT2ZDCSIGNALSCONTAINER_H 
 #define TRIGCALOEVENT_TRIGT2ZDCSIGNALSCONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TrigCaloEvent/TrigT2ZdcSignals.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigT2ZdcSignalsContainer : public DataVector<TrigT2ZdcSignals> { }; 
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauCluster.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauCluster.h
index 77c97048c2faa8f5d0c076718c264e957153872f..7254a3ebf3c734ed2c667bbfe7963c661941be1f 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauCluster.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauCluster.h
@@ -23,7 +23,7 @@ DATE:		October 17th, 2005
 ******************************************************/
 // includes section
 #include <math.h>
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/TrigCaloCluster.h"
 #include "TrigCaloEvent/TrigTauClusterDetailsContainer.h"
 
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterContainer.h
index 6d66cd6415511ef8164e1cd9bad914d3ea52958c..28a0c343a32c503114b43437160203111fc29fc1 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterContainer.h
@@ -23,8 +23,8 @@ DATE:		October 17th, 2005
 ******************************************************/
 // includes section
 #include "TrigCaloEvent/TrigTauCluster.h"
-#include "DataModel/DataVector.h"
-#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/BaseInfo.h"
 
 /** Container from TrigTauCluster type objects.
         See TrigTauCluster and T2CaloTaus
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetails.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetails.h
index 4453df54269513f6366f9cbe424ea015eb7ff4ef..3e2c7588e79ce2dd1ed49a6236773f961188b5de 100644
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetails.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetails.h
@@ -20,7 +20,7 @@ DATE:		January 14th, 2009
 // for printing out
 #include <iostream>
 #include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 /** Number of EM Samples */
 const int NUMEMSAMP = 4;
diff --git a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetailsContainer.h b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetailsContainer.h
index 999caacf6456743a0a1c47eb9e2b21fbad29341a..e9f13f69b649c3bae823d546338c9cbcc9917e9d 100755
--- a/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetailsContainer.h
+++ b/Trigger/TrigEvent/TrigCaloEvent/TrigCaloEvent/TrigTauClusterDetailsContainer.h
@@ -19,8 +19,8 @@ DATE:		January 21st, 2009
 ******************************************************/
 // includes section
 #include "TrigCaloEvent/TrigTauClusterDetails.h"
-#include "DataModel/DataVector.h"
-#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/BaseInfo.h"
 
 /** Container from TrigTauClusterDetails type objects.
         See TrigTauClusterDetails and T2CaloTaus
diff --git a/Trigger/TrigEvent/TrigCaloEvent/src/TrigRNNOutput.cxx b/Trigger/TrigEvent/TrigCaloEvent/src/TrigRNNOutput.cxx
index 38a2c3e88c424a957517878d144cc5a53ff237e5..9f06316c2bab0a4401d671f0f081c44f11b2c725 100644
--- a/Trigger/TrigEvent/TrigCaloEvent/src/TrigRNNOutput.cxx
+++ b/Trigger/TrigEvent/TrigCaloEvent/src/TrigRNNOutput.cxx
@@ -4,7 +4,7 @@
 
 #include "TrigCaloEvent/TrigRNNOutput.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 TrigRNNOutput::TrigRNNOutput()
   : m_output(), m_cluster() {