diff --git a/include/libtorrent/aux_/file_progress.hpp b/include/libtorrent/aux_/file_progress.hpp
index e4a7cd142..22cc0d32c 100644
--- a/include/libtorrent/aux_/file_progress.hpp
+++ b/include/libtorrent/aux_/file_progress.hpp
@@ -36,6 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <boost/cstdint.hpp>
 
+#include "libtorrent/export.hpp"
+
 namespace libtorrent
 {
 class piece_picker;
@@ -45,7 +47,7 @@ class torrent_handle;
 
 namespace aux
 {
-	struct file_progress
+	struct TORRENT_EXTRA_EXPORT file_progress
 	{
 		file_progress();
 
diff --git a/test/web_server.py b/test/web_server.py
index c6742d51a..34de34f74 100644
--- a/test/web_server.py
+++ b/test/web_server.py
@@ -145,7 +145,7 @@ class http_handler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 				if not keepalive:
 					s.send_header("Connection", "close")
 					try:
-						s.request.shutdown(SHUT_RD);
+						s.request.shutdown(socket.SHUT_RD);
 					except Exception, e:
 						print 'Failed to shutdown read-channel of socket: ', e