diff --git a/include/libtorrent/identify_client.hpp b/include/libtorrent/identify_client.hpp
index 7f313ee8f..e8cb3b930 100755
--- a/include/libtorrent/identify_client.hpp
+++ b/include/libtorrent/identify_client.hpp
@@ -33,6 +33,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_IDENTIFY_CLIENT_HPP_INCLUDED
 #define TORRENT_IDENTIFY_CLIENT_HPP_INCLUDED
 
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#endif
+
+#include <boost/optional.hpp>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/fingerprint.hpp"
 #include "libtorrent/config.hpp"
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 6c6fc6647..03d18e87f 100755
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -1096,7 +1096,6 @@ namespace libtorrent
 #ifndef NDEBUG
 		m_policy->check_invariant();
 #endif
-
 	}
 
 	void torrent::disconnect_all()
diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp
index 0a1bc56fb..6355d8e34 100644
--- a/test/test_ip_filter.cpp
+++ b/test/test_ip_filter.cpp
@@ -19,8 +19,8 @@ void test_rules_invariant(std::vector<ip_filter::ip_range> const& r, ip_filter c
 	TEST_CHECK(!r.empty());
 	if (r.empty()) return;
 
-	TEST_CHECK(r.front().first == address("0.0.0.0"));
-	TEST_CHECK(r.back().last == address("255.255.255.255"));
+	TEST_CHECK(r.front().first == address::from_string("0.0.0.0"));
+	TEST_CHECK(r.back().last == address::from_string("255.255.255.255"));
 	
 	iterator i = r.begin();
 	iterator j = boost::next(i);
@@ -41,15 +41,15 @@ int test_main()
 	// **** test joining of ranges at the end ****
 	ip_filter::ip_range expected1[] =
 	{
-		{address("0.0.0.0"), address("0.255.255.255"), 0}
-		, {address("1.0.0.0"), address("3.0.0.0"), ip_filter::blocked}
-		, {address("3.0.0.1"), address("255.255.255.255"), 0}
+		{address::from_string("0.0.0.0"), address::from_string("0.255.255.255"), 0}
+		, {address::from_string("1.0.0.0"), address::from_string("3.0.0.0"), ip_filter::blocked}
+		, {address::from_string("3.0.0.1"), address::from_string("255.255.255.255"), 0}
 	};
 	
 	{
 		ip_filter f;
-		f.add_rule(address("1.0.0.0"), address("2.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("2.0.0.1"), address("3.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked);
 
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -62,8 +62,8 @@ int test_main()
 
 	{
 		ip_filter f;
-		f.add_rule(address("2.0.0.1"), address("3.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("1.0.0.0"), address("2.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked);
 
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -77,8 +77,8 @@ int test_main()
 
 	{
 		ip_filter f;
-		f.add_rule(address("2.0.0.1"), address("3.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("1.0.0.0"), address("2.4.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.4.0.0"), ip_filter::blocked);
 
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -92,8 +92,8 @@ int test_main()
 
 	{
 		ip_filter f;
-		f.add_rule(address("1.0.0.0"), address("2.4.0.0"), ip_filter::blocked);
-		f.add_rule(address("2.0.0.1"), address("3.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.4.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked);
 
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -107,12 +107,12 @@ int test_main()
 
 	{
 		ip_filter f;
-		f.add_rule(address("1.0.0.0"), address("2.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("3.0.0.0"), address("4.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("5.0.0.0"), address("6.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("7.0.0.0"), address("8.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("3.0.0.0"), address::from_string("4.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("5.0.0.0"), address::from_string("6.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("7.0.0.0"), address::from_string("8.0.0.0"), ip_filter::blocked);
 
-		f.add_rule(address("1.0.1.0"), address("9.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.1.0"), address::from_string("9.0.0.0"), ip_filter::blocked);
 		
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -120,9 +120,9 @@ int test_main()
 		TEST_CHECK(range.size() == 3);
 		ip_filter::ip_range expected[] =
 		{
-			{address("0.0.0.0"), address("0.255.255.255"), 0}
-			, {address("1.0.0.0"), address("9.0.0.0"), ip_filter::blocked}
-			, {address("9.0.0.1"), address("255.255.255.255"), 0}
+			{address::from_string("0.0.0.0"), address::from_string("0.255.255.255"), 0}
+			, {address::from_string("1.0.0.0"), address::from_string("9.0.0.0"), ip_filter::blocked}
+			, {address::from_string("9.0.0.1"), address::from_string("255.255.255.255"), 0}
 		};
 	
 		TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare));
@@ -132,12 +132,12 @@ int test_main()
 
 	{
 		ip_filter f;
-		f.add_rule(address("1.0.0.0"), address("2.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("3.0.0.0"), address("4.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("5.0.0.0"), address("6.0.0.0"), ip_filter::blocked);
-		f.add_rule(address("7.0.0.0"), address("8.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("3.0.0.0"), address::from_string("4.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("5.0.0.0"), address::from_string("6.0.0.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("7.0.0.0"), address::from_string("8.0.0.0"), ip_filter::blocked);
 
-		f.add_rule(address("0.0.1.0"), address("7.0.4.0"), ip_filter::blocked);
+		f.add_rule(address::from_string("0.0.1.0"), address::from_string("7.0.4.0"), ip_filter::blocked);
 		
 		range = f.export_filter();
 		test_rules_invariant(range, f);
@@ -145,9 +145,9 @@ int test_main()
 		TEST_CHECK(range.size() == 3);
 		ip_filter::ip_range expected[] =
 		{
-			{address("0.0.0.0"), address("0.0.0.255"), 0}
-			, {address("0.0.1.0"), address("8.0.0.0"), ip_filter::blocked}
-			, {address("8.0.0.1"), address("255.255.255.255"), 0}
+			{address::from_string("0.0.0.0"), address::from_string("0.0.0.255"), 0}
+			, {address::from_string("0.0.1.0"), address::from_string("8.0.0.0"), ip_filter::blocked}
+			, {address::from_string("8.0.0.1"), address::from_string("255.255.255.255"), 0}
 		};
 	
 		TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare));
diff --git a/test/test_metadata_extension.cpp b/test/test_metadata_extension.cpp
index 55c4b0d22..e17949bd8 100644
--- a/test/test_metadata_extension.cpp
+++ b/test/test_metadata_extension.cpp
@@ -42,7 +42,7 @@ void test_transfer(char const* tracker_url, libtorrent::torrent_info const& t)
 	}
 
 	std::cerr << "connecting peer\n";
-	tor1.connect_peer(tcp::endpoint(ses2.listen_port(), "127.0.0.1"));	
+	tor1.connect_peer(tcp::endpoint(address::from_string("127.0.0.1"), ses2.listen_port()));
 
 	for (int i = 0; i < 50; ++i)
 	{
diff --git a/test/test_piece_picker.cpp b/test/test_piece_picker.cpp
index 5c10fa8ad..efa120308 100644
--- a/test/test_piece_picker.cpp
+++ b/test/test_piece_picker.cpp
@@ -138,9 +138,9 @@ int test_main()
 
 		// we have block 0 and 2 already, so we can't mark
 		// them as begin downloaded. 
-		p.mark_as_downloading(piece_block(1, 1), tcp::endpoint(0, address("1.1.1.1")));
-		p.mark_as_downloading(piece_block(1, 3), tcp::endpoint(0, address("1.1.1.1")));
-		p.mark_as_downloading(piece_block(2, 0), tcp::endpoint(0, address("1.1.1.1")));
+		p.mark_as_downloading(piece_block(1, 1), tcp::endpoint(address::from_string("1.1.1.1"), 0));
+		p.mark_as_downloading(piece_block(1, 3), tcp::endpoint(address::from_string("1.1.1.1"), 0));
+		p.mark_as_downloading(piece_block(2, 0), tcp::endpoint(address::from_string("1.1.1.1"), 0));
 
 		std::vector<piece_picker::downloading_piece> const& downloads = p.get_download_queue();
 		TEST_CHECK(downloads.size() == 2);
@@ -221,7 +221,7 @@ int test_main()
 		// to make sure it can still fall back on partial pieces
 
 		picked.clear();
-		p.pick_pieces(peer1, picked, 100, true, tcp::endpoint(0, address("1.1.1.1")));
+		p.pick_pieces(peer1, picked, 100, true, tcp::endpoint(address::from_string("1.1.1.1"), 0));
 
 		TEST_CHECK(picked.size() == 11);