diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index a4c8a7b60..966d23128 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <fstream>
+#include <boost/asio.hpp>
 #include <QtNetwork/QNetworkReply>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h
index 638469fbe..cd0c309b3 100644
--- a/alethzero/MainWin.h
+++ b/alethzero/MainWin.h
@@ -26,6 +26,7 @@
 #endif
 
 #include <map>
+#include <boost/asio.hpp>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QMutex>
diff --git a/eth/main.cpp b/eth/main.cpp
index 8014cc0fa..fa164cfda 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <iostream>
 #include <signal.h>
+#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 #include <libdevcrypto/FileSystem.h>
diff --git a/libethereum/All.h b/libethereum/All.h
index 24109cb87..adae84843 100644
--- a/libethereum/All.h
+++ b/libethereum/All.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <boost/asio.hpp>
 #include "Account.h"
 #include "CanonBlockChain.h"
 #include "Client.h"
diff --git a/libethereum/Client.h b/libethereum/Client.h
index 187152672..fbbe9e22c 100644
--- a/libethereum/Client.h
+++ b/libethereum/Client.h
@@ -27,6 +27,7 @@
 #include <atomic>
 #include <string>
 #include <array>
+#include <boost/asio.hpp>
 #include <boost/utility.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
diff --git a/libethereum/EthereumHost.h b/libethereum/EthereumHost.h
index dfa928675..9e2ddf6de 100644
--- a/libethereum/EthereumHost.h
+++ b/libethereum/EthereumHost.h
@@ -28,6 +28,7 @@
 #include <memory>
 #include <utility>
 #include <thread>
+#include <boost/asio.hpp>
 #include <libdevcore/Guards.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/RangeMask.h>
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
index a4f7bcd92..adc408324 100644
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@@ -24,6 +24,7 @@
 #include <chrono>
 #include <thread>
 #include <mutex>
+#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
diff --git a/libp2p/Host.h b/libp2p/Host.h
index 48e678030..ec59d105f 100644
--- a/libp2p/Host.h
+++ b/libp2p/Host.h
@@ -30,6 +30,7 @@
 #include <utility>
 #include <thread>
 #include <chrono>
+#include <boost/asio.hpp>
 #include <libdevcore/Guards.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/RangeMask.h>
diff --git a/libp2p/Network.cpp b/libp2p/Network.cpp
index d0276d67e..b54395aec 100644
--- a/libp2p/Network.cpp
+++ b/libp2p/Network.cpp
@@ -26,6 +26,7 @@
 #include <ifaddrs.h>
 #endif
 
+#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
diff --git a/libp2p/Session.h b/libp2p/Session.h
index 4d55e7d9d..2d5b937bf 100644
--- a/libp2p/Session.h
+++ b/libp2p/Session.h
@@ -27,6 +27,7 @@
 #include <set>
 #include <memory>
 #include <utility>
+#include <boost/asio.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/RangeMask.h>
diff --git a/libwebthree/WebThree.cpp b/libwebthree/WebThree.cpp
index 1cf478746..23dbfe0c4 100644
--- a/libwebthree/WebThree.cpp
+++ b/libwebthree/WebThree.cpp
@@ -23,6 +23,7 @@
 
 #include <chrono>
 #include <thread>
+#include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <libdevcore/Log.h>
 #include <libp2p/Host.h>
diff --git a/libwebthree/WebThree.h b/libwebthree/WebThree.h
index 4a3bee59b..bcccc150c 100644
--- a/libwebthree/WebThree.h
+++ b/libwebthree/WebThree.h
@@ -25,6 +25,7 @@
 #include <mutex>
 #include <list>
 #include <atomic>
+#include <boost/asio.hpp>
 #include <boost/utility.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
diff --git a/libwhisper/Common.h b/libwhisper/Common.h
index 8180b0ec4..61c92f6eb 100644
--- a/libwhisper/Common.h
+++ b/libwhisper/Common.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <chrono>
+#include <boost/asio.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
diff --git a/libwhisper/Interface.h b/libwhisper/Interface.h
index 37651a826..189c3806c 100644
--- a/libwhisper/Interface.h
+++ b/libwhisper/Interface.h
@@ -26,6 +26,7 @@
 #include <set>
 #include <memory>
 #include <utility>
