diff --git a/Calorimeter/CaloEvent/CMakeLists.txt b/Calorimeter/CaloEvent/CMakeLists.txt
index 5697e61a0ba279d4bc67a6ec5e474bb96f165e48..8e0fb585bfd8bb0e3a7842828486950cded785fa 100644
--- a/Calorimeter/CaloEvent/CMakeLists.txt
+++ b/Calorimeter/CaloEvent/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_depends_on_subdirs(
    Control/AthAllocators
    Control/AthContainers
    Control/AthLinks
-   Control/CLIDSvc
+   Control/AthenaKernel
    Control/CxxUtils
    Control/Navigation
    DetectorDescription/GeoPrimitives
@@ -27,8 +27,6 @@ atlas_depends_on_subdirs(
    LArCalorimeter/LArRawConditions #not ideal .. LAr should depend on Calo. 
    PRIVATE
    AtlasTest/TestTools
-   Control/AthenaKernel
-   Control/SGTools
    Control/StoreGate
    DetectorDescription/IdDictParser
    LArCalorimeter/LArRawConditions
@@ -45,8 +43,7 @@ atlas_add_library( CaloEvent CaloEvent/*.h CaloEvent/*.icc src/*.cxx
    LINK_LIBRARIES CaloConditions CaloGeoHelpers CaloIdentifier AthAllocators
    AthContainers AthLinks CxxUtils Navigation GeoPrimitives
    Identifier EventKernel FourMom NavFourMom CaloDetDescrLib
-   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel
-   SGTools )
+   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel )
 
 atlas_add_dictionary( CaloEventDict
    CaloEvent/CaloEventDict.h CaloEvent/selection.xml
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h b/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
index 6ed1c136e7290de23e62c8c07e3e49238ff7768a..2bb8e71924511e774f1fa7fab2f558331465e3d0 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h
@@ -31,7 +31,7 @@ class CaloBCIDAverage {
 };
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(CaloBCIDAverage, 141052237, 1)
 
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCell2ClusterMap.h b/Calorimeter/CaloEvent/CaloEvent/CaloCell2ClusterMap.h
index 351cd38da5248d8090c4c5d7adda476c55c04f87..3d2fbaf86461dcfbc5590149c96e63eca4dca8b8 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCell2ClusterMap.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCell2ClusterMap.h
@@ -19,10 +19,9 @@
  */
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "Navigation/Navigable.h"
 #include "CaloEvent/CaloClusterContainer.h"
-#include "CLIDSvc/CLASS_DEF.h"
 
 class CaloCell2ClusterMap : public DataVector< Navigable<CaloClusterContainer> > 
 {
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCellContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloCellContainer.h
index 68004e94934d31b313fb503171612f24900d2a34..e8152d8f962b8c4e09872d40e3ae35d3299e7bce 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCellContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCellContainer.h
@@ -41,7 +41,7 @@ MODIFIED: David Rousseau: heavy modification to allow storing all
 ********************************************************************/
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloEvent/CaloCell.h"
 
 #include "CaloIdentifier/CaloCell_ID.h"
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCellContainerVector.h b/Calorimeter/CaloEvent/CaloEvent/CaloCellContainerVector.h
index e783f47cc2fdf21519bfd0f65f2a427480f524bb..568ad10bb64f7a7a2b08eca518df1c9571db176f 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCellContainerVector.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCellContainerVector.h
@@ -28,7 +28,7 @@ PURPOSE:  Vector Container for CaloCell
 ********************************************************************/
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloEvent/CaloCellContainer.h"
 
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCellLinkContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloCellLinkContainer.h
index 24bef34182c913276cb5e7248b8e5ba3ac4a4a50..37273830f563227927e28a4f88e52c6a6eee74c6 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCellLinkContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCellLinkContainer.h
@@ -16,7 +16,7 @@
 
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "AthContainers/DataVector.h"
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloClusterCellLinkContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloClusterCellLinkContainer.h
index 5f3e984afe9061d4d0e293a44005f86118df3304..6220511c09b8626dce7818d1ceae0ce7fe161a6a 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloClusterCellLinkContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloClusterCellLinkContainer.h
@@ -16,7 +16,7 @@
 
 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthContainers/DataVector.h"
 #include "CaloEvent/CaloClusterCellLink.h"
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloClusterContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloClusterContainer.h
index 85130c2e5164724e972674d4cb1e1bada2e9ce92..7d6b74a7adc8bde07db7b82e15578095be6dd006 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloClusterContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloClusterContainer.h
@@ -23,7 +23,7 @@ PURPOSE:  Container for CaloCluster objects
 // INCLUDE HEADER FILES:
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "CaloEvent/CaloTowerSeg.h"
 #include "CaloEvent/CaloCluster.h"
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCompactCell.h b/Calorimeter/CaloEvent/CaloEvent/CaloCompactCell.h
index 0ea3cff15bdf720a0d379906edec7930123d5f80..e9e03dce61c07357388f52ef9f96016fa50cd56d 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCompactCell.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCompactCell.h
@@ -18,7 +18,7 @@
  * multiples of 16bit @c shorts. 
  */
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 
 class CaloCompactCell 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCompactCellContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloCompactCellContainer.h
index 7ae413695db2c586fd65ce16c280e3daceeba198..5a24503299a5570e4872c26c9951b7ac3ef461e4 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloCompactCellContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCompactCellContainer.h
@@ -23,7 +23,7 @@
  * are produced by the @c CaloCompactCellTool in @c CaloTools.
  */
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CaloEvent/CaloCompactCell.h"
 #include <vector>
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloShowerContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloShowerContainer.h
index 3f51d288f16cac72da84b03ca15c77cc0d08e0fa..11d7542f53ed5799c6be143ea0b7b466970c0cd6 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloShowerContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloShowerContainer.h
@@ -5,7 +5,7 @@
 #ifndef CALOEVENT_CALOSHOWERCONTAINER_H
 #define CALOEVENT_CALOSHOWERCONTAINER_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "AthContainers/DataVector.h"
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloTopoTowerContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloTopoTowerContainer.h
index f838a0e755dc7197441bf4bf5e1f834c67440043..10f3e753f7c9a1511a1372f8768cf8632ce7e302 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloTopoTowerContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloTopoTowerContainer.h
@@ -29,7 +29,7 @@ UPDATE:   March 15, 2010
 ********************************************************************/
 
 // INCLUDE HEADER FILES:
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "CaloIdentifier/CaloCell_ID.h"
 
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloTowerContainer.h b/Calorimeter/CaloEvent/CaloEvent/CaloTowerContainer.h
index 51aea65a4ae45ab8fa5cc208466828c87ff96edc..4cf42d20e0b47ee31067a7f95e7c289e5f40d020 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloTowerContainer.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloTowerContainer.h
@@ -59,7 +59,7 @@ UPDATE:   MAY-11-01
 
 // INCLUDE HEADER FILES:
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include "CaloIdentifier/CaloCell_ID.h"
 
diff --git a/Calorimeter/CaloEvent/src/CaloCell.cxx b/Calorimeter/CaloEvent/src/CaloCell.cxx
index dd5896d226ca7c14819060ae05ad6a9dafcd369f..df9d9412e64f6a59c99a9aabbf8f60b9bf7e31eb 100644
--- a/Calorimeter/CaloEvent/src/CaloCell.cxx
+++ b/Calorimeter/CaloEvent/src/CaloCell.cxx
@@ -7,7 +7,7 @@
 #include "CLHEP/Geometry/Vector3D.h"
 #include "CLHEP/Geometry/Point3D.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 #include <cmath>
 
 CaloCell::~CaloCell()