diff --git a/include/libtorrent/add_torrent_params.hpp b/include/libtorrent/add_torrent_params.hpp
index 2c2fe8d09..fe7c6754e 100644
--- a/include/libtorrent/add_torrent_params.hpp
+++ b/include/libtorrent/add_torrent_params.hpp
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 namespace libtorrent
 {
-	struct torrent_info;
+	class torrent_info;
 
 	struct add_torrent_params
 	{
diff --git a/include/libtorrent/file.hpp b/include/libtorrent/file.hpp
index 3eb6a696f..6cd997ca4 100644
--- a/include/libtorrent/file.hpp
+++ b/include/libtorrent/file.hpp
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
-#include <winbase.h>
+#include <windows.h>
 #include <winioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/include/libtorrent/storage_defs.hpp b/include/libtorrent/storage_defs.hpp
index c18580f7f..0f6675f74 100644
--- a/include/libtorrent/storage_defs.hpp
+++ b/include/libtorrent/storage_defs.hpp
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
 namespace libtorrent
 {
 	struct storage_interface;
-	struct file_storage;
+	class file_storage;
 	struct file_pool;
 
 	enum storage_mode_t