move includes around to lessen overall load

40 files changed, 112 insertions, 80 deletions

diff --git a/src/blockchain_db/berkeleydb/db_bdb.h b/src/blockchain_db/berkeleydb/db_bdb.h
index a040a70ef..dd78d951f 100644
--- a/src/blockchain_db/berkeleydb/db_bdb.h
+++ b/src/blockchain_db/berkeleydb/db_bdb.h
@@ -28,7 +28,7 @@
 #include <db_cxx.h>
 
 #include "blockchain_db/blockchain_db.h"
-#include "cryptonote_protocol/blobdatatype.h" // for type blobdata
+#include "cryptonote_basic/blobdatatype.h" // for type blobdata
 
 #include <unordered_map>
 #include <condition_variable>
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index 2fb43a4ba..07b2451b0 100644
--- a/src/blockchain_db/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -28,6 +28,7 @@
 
 #include <boost/range/adaptor/reversed.hpp>
 
+#include "string_tools.h"
 #include "blockchain_db.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
 #include "profile_tools.h"
diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index 79676b808..88034a927 100644
--- a/src/blockchain_db/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
@@ -36,7 +36,7 @@
 #include <boost/program_options.hpp>
 #include "common/command_line.h"
 #include "crypto/hash.h"
-#include "cryptonote_protocol/blobdatatype.h"
+#include "cryptonote_basic/blobdatatype.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/difficulty.h"
 #include "cryptonote_basic/hardfork.h"
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 865558e07..07a0e67b1 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -34,6 +34,7 @@
 #include <cstring>  // memcpy
 #include <random>
 
+#include "string_tools.h"
 #include "common/util.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
 #include "crypto/crypto.h"
diff --git a/src/blockchain_db/lmdb/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h
index fce8f29ed..85b62b5db 100644
--- a/src/blockchain_db/lmdb/db_lmdb.h
+++ b/src/blockchain_db/lmdb/db_lmdb.h
@@ -29,7 +29,7 @@
 #include <atomic>
 
 #include "blockchain_db/blockchain_db.h"
-#include "cryptonote_protocol/blobdatatype.h" // for type blobdata
+#include "cryptonote_basic/blobdatatype.h" // for type blobdata
 #include "ringct/rctTypes.h"
 #include <boost/thread/tss.hpp>
 
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp
index a50b0bad6..70d1dd696 100644
--- a/src/blockchain_utilities/blockchain_import.cpp
+++ b/src/blockchain_utilities/blockchain_import.cpp
@@ -32,6 +32,7 @@
 #include <fstream>
 
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include "misc_log_ex.h"
 #include "bootstrap_file.h"
 #include "bootstrap_serialization.h"
diff --git a/src/blockchain_utilities/blocksdat_file.h b/src/blockchain_utilities/blocksdat_file.h
index d43811772..3fa3ee29e 100644
--- a/src/blockchain_utilities/blocksdat_file.h
+++ b/src/blockchain_utilities/blocksdat_file.h
@@ -31,8 +31,9 @@
 #include <boost/iostreams/stream_buffer.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/back_inserter.hpp>
-
 #include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/cryptonote_boost_serialization.h"
diff --git a/src/blockchain_utilities/bootstrap_file.h b/src/blockchain_utilities/bootstrap_file.h
index 0926ee2e5..63914dc26 100644
--- a/src/blockchain_utilities/bootstrap_file.h
+++ b/src/blockchain_utilities/bootstrap_file.h
@@ -31,8 +31,9 @@
 #include <boost/iostreams/stream_buffer.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/back_inserter.hpp>
-
 #include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_core/blockchain.h"
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 9be08958c..c66c4f5d6 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -36,15 +36,38 @@ using namespace epee;
 
 #include "common/dns_utils.h"
 #include "include_base_utils.h"
+#include "string_tools.h"
 #include "storages/portable_storage_template_helper.h" // epee json include
