diff --git a/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
index 39c7db3f3794721ea184637a6663106967ac11ec..bae7f42f98d3e9f0299f8394ef6970021ae3362d 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
@@ -8,9 +8,8 @@ atlas_subdir( TrigT1Interfaces )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
-                          Control/CLIDSvc
+                          Control/AthenaKernel
                           Control/AthContainers
-                          Control/SGTools
                           GaudiKernel
                           PRIVATE
                           Trigger/TrigConfiguration/TrigConfL1Data )
@@ -25,12 +24,12 @@ atlas_add_library( TrigT1Interfaces
                    src/*.cxx
                    PUBLIC_HEADERS TrigT1Interfaces
                    INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${XERCESC_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers SGTools GaudiKernel ${TDAQ-COMMON_LIBRARIES}
+                   LINK_LIBRARIES ${XERCESC_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers AthenaKernel GaudiKernel ${TDAQ-COMMON_LIBRARIES}
                    PRIVATE_LINK_LIBRARIES TrigConfL1Data )
 
 atlas_add_dictionary( TrigT1InterfacesDict
                       TrigT1Interfaces/TrigT1InterfacesDict.h
                       TrigT1Interfaces/selection.xml
                       INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${XERCESC_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers SGTools GaudiKernel TrigConfL1Data TrigT1Interfaces )
+                      LINK_LIBRARIES ${XERCESC_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers AthenaKernel GaudiKernel TrigConfL1Data TrigT1Interfaces )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
index c093f08509f50f5bb7a34f8ee195d2c94091271d..0c82d7951aaba5c539a2004b99e2eed7793b1b71 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BcmCTP.h
@@ -48,10 +48,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::BcmCTP , 155355998 , 1 )
 
 #endif // TRIGT1INTERFACES_BCM_CTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
index b0305c51f1255074d8350a9f7d6e2928ecf45a11..0cedbb78934c412daeae021fa9843c06bc8710e4 100755
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/BptxCTP.h
@@ -48,10 +48,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::BptxCTP , 215712302 , 1 )
 
 #endif // TRIGT1INTERFACES_BPTX_CTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
index cab3b7165446ef3f06c3df8f89ba6ebdc55fd654..b3ae7e8a37133be91509edab55f738404f8a9964 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/CTPSLink.h
@@ -130,9 +130,7 @@ namespace LVL1CTP {
 
 } // namespace LVL1CTP
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1CTP::CTPSLink, 6013, 0 )
 
 #endif // TRIGT1INTERFACES_CTPSLINK_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
index edd5967fa57a620ce1ae0def7ceb93423780fe29..4dce37fb9a4070bd4d009c2f4ca6027d2f9489b3 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EmTauCTP.h
@@ -57,9 +57,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::EmTauCTP, 6253, 1 )
 
 #endif // TRIGT1INTERFACES_EMTAUCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
index ae7967f68e4bd9dc0308b37802432fe8c96f4b2f..0f33063ab4252725a4705a27dc9b12dd33e1f634 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/EnergyCTP.h
@@ -54,9 +54,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::EnergyCTP, 6254, 1 )
 
 #endif // TRIGT1INTERFACES_ENERGYCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
index 0cb450e6521687e0360a654e9a27a1b8c4d8adae..da40223914946896fa6c182fb1d6d2197b19caa4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/FrontPanelCTP.h
@@ -89,9 +89,7 @@ private:
 
 } //> end namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::FrontPanelCTP , 33637034 , 1 )
 
 #endif //> !TRIGT1INTERFACES_FRONTPANELCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
index c11c38277a7a994fb4b8a93fe97f05877acb315a..4c4b9b358af5a818768a9a23e06e83c8245b99f7 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/JetCTP.h
@@ -46,9 +46,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::JetCTP, 6252, 1 )
 
 #endif // TRIGT1INTERFACES_JETCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
index 319f8cd56e81c7144281dedb1fc7ae081386d4ce..db57e90cb4b416752d2c5e40dc4c88ec54bbbfd9 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
@@ -49,10 +49,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::LucidCTP , 48467911 , 1 )
 
 #endif // TRIGT1INTERFACES_LUCID_CTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
index 9b83381eecad5a19f9c89636018891e2790d63d0..e54b00b77cbc5e3bf93fcf12990c344b5d339f91 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInput.h
@@ -165,9 +165,7 @@ namespace LVL1MUONIF {
 
 } // namespace LVL1MUONIF
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1MUONIF::Lvl1MuCTPIInput, 6102, 0 )
 
 #endif // TRIGT1INTERFACES_LVL1MUCTPIINPUT_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
index 0eb3b8a377018ad0c7abfd477b359bf70e989421..4c9f82226cfe29cf97c96b8042ab8227cc499ac8 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MbtsCTP.h
@@ -51,10 +51,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::MbtsCTP , 142768909 , 1 )
 
 #endif // TRIGT1INTERFACES_MBTS_CTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
index 050f7fab7f3389c98f69950bc6afec0b64b8f3d9..a1e82a74728a96b5e644a0d5cab3f1a5a7190278 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
@@ -38,9 +38,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::MuCTPICTP, 6070, 0 )
 
 #endif // TRIGT1INTERFACES_MUCTPICTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
index 610d9c20aaa270f47af87a96486c5c2d4da78232..82c0162ba4ccbaa9fd909c2701fbad54c37a8d6e 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIL1Topo.h
@@ -61,8 +61,6 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::MuCTPIL1Topo, 6175, 0 )
  #endif // TRIGT1INTERFACES_MUCTPIL1TOPO_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
index e9f8179f61ded2de108c57286ffda7cbf5d18c39..a3251c796bc352b113aac715b833f9f0976302fa 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPIToRoIBSLink.h
@@ -45,9 +45,7 @@ namespace L1MUINT {
 
 } // namespace L1MUINT
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( L1MUINT::MuCTPIToRoIBSLink, 6103, 0 )
 
 #endif // TRIGT1INTERFACES_MUCTPITOROIBSLINK_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
index ee13896b155ad16ecfc19cf1217c20ec918b2a52..b57260bbe9b7c7b6c1841ad5a95a8926ba27fe2d 100755
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/NimCTP.h
@@ -41,9 +41,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::NimCTP, 22423433, 1 )
 
 #endif // TRIGT1INTERFACES_NIMCTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
index b2b47c1dfc14900946e8e3ee84ad94afd02ff873..eb0a50936cd40e8e6105d05c6c2ebced6ac0eada 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
@@ -161,9 +161,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( DataVector< LVL1::RecEmTauRoI >, 6256, 1 )
 CLASS_DEF( LVL1::RecEmTauRoI, 6257, 1 )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
index ef6d0f5cb967ea46051d75158cf7dc61e2fd5e72..fb4ba0eaaf169d3a5b33a95d2c88fca966fb39b7 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
@@ -141,9 +141,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( DataVector< LVL1::RecEnergyRoI >, 6262, 1 )
 CLASS_DEF( LVL1::RecEnergyRoI, 6263, 1 )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
index a308ecc0d997e22079bd7952d446f3138bcf61da..d6d184e62a18418f6691cdba0c556554bdcb7381 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetEtRoI.h
@@ -50,9 +50,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( DataVector< LVL1::RecJetEtRoI >, 6260, 1 )
 CLASS_DEF( LVL1::RecJetEtRoI, 6261, 1 )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
index b17667f83b08fd7627cc3c6c0ced1cd579ff2a8b..9cf1d94bf1016f67e6b4794f7baec0fcc8ad547b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
@@ -151,9 +151,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( DataVector< LVL1::RecJetRoI >, 6258, 1 )
 CLASS_DEF( LVL1::RecJetRoI, 6259, 1 )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
index 2a688a5df0abe372cac65bdbee82ba5ced911ab4..969354888d61675300cbebbc8bc2e40da65e523b 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecMuonRoI.h
@@ -191,9 +191,7 @@ namespace LVL1 {
 } // namespace LVL1
 
 /* CLID for RecMuonRoI */
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( DataVector< LVL1::RecMuonRoI >, 247859471, 1 )
 CLASS_DEF( LVL1::RecMuonRoI, 6080, 0 )
 
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
index a1e104f9cd77cbac0bc1f730de919327defb99f1..0a4af99c10b9eda9e05052b201b90fcc3ec643e7 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h
@@ -13,9 +13,7 @@
 #include "TrigT1Interfaces/RecJetRoI.h"
 
 //#include "StoreGate/tools/ClassID_traits.h"
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthContainers/DataVector.h"                  
 
 CLASS_DEF(DataVector<LVL1CTP::SlinkWord>,   6250, 1)
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
index 8f32a1aba526f7eb3bd7712fa9633f1a9dcdb347..59a5b8c3edc968a263ad12cc703ef2b43a7df87f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrtCTP.h
@@ -47,10 +47,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::TrtCTP , 50110070 , 1 )
 
 #endif // TRIGT1INTERFACES_TRT_CTP_H
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
index 9ebb09870f6fceafb789d161524b4ad78d796d6b..56ce90d5994d6366048f901d5de223701d8a27bc 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ZdcCTP.h
@@ -48,10 +48,7 @@ namespace LVL1 {
 
 } // namespace LVL1
 
-#ifndef CLIDSVC_CLASSDEF_H
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LVL1::ZdcCTP , 232437259 , 1 )
 
 #endif // TRIGT1INTERFACES_ZDC_CTP_H