diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
index f85461ce3a4948757eea21353c9e3a7eb2b59ea5..af571f9f7145a7a70eeadcc86fd1f3eb3b4b6606 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
@@ -8,8 +8,7 @@ atlas_subdir( GeoModelUtilities )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/RDBAccessSvc
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           DetectorDescription/GeoModel/GeoModelKernel
@@ -27,6 +26,6 @@ atlas_add_library( GeoModelUtilities
                    PUBLIC_HEADERS GeoModelUtilities
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps SGTools GeoModelKernel
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GeoModelKernel
                    PRIVATE_LINK_LIBRARIES GaudiKernel )
 
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
index 8e58ffb8e09dad96bfd6fbb9d635368c58d3e014..6dbba6cc450931a52b51c0cd31c6e2cc2dd96654 100755
--- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
@@ -7,7 +7,7 @@
 
 #include "GeoModelKernel/GeoVAlignmentStore.h"
 #include "GeoModelUtilities/TransformMap.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/CondCont.h"
 #include "CLHEP/Geometry/Transform3D.h"
 #include <stdexcept>
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoBorderSurfaceContainer.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoBorderSurfaceContainer.h
index 8b675f87b06b0e62c9a35e517126a06d198409fa..d67ec70f8ddf13b245bdd6eb2ff879cc0680de29 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoBorderSurfaceContainer.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoBorderSurfaceContainer.h
@@ -6,7 +6,7 @@
 #define GeoBorderSurfaceContainer_h 1
 
 #include "GeoModelUtilities/GeoBorderSurface.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 
 typedef std::vector< GeoBorderSurface > GeoBorderSurfaceContainer;
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoModelExperiment.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoModelExperiment.h
index a900e95d8b49152f3f7c36f098b42339ee4edf4c..be4267a9d50fa00c551abf45350a733d658dbae6 100755
--- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoModelExperiment.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoModelExperiment.h
@@ -15,7 +15,7 @@
 #ifndef GEOMODELSVC_GEOMODELEXPERIMENT_H
 #define GEOMODELSVC_GEOMODELEXPERIMENT_H
 #include "GeoModelKernel/GeoVPhysVol.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <set>
 #include <string>
 #include <vector>
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredAlignX.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredAlignX.h
index c2799bad0715698c485a2224a7a430e94961cfc7..694e33744182c8b6f5c8534b2c5f391f6dbd7a86 100755
--- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredAlignX.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredAlignX.h
@@ -12,7 +12,7 @@
 
 #ifndef STOREDALIGNX_H 
 #define STOREDALIGNX_H
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <set>
 #include <string>
 
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredPhysVol.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredPhysVol.h
index 8b69d1633fc10fb18a22d9751d1938d69a29e732..a647e202b12e724d3dbaa8661a9153b0a155516d 100755
--- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredPhysVol.h
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/StoredPhysVol.h
@@ -13,7 +13,7 @@
 #ifndef STOREDPHYSVOL_H 
 #define STOREDPHYSVOL_H
 #include "GeoModelKernel/GeoVPhysVol.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <set>
 #include <string>