-#include <sstream>
-#include <random>
+#include "serialization/keyvalue_serialization.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "checkpoints"
 
 namespace cryptonote
 {
+  /**
+   * @brief struct for loading a checkpoint from json
+   */
+  struct t_hashline
+  {
+    uint64_t height; //!< the height of the checkpoint
+    std::string hash; //!< the hash for the checkpoint
+        BEGIN_KV_SERIALIZE_MAP()
+          KV_SERIALIZE(height)
+          KV_SERIALIZE(hash)
+        END_KV_SERIALIZE_MAP()
+  };
+
+  /**
+   * @brief struct for loading many checkpoints from json
+   */
+  struct t_hash_json {
+    std::vector<t_hashline> hashlines; //!< the checkpoint lines from the file
+        BEGIN_KV_SERIALIZE_MAP()
+          KV_SERIALIZE(hashlines)
+        END_KV_SERIALIZE_MAP()
+  };
+
   //---------------------------------------------------------------------------
   checkpoints::checkpoints()
   {
diff --git a/src/checkpoints/checkpoints.h b/src/checkpoints/checkpoints.h
index a643c5790..3e034f6f0 100644
--- a/src/checkpoints/checkpoints.h
+++ b/src/checkpoints/checkpoints.h
@@ -33,7 +33,6 @@
 #include <vector>
 #include "misc_log_ex.h"
 #include "crypto/hash.h"
-#include "serialization/keyvalue_serialization.h"
 
 #define ADD_CHECKPOINT(h, hash)  CHECK_AND_ASSERT(add_checkpoint(h,  hash), false);
 #define JSON_HASH_FILE_NAME "checkpoints.json"
@@ -187,32 +186,7 @@ namespace cryptonote
     bool load_checkpoints_from_dns(bool testnet = false);
 
   private:
-
-
-    /**
-     * @brief struct for loading a checkpoint from json
-     */
-  struct t_hashline
-  {
-    uint64_t height; //!< the height of the checkpoint
-    std::string hash; //!< the hash for the checkpoint
-        BEGIN_KV_SERIALIZE_MAP()
-          KV_SERIALIZE(height)
-          KV_SERIALIZE(hash)
-        END_KV_SERIALIZE_MAP()
-  };
-
-  /**
-   * @brief struct for loading many checkpoints from json
-   */
-  struct t_hash_json {
-    std::vector<t_hashline> hashlines; //!< the checkpoint lines from the file
-        BEGIN_KV_SERIALIZE_MAP()
-          KV_SERIALIZE(hashlines)
-        END_KV_SERIALIZE_MAP()
-  };
-
     std::map<uint64_t, crypto::hash> m_points; //!< the checkpoints container
-
   };
+
 }
diff --git a/src/common/boost_serialization_helper.h b/src/common/boost_serialization_helper.h
index 4a503d830..f8b21c52e 100644
--- a/src/common/boost_serialization_helper.h
+++ b/src/common/boost_serialization_helper.h
@@ -33,6 +33,7 @@
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/portable_binary_oarchive.hpp>
 #include <boost/archive/portable_binary_iarchive.hpp>
+#include <boost/filesystem/operations.hpp>
 
 
 namespace tools
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index f549218cb..d942ae9d0 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -34,6 +34,8 @@
 #include "include_base_utils.h"
 #include <random>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 using namespace epee;
 namespace bf = boost::filesystem;
 
diff --git a/src/common/perf_timer.cpp b/src/common/perf_timer.cpp
index 3b68485d9..4947058d3 100644
--- a/src/common/perf_timer.cpp
+++ b/src/common/perf_timer.cpp
@@ -26,6 +26,8 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <vector>
+#include "misc_os_dependent.h"
 #include "perf_timer.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -35,7 +37,8 @@ namespace tools
 {
 
 el::Level performance_timer_log_level = el::Level::Debug;
-__thread std::vector<PerformanceTimer*> *performance_timers = NULL;
+
+static __thread std::vector<PerformanceTimer*> *performance_timers = NULL;
 
 void set_performance_timer_log_level(el::Level level)
 {
@@ -48,4 +51,38 @@ void set_performance_timer_log_level(el::Level level)
   performance_timer_log_level = level;
 }
 
+PerformanceTimer::PerformanceTimer(const std::string &s, uint64_t unit, el::Level l): name(s), unit(unit), level(l), started(false)
+{
+  ticks = epee::misc_utils::get_ns_count();
+  if (!performance_timers)
+  {
+    MLOG(level, "PERF             ----------");
+    performance_timers = new std::vector<PerformanceTimer*>();
+  }
+  else
+  {
+    PerformanceTimer *pt = performance_timers->back();
+    if (!pt->started)
+    {
+      MLOG(pt->level, "PERF           " << std::string((performance_timers->size()-1) * 2, ' ') << "  " << pt->name);
+      pt->started = true;
+    }
+  }
+  performance_timers->push_back(this);
+}
+
+PerformanceTimer::~PerformanceTimer()
+{
+  performance_timers->pop_back();
+  ticks = epee::misc_utils::get_ns_count() - ticks;
+  char s[12];
+  snprintf(s, sizeof(s), "%8llu  ", (unsigned long long)ticks / (1000000000 / unit));
+  MLOG(level, "PERF " << s << std::string(performance_timers->size() * 2, ' ') << "  " << name);
+  if (performance_timers->empty())
+  {
+    delete performance_timers;
+    performance_timers = NULL;
+  }
+}
+
 }
