diff --git a/src/broadcast_socket.cpp b/src/broadcast_socket.cpp
index 290dfa1ea..7e8dafce3 100644
--- a/src/broadcast_socket.cpp
+++ b/src/broadcast_socket.cpp
@@ -258,7 +258,10 @@ namespace libtorrent
 			if (!loopback && is_loopback(i->interface_address)) continue;
 
 			ec = error_code();
-#if TORRENT_USE_IPV6
+
+			// if_nametoindex was introduced in vista
+#if TORRENT_USE_IPV6 \
+		&& (!defined TORRENT_WINDOWS || _WIN32_WINNT >= _WIN32_WINNT_VISTA)
 			if (i->interface_address.is_v6() &&
 			    i->interface_address.to_v6().is_link_local()) {
 				address_v6 addr6 = i->interface_address.to_v6();
diff --git a/test/test_dht.cpp b/test/test_dht.cpp
index c65dfbefb..af9e1c670 100644
--- a/test/test_dht.cpp
+++ b/test/test_dht.cpp
@@ -1367,14 +1367,6 @@ int test_main()
 
 	// test traversal algorithms
 
-	dht::key_desc_t ping_desc[] = {
-		{"y", lazy_entry::string_t, 1, 0},
-		{"t", lazy_entry::string_t, 2, 0},
-		{"q", lazy_entry::string_t, 4, 0},
-		{"a", lazy_entry::dict_t, 0, key_desc_t::parse_children},
-			{"id", lazy_entry::string_t, 20, key_desc_t::last_child},
-	};
-
 	dht::key_desc_t find_node_desc[] = {
 		{"y", lazy_entry::string_t, 1, 0},
 		{"t", lazy_entry::string_t, 2, 0},