diff --git a/include/libtorrent/resolve_links.hpp b/include/libtorrent/resolve_links.hpp
index 14e2680a1..da47361f6 100644
--- a/include/libtorrent/resolve_links.hpp
+++ b/include/libtorrent/resolve_links.hpp
@@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/unordered_map.hpp>
 #include <vector>
 #include <utility>
+#include "libtorrent/export.hpp"
 
 namespace libtorrent
 {
@@ -45,7 +46,7 @@ namespace libtorrent
 #ifndef TORRENT_DISABLE_MUTABLE_TORRENTS
 	// this class is used for mutable torrents, to discover identical files
 	// in other torrents.
-	struct resolve_links
+	struct TORRENT_EXTRA_EXPORT resolve_links
 	{
 		struct link_t
 		{
diff --git a/test/test_ssl.cpp b/test/test_ssl.cpp
index d46b1856e..c368c5e19 100644
--- a/test/test_ssl.cpp
+++ b/test/test_ssl.cpp
@@ -86,7 +86,7 @@ int peer_disconnects = 0;
 int peer_errors = 0;
 int ssl_peer_disconnects = 0;
 
-bool on_alert(alert* a)
+bool on_alert(alert const* a)
 {
 	if (peer_disconnected_alert* e = alert_cast<peer_disconnected_alert>(a))
 	{
@@ -561,10 +561,10 @@ void test_malicious_peer()
 		, combine_path("..", combine_path("ssl", "dhparams.pem"))
 		, "test");
 
-	std::auto_ptr<alert> a = wait_for_alert(ses1
+	alert const* a = wait_for_alert(ses1
 		, torrent_finished_alert::alert_type, "ses1");
-	TEST_CHECK(a.get());
-	if (a.get())
+	TEST_CHECK(a);
+	if (a)
 	{
 		TEST_EQUAL(a->type(), torrent_finished_alert::alert_type);
 	}