diff --git a/.gitmodules b/.gitmodules
index 30cd2f4551..b71046518f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,9 @@
 [submodule "thirdparty/fc"]
 	path = thirdparty/fc
 	url = https://github.com/VIZ-Blockchain/fc.git
-	branch = master
 [submodule "thirdparty/chainbase"]
 	path = thirdparty/chainbase
 	url = https://github.com/VIZ-Blockchain/chainbase.git
-	branch = lib-boost-1.71
 [submodule "thirdparty/appbase"]
 	path = thirdparty/appbase
 	url = https://github.com/VIZ-Blockchain/appbase.git
-	branch = lib-boost-1.71
diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp
index 6c4a8c5456..2f5ed47647 100644
--- a/libraries/chain/include/graphene/chain/fork_database.hpp
+++ b/libraries/chain/include/graphene/chain/fork_database.hpp
@@ -12,7 +12,13 @@
 namespace graphene {
     namespace chain {
         using boost::multi_index_container;
-        using namespace boost::multi_index;
+        using boost::multi_index::indexed_by;
+        using boost::multi_index::hashed_unique;
+        using boost::multi_index::hashed_non_unique;
+        using boost::multi_index::ordered_non_unique;
+        using boost::multi_index::tag;
+        using boost::multi_index::member;
+        using boost::multi_index::const_mem_fun;
 
         using graphene::protocol::signed_block;
         using graphene::protocol::block_id_type;