diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp
index f6131a5c..46d763e0 100644
--- a/libraries/app/api.cpp
+++ b/libraries/app/api.cpp
@@ -23,6 +23,7 @@
 #include <graphene/chain/protocol/fee_schedule.hpp>
 
 #include <fc/crypto/hex.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 namespace graphene { namespace app {
 
diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp
index 2851ad64..95c37790 100644
--- a/libraries/chain/block_database.cpp
+++ b/libraries/chain/block_database.cpp
@@ -18,6 +18,7 @@
 #include <graphene/chain/block_database.hpp>
 #include <graphene/chain/protocol/fee_schedule.hpp>
 #include <fc/io/raw.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 namespace graphene { namespace chain {
 
diff --git a/libraries/chain/committee_member_evaluator.cpp b/libraries/chain/committee_member_evaluator.cpp
index 345b9b77..fec610b7 100644
--- a/libraries/chain/committee_member_evaluator.cpp
+++ b/libraries/chain/committee_member_evaluator.cpp
@@ -22,6 +22,8 @@
 #include <graphene/chain/protocol/fee_schedule.hpp>
 #include <graphene/chain/transaction_evaluation_state.hpp>
 
+#include <fc/smart_ref_impl.hpp>
+
 namespace graphene { namespace chain {
 
 void_result committee_member_create_evaluator::do_evaluate( const committee_member_create_operation& op )
diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index 11c91c5c..4be19289 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -16,7 +16,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <graphene/chain/fork_database.hpp>
-
+#include <graphene/chain/protocol/fee_schedule.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 namespace graphene { namespace chain {
 fork_database::fork_database()
diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp
index 4e9341f2..0fe7e81b 100644
--- a/libraries/chain/proposal_evaluator.cpp
+++ b/libraries/chain/proposal_evaluator.cpp
@@ -21,6 +21,8 @@
 #include <graphene/chain/protocol/fee_schedule.hpp>
 #include <graphene/chain/exceptions.hpp>
 
+#include <fc/smart_ref_impl.hpp>
+
 namespace graphene { namespace chain {
 
 void_result proposal_create_evaluator::do_evaluate(const proposal_create_operation& o)
diff --git a/libraries/chain/protocol/proposal.cpp b/libraries/chain/protocol/proposal.cpp
index 118a23fc..148dfea9 100644
--- a/libraries/chain/protocol/proposal.cpp
+++ b/libraries/chain/protocol/proposal.cpp
@@ -1,6 +1,7 @@
 /* Copyright (C) Cryptonomex, Inc - All Rights Reserved **/
 #include <graphene/chain/protocol/operations.hpp>
 #include <graphene/chain/protocol/fee_schedule.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 namespace graphene { namespace chain {
 
diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp
index d3e662db..39d43c5e 100644
--- a/libraries/chain/protocol/transaction.cpp
+++ b/libraries/chain/protocol/transaction.cpp
@@ -17,9 +17,9 @@
  */
 #include <graphene/chain/exceptions.hpp>
 #include <graphene/chain/protocol/fee_schedule.hpp>
-#include <graphene/chain/protocol/fee_schedule.hpp>
 #include <fc/io/raw.hpp>
 #include <fc/bitutil.hpp>
+#include <fc/smart_ref_impl.hpp>
 #include <algorithm>
 
 namespace graphene { namespace chain {
diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp
index 4c568d76..93bb5759 100644
--- a/libraries/net/node.cpp
+++ b/libraries/net/node.cpp
@@ -62,6 +62,7 @@
 #include <fc/crypto/rand.hpp>
 #include <fc/network/rate_limiting.hpp>
 #include <fc/network/ip.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 #include <graphene/net/node.hpp>
 #include <graphene/net/peer_database.hpp>
diff --git a/libraries/plugins/account_history/account_history_plugin.cpp b/libraries/plugins/account_history/account_history_plugin.cpp
index cf9d12f5..3e5146d6 100644
--- a/libraries/plugins/account_history/account_history_plugin.cpp
+++ b/libraries/plugins/account_history/account_history_plugin.cpp
@@ -26,6 +26,7 @@
 #include <graphene/chain/operation_history_object.hpp>
 #include <graphene/chain/transaction_evaluation_state.hpp>
 
+#include <fc/smart_ref_impl.hpp>
 #include <fc/thread/thread.hpp>
 
 namespace graphene { namespace account_history {
diff --git a/libraries/plugins/market_history/market_history_plugin.cpp b/libraries/plugins/market_history/market_history_plugin.cpp
index 4a76b89b..260d4c7e 100644
--- a/libraries/plugins/market_history/market_history_plugin.cpp
+++ b/libraries/plugins/market_history/market_history_plugin.cpp
@@ -28,6 +28,7 @@
 #include <graphene/chain/protocol/fee_schedule.hpp>
 
 #include <fc/thread/thread.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 namespace graphene { namespace market_history {
 
diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp
index 624ad59d..6380fba7 100644
--- a/libraries/plugins/witness/witness.cpp
+++ b/libraries/plugins/witness/witness.cpp
@@ -23,6 +23,7 @@
 
 #include <graphene/utilities/key_conversion.hpp>
 
+#include <fc/smart_ref_impl.hpp>
 #include <fc/thread/thread.hpp>
 
 using namespace graphene::witness_plugin;
diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp
index f0cf6da2..22685068 100644
--- a/programs/cli_wallet/main.cpp
+++ b/programs/cli_wallet/main.cpp
@@ -28,14 +28,13 @@
 #include <fc/rpc/cli.hpp>
 #include <fc/rpc/http_api.hpp>
 #include <fc/rpc/websocket_api.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 #include <graphene/app/api.hpp>
 #include <graphene/chain/protocol/protocol.hpp>
 #include <graphene/utilities/key_conversion.hpp>
 #include <graphene/wallet/wallet.hpp>
 
-#include <fc/rpc/websocket_api.hpp>
-
 #include <fc/interprocess/signals.hpp>
 #include <boost/program_options.hpp>
 
diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp
index 6022b9fe..8f01f70c 100644
--- a/programs/js_operation_serializer/main.cpp
+++ b/programs/js_operation_serializer/main.cpp
@@ -24,6 +24,7 @@
 #include <graphene/chain/market_evaluator.hpp>
 #include <graphene/chain/account_object.hpp>
 #include <graphene/chain/balance_object.hpp>
+#include <fc/smart_ref_impl.hpp>
 #include <iostream>
 
 using namespace graphene::chain;
diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp
index 47c907e3..5950f6aa 100644
--- a/programs/size_checker/main.cpp
+++ b/programs/size_checker/main.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <fc/io/json.hpp>
+#include <fc/smart_ref_impl.hpp>
 #include <fc/variant.hpp>
 #include <fc/variant_object.hpp>
 
diff --git a/tests/app/main.cpp b/tests/app/main.cpp
index bad909fc..1de4dc3e 100644
--- a/tests/app/main.cpp
+++ b/tests/app/main.cpp
@@ -27,6 +27,7 @@
 #include <graphene/account_history/account_history_plugin.hpp>
 
 #include <fc/thread/thread.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 #include <boost/filesystem/path.hpp>
 
diff --git a/tests/benchmarks/genesis_allocation.cpp b/tests/benchmarks/genesis_allocation.cpp
index 033a4350..eb93700a 100644
--- a/tests/benchmarks/genesis_allocation.cpp
+++ b/tests/benchmarks/genesis_allocation.cpp
@@ -22,6 +22,7 @@
 #include <graphene/time/time.hpp>
 
 #include <fc/crypto/digest.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 #include <boost/test/auto_unit_test.hpp>
 
diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp
index e0a643f9..14671b87 100644
--- a/tests/common/database_fixture.hpp
+++ b/tests/common/database_fixture.hpp
@@ -20,6 +20,7 @@
 #include <graphene/app/application.hpp>
 #include <graphene/chain/database.hpp>
 #include <fc/io/json.hpp>
+#include <fc/smart_ref_impl.hpp>
 
 #include <iostream>