+#include <boost/asio.hpp>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/SHA3.h>
diff --git a/libwhisper/Message.h b/libwhisper/Message.h
index 7e5df5a95..4b457f251 100644
--- a/libwhisper/Message.h
+++ b/libwhisper/Message.h
@@ -26,6 +26,7 @@
 #include <set>
 #include <memory>
 #include <utility>
+#include <boost/asio.hpp>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
diff --git a/libwhisper/WhisperHost.h b/libwhisper/WhisperHost.h
index b6e683778..701f2ef54 100644
--- a/libwhisper/WhisperHost.h
+++ b/libwhisper/WhisperHost.h
@@ -26,6 +26,7 @@
 #include <set>
 #include <memory>
 #include <utility>
+#include <boost/asio.hpp>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/Guards.h>
diff --git a/libwhisper/WhisperPeer.h b/libwhisper/WhisperPeer.h
index 5dd265e5a..0a30accc9 100644
--- a/libwhisper/WhisperPeer.h
+++ b/libwhisper/WhisperPeer.h
@@ -26,6 +26,7 @@
 #include <set>
 #include <memory>
 #include <utility>
+#include <boost/asio.hpp>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/SHA3.h>
diff --git a/mix/AppContext.cpp b/mix/AppContext.cpp
index 29124a39a..513fd3103 100644
--- a/mix/AppContext.cpp
+++ b/mix/AppContext.cpp
@@ -22,6 +22,7 @@
  * - KeyEventManager
  */
 
+#include <boost/asio.hpp>
 #include <QMessageBox>
 #include <QClipboard>
 #include <QQmlComponent>
diff --git a/mix/AppContext.h b/mix/AppContext.h
index 268771207..f7f17ff63 100644
--- a/mix/AppContext.h
+++ b/mix/AppContext.h
@@ -27,6 +27,7 @@
 
 #pragma once
 
+#include <boost/asio.hpp>
 #include <memory>
 #include <QUrl>
 #include <QObject>
diff --git a/mix/CodeEditorExtensionManager.cpp b/mix/CodeEditorExtensionManager.cpp
index 97b808eb2..f81f6648e 100644
--- a/mix/CodeEditorExtensionManager.cpp
+++ b/mix/CodeEditorExtensionManager.cpp
@@ -20,6 +20,7 @@
  * Ethereum IDE client.
  */
 
+#include <boost/asio.hpp>
 #include <QQuickItem>
 #include <QGraphicsObject>
 #include <QQmlEngine>
diff --git a/mix/Extension.cpp b/mix/Extension.cpp
index 8a36751a0..d4a279afa 100644
--- a/mix/Extension.cpp
+++ b/mix/Extension.cpp
@@ -17,13 +17,14 @@
  * Ethereum IDE client.
  */
 
+#include "AppContext.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QQmlApplicationEngine>
 #include <libevm/VM.h>
 #include <libwebthree/WebThree.h>
 #include "Extension.h"
-#include "AppContext.h"
+
 using namespace dev;
 using namespace dev::mix;
 
diff --git a/mix/Extension.h b/mix/Extension.h
index 98daf2918..b42fd99a2 100644
--- a/mix/Extension.h
+++ b/mix/Extension.h
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <boost/asio.hpp>
 #include <QApplication>
 #include <QQmlComponent>
 
diff --git a/mix/QContractDefinition.cpp b/mix/QContractDefinition.cpp
index eacaee2f9..ca617955c 100644
--- a/mix/QContractDefinition.cpp
+++ b/mix/QContractDefinition.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <QObject>
+#include <boost/asio.hpp>
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Scanner.h>
diff --git a/neth/main.cpp b/neth/main.cpp
index ca25b8d11..b6ab5a209 100644
--- a/neth/main.cpp
+++ b/neth/main.cpp
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <iostream>
 #include <signal.h>
