Merge pull request #8205

0d6fce8 Compil. time: cryptonote_core minus portable_storage header (mj-xmr)

src/cryptonote_core/cryptonote_core.h

@@ -40,7 +40,6 @@
 #include "cryptonote_core/i_core_events.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler_common.h"
 #include "cryptonote_protocol/enums.h"
-#include "storages/portable_storage_template_helper.h"
 #include "common/download.h"
 #include "common/command_line.h"
 #include "tx_pool.h"

tests/core_tests/chaingen_main.cpp

@@ -35,6 +35,8 @@
 #include "tx_pool.h"
 #include "transaction_tests.h"
 
+#include <boost/regex.hpp>
+
 namespace po = boost::program_options;
 
 namespace