diff --git a/Calorimeter/CaloIdentifier/CMakeLists.txt b/Calorimeter/CaloIdentifier/CMakeLists.txt
index 1627df779dfbd3ba6025d22682379795c848f535..21a2db78159c46c5938b6e4304e59c3697a29a28 100644
--- a/Calorimeter/CaloIdentifier/CMakeLists.txt
+++ b/Calorimeter/CaloIdentifier/CMakeLists.txt
@@ -8,8 +8,7 @@ atlas_subdir( CaloIdentifier )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloGeoHelpers
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/AtlasDetDescr
                           DetectorDescription/IdDict
                           DetectorDescription/Identifier
@@ -31,131 +30,131 @@ atlas_add_library( CaloIdentifier
                    PUBLIC_HEADERS CaloIdentifier
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel StoreGateLib SGtests
+                   LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools CxxUtils IdDictParser PathResolver )
 
 atlas_add_dictionary( CaloIdentifierDict
                       CaloIdentifier/CaloIdentifierDict.h
                       CaloIdentifier/selection.xml
                       INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
 
 atlas_add_executable( test_lar_id
                       test/test_lar_id.cxx
                       INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
 
 atlas_add_executable( test_calo_dm_id
                       test/test_calo_dm_id.cxx
                       INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
 
 atlas_add_executable( test_cell_id
                       test/test_cell_id.cxx
                       INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
 
 atlas_add_executable( test_lvl1_id
                       test/test_lvl1_id.cxx
                       INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
 
 #atlas_add_test( GTower_ID_test
 #                SOURCES
 #                test/GTower_ID_test.cxx
 #                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-#                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+#                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
 #                EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 #atlas_add_test( JTower_ID_test
 #                SOURCES
 #                test/JTower_ID_test.cxx
 #                INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-#                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+#                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
 #                EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArEM_ID_test
                 SOURCES
                 test/LArEM_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArEM_SuperCell_ID_test
                 SOURCES
                 test/LArEM_SuperCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArHEC_ID_test
                 SOURCES
                 test/LArHEC_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArHEC_SuperCell_ID_test
                 SOURCES
                 test/LArHEC_SuperCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArFCAL_ID_test
                 SOURCES
                 test/LArFCAL_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArFCAL_SuperCell_ID_test
                 SOURCES
                 test/LArFCAL_SuperCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( LArMiniFCAL_ID_test
                 SOURCES
                 test/LArMiniFCAL_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( TileID_test
                 SOURCES
                 test/TileID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( Tile_SuperCell_ID_test
                 SOURCES
                 test/Tile_SuperCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( CaloCell_ID_test
                 SOURCES
                 test/CaloCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( CaloCell_SuperCell_ID_test
                 SOURCES
                 test/CaloCell_SuperCell_ID_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( CaloIDHelper_test
                 SOURCES
                 test/CaloIDHelper_test.cxx
                 INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers SGTools AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+                LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
                 EXTRA_PATTERNS "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
 
 atlas_add_test( CaloHelpersTest_test
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_ID.h
index 16060f464b18facb4309071de67b08a70ae10b61..951e99855286e63dc6e6d0843dc7af6a0e7a8692 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_ID.h
@@ -5,13 +5,13 @@
 #ifndef CALOCELL_ID_H
 #define CALOCELL_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 
 #include "CaloIdentifier/CaloID.h"
 #include "CaloIdentifier/CaloCell_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <iostream>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_SuperCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_SuperCell_ID.h
index c4dcb4352b0189a85b72906db2bc1d43f6f90037..b68c76990d2c22f9651e862007fea5c857d0d84d 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_SuperCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloCell_SuperCell_ID.h
@@ -17,14 +17,14 @@
 #define CALOIDENTIFIER_CALOCELL_SUPERCELL_ID_H
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 
 #include "CaloIdentifier/CaloID.h"
 #include "CaloIdentifier/CaloCell_Base_ID.h"
 #include "CaloIdentifier/LArNeighbours.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <iostream>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloDM_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloDM_ID.h
index e5a835a0cf9950f724f4cd8933cd45e6f098303a..10518512911c4c80afa82dde2e904f8fc789445c 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloDM_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloDM_ID.h
@@ -5,7 +5,7 @@
 #ifndef CALODM_ID_H
 #define CALODM_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Range.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloIdManager.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloIdManager.h
index b21c35607b75af4e876f53723660600a3f60c8f1..3e62ccb8cfc41267e724878c439e9ed3ee8e8ad0 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloIdManager.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloIdManager.h
@@ -13,7 +13,7 @@
 #ifndef CALOID_CALOIDMANAGER_H
 # define CALOID_CALOIDMANAGER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class CaloCell_ID;
 class CaloCell_SuperCell_ID;
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloLVL1_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloLVL1_ID.h
index a8eb1e3633ff7bc17cdc6c76db4548796d9c2100..13e6c8a57aa3c3a21a12f199bb46c763bb967058 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/CaloLVL1_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/CaloLVL1_ID.h
@@ -5,7 +5,7 @@
 #ifndef CALOLVL1_ID_H
 #define CALOLVL1_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Range.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/GTower_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/GTower_ID.h
index 6c82891d6512c63eee8c5e189f96f27757cd98c3..9e463715a3120f87c806943c4d67594ea36dafc5 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/GTower_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/GTower_ID.h
@@ -5,14 +5,14 @@
 #ifndef GTOWER_ID_H
 #define GTOWER_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
 #include "IdDict/IdDictDefs.h"
 
 #include "CaloIdentifier/JGTowerBase_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/JGTowerBase_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/JGTowerBase_ID.h
index 12df3a5d80897d15123d5409ee3b1c5eede87db4..17a5a8c6c160266c685fbf76c3119563e6da43fb 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/JGTowerBase_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/JGTowerBase_ID.h
@@ -14,7 +14,7 @@
 #ifndef JGTOWERBASE_ID_H
 #define JGTOWERBASE_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/Range.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/JTower_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/JTower_ID.h
index 6aa9057705c044ccafbd242fdeab50161b83da84..88069f8a8da446f78ebc56190dbac56e6c4def42 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/JTower_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/JTower_ID.h
@@ -5,14 +5,14 @@
 #ifndef JTOWER_ID_H
 #define JTOWER_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
 #include "IdDict/IdDictDefs.h"
 
 #include "CaloIdentifier/JGTowerBase_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_ID.h
index 032cfbcb76380d623502ccbf477aa5cf9b9c1ca0..5c74216f2c9958cb34bc875e4965d3c0b2f5dde6 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_ID.h
@@ -5,7 +5,7 @@
 #ifndef LAREM_ID_H
 #define LAREM_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
@@ -13,7 +13,7 @@
 
 #include "CaloIdentifier/LArID_Exception.h"
 #include "CaloIdentifier/LArEM_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_SuperCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_SuperCell_ID.h
index 57fe32d783edefcc5a0abf4cb724a94b7ea81f00..6adbcbc9722f6e57057fa244fc8dd327367fdefb 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_SuperCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArEM_SuperCell_ID.h
@@ -16,9 +16,9 @@
 #ifndef CALOIDENTIFIER_LAREM_SUPERCELL_ID_H
 #define CALOIDENTIFIER_LAREM_SUPERCELL_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloIdentifier/LArEM_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 
 /**
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_ID.h
index 84e64285c6787c085c57d1fefd60a1e265156ae6..94a9532d641a5ade7dfd5cff033875fdcf8b1957 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_ID.h
@@ -5,7 +5,7 @@
 #ifndef LARFCAL_ID_H
 #define LARFCAL_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
@@ -13,7 +13,7 @@
 
 #include "CaloIdentifier/LArID_Exception.h"
 #include "CaloIdentifier/LArFCAL_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include "boost/range/iterator_range.hpp"
 #include <vector>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_SuperCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_SuperCell_ID.h
index 0ab894f5df7e5c308592d493ededcdebdb71d297..779eaee166ee2900c21e04e8a639564068e200b6 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_SuperCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_SuperCell_ID.h
@@ -5,9 +5,9 @@
 #ifndef CALOIDENTIFIER_LARFCAL_SUPERCELL_ID_H
 #define CALOIDENTIFIER_LARFCAL_SUPERCELL_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloIdentifier/LArFCAL_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_Base_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_Base_ID.h
index 37ee2db5acf0e9874f5f6b013f5f63fcac9af424..d2b03232e5f5a90471a6f807c63b4bbff96f7b81 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_Base_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_Base_ID.h
@@ -17,7 +17,7 @@
 #define CALOIDENTIFIER_LARHEC_BASE_ID_H
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_ID.h
index b7f80f3dabfab713823a8cb234a2804d5ac93123..53ce898578a971ded7f9eefbc535b137853834ff 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_ID.h
@@ -6,7 +6,7 @@
 #define LARHEC_ID_H
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
@@ -14,7 +14,7 @@
 
 #include "CaloIdentifier/LArHEC_Base_ID.h"
 #include "CaloIdentifier/LArID_Exception.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 #include "boost/range/iterator_range.hpp"
 
 #include <vector>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_SuperCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_SuperCell_ID.h
index c778a2b2cced4565290706c1cd3b03fa160532e8..6c2dc8d50c5da96c007791ba27d688c173359382 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_SuperCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArHEC_SuperCell_ID.h
@@ -17,9 +17,9 @@
 #define CALOIDENTIFIER_LARHEC_SUPERCELL_ID_H
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloIdentifier/LArHEC_Base_ID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 
 /**  
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/LArMiniFCAL_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/LArMiniFCAL_ID.h
index bfd6a6b6515517c0bf6b3294da2feb1638a337b2..f6328a9af76fb9de246580a2810e10fc8e6597db 100644
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/LArMiniFCAL_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/LArMiniFCAL_ID.h
@@ -5,7 +5,7 @@
 #ifndef LARMiniFCAL_ID_H
 #define LARMiniFCAL_ID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/IdentifierHash.h"
 #include "IdDict/IdDictFieldImplementation.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/TTOnlineID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/TTOnlineID.h
index 487c80581bd51ef30edc78da77d889c9e4452b35..1a23595a0e27d4f41e08aace70fdc73e10c6e169 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/TTOnlineID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/TTOnlineID.h
@@ -5,7 +5,7 @@
 #ifndef CALOIDENTIFIER_TTONLINEID_H
 #define CALOIDENTIFIER_TTONLINEID_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "GaudiKernel/MsgStream.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "Identifier/HWIdentifier.h"
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/TileID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/TileID.h
index a3092279e9e1fead8f193be034a1124a4da7b232..7924db062d3e9dbcd77c29656225d5d83c1fdac0 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/TileID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/TileID.h
@@ -24,8 +24,8 @@
 #include "CaloIdentifier/Tile_Base_ID.h"
 #include "CaloIdentifier/TileID_Exception.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include "boost/range/iterator_range.hpp"
 #include <string>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_Base_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_Base_ID.h
index 14666ffb77cd1d1dce732fe5ec30d08fa2f05d56..00d1395013237b77afb393c324c9cdc3e62eea32 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_Base_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_Base_ID.h
@@ -22,7 +22,7 @@
 #include "CaloIdentifier/TileID_Exception.h"
 #include "CaloIdentifier/TileNeighbour.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "boost/range/iterator_range.hpp"
 #include <string>
diff --git a/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_SuperCell_ID.h b/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_SuperCell_ID.h
index 245e9e8722672c73f38744d9967c8b2602a05ccc..2316620d3dc6cda73d2c73ad03c8ac5c534580d0 100755
--- a/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_SuperCell_ID.h
+++ b/Calorimeter/CaloIdentifier/CaloIdentifier/Tile_SuperCell_ID.h
@@ -22,8 +22,8 @@
 #include "CaloIdentifier/Tile_Base_ID.h"
 #include "CaloIdentifier/TileID_Exception.h"
 
-#include "CLIDSvc/CLASS_DEF.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include "boost/range/iterator_range.hpp"
 #include <string>