diff --git a/include/libtorrent/file_storage.hpp b/include/libtorrent/file_storage.hpp
index 58df818dd..fba4798b0 100644
--- a/include/libtorrent/file_storage.hpp
+++ b/include/libtorrent/file_storage.hpp
@@ -338,6 +338,11 @@ namespace libtorrent
 		}
 		TORRENT_DEPRECATED_PREFIX
 		file_entry at(iterator i) const TORRENT_DEPRECATED;
+
+		iterator begin_deprecated() const { return m_files.begin(); }
+		iterator end_deprecated() const { return m_files.end(); }
+		reverse_iterator rbegin_deprecated() const { return m_files.rbegin(); }
+		reverse_iterator rend_deprecated() const { return m_files.rend(); }
 #endif // TORRENT_NO_DEPRECATE
 
 		// returns the number of files in the file_storage
diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp
index 906a1102a..9b1db3ad5 100644
--- a/include/libtorrent/torrent_info.hpp
+++ b/include/libtorrent/torrent_info.hpp
@@ -475,12 +475,12 @@ namespace libtorrent
 		// You can resolve it into the public representation of a file (``file_entry``)
 		// using the ``file_storage::at`` function, which takes an index and an iterator.
 		TORRENT_DEPRECATED_PREFIX
-		file_iterator begin_files() const TORRENT_DEPRECATED { return m_files.begin(); }
+		file_iterator begin_files() const TORRENT_DEPRECATED { return m_files.begin_deprecated(); }
 		TORRENT_DEPRECATED_PREFIX
-		file_iterator end_files() const TORRENT_DEPRECATED { return m_files.end(); }
-		reverse_file_iterator rbegin_files() const TORRENT_DEPRECATED { return m_files.rbegin(); }
+		file_iterator end_files() const TORRENT_DEPRECATED { return m_files.end_deprecated(); }
+		reverse_file_iterator rbegin_files() const TORRENT_DEPRECATED { return m_files.rbegin_deprecated(); }
 		TORRENT_DEPRECATED_PREFIX
-		reverse_file_iterator rend_files() const TORRENT_DEPRECATED { return m_files.rend(); }
+		reverse_file_iterator rend_files() const TORRENT_DEPRECATED { return m_files.rend_deprecated(); }
 
 		TORRENT_DEPRECATED_PREFIX
 		file_iterator file_at_offset(size_type offset) const TORRENT_DEPRECATED