diff --git a/src/common/perf_timer.h b/src/common/perf_timer.h
index 4d7d99afb..a1d71609c 100644
--- a/src/common/perf_timer.h
+++ b/src/common/perf_timer.h
@@ -41,44 +41,12 @@ namespace tools
 class PerformanceTimer;
 
 extern el::Level performance_timer_log_level;
-extern __thread std::vector<PerformanceTimer*> *performance_timers;
 
 class PerformanceTimer
 {
 public:
-  PerformanceTimer(const std::string &s, uint64_t unit, el::Level l = el::Level::Debug): name(s), unit(unit), level(l), started(false)
-  {
-    ticks = epee::misc_utils::get_ns_count();
-    if (!performance_timers)
-    {
-      MLOG(level, "PERF             ----------");
-      performance_timers = new std::vector<PerformanceTimer*>();
-    }
-    else
-    {
-      PerformanceTimer *pt = performance_timers->back();
-      if (!pt->started)
-      {
-        MLOG(pt->level, "PERF           " << std::string((performance_timers->size()-1) * 2, ' ') << "  " << pt->name);
-        pt->started = true;
-      }
-    }
-    performance_timers->push_back(this);
-  }
-
-  ~PerformanceTimer()
-  {
-    performance_timers->pop_back();
-    ticks = epee::misc_utils::get_ns_count() - ticks;
-    char s[12];
-    snprintf(s, sizeof(s), "%8llu  ", (unsigned long long)ticks / (1000000000 / unit));
-    MLOG(level, "PERF " << s << std::string(performance_timers->size() * 2, ' ') << "  " << name);
-    if (performance_timers->empty())
-    {
-      delete performance_timers;
-      performance_timers = NULL;
-    }
-  }
+  PerformanceTimer(const std::string &s, uint64_t unit, el::Level l = el::Level::Debug);
+  ~PerformanceTimer();
 
 private:
   std::string name;
diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp
index 6fdf4dd47..bcdf72b60 100644
--- a/src/common/stack_trace.cpp
+++ b/src/common/stack_trace.cpp
@@ -39,6 +39,7 @@
 #ifndef STATICLIB
 #include <dlfcn.h>
 #endif
+#include <boost/algorithm/string.hpp>
 #include "common/stack_trace.h"
 #include "misc_log_ex.h"
 
diff --git a/src/common/updates.cpp b/src/common/updates.cpp
index 141330c2c..eff6754af 100644
--- a/src/common/updates.cpp
+++ b/src/common/updates.cpp
@@ -26,6 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <boost/algorithm/string.hpp>
 #include "misc_log_ex.h"
 #include "util.h"
 #include "dns_utils.h"
diff --git a/src/common/util.cpp b/src/common/util.cpp
index de19fec81..d9e12ffe4 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -54,6 +54,7 @@ using namespace epee;
   #include <sys/stat.h>
 #endif
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include <boost/asio.hpp>
 #include <openssl/sha.h>
 
diff --git a/src/cryptonote_protocol/blobdatatype.h b/src/cryptonote_basic/blobdatatype.h
index 2d12a84af..2d12a84af 100644
--- a/src/cryptonote_protocol/blobdatatype.h
+++ b/src/cryptonote_basic/blobdatatype.h
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp
index 6759f1826..a22c3bdea 100644
--- a/src/cryptonote_basic/cryptonote_format_utils.cpp
+++ b/src/cryptonote_basic/cryptonote_format_utils.cpp
@@ -32,7 +32,9 @@
 using namespace epee;
 
 #include <atomic>
+#include <boost/algorithm/string.hpp>
 #include "wipeable_string.h"
+#include "string_tools.h"
 #include "cryptonote_format_utils.h"
 #include "cryptonote_config.h"
 #include "crypto/crypto.h"
diff --git a/src/cryptonote_basic/cryptonote_format_utils.h b/src/cryptonote_basic/cryptonote_format_utils.h
index 714d80195..cabdb1f5c 100644
--- a/src/cryptonote_basic/cryptonote_format_utils.h
+++ b/src/cryptonote_basic/cryptonote_format_utils.h
@@ -29,7 +29,7 @@
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
 #pragma once
-#include "cryptonote_protocol/cryptonote_protocol_defs.h"
+#include "blobdatatype.h"
 #include "cryptonote_basic_impl.h"
 #include "account.h"
 #include "subaddress_index.h"
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp
index c90ab0f03..670baea50 100644
--- a/src/cryptonote_basic/miner.cpp
+++ b/src/cryptonote_basic/miner.cpp
@@ -32,14 +32,17 @@
 #include <numeric>
 #include <boost/utility/value_init.hpp>
 #include <boost/interprocess/detail/atomic.hpp>
+#include <boost/algorithm/string.hpp>
 #include <boost/limits.hpp>
-#include "misc_language.h"
 #include "include_base_utils.h"
+#include "misc_language.h"
+#include "syncobj.h"
 #include "cryptonote_basic_impl.h"
 #include "cryptonote_format_utils.h"
 #include "file_io_utils.h"
 #include "common/command_line.h"
 #include "string_coding.h"
+#include "string_tools.h"
 #include "storages/portable_storage_template_helper.h"
 #include "boost/logic/tribool.hpp"
 
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 04f1e46a7..8985c11ca 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -28,7 +28,10 @@
 //
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+#include <boost/algorithm/string.hpp>
+
 #include "include_base_utils.h"
+#include "string_tools.h"
 using namespace epee;
 
 #include <unordered_set>
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index 6cb4fc938..1b60f83f0 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -36,7 +36,6 @@
 #include <boost/program_options/variables_map.hpp>
 #include <boost/interprocess/sync/file_lock.hpp>
 
-#include "p2p/net_node_common.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler_common.h"
 #include "storages/portable_storage_template_helper.h"
 #include "common/download.h"
diff --git a/src/cryptonote_core/cryptonote_tx_utils.cpp b/src/cryptonote_core/cryptonote_tx_utils.cpp
index 4afa669fd..662420bef 100644
--- a/src/cryptonote_core/cryptonote_tx_utils.cpp
+++ b/src/cryptonote_core/cryptonote_tx_utils.cpp
@@ -30,6 +30,7 @@
 
 #include <unordered_set>
 #include "include_base_utils.h"
+#include "string_tools.h"
 using namespace epee;
 
 #include "common/apply_permutation.h"
diff --git a/src/cryptonote_protocol/block_queue.cpp b/src/cryptonote_protocol/block_queue.cpp
index 813167400..bfff35456 100644
--- a/src/cryptonote_protocol/block_queue.cpp
+++ b/src/cryptonote_protocol/block_queue.cpp
@@ -31,6 +31,7 @@
 #include <vector>
 #include <unordered_map>
 #include <boost/uuid/nil_generator.hpp>
+#include "string_tools.h"
 #include "cryptonote_protocol_defs.h"
 #include "block_queue.h"
 
diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h
index 7cf7e4a4d..fc2f4c343 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_defs.h
+++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h
@@ -33,7 +33,7 @@
 #include <list>
 #include "serialization/keyvalue_serialization.h"
 #include "cryptonote_basic/cryptonote_basic.h"
-#include "cryptonote_protocol/blobdatatype.h"
+#include "cryptonote_basic/blobdatatype.h"
 namespace cryptonote
 {
 
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 2f9c2b2f9..c8b5abec5 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -59,7 +59,6 @@ set(daemon_private_headers
   rpc_command_executor.h
 
   # cryptonote_protocol
-  ../cryptonote_protocol/blobdatatype.h
   ../cryptonote_protocol/cryptonote_protocol_defs.h
   ../cryptonote_protocol/cryptonote_protocol_handler.h
   ../cryptonote_protocol/cryptonote_protocol_handler.inl
diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp
index 7ff6b2bf3..ecf58e22c 100644
--- a/src/daemon/command_server.cpp
+++ b/src/daemon/command_server.cpp
@@ -26,8 +26,10 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <boost/algorithm/string.hpp>
 #include "cryptonote_config.h"
 #include "version.h"
+#include "string_tools.h"
 #include "daemon/command_server.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index f8acf1357..3bc6ea392 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -30,6 +30,7 @@
 
 #include <memory>
 #include <stdexcept>
+#include <boost/algorithm/string/split.hpp>
 #include "misc_log_ex.h"
 #include "daemon/daemon.h"
 #include "rpc/daemon_handler.h"
diff --git a/src/daemon/executor.h b/src/daemon/executor.h
index 137e7209c..35c9e9b47 100644
--- a/src/daemon/executor.h
+++ b/src/daemon/executor.h
@@ -32,7 +32,6 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <string>
-#include <vector>
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "daemon"
diff --git a/src/debug_utilities/cn_deserialize.cpp b/src/debug_utilities/cn_deserialize.cpp
index 7235ef855..a59c04dc6 100644
--- a/src/debug_utilities/cn_deserialize.cpp
+++ b/src/debug_utilities/cn_deserialize.cpp
@@ -26,6 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <boost/filesystem.hpp>
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/tx_extra.h"
 #include "cryptonote_core/blockchain.h"
diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
index d49d83989..181854e8e 100644
--- a/src/p2p/p2p_protocol_defs.h
+++ b/src/p2p/p2p_protocol_defs.h
@@ -34,6 +34,8 @@
 #include "serialization/keyvalue_serialization.h"
 #include "net/net_utils_base.h"
 #include "misc_language.h"
+#include "string_tools.h"
+#include "time_helper.h"
 #include "cryptonote_config.h"
 #ifdef ALLOW_DEBUG_COMMANDS
 #include "crypto/crypto.h"
diff --git a/src/ringct/rctOps.cpp b/src/ringct/rctOps.cpp
index 8e94b52b3..a7311482c 100644
--- a/src/ringct/rctOps.cpp
+++ b/src/ringct/rctOps.cpp
@@ -28,6 +28,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <boost/lexical_cast.hpp>
 #include "misc_log_ex.h"
 #include "rctOps.h"
 using namespace crypto;
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index c2206c89a..8abca43e4 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -29,6 +29,7 @@
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
 #include "include_base_utils.h"
+#include "string_tools.h"
 using namespace epee;
 
 #include "core_rpc_server.h"
diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp
index 4d3fbf491..6643ce4e4 100644
--- a/src/rpc/daemon_handler.cpp
+++ b/src/rpc/daemon_handler.cpp
@@ -32,7 +32,7 @@
 // but including here for clarity
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_basic/cryptonote_format_utils.h"
-#include "cryptonote_protocol/blobdatatype.h"
+#include "cryptonote_basic/blobdatatype.h"
 #include "ringct/rctSigs.h"
 
 namespace cryptonote
diff --git a/src/rpc/rpc_args.cpp b/src/rpc/rpc_args.cpp
index e03c5472d..ce4070270 100644
--- a/src/rpc/rpc_args.cpp
+++ b/src/rpc/rpc_args.cpp
@@ -30,6 +30,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
+#include <boost/bind.hpp>
 #include "common/command_line.h"
 #include "common/i18n.h"
 
diff --git a/src/serialization/json_object.h b/src/serialization/json_object.h
index 5dca7b249..fc4f528b2 100644
--- a/src/serialization/json_object.h
+++ b/src/serialization/json_object.h
@@ -28,6 +28,7 @@
 
 #pragma once
 
+#include "string_tools.h"
 #include "rapidjson/document.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "rpc/message_data_structs.h"
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 59e759bfc..7b7e371a2 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -28,12 +28,15 @@
 // 
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+#include <numeric>
 #include <random>
 #include <tuple>
 #include <boost/format.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/utility/value_init.hpp>
-#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/split.hpp>
 #include "include_base_utils.h"
 using namespace epee;
 
@@ -49,7 +52,7 @@ using namespace epee;
 #include "profile_tools.h"
 #include "crypto/crypto.h"
 #include "serialization/binary_utils.h"
-#include "cryptonote_protocol/blobdatatype.h"
+#include "cryptonote_basic/blobdatatype.h"
 #include "mnemonics/electrum-words.h"
 #include "common/i18n.h"
 #include "common/util.h"
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index de1bed90c..be8315468 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -59,8 +59,6 @@
 #include "common/password.h"
 #include "node_rpc_proxy.h"
 
-#include <iostream>
-
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "wallet.wallet2"
 
diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp
index e665042d4..91162c4bc 100644
--- a/src/wallet/wallet_args.cpp
+++ b/src/wallet/wallet_args.cpp
@@ -28,6 +28,7 @@
 #include "wallet/wallet_args.h"
 
 #include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/format.hpp>
 #include "common/i18n.h"
 #include "common/util.h"