diff --git a/Event/EventBookkeeperMetaData/CMakeLists.txt b/Event/EventBookkeeperMetaData/CMakeLists.txt
index 78e77f1222dbf6439f099a657e2bab7f08dc0319..2adfac9041dfff91118df41d874db4d057f968cd 100644
--- a/Event/EventBookkeeperMetaData/CMakeLists.txt
+++ b/Event/EventBookkeeperMetaData/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( EventBookkeeperMetaData )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
-                          Control/SGTools
+                          Control/AthenaKernel
+                          Control/AthContainers
                           GaudiKernel )
 
 # External dependencies:
@@ -20,12 +19,12 @@ atlas_add_library( EventBookkeeperMetaData
                    src/*.cxx
                    PUBLIC_HEADERS EventBookkeeperMetaData
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES DataModel SGTools GaudiKernel
+                   LINK_LIBRARIES AthContainers GaudiKernel
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( EventBookkeeperMetaDataDict
                       EventBookkeeperMetaData/EventBookkeeperMetaDataDict.h
                       EventBookkeeperMetaData/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel SGTools GaudiKernel EventBookkeeperMetaData )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers GaudiKernel EventBookkeeperMetaData )
 
diff --git a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeper.h b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeper.h
index 0a3b3dae14c432b69e2b89cae03177ff6dd54043..15a8e474e5d74bf8274bbe36a30938b9dcbb8196 100644
--- a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeper.h
+++ b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeper.h
@@ -9,8 +9,7 @@
 #ifndef EVENTBOOKKEEPER_H 
 #define EVENTBOOKKEEPER_H 
  
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 #include <iosfwd>
 #include <stdint.h>
diff --git a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeperCollection.h b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeperCollection.h
index b50469cd230ec219f19ff365fb764c1dda83e090..82630a1b527d623d3271a4a9e0ca546f76cc532b 100644
--- a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeperCollection.h
+++ b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeperCollection.h
@@ -13,11 +13,9 @@
 #include <iostream>
 
 // DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "EventBookkeeperMetaData/EventBookkeeper.h"
-
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class EventBookkeeperCollection: public DataVector<EventBookkeeper> 
 {
diff --git a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecision.h b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecision.h
index 31b13bc26b78858368f7f49f7f10179ff305792c..a1839bac7525581eadb492ee3ab9acbed5ae3df1 100644
--- a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecision.h
+++ b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecision.h
@@ -9,8 +9,7 @@
 #ifndef SKIMDECISION_H 
 #define SKIMDECISION_H 
  
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 
 class SkimDecision
diff --git a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecisionCollection.h b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecisionCollection.h
index 7d1c47be26a2cc3d18dd219ec4e0669d29a2c570..c607c8053d447e48b62354efe22b3bee8571ee83 100644
--- a/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecisionCollection.h
+++ b/Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecisionCollection.h
@@ -13,11 +13,9 @@
 #include <iostream>
 
 // DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "EventBookkeeperMetaData/SkimDecision.h"
-
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class SkimDecisionCollection: public DataVector<SkimDecision> 
 {