diff --git a/Event/ByteStreamData/ByteStreamData/ByteStream.h b/Event/ByteStreamData/ByteStreamData/ByteStream.h
index f36f9ae6e6cd27872065a47adc5872b9d63c3afe..1b29b77a5f50d9868a01337a74ac0d58a55cd4c8 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStream.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStream.h
@@ -41,6 +41,6 @@ private:
   OFFLINE_FRAGMENTS_NAMESPACE::DataType* m_start;
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(ByteStream, 7001, 1)
 #endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
index a003e94ec7545038e0d01d4e88535239b484362e..15f6a5d43a2dcedc31b2c74c275164c5e5e63834 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
@@ -84,6 +84,6 @@ private:
    std::vector<std::string> m_freeMetaDataStrings;
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(ByteStreamMetadata, 170625359, 1)
 #endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
index 4209524d2f91ffd32e78706bad25f7f9ca015151..2f6b5f2cbc16bcd4bfad2f2dd80bccee31c5b52f 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
@@ -12,7 +12,7 @@
  **/
 
 #include "ByteStreamData/ByteStreamMetadata.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 /** @class ByteStreamMetadataContainer 
  *  @brief This class is the StoreGate data object for bytestream metadata. 
@@ -20,6 +20,6 @@
 class ByteStreamMetadataContainer : public DataVector<ByteStreamMetadata> {
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(ByteStreamMetadataContainer, 1076128893, 1)
 #endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
index b4ed0509e81ab0e3cddd8d23a75cfec7a5c4a61a..896ed4ffaadfe06fd3a9ef54546e758d54655ab9 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <map>
 #include <string>
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
  
 class ByteStreamFreeMetadataString : public std::pair<std::string,std::string>
 {
diff --git a/Event/ByteStreamData/CMakeLists.txt b/Event/ByteStreamData/CMakeLists.txt
index 851553d77bea1ede8c23567094c5cbdfd7f5ac06..3ea4216c32b1127d0b307141b82a2de9c0220da0 100644
--- a/Event/ByteStreamData/CMakeLists.txt
+++ b/Event/ByteStreamData/CMakeLists.txt
@@ -9,9 +9,8 @@ atlas_subdir( ByteStreamData )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs(
    PUBLIC
-   Control/CLIDSvc
-   Control/DataModel
-   Control/SGTools )
+   Control/AthenaKernel
+   Control/AthContainers )
 
 # External dependencies:
 find_package( tdaq-common )
@@ -31,7 +30,7 @@ atlas_add_library( ByteStreamData
    src/ByteStreamMetadata.cxx
    PUBLIC_HEADERS ByteStreamData
    ${extra_inc}
-   LINK_LIBRARIES DataModel SGTools ${extra_lib} )
+   LINK_LIBRARIES AthContainers ${extra_lib} )
 
 atlas_add_library( ByteStreamData_test
    src/ROBData_t.cxx