diff --git a/libuavcan/include/uavcan/marshal/bit_stream.hpp b/libuavcan/include/uavcan/marshal/bit_stream.hpp
index 07172a7929..eb6da3a611 100644
--- a/libuavcan/include/uavcan/marshal/bit_stream.hpp
+++ b/libuavcan/include/uavcan/marshal/bit_stream.hpp
@@ -7,13 +7,12 @@
 #include <cassert>
 #include <uavcan/stdint.hpp>
 #include <uavcan/util/compile_time.hpp>
+#include <uavcan/transport/abstract_transfer_buffer.hpp>
 #include <uavcan/impl_constants.hpp>
 
 namespace uavcan
 {
 
-class UAVCAN_EXPORT ITransferBuffer;
-
 void bitarrayCopy(const unsigned char* src_org, int src_offset, int src_len, unsigned char* dst_org, int dst_offset);
 
 class UAVCAN_EXPORT BitStream
diff --git a/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp b/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
new file mode 100644
index 0000000000..d11b108935
--- /dev/null
+++ b/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/stdint.hpp>
+
+namespace uavcan
+{
+/**
+ * API for transfer buffer users.
+ */
+class UAVCAN_EXPORT ITransferBuffer
+{
+public:
+    virtual ~ITransferBuffer() { }
+
+    virtual int read(unsigned offset, uint8_t* data, unsigned len) const = 0;
+    virtual int write(unsigned offset, const uint8_t* data, unsigned len) = 0;
+};
+
+}
diff --git a/libuavcan/include/uavcan/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
index cfbbe32d6a..fce58681e0 100644
--- a/libuavcan/include/uavcan/transport/transfer_buffer.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
@@ -9,6 +9,7 @@
 #include <uavcan/stdint.hpp>
 #include <uavcan/error.hpp>
 #include <uavcan/transport/frame.hpp>
+#include <uavcan/transport/abstract_transfer_buffer.hpp>
 #include <uavcan/linked_list.hpp>
 #include <uavcan/dynamic_memory.hpp>
 #include <uavcan/impl_constants.hpp>
@@ -17,18 +18,6 @@
 namespace uavcan
 {
 UAVCAN_PACKED_BEGIN
-/**
- * API for transfer buffer users.
- */
-class UAVCAN_EXPORT ITransferBuffer
-{
-public:
-    virtual ~ITransferBuffer() { }
-
-    virtual int read(unsigned offset, uint8_t* data, unsigned len) const = 0;
-    virtual int write(unsigned offset, const uint8_t* data, unsigned len) = 0;
-};
-
 /**
  * Internal for TransferBufferManager
  */