Avoid boost include order issue on windows:

http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue/16288859#16288859

Make sure boost/asio.hpp is included before windows.h.

11 files changed, 18 insertions, 4 deletions

diff --git a/TestHelper.h b/TestHelper.h
index 3707a5ff..0b80273c 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <functional>
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include "JsonSpiritHeaders.h"
 #include <libethereum/State.h>
diff --git a/checkRandomTest.cpp b/checkRandomTest.cpp
index e3442d43..50c3c367 100644
--- a/checkRandomTest.cpp
+++ b/checkRandomTest.cpp
@@ -20,6 +20,7 @@
  * Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
  */
 
+#include <boost/asio.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Log.h>
diff --git a/createRandomTest.cpp b/createRandomTest.cpp
index fa5ed7bd..da1a028b 100644
--- a/createRandomTest.cpp
+++ b/createRandomTest.cpp
@@ -23,6 +23,7 @@
 #include <string>
 #include <iostream>
 #include <chrono>
+#include <boost/asio.hpp>
 #include <boost/random.hpp>
 #include <boost/filesystem/path.hpp>
 #pragma GCC diagnostic ignored "-Wunused-parameter"
diff --git a/genesis.cpp b/genesis.cpp
index 7ca741ee..a450b79f 100644
--- a/genesis.cpp
+++ b/genesis.cpp
@@ -22,10 +22,14 @@
 
 #include <fstream>
 #include <random>
+
+// Make sure boost/asio.hpp is included before windows.h.
+#include <boost/asio.hpp>
+#include <boost/test/unit_test.hpp>
+
 #include "JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libethereum/CanonBlockChain.h>
-#include <boost/test/unit_test.hpp>
 #include "TestHelper.h"
 
 using namespace std;
diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index 551983db..c96e9e98 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -21,11 +21,12 @@
  */
 
 #include <fstream>
+#include <boost/asio.hpp>
+#include <boost/test/unit_test.hpp>
 #include "JsonSpiritHeaders.h"
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonIO.h>
 #include <libdevcrypto/TrieCommon.h>
-#include <boost/test/unit_test.hpp>
 #include "TestHelper.h"
 
 using namespace std;
diff --git a/net.cpp b/net.cpp
index 5039c543..f842ff1a 100644
--- a/net.cpp
+++ b/net.cpp
@@ -19,6 +19,7 @@
  * @date 2014
  */
 
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/Worker.h>
 #include <libdevcrypto/Common.h>
diff --git a/rlp.cpp b/rlp.cpp
index be098d84..c67f0966 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -22,11 +22,12 @@
 
 #include <fstream>
 #include <sstream>
+#include <boost/asio.hpp>
+#include <boost/test/unit_test.hpp>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
-#include <boost/test/unit_test.hpp>
 #include <algorithm>
 #include "JsonSpiritHeaders.h"
 #include "TestHelper.h"
diff --git a/state.cpp b/state.cpp
index fe133822..99fa36fc 100644
--- a/state.cpp
+++ b/state.cpp
@@ -20,6 +20,7 @@
  * State test functions.
  */
 
+#include <boost/asio.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/test/unit_test.hpp>
 #include "JsonSpiritHeaders.h"
diff --git a/trie.cpp b/trie.cpp
index 39a3a59a..a1571341 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -22,12 +22,13 @@
 
 #include <fstream>
 #include <random>
+#include <boost/asio.hpp>
+#include <boost/test/unit_test.hpp>
 #include "JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libdevcrypto/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
-#include <boost/test/unit_test.hpp>
 #include "TestHelper.h"
 
 using namespace std;
diff --git a/vm.cpp b/vm.cpp
index 16f7385a..423d55ac 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <chrono>
+#include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <libethereum/Executive.h>
 #include <libevm/VMFactory.h>
diff --git a/vm.h b/vm.h
index 0a5b5fb4..ae28213b 100644
--- a/vm.h
+++ b/vm.h
@@ -25,6 +25,7 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <fstream>
 #include <cstdint>
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <json_spirit/json_spirit.h>
 #include <libdevcore/Log.h>