diff --git a/Control/DataModelAthenaPool/CMakeLists.txt b/Control/DataModelAthenaPool/CMakeLists.txt
index ee83a65e4bad4f5e13cd9ccd2e35c196095a8d32..0cdd4b8b08ca7309a0fe8ee24ef500b8721e50ae 100644
--- a/Control/DataModelAthenaPool/CMakeLists.txt
+++ b/Control/DataModelAthenaPool/CMakeLists.txt
@@ -17,7 +17,6 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           AtlasTest/TestTools
-                          Control/CLIDSvc
                           Control/SGTools
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Database/AthenaPOOL/RootConversions )
diff --git a/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx b/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
index fcd18c46a224c995863f91ec61361fd1a46d6f2a..4742e8673c6cc4ab1e97f2444214df5b772b63ff 100755
--- a/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/DataLink_p2_test.cxx
@@ -15,7 +15,7 @@
 #undef NDEBUG
 #include "AthLinks/DataLink.h"
 #include "DataModelAthenaPool/DataLinkCnv_p2.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
index 472ca2c452e6546dbfd2b6c8f15a2813f468418e..d96ca65a8ab17591081960a675b7a11100dec10c 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx
@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
index 0ae5441fdc5e3c7c9dae6541acc65111cb8a4f8c..10a9e718bddcef1c33b3b15868fc0cac77e6ad9b 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx
@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p2.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
index 785920512c75f0ab8aa572dc7136e3123eb9eb74..0dfcefeeeddc1ecd879fa123166d29bc89426819 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx
@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
index 89d0ead85fd63fa1575b6d8c1746b4e3263781ba..fe006be491a95ba5d0eacf9b47dfb258e2cec236 100644
--- a/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx
@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLinkVector.h"
 #include "DataModelAthenaPool/ElementLinkVectorCnv_p1.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
index 8320ee5aa24f0f798f17ca52243151a43648a344..e2de60da842e1e0a6787ae59f58e4dcc93bc5b0f 100644
--- a/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx
@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableCnv_p1.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
index 6d24041ebe4e223fb94ed6fc1ddd51030c220b9b..03683ae98680713314a44d7fff2a6153283852b5 100644
--- a/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx
@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableCnv_p2.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
index c7f9eee352e01c848ed99fd678f66d2e5888c8ba..8e7d96da97a2a18ef2b5c8210d41c1971058eb0e 100644
--- a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx
@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableVectorCnv_p1.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>
diff --git a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
index ac6e3f90243a4f3cd24c168b9abc68862cc1121d..d812912eb985f78801f037c73585e98323ebd863 100644
--- a/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
+++ b/Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx
@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableVectorCnv_p2.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>