diff --git a/Event/EventPacker/CMakeLists.txt b/Event/EventPacker/CMakeLists.txt
index 7be50dc27412891d39241aa8c36e22227fa480d6..ab0c83936a09234ce5863b933eed0b322a1f8e94 100644
--- a/Event/EventPacker/CMakeLists.txt
+++ b/Event/EventPacker/CMakeLists.txt
@@ -39,6 +39,7 @@ gaudi_add_library(EventPackerLib
         src/lib/PackedVertex.cpp
         src/lib/PackedWeightsVector.cpp
         src/lib/StandardPacker.cpp
+        src/lib/PackedDataBuffer.cpp
     LINK
         PUBLIC
             Boost::headers
@@ -50,6 +51,8 @@ gaudi_add_library(EventPackerLib
             LHCb::RecEvent
             LHCb::RelationsLib
             LHCb::TrackEvent
+            LHCb::DAQEventLib
+            LHCb::HltEvent
 )
 
 gaudi_add_module(EventPacker
diff --git a/Event/EventPacker/dict/PackedEventDict.h b/Event/EventPacker/dict/PackedEventDict.h
index c0aa6ac5755810c330b4985c5fc25178aed2f574..3275d5d8f377f5295117f1dc108ba50e82d8914d 100755
--- a/Event/EventPacker/dict/PackedEventDict.h
+++ b/Event/EventPacker/dict/PackedEventDict.h
@@ -18,6 +18,8 @@
 #include "Event/PackedCaloDigit.h"
 #include "Event/PackedCaloHypo.h"
 #include "Event/PackedCluster.h"
+#include "Event/PackedData.h"
+#include "Event/PackedDataBuffer.h"
 #include "Event/PackedDecReport.h"
 #include "Event/PackedFlavourTag.h"
 #include "Event/PackedMCCaloHit.h"
diff --git a/Hlt/HltDAQ/src/component/HltPackedData.h b/Event/EventPacker/include/Event/PackedData.h
similarity index 100%
rename from Hlt/HltDAQ/src/component/HltPackedData.h
rename to Event/EventPacker/include/Event/PackedData.h
diff --git a/Hlt/HltDAQ/src/component/PackedDataBuffer.h b/Event/EventPacker/include/Event/PackedDataBuffer.h
similarity index 98%
rename from Hlt/HltDAQ/src/component/PackedDataBuffer.h
rename to Event/EventPacker/include/Event/PackedDataBuffer.h
index 736839b51521aae9fba8c2e480d2edd9ce54d528..2ec0a8d38192a66cb140bd116d2b607f67da09b5 100644
--- a/Hlt/HltDAQ/src/component/PackedDataBuffer.h
+++ b/Event/EventPacker/include/Event/PackedDataBuffer.h
@@ -10,7 +10,7 @@
 \*****************************************************************************/
 #pragma once
 #include "Compression.h"
-#include "HltPackedData.h"
+#include "Event/PackedData.h"
 #include "RVersion.h"
 #include <algorithm>
 #include <cstdint>
@@ -72,7 +72,7 @@ namespace LHCb::Hlt::PackedData {
     /// Initialize from an existing buffer and reset position to zero.
     bool init( const buffer_type& data, bool compressed = false );
     /// Return the internal buffer.
-    const buffer_type& buffer() { return m_buffer; }
+    const buffer_type& buffer() const { return m_buffer; }
     /// Compress the buffer
     bool compress( Compression compression, int level, buffer_type& output ) const;
     /// Reserve size for the buffer
@@ -241,7 +241,7 @@ namespace LHCb::Hlt::PackedData {
     /// Clear the internal byte buffer.
     void clear() { m_buffer.clear(); }
     /// Return a reference to the internal buffer.
-    const std::vector<uint8_t>& buffer() { return m_buffer.buffer(); }
+    const std::vector<uint8_t>& buffer() const { return m_buffer.buffer(); }
     /// Compress the buffer
     bool compress( Compression compression, int level, ByteBuffer::buffer_type& output ) const {
       return m_buffer.compress( compression, level, output );
diff --git a/Hlt/HltDAQ/src/component/PackedDataBuffer.cpp b/Event/EventPacker/src/lib/PackedDataBuffer.cpp
similarity index 98%
rename from Hlt/HltDAQ/src/component/PackedDataBuffer.cpp
rename to Event/EventPacker/src/lib/PackedDataBuffer.cpp
index d715e86f992f25221446078c9c8414c5fabffa4c..9d123220a6c5a5d4d816e304515fae36747d369a 100644
--- a/Hlt/HltDAQ/src/component/PackedDataBuffer.cpp
+++ b/Event/EventPacker/src/lib/PackedDataBuffer.cpp
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization  *
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
-#include "PackedDataBuffer.h"
+#include "Event/PackedDataBuffer.h"
 #include "Compression.h"
 #include "RVersion.h"
 #include "RZip.h"
diff --git a/Hlt/HltDAQ/CMakeLists.txt b/Hlt/HltDAQ/CMakeLists.txt
index eba4db9b25dbddba3b406b284ca0334e7814dc00..e1e1c7f5540e95a9c205ce6bb26db75a7352db30 100644
--- a/Hlt/HltDAQ/CMakeLists.txt
+++ b/Hlt/HltDAQ/CMakeLists.txt
@@ -55,7 +55,6 @@ gaudi_add_module(HltDAQ
         src/component/HltTrackReportsWriter.cpp
         src/component/HltVertexReportsDecoder.cpp
         src/component/HltVertexReportsWriter.cpp
-        src/component/PackedDataBuffer.cpp
         src/component/PackedDataChecksum.cpp
         src/component/ReportConvertTool.cpp
         src/component/RoutingBitsWriter.cpp
diff --git a/Hlt/HltDAQ/src/component/HltPackedDataDecoder.cpp b/Hlt/HltDAQ/src/component/HltPackedDataDecoder.cpp
index fffea46d633f4362fed5a6a8e0b209db59f5a36c..7dd152ce752be98ddda80dd501878bb5587e550f 100644
--- a/Hlt/HltDAQ/src/component/HltPackedDataDecoder.cpp
+++ b/Hlt/HltDAQ/src/component/HltPackedDataDecoder.cpp
@@ -15,6 +15,8 @@
 #include "Event/PackedCaloDigit.h"
 #include "Event/PackedCaloHypo.h"
 #include "Event/PackedCluster.h"
+#include "Event/PackedData.h"
+#include "Event/PackedDataBuffer.h"
 #include "Event/PackedFlavourTag.h"
 #include "Event/PackedMuonPID.h"
 #include "Event/PackedPartToRelatedInfoRelation.h"
@@ -27,9 +29,7 @@
 #include "Event/PackedVertex.h"
 #include "Event/RawEvent.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "HltPackedData.h"
 #include "HltRawBankDecoderBase.h"
-#include "PackedDataBuffer.h"
 #include "PackedDataChecksum.h"
 #include "RZip.h"
 
diff --git a/Hlt/HltDAQ/src/component/HltPackedDataWriter.cpp b/Hlt/HltDAQ/src/component/HltPackedDataWriter.cpp
index ad467f693067cc2a77be6daea546955c8afbd0e0..72d290f3db268186b102c851be8f5b2b328f3552 100644
--- a/Hlt/HltDAQ/src/component/HltPackedDataWriter.cpp
+++ b/Hlt/HltDAQ/src/component/HltPackedDataWriter.cpp
@@ -13,6 +13,8 @@
 #include "Event/PackedCaloDigit.h"
 #include "Event/PackedCaloHypo.h"
 #include "Event/PackedCluster.h"
+#include "Event/PackedData.h"
+#include "Event/PackedDataBuffer.h"
 #include "Event/PackedFlavourTag.h"
 #include "Event/PackedMuonPID.h"
 #include "Event/PackedPartToRelatedInfoRelation.h"
@@ -25,9 +27,7 @@
 #include "Event/PackedVertex.h"
 #include "Event/RawEvent.h"
 #include "GaudiAlg/MergingTransformer.h"
-#include "HltPackedData.h"
 #include "Kernel/IANNSvc.h"
-#include "PackedDataBuffer.h"
 #include "PackedDataChecksum.h"
 #include "RZip.h"
 #include <optional>