diff --git a/Trigger/TrigEvent/TrigMuonEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigMuonEvent/CMakeLists.txt
index 9c76ededf78a16a95e7a7a15a4f1d02f2f8ad527..87f3c5889fbcc63bec95959fcc658599246027a6 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMuonEvent/CMakeLists.txt
@@ -7,10 +7,10 @@ atlas_subdir( TrigMuonEvent )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthenaKernel
+                          Control/AthLinks
+                          Control/AthContainers
                           Control/Navigation
-                          Control/SGTools
                           Event/EventKernel
                           Event/FourMom
                           GaudiKernel
@@ -18,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Trigger/TrigEvent/TrigInDetEvent
                           PRIVATE
                           AtlasTest/TestTools
-                          Control/AthenaKernel
                           Event/xAOD/xAODMuon
                           Event/xAOD/xAODTrigMuon
                           MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern
@@ -35,32 +34,32 @@ atlas_add_library( TrigMuonEvent
                    src/*.cxx
                    PUBLIC_HEADERS TrigMuonEvent
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TrigSerializeCnvSvcLib TrigNavigationLib
+                   LINK_LIBRARIES AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TrigSerializeCnvSvcLib TrigNavigationLib
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent )
 
 atlas_add_sercnv_library( TrigMuonEventSerCnv
                           FILES TrigMuonEvent/MuonFeature.h TrigMuonEvent/MuonFeatureContainer.h TrigMuonEvent/CombinedMuonFeature.h TrigMuonEvent/CombinedMuonFeatureContainer.h TrigMuonEvent/IsoMuonFeature.h TrigMuonEvent/IsoMuonFeatureContainer.h TrigMuonEvent/TrigMuonClusterFeature.h TrigMuonEvent/TrigMuonClusterFeatureContainer.h TrigMuonEvent/TrigMuonEF.h TrigMuonEvent/TrigMuonEFContainer.h TrigMuonEvent/TileMuFeature.h TrigMuonEvent/TileMuFeatureContainer.h TrigMuonEvent/TileTrackMuFeature.h TrigMuonEvent/TileTrackMuFeatureContainer.h TrigMuonEvent/TrigMuonEFTrack.h TrigMuonEvent/TrigMuonEFCbTrack.h TrigMuonEvent/TrigMuonEFInfo.h TrigMuonEvent/TrigMuonEFInfoContainer.h TrigMuonEvent/TrigMuonEFInfoTrack.h TrigMuonEvent/TrigMuonEFInfoTrackContainer.h TrigMuonEvent/TrigMuonEFIsolation.h TrigMuonEvent/TrigMuonEFIsolationContainer.h TrigMuonEvent/MuonFeatureDetails.h TrigMuonEvent/MuonFeatureDetailsContainer.h
                           INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                          LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
+                          LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
 
 atlas_add_sercnv_library( TrigMuonEventxAODSerCnv
                           FILES xAODMuon/MuonContainer.h xAODMuon/MuonAuxContainer.h xAODTrigMuon/L2StandAloneMuonContainer.h xAODTrigMuon/L2StandAloneMuonAuxContainer.h xAODTrigMuon/L2CombinedMuonContainer.h xAODTrigMuon/L2CombinedMuonAuxContainer.h xAODTrigMuon/L2IsoMuonContainer.h xAODTrigMuon/L2IsoMuonAuxContainer.h
                           TYPES_WITH_NAMESPACE xAOD::MuonContainer xAOD::MuonAuxContainer xAOD::L2StandAloneMuonContainer xAOD::L2StandAloneMuonAuxContainer xAOD::L2CombinedMuonContainer xAOD::L2CombinedMuonAuxContainer xAOD::L2IsoMuonContainer xAOD::L2IsoMuonAuxContainer
                           CNV_PFX xAOD
                           INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                          LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
+                          LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
 
 atlas_add_dictionary( TrigMuonEvent_cDict
                       TrigMuonEvent/TrigMuonEvent_cDict.h
                       TrigMuonEvent/selection_c.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent )
 
 atlas_add_dictionary( TrigMuonEventDict
                       TrigMuonEvent/TrigMuonEventDict.h
                       TrigMuonEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent
                       DATA_LINKS MuonFeature CombinedMuonFeature IsoMuonFeature TrigMuonClusterFeature TrigMuonEFContainer TileMuFeature TileTrackMuFeature TrigMuonEFIsolationContainer
                       ELEMENT_LINKS MuonFeatureContainer CombinedMuonFeatureContainer IsoMuonFeatureContainer TrigMuonClusterFeatureContainer TileMuFeatureContainer TileTrackMuFeatureContainer TrigMuonEFInfoContainer )
 
@@ -68,6 +67,6 @@ atlas_add_test( Operators_test
                 SOURCES
                 test/Operators_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent
+                LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthContainers Navigation EventKernel FourMom GaudiKernel Particle TrigInDetEvent TestTools AthenaKernel xAODMuon xAODTrigMuon MuonPattern MuonSegment MuidEvent TrigSerializeCnvSvcLib TrigNavigationLib TrigMuonEvent
                 EXTRA_PATTERNS ".*" )
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CachingFeatureCollection.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CachingFeatureCollection.h
index 56194d065ca89c0e9c3392cb8368f13c31d4654c..665283ceb3d711706c69b6dd93c5fb406f861daa 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CachingFeatureCollection.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CachingFeatureCollection.h
@@ -5,8 +5,8 @@
 #ifndef TrigMuonEvent_CachingFeatureCollection_H__
 #define TrigMuonEvent_CachingFeatureCollection_H__
 
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 
 typedef DataVector<int> CachingFeatureCollection;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeature.h
index ed082dd26dc7015e51461e17243dae19277bb2e5..cdd476978456b6829d2f3c66b504fb09b5f872be 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeature.h
@@ -8,12 +8,12 @@
 #define TRIGMUONEVENT_COMBINED_MUON_FEATURE_H
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "EventKernel/INavigable4Momentum.h"
 #include "FourMom/P4PtEtaPhiMBase.h"
 #include "Navigation/NavigableTerminalNode.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 // STL include(s):
 #include <vector>
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeatureContainer.h
index d02031dc6755efb14d9769ba15c94c34ce16c7f7..ff2c575b301e0f1a9e15fd61d27cd777b6b6972b 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/CombinedMuonFeatureContainer.h
@@ -7,9 +7,9 @@
 #ifndef TRIG_COMBINEDMUONFEATURECONTAINER
 #define TRIG_COMBINEDMUONFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/CombinedMuonFeature.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class CombinedMuonFeatureContainer : public DataVector<CombinedMuonFeature> { }; 
 CLASS_DEF( CombinedMuonFeatureContainer , 1078838239 , 1 )
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeature.h
index 7efced84da65c41e2152d94dfd06ae204412d6d6..c8997a685b2cd091a35cfe12e24fc8e08b1f9d3c 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeature.h
@@ -25,8 +25,8 @@ DATE:		V4.0 May 5th, 2008
 #include <cmath>
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "EventKernel/INavigable4Momentum.h"
 #include "FourMom/P4PtEtaPhiMBase.h"
 #include "Navigation/NavigableTerminalNode.h"
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeatureContainer.h
index e9c4c03a74194d207ea869fb0156ea1459e86ec3..5de78685ca896b1f17a457dee264a8a8b92e928c 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/IsoMuonFeatureContainer.h
@@ -7,9 +7,9 @@
 #ifndef TRIG_ISOMUONFEATURECONTAINER
 #define TRIG_ISOMUONFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/IsoMuonFeature.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class IsoMuonFeatureContainer : public DataVector<IsoMuonFeature> { }; 
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeature.h
index b95c868ffeb022013e3a80c7df6f51ba16af4473..9a1c4775e4f8e5d224fc57adc46a23fc78210b24 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeature.h
@@ -12,8 +12,8 @@
 #include <map>
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 
 // Forward declaration(s):
 class MsgStream;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureContainer.h
index 62627fc79c76928cb109e88c94c74c3cf3dc95d0..da734bc44f416fad72c8fccc06992cbb1cab6ef7 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureContainer.h
@@ -5,13 +5,13 @@
 #ifndef TRIG_MUONFEATURECONTAINER
 #define TRIG_MUONFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #ifndef TRIGMUONEVENT_MUON_FEATURE_H
 #include "TrigMuonEvent/MuonFeature.h"
 #endif
 
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class MuonFeatureContainer : public DataVector<MuonFeature> { }; 
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetails.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetails.h
index b9d02fe2e057d22a44de5775ad967cb520551b05..6b004ffe7c3531b58f72506ebaa45bda0baf0810 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetails.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetails.h
@@ -12,8 +12,8 @@
 #include <stdint.h>
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "GaudiKernel/MsgStream.h"
 
 //class MsgStream;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetailsContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetailsContainer.h
index 4799e15829646a2b416480250102c22245a07798..f3ace6135f2bc0df3be4b8cd2d86e3c5de938934 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetailsContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/MuonFeatureDetailsContainer.h
@@ -5,9 +5,9 @@
 #ifndef TRIG_MUONFEATUREDETAILSCONTAINER
 #define TRIG_MUONFEATUREDETAILSCONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/MuonFeatureDetails.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class MuonFeatureDetailsContainer : public DataVector<MuonFeatureDetails> { }; 
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeature.h
index dba00d3bc4f84bc9f6d288a7535a469b236b6c5c..b43c534148ba365e3594b73a65d3d2abd68b7996 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeature.h
@@ -20,8 +20,8 @@
 #ifndef TRIGMUONEVENT_TILEMUFEATURE_H
 #define TRIGMUONEVENT_TILEMUFEATURE_H
  
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 
 #include <vector>
 #include <string>
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeatureContainer.h
index f3f292a06ca527df181080e22a9e72768fa7754d..906f487ab1cbfff9133aeedec6b010799417c3b8 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileMuFeatureContainer.h
@@ -5,10 +5,10 @@
 #ifndef TRIG_TILEMUFEATURECONTAINER
 #define TRIG_TILEMUFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "TrigMuonEvent/TileMuFeature.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TileMuFeatureContainer : public DataVector<TileMuFeature> { }; 
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeature.h
index 7ba3210130f01f9ec114312e74e7422202fd436c..d644492731afe0c2ffcbd487ca747cc0a8a97c5c 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeature.h
@@ -23,12 +23,12 @@
 #include <string>
 #include <vector>
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "EventKernel/INavigable4Momentum.h"
 #include "FourMom/P4PtEtaPhiMBase.h"
 #include "Navigation/NavigableTerminalNode.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 
 // Trigger includes:
 #include "TrigMuonEvent/TileMuFeatureContainer.h"
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeatureContainer.h
index 37f4eb28fa32a6e664e314d5f3fee24c665fb1b6..70ec3160fa4ee0948a98af5a4238845cd311b685 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TileTrackMuFeatureContainer.h
@@ -7,9 +7,9 @@
 #ifndef TRIG_TILETRACKMUFEATURECONTAINER
 #define TRIG_TILETRACKMUFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/TileTrackMuFeature.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TileTrackMuFeatureContainer : public DataVector<TileTrackMuFeature> { }; 
 CLASS_DEF( TileTrackMuFeatureContainer , 1294436667, 1)
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigCombDiMuonContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigCombDiMuonContainer.h
index b790852d7da0ce1956636b1ae37cdf010c115ac7..0432567837139c70d8f64907045e6c7cf12cbce8 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigCombDiMuonContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigCombDiMuonContainer.h
@@ -5,7 +5,7 @@
 #ifndef TRIG_DIMUON_CONTAINER
 #define TRIG_DIMUON_CONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/CombinedMuonFeature.h"
 
 typedef std::vector<std::pair<CombinedMuonFeature, CombinedMuonFeature> > TrigCombDiMuonContainer;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigDiMuon.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigDiMuon.h
index e09361108736b31ed903a8c429a7333a62bdd6bf..317e8b73407cf677b25c361a3146e58415813729 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigDiMuon.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigDiMuon.h
@@ -13,7 +13,7 @@ NAME:     TrigDiMuon.h
 PURPOSE:  tracks passed MS identification
 
 ********************************************************************/
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigInDetEvent/TrigInDetTrack.h"
 #include <vector>
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeature.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeature.h
index 204814139022583def0b6a15e4b8e78e3064b7f4..ec6834a1cb4c2713abec9a9bea40b475096e0557 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeature.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeature.h
@@ -21,8 +21,8 @@ DATE:		V1.0 Jan 13th , 2009
 #include <map>
 #include <string>
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
 #include "EventKernel/INavigable4Momentum.h"
 #include "FourMom/P4PtEtaPhiMBase.h"
 #include "Navigation/NavigableTerminalNode.h"
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeatureContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeatureContainer.h
index 7f4bc3fc42b39f8b83a7743a4e03ff45127b32f2..1d15930402e832bef4f78bc97d640ae17d40733c 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeatureContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonClusterFeatureContainer.h
@@ -7,9 +7,9 @@
 #ifndef TRIG_TRIGMUONCLUSTERFEATURECONTAINER
 #define TRIG_TRIGMUONCLUSTERFEATURECONTAINER
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/TrigMuonClusterFeature.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigMuonClusterFeatureContainer : public DataVector<TrigMuonClusterFeature> { }; 
 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEF.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEF.h
index 96ff16430ad343d339afa78cb36e4ef5206f6684..5f0c49280e86b36bcef5c088cfafffd0fe5eac26 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEF.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEF.h
@@ -15,7 +15,7 @@
 #include "EventKernel/INavigable4Momentum.h"
 #include "FourMom/P4IPtCotThPhiM.h"
 #include "Navigation/NavigableTerminalNode.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Forward declaration(s):
 class MsgStream;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFCbTrack.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFCbTrack.h
index bd4ad77a53e2324399b10617e1d153e36ad67d46..29e51729ca04b910a901538cda07b437ca4425ef 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFCbTrack.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFCbTrack.h
@@ -12,8 +12,8 @@
 #include <string>
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/ElementLink.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthLinks/ElementLink.h"
 #include "Particle/TrackParticleContainer.h"
 
 // Local include(s):
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFContainer.h
index 7c21dd5460414363dcbb39d9cf24668d1893950e..0a8969f9735b3c6b8c08425233f6c141d2f2bf1e 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFContainer.h
@@ -18,10 +18,10 @@
 ********************************************************************/
  
 // INCLUDE HEADER FILES:
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/TrigMuonEF.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigMuonEFContainer : public DataVector<TrigMuonEF> 
 { 
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h
index 1822fa64561002755039aeff5b2551a821cec594..1ee18baaac6fc1a7a60632088760b08a823c3b6a 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h
@@ -12,7 +12,7 @@
 #include <string>
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Forward declaration(s):
 class MsgStream;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoContainer.h
index b7eacdcc71c5c2213f6de457c5f8283d52cf14f7..5ec5f250178bade5dcacce93bb9e9bff1e986167 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoContainer.h
@@ -18,10 +18,10 @@
 ********************************************************************/
  
 // INCLUDE HEADER FILES:
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/TrigMuonEFInfo.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigMuonEFInfoContainer : public DataVector<TrigMuonEFInfo> 
 {
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrack.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrack.h
index b7ec8d4697e1d4ad0dfe33b6afe8b8946b9eef85..eb39d65b38afa513df10d3bfda64fdbee32f2a1c 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrack.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrack.h
@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // Forward declaration(s):
 class MsgStream;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrackContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrackContainer.h
index 449017025aff6522d207614e46ab93c6f03aa805..54d07430d4d39493aec159e34cfebbddf1e1bd84 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrackContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfoTrackContainer.h
@@ -18,10 +18,10 @@
 ********************************************************************/
 
 // INCLUDE HEADER FILES:
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrack.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 class TrigMuonEFInfoTrackContainer : public DataVector<TrigMuonEFInfoTrack>
 {
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolation.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolation.h
index 0fe97b66f523bdc51288ddd874ecb27c21682425..7076a685fc6cfa79e3bd0649f9d866430b833746 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolation.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolation.h
@@ -15,8 +15,8 @@
  */
 
 // Gaudi/Athena include(s):
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/ElementLink.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigMuonEvent/TrigMuonEFInfoContainer.h"
 
 class TrigMuonEFInfoTrack;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolationContainer.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolationContainer.h
index a32585e6e64bdb998b5a58e9db9f3efecf579742..3e6ae06cd1a069115ce96a8a8f37d6b21608983e 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolationContainer.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFIsolationContainer.h
@@ -15,9 +15,9 @@
  */
 
 // athena / gaudi includes
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
-#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/BaseInfo.h"
 
 // local includes
 #include "TrigMuonEvent/TrigMuonEFIsolation.h"
diff --git a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFTrack.h b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFTrack.h
index 3858532c0c7eabe9839b0d3f84b39dbe0f4c0627..4a14961278ca29bad15fd43cf5af64cfa8f2b789 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFTrack.h
+++ b/Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFTrack.h
@@ -14,7 +14,7 @@
 
 // Gaudi/Athena include(s):
 #include "FourMom/P4IPtCotThPhiM.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "Navigation/NavigableTerminalNode.h"
 #include "EventKernel/INavigable4Momentum.h"