+#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 #include <libdevcrypto/FileSystem.h>
diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp
index f82b72b88..4ee53f88e 100644
--- a/test/TestHelper.cpp
+++ b/test/TestHelper.cpp
@@ -23,6 +23,7 @@
 
 #include <thread>
 #include <chrono>
+#include <boost/asio.hpp>
 #include <boost/filesystem/path.hpp>
 #include <libethereum/Client.h>
 #include <liblll/Compiler.h>
diff --git a/test/fork.cpp b/test/fork.cpp
index bc6ed87bc..934583164 100644
--- a/test/fork.cpp
+++ b/test/fork.cpp
@@ -19,7 +19,7 @@
  * @date 2014
  * Tests for different forking behavior
  */
-
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <libethereum/Client.h>
diff --git a/test/txTest.cpp b/test/txTest.cpp
index 8d067f9bb..dcb2515af 100644
--- a/test/txTest.cpp
+++ b/test/txTest.cpp
@@ -19,7 +19,7 @@
  * @date 2014
  * Simple peer transaction send test.
  */
-
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <libethereum/Client.h>
diff --git a/test/whisperTopic.cpp b/test/whisperTopic.cpp
index 4609c957d..2f90b4fb9 100644
--- a/test/whisperTopic.cpp
+++ b/test/whisperTopic.cpp
@@ -19,6 +19,7 @@
  * @date 2014
  */
 #include <functional>
+#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <libp2p/Host.h>
 #include <libwhisper/WhisperPeer.h>
diff --git a/third/MainWin.cpp b/third/MainWin.cpp
index 5fb5074bc..c91c416d8 100644
--- a/third/MainWin.cpp
+++ b/third/MainWin.cpp
@@ -20,6 +20,11 @@
  */
 
 #include <fstream>
+
+// Make sure boost/asio.hpp is included before windows.h.
+#include <boost/asio.hpp>
+#include <boost/algorithm/string.hpp>
+
 #include <QtNetwork/QNetworkReply>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
@@ -27,7 +32,6 @@
 #include <QtWebKitWidgets/QWebFrame>
 #include <QtGui/QClipboard>
 #include <QtCore/QtCore>
-#include <boost/algorithm/string.hpp>
 #include <libserpent/funcs.h>
 #include <libserpent/util.h>
 #include <libdevcrypto/FileSystem.h>
@@ -112,7 +116,7 @@ Main::Main(QWidget *parent) :
 	statusBar()->addPermanentWidget(ui->peerCount);
 	statusBar()->addPermanentWidget(ui->mineStatus);
 	statusBar()->addPermanentWidget(ui->blockCount);
-	
+
 	connect(ui->ourAccounts->model(), SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)), SLOT(ourAccountsRowsMoved()));
 
 	bytesConstRef networkConfig((byte*)m_networkConfig.data(), m_networkConfig.size());
@@ -124,7 +128,7 @@ Main::Main(QWidget *parent) :
 //	m_server = unique_ptr<WebThreeStubServer>(new WebThreeStubServer(m_httpConnector, *web3(), keysAsVector(m_myKeys)));
 	m_server->setIdentities(keysAsVector(owned()));
 	m_server->StartListening();
-	
+
 	connect(ui->webView, &QWebView::loadStarted, [this]()
 	{
 		QWebFrame* f = ui->webView->page()->mainFrame();
@@ -138,16 +142,16 @@ Main::Main(QWidget *parent) :
 			f->evaluateJavaScript(contentsOfQResource(":/js/setup.js"));
 		});
 	});
-	
+
 	connect(ui->webView, &QWebView::loadFinished, [=]()
 	{
 	});
-	
+
 	connect(ui->webView, &QWebView::titleChanged, [=]()
 	{
 		ui->tabWidget->setTabText(0, ui->webView->title());
 	});
-	
+
 	readSettings();
 
 	installWatches();
@@ -521,7 +525,7 @@ void Main::timerEvent(QTimerEvent*)
 	// 7/18, Alex: aggregating timers, prelude to better threading?
 	// Runs much faster on slower dual-core processors
 	static int interval = 100;
-	
+
 	// refresh mining every 200ms
 	if (interval / 100 % 2 == 0)
 		refreshMining();