diff --git a/plugins/net_plugin/include/eosio/net_plugin/message_buffer.hpp b/libraries/fc/include/fc/network/message_buffer.hpp
similarity index 99%
rename from plugins/net_plugin/include/eosio/net_plugin/message_buffer.hpp
rename to libraries/fc/include/fc/network/message_buffer.hpp
index 8e46fe4ce0caa3fd2b4b059fe0b1d991c8203a38..702beacd3e54631b13ac0e456f9676747eceb31c 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/message_buffer.hpp
+++ b/libraries/fc/include/fc/network/message_buffer.hpp
@@ -9,7 +9,7 @@
 #include <deque>
 #include <array>
 
-namespace eosio {
+namespace fc {
   template <uint32_t buffer_len>
   class mb_datastream;
 
@@ -299,4 +299,4 @@ namespace eosio {
     return mb_datastream<buffer_len>(*this);
   }
 
-} // namespace eosio
+} // namespace fc
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8c24dc43023c0bbe3217436ade34676997b507b7..3f449dda4a8b7f7130fdbb9c9ae5bd1ed369f330 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -6,7 +6,6 @@
 
 #include <eosio/net_plugin/net_plugin.hpp>
 #include <eosio/net_plugin/protocol.hpp>
-#include <eosio/net_plugin/message_buffer.hpp>
 #include <eosio/chain/chain_controller.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/block.hpp>
@@ -14,6 +13,7 @@
 #include <eosio/utilities/key_conversion.hpp>
 #include <eosio/chain/contracts/types.hpp>
 
+#include <fc/network/message_buffer.hpp>
 #include <fc/network/ip.hpp>
 #include <fc/io/json.hpp>
 #include <fc/io/raw.hpp>
@@ -399,7 +399,7 @@ namespace eosio {
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       socket_ptr              socket;
 
-      message_buffer<1024*1024>    pending_message_buffer;
+      fc::message_buffer<1024*1024>    pending_message_buffer;
       vector<char>            blk_buffer;
 
       struct queued_write {
diff --git a/unittests/message_buffer_tests.cpp b/unittests/message_buffer_tests.cpp
index 736136d000f513a2df3fd9ab739734030cf9759f..0fe4c70833694a9a3819f7e03974b4b1907da3f6 100644
--- a/unittests/message_buffer_tests.cpp
+++ b/unittests/message_buffer_tests.cpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosio/net_plugin/message_buffer.hpp>
+#include <fc/network/message_buffer.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -36,7 +36,7 @@ constexpr auto     def_buffer_size = 1024*1024*def_buffer_size_mb;
 BOOST_AUTO_TEST_CASE(message_buffer_construction)
 {
   try {
-    eosio::message_buffer<def_buffer_size> mb;
+    fc::message_buffer<def_buffer_size> mb;
     BOOST_CHECK_EQUAL(mb.total_bytes(), def_buffer_size);
     BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size);
     BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(message_buffer_construction)
 BOOST_AUTO_TEST_CASE(message_buffer_growth)
 {
   try {
-    eosio::message_buffer<def_buffer_size> mb;
+    fc::message_buffer<def_buffer_size> mb;
     mb.add_buffer_to_chain();
     BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
     BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size);
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(message_buffer_peek_read)
   try {
     {
       const uint32_t small = 32;
-      eosio::message_buffer<small> mb;
+      fc::message_buffer<small> mb;
       BOOST_CHECK_EQUAL(mb.total_bytes(), small);
       BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
       BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(message_buffer_write_ptr_to_end)
   try {
     {
       const uint32_t small = 32;
-      eosio::message_buffer<small> mb;
+      fc::message_buffer<small> mb;
       BOOST_CHECK_EQUAL(mb.total_bytes(), small);
       BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
       BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);