move includes around to lessen overall load

22 files changed, 87 insertions, 75 deletions

diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 6d369d4d8..4ea3fa54b 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include "misc_log_ex.h"
+#include "string_tools.h"
 #include <atomic>
 #include <condition_variable>
 #include <functional>
@@ -37,6 +38,8 @@
 #include <stdio.h>
 #endif
 #include <boost/thread.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
 
 #ifdef HAVE_READLINE
   #include "readline_buffer.h"
diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
index c387743a6..f037b4dd5 100644
--- a/contrib/epee/include/file_io_utils.h
+++ b/contrib/epee/include/file_io_utils.h
@@ -29,7 +29,8 @@
 #define _FILE_IO_UTILS_H_
 
 #include <iostream>
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 
 namespace epee
 {
@@ -63,7 +64,7 @@ namespace file_io_utils
 	}
 
 	inline
-	bool get_file_time(const std::string& path_to_file, OUT time_t& ft)
+	bool get_file_time(const std::string& path_to_file, time_t& ft)
 	{
 		boost::system::error_code ec;
 		ft = boost::filesystem::last_write_time(boost::filesystem::path(path_to_file), ec);
diff --git a/contrib/epee/include/math_helper.h b/contrib/epee/include/math_helper.h
index 90398acbb..ef839f609 100644
--- a/contrib/epee/include/math_helper.h
+++ b/contrib/epee/include/math_helper.h
@@ -37,6 +37,7 @@
 #include <boost/uuid/random_generator.hpp>
 
 #include "misc_os_dependent.h"
+#include "syncobj.h"
 
 namespace epee
 {
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index 67fd93206..35ec0950b 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -28,26 +28,7 @@
 #ifndef _MISC_LOG_EX_H_
 #define _MISC_LOG_EX_H_
 
-#include "static_initializer.h"
-#include "string_tools.h"
-#include "time_helper.h"
-#include "misc_os_dependent.h"
-
-#include "syncobj.h"
-
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <fstream>
-#include <algorithm>
-#include <list>
-#include <map>
 #include <string>
-#include <time.h>
-#include <boost/cstdint.hpp>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
 
 #include "easylogging++.h"
 
diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h
index 69ded09e5..81cecf714 100644
--- a/contrib/epee/include/misc_os_dependent.h
+++ b/contrib/epee/include/misc_os_dependent.h
@@ -42,6 +42,9 @@
 #include <mach/mach.h>
 #endif
 
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+
 #pragma once 
 namespace epee
 {
diff --git a/contrib/epee/include/net/http_client.h b/contrib/epee/include/net/http_client.h
index d77c84c28..1a9d5d064 100644
--- a/contrib/epee/include/net/http_client.h
+++ b/contrib/epee/include/net/http_client.h
@@ -50,6 +50,7 @@
 #include "http_auth.h"
 #include "to_nonconst_iterator.h"
 #include "net_parse_helpers.h"
+#include "syncobj.h"
 
 //#include "shlwapi.h"
 
diff --git a/contrib/epee/include/net/http_client_base.h b/contrib/epee/include/net/http_client_base.h
index f5fb57d03..c3da28718 100644
--- a/contrib/epee/include/net/http_client_base.h
+++ b/contrib/epee/include/net/http_client_base.h
@@ -38,8 +38,8 @@ namespace epee
       virtual ~i_sub_handler(){}
 
       virtual bool update_in( std::string& piece_of_transfer)=0;
-      virtual void stop(std::string& OUT collect_remains)=0;
-      virtual bool update_and_stop(std::string& OUT collect_remains, bool& is_changed)
+      virtual void stop(std::string& collect_remains)=0;
+      virtual bool update_and_stop(std::string& collect_remains, bool& is_changed)
       {
         is_changed = true;
         bool res = this->update_in(collect_remains);
@@ -66,7 +66,7 @@ namespace epee
       {
         return m_powner_filter->handle_target_data(piece_of_transfer);
       }
-      virtual void stop(std::string& OUT collect_remains)
+      virtual void stop(std::string& collect_remains)
       {
 
       }
diff --git a/contrib/epee/include/net/levin_protocol_handler_async.h b/contrib/epee/include/net/levin_protocol_handler_async.h
index 7ad6d198b..7b526e4e7 100644
--- a/contrib/epee/include/net/levin_protocol_handler_async.h
+++ b/contrib/epee/include/net/levin_protocol_handler_async.h
@@ -35,6 +35,8 @@
 
 #include "levin_base.h"
 #include "misc_language.h"
+#include "syncobj.h"
+#include "misc_os_dependent.h"
 
 #include <random>
 #include <chrono>
diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h
index ee0e13fc1..2c2efcd82 100644
--- a/contrib/epee/include/net/net_helper.h
+++ b/contrib/epee/include/net/net_helper.h
@@ -31,23 +31,16 @@
 
 //#include <Winsock2.h>
 //#include <Ws2tcpip.h>
-#include <boost/lexical_cast.hpp>
-#include <iostream>
-#include <istream>
-#include <ostream>
 #include <string>
 #include <boost/version.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include <boost/preprocessor/selection/min.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/interprocess/detail/atomic.hpp>
 #include "net/net_utils_base.h"
 #include "misc_language.h"
-//#include "profile_tools.h"
-#include "../string_tools.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "net"
diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h
index 04e3fe6a4..7615786be 100644
--- a/contrib/epee/include/net/net_utils_base.h
+++ b/contrib/epee/include/net/net_utils_base.h
@@ -29,13 +29,11 @@
 #ifndef _NET_UTILS_BASE_H_
 #define _NET_UTILS_BASE_H_
 
-#include <boost/asio/io_service.hpp>
 #include <boost/uuid/uuid.hpp>
-#include <memory>
+#include <boost/asio/io_service.hpp>
 #include <typeinfo>
 #include <type_traits>
 #include "serialization/keyvalue_serialization.h"
-#include "string_tools.h"
 #include "misc_log_ex.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -45,7 +43,6 @@
 #define MAKE_IP( a1, a2, a3, a4 )	(a1|(a2<<8)|(a3<<16)|(a4<<24))
 #endif
 
-
 namespace epee
 {
 namespace net_utils
@@ -214,19 +211,8 @@ namespace net_utils
 	inline bool operator>=(const network_address& lhs, const network_address& rhs)
 	{ return !lhs.less(rhs); }
 
-	inline bool create_network_address(network_address &address, const std::string &string, uint16_t default_port = 0)
-	{
-		uint32_t ip;
-		uint16_t port;
-		if (epee::string_tools::parse_peer_from_string(ip, port, string))
-		{
-			if (default_port && !port)
-				port = default_port;
-			address = ipv4_network_address{ip, port};
-			return true;
-		}
-		return false;
-	}
+	bool create_network_address(network_address &address, const std::string &string, uint16_t default_port = 0);
+
 	/************************************************************************/
 	/*                                                                      */
 	/************************************************************************/
@@ -309,21 +295,8 @@ namespace net_utils
   //some helpers
 
 
-  inline 
-    std::string print_connection_context(const connection_context_base& ctx)
-  {
-    std::stringstream ss;
-    ss << ctx.m_remote_address.str() << " " << epee::string_tools::get_str_from_guid_a(ctx.m_connection_id) << (ctx.m_is_income ? " INC":" OUT");
-    return ss.str();
-  }
-
-  inline 
-    std::string print_connection_context_short(const connection_context_base& ctx)
-  {
-    std::stringstream ss;
-    ss << ctx.m_remote_address.str() << (ctx.m_is_income ? " INC":" OUT");
-    return ss.str();
-  }
+  std::string print_connection_context(const connection_context_base& ctx);
+  std::string print_connection_context_short(const connection_context_base& ctx);
 
 inline MAKE_LOGGABLE(connection_context_base, ct, os)
 {
diff --git a/contrib/epee/include/profile_tools.h b/contrib/epee/include/profile_tools.h
index f285fe48b..a0b5f77f4 100644
--- a/contrib/epee/include/profile_tools.h
+++ b/contrib/epee/include/profile_tools.h
@@ -28,6 +28,8 @@
 #ifndef _PROFILE_TOOLS_H_
 #define _PROFILE_TOOLS_H_
 
+#include "misc_os_dependent.h"
+
 namespace epee
 {
 
diff --git a/contrib/epee/include/readline_buffer.h b/contrib/epee/include/readline_buffer.h
index cda7e34f9..87c8826cb 100644
--- a/contrib/epee/include/readline_buffer.h
+++ b/contrib/epee/include/readline_buffer.h
@@ -2,9 +2,7 @@
 
 #include <streambuf>
 #include <sstream>
-#include <iostream>
 #include <vector>
-#include <algorithm>
 
 namespace rdln
 {
diff --git a/contrib/epee/include/reg_exp_definer.h b/contrib/epee/include/reg_exp_definer.h
index e2bed5c3f..eb11c9e10 100644
--- a/contrib/epee/include/reg_exp_definer.h
+++ b/contrib/epee/include/reg_exp_definer.h
@@ -29,7 +29,7 @@
 #define _REG_EXP_DEFINER_H_
 
 #include <boost/interprocess/detail/atomic.hpp>
-
+#include "syncobj.h"
 
 namespace epee
 {
diff --git a/contrib/epee/include/serialization/keyvalue_serialization_overloads.h b/contrib/epee/include/serialization/keyvalue_serialization_overloads.h
index 2e020b136..7087136cc 100644
--- a/contrib/epee/include/serialization/keyvalue_serialization_overloads.h
+++ b/contrib/epee/include/serialization/keyvalue_serialization_overloads.h
@@ -26,6 +26,13 @@
 
 #pragma once
 
+#include <set>
+#include <list>
+#include <vector>
+#include <deque>
+#include <boost/mpl/vector.hpp>
+#include <boost/mpl/contains_fwd.hpp>
+
 namespace epee
 {
   namespace serialization
diff --git a/contrib/epee/include/storages/portable_storage_from_json.h b/contrib/epee/include/storages/portable_storage_from_json.h
index 04b57376c..727f36552 100644
--- a/contrib/epee/include/storages/portable_storage_from_json.h
+++ b/contrib/epee/include/storages/portable_storage_from_json.h
@@ -25,6 +25,8 @@
 // 
 
 #pragma once
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include "parserse_base_utils.h"
 #include "file_io_utils.h"
 
diff --git a/contrib/epee/include/storages/portable_storage_to_bin.h b/contrib/epee/include/storages/portable_storage_to_bin.h
index 38e9f9098..9501bbc2a 100644
--- a/contrib/epee/include/storages/portable_storage_to_bin.h
+++ b/contrib/epee/include/storages/portable_storage_to_bin.h
@@ -28,6 +28,7 @@
 
 #pragma once 
 
+#include "pragma_comp_defs.h"
 #include "misc_language.h"
 #include "portable_storage_base.h"
 
diff --git a/contrib/epee/include/storages/portable_storage_val_converters.h b/contrib/epee/include/storages/portable_storage_val_converters.h
index f4a16cfae..52aa09eba 100644
--- a/contrib/epee/include/storages/portable_storage_val_converters.h
+++ b/contrib/epee/include/storages/portable_storage_val_converters.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <regex>
+#include <boost/regex.hpp>
 
 #include "misc_language.h"
 #include "portable_storage_base.h"
@@ -146,7 +146,7 @@ POP_WARNINGS
         if(std::all_of(from.begin(), from.end(), ::isdigit))
           to = boost::lexical_cast<uint64_t>(from);
         // MyMonero ISO 8061 timestamp (2017-05-06T16:27:06Z)
-        else if (std::regex_match (from, std::regex("\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\dZ")))
+        else if (boost::regex_match (from, boost::regex("\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\dZ")))
         {
           // Convert to unix timestamp
           std::tm tm = {};
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h
index 25639263c..307323aa1 100644
--- a/contrib/epee/include/string_tools.h
+++ b/contrib/epee/include/string_tools.h
@@ -35,15 +35,15 @@
 # include <windows.h>
 #endif
 
+#include <string.h>
 #include <locale>
 #include <cstdlib>
 #include <string>
 #include <type_traits>
-#include <regex>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include "hex.h"
 #include "span.h"
 #include "warnings.h"
@@ -350,11 +350,8 @@ POP_WARNINGS
     s = *(t_pod_type*)bin_buff.data();
     return true;
   }
-	//----------------------------------------------------------------------------
-	inline bool validate_hex(uint64_t length, const std::string& str)
-	{
-		return std::regex_match(str, std::regex("'^[0-9abcdefABCDEF]+$'")) && str.size() == length;
-	}
+  //----------------------------------------------------------------------------
+  bool validate_hex(uint64_t length, const std::string& str);
   //----------------------------------------------------------------------------
 	inline std::string get_extension(const std::string& str)
 	{
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 74b7dd2f4..a30efbc6a 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -28,7 +28,11 @@
 #ifndef _MLOG_H_
 #define _MLOG_H_
 
+#include <time.h>
 #include <atomic>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include "string_tools.h"
 #include "misc_log_ex.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
diff --git a/contrib/epee/src/net_utils_base.cpp b/contrib/epee/src/net_utils_base.cpp
index 22afcf819..2f4015e81 100644
--- a/contrib/epee/src/net_utils_base.cpp
+++ b/contrib/epee/src/net_utils_base.cpp
@@ -1,5 +1,6 @@
 
 #include "net/net_utils_base.h"
+#include "string_tools.h"
 
 #include <cstring>
 #include <typeindex>
@@ -56,5 +57,34 @@ namespace epee { namespace net_utils
 		if (typeid(*self_) != typeid(*other_self)) return false;
 		return self_->is_same_host(*other_self);
 	}
+
+	bool create_network_address(network_address &address, const std::string &string, uint16_t default_port)
+	{
+		uint32_t ip;
+		uint16_t port;
+		if (epee::string_tools::parse_peer_from_string(ip, port, string))
+		{
+			if (default_port && !port)
+				port = default_port;
+			address = ipv4_network_address{ip, port};
+			return true;
+		}
+		return false;
+	}
+
+  std::string print_connection_context(const connection_context_base& ctx)
+  {
+    std::stringstream ss;
+    ss << ctx.m_remote_address.str() << " " << epee::string_tools::get_str_from_guid_a(ctx.m_connection_id) << (ctx.m_is_income ? " INC":" OUT");
+    return ss.str();
+  }
+
+  std::string print_connection_context_short(const connection_context_base& ctx)
+  {
+    std::stringstream ss;
+    ss << ctx.m_remote_address.str() << (ctx.m_is_income ? " INC":" OUT");
+    return ss.str();
+  }
+
 }}
 
diff --git a/contrib/epee/src/readline_buffer.cpp b/contrib/epee/src/readline_buffer.cpp
index 291bba94c..00c2ddd62 100644
--- a/contrib/epee/src/readline_buffer.cpp
+++ b/contrib/epee/src/readline_buffer.cpp
@@ -3,6 +3,7 @@
 #include <readline/history.h>
 #include <sys/select.h>
 #include <unistd.h>
+#include <iostream>
 #include <boost/thread.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/contrib/epee/src/string_tools.cpp b/contrib/epee/src/string_tools.cpp
index d04b16b75..fd0254016 100644
--- a/contrib/epee/src/string_tools.cpp
+++ b/contrib/epee/src/string_tools.cpp
@@ -26,6 +26,8 @@
 
 #include "string_tools.h"
 
+#include <ctype.h>
+
 #ifdef _WIN32
 # include <winsock2.h>
 #else
@@ -56,6 +58,16 @@ namespace string_tools
 
     return true;
   }
+  //----------------------------------------------------------------------------
+  bool validate_hex(uint64_t length, const std::string& str)
+  {
+    if (str.size() != length)
+      return false;
+    for (char c: str)
+      if (!isxdigit(c))
+        return false;
+    return true;
+  }
 }
 }