diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp
index 62126f6d5..5ad89f587 100644
--- a/include/libtorrent/piece_picker.hpp
+++ b/include/libtorrent/piece_picker.hpp
@@ -307,7 +307,7 @@ namespace libtorrent
 
 		// clears the given piece's download flag
 		// this means that this piece-block can be picked again
-		void abort_download(piece_block block, void* peer);
+		void abort_download(piece_block block, void* peer = 0);
 
 		bool is_piece_finished(int index) const;
 
diff --git a/test/test_bandwidth_limiter.cpp b/test/test_bandwidth_limiter.cpp
index 8f0d0785b..bc9846d42 100644
--- a/test/test_bandwidth_limiter.cpp
+++ b/test/test_bandwidth_limiter.cpp
@@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
+#include <math.h>
 
 struct torrent;
 struct peer_connection;
diff --git a/test/test_piece_picker.cpp b/test/test_piece_picker.cpp
index f967af5b7..a4d1d09d4 100644
--- a/test/test_piece_picker.cpp
+++ b/test/test_piece_picker.cpp
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <vector>
 #include <set>
+#include <map>
 #include <iostream>
 
 #include "test.hpp"