Merge pull request #6516

8656a8c9f remove double includes (sumogr)

contrib/epee/include/net/abstract_tcp_server2.h

@@ -48,12 +48,9 @@
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/array.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp> //! \TODO Convert to std::shared_ptr
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/thread/thread.hpp>
-#include <memory>
 #include "byte_slice.h"
 #include "net_utils_base.h"
 #include "syncobj.h"

contrib/epee/include/net/network_throttle.hpp

@@ -44,10 +44,7 @@
 #include <boost/shared_ptr.hpp>
 #include <atomic>
 
-#include <boost/asio.hpp>
 #include <boost/array.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/thread/thread.hpp>
@@ -63,7 +60,6 @@
 #include <boost/utility/value_init.hpp>
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/thread/thread.hpp> 
 #include "misc_language.h"
 #include "pragma_comp_defs.h"
 #include <sstream>

src/daemon/daemon.cpp

@@ -43,7 +43,6 @@
 #include "daemon/protocol.h"
 #include "daemon/rpc.h"
 #include "daemon/command_server.h"
-#include "daemon/command_server.h"
 #include "daemon/command_line_args.h"
 #include "net/net_ssl.h"
 #include "version.h"

src/wallet/message_transporter.h

@@ -31,7 +31,6 @@
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_basic/cryptonote_boost_serialization.h"
 #include "cryptonote_basic/account_boost_serialization.h"
-#include "cryptonote_basic/cryptonote_basic.h"
 #include "net/http_server_impl_base.h"
 #include "net/http_client.h"
 #include "net/abstract_http_client.h"

tests/core_proxy/core_proxy.cpp

@@ -47,7 +47,6 @@
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler.inl"
 #include "core_proxy.h"
-#include "version.h"
 
 #if defined(WIN32)
 #include <crtdbg.h>

tests/unit_tests/mnemonics.cpp

@@ -49,9 +49,7 @@
 #include "mnemonics/esperanto.h"
 #include "mnemonics/lojban.h"
 #include "mnemonics/english_old.h"
-#include "mnemonics/language_base.h"
 #include "mnemonics/singleton.h"
-#include <boost/algorithm/string.hpp>
 
 namespace
 {