diff --git a/include/libtorrent/settings_pack.hpp b/include/libtorrent/settings_pack.hpp
index 322ec44fa..6fa51dd4b 100644
--- a/include/libtorrent/settings_pack.hpp
+++ b/include/libtorrent/settings_pack.hpp
@@ -378,6 +378,7 @@ namespace libtorrent
 			// to connect to i2p peers.
 			allow_i2p_mixed,
 
+#ifndef TORRENT_NO_DEPRECATE
 			// ``low_prio_disk`` determines if the disk I/O should use a normal or
 			// low priority policy. This defaults to true, which means that it's
 			// low priority by default. Other processes doing disk I/O will
@@ -386,6 +387,9 @@ namespace libtorrent
 			// background. For high-performance server setups, this might not be
 			// desirable.
 			low_prio_disk,
+#else
+			deprecated17,
+#endif
 
 			// ``volatile_read_cache``, if this is set to true, read cache blocks
 			// that are hit by peer read requests are removed from the disk cache
@@ -500,19 +504,23 @@ namespace libtorrent
 			// libtorrent API.
 			report_web_seed_downloads,
 
+#ifndef TORRENT_NO_DEPRECATE
 			// set to true if uTP connections should be rate limited This option
 			// is *DEPRECATED*, please use set_peer_class_filter() instead.
-#ifndef TORRENT_NO_DEPRECATE
 			rate_limit_utp,
 #else
 			deprecated2,
 #endif
 
+#ifndef TORRENT_NO_DEPRECATE
 			// if this is true, the ``&ip=`` argument in tracker requests (unless
 			// otherwise specified) will be set to the intermediate IP address if
 			// the user is double NATed. If the user is not double NATed, this
 			// option does not have an affect
 			announce_double_nat,
+#else
+			deprecated18,
+#endif
 
 			// ``seeding_outgoing_connections`` determines if seeding (and
 			// finished) torrents should attempt to make outgoing connections or
@@ -547,10 +555,14 @@ namespace libtorrent
 			// is one). If no IP filter is set, this setting is irrelevant.
 			apply_ip_filter_to_trackers,
 
+#ifndef TORRENT_NO_DEPRECATE
 			// ``use_disk_read_ahead`` defaults to true and will attempt to
 			// optimize disk reads by giving the operating system heads up of disk
 			// read requests as they are queued in the disk job queue.
 			use_disk_read_ahead,
+#else
+			deprecated19,
+#endif
 
 			// ``lock_files`` determines whether or not to lock files which
 			// libtorrent is downloading to or seeding from. This is implemented
diff --git a/src/session.cpp b/src/session.cpp
index 1b0deb8c0..feab7641d 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -110,7 +110,6 @@ namespace libtorrent
 		set.set_int(settings_pack::cache_size, 0);
 		set.set_int(settings_pack::cache_buffer_chunk_size, 1);
 		set.set_bool(settings_pack::use_read_cache, false);
-		set.set_bool(settings_pack::use_disk_read_ahead, false);
 
 		set.set_bool(settings_pack::close_redundant_connections, true);
 
@@ -174,7 +173,6 @@ namespace libtorrent
 		set.set_int(settings_pack::cache_buffer_chunk_size, 0);
 		set.set_int(settings_pack::read_cache_line_size, 32);
 		set.set_int(settings_pack::write_cache_line_size, 256);
-		set.set_bool(settings_pack::low_prio_disk, false);
 		// 30 seconds expiration to save cache
 		// space for active pieces
 		set.set_int(settings_pack::cache_expiry, 30);
diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
index 53ed62563..45754680b 100644
--- a/src/settings_pack.cpp
+++ b/src/settings_pack.cpp
@@ -169,7 +169,7 @@ namespace libtorrent
 		DEPRECATED_SET(lock_disk_cache, false, nullptr),
 		SET(disable_hash_checks, false, nullptr),
 		SET(allow_i2p_mixed, false, nullptr),
-		SET(low_prio_disk, true, nullptr),
+		DEPRECATED_SET(low_prio_disk, true, nullptr),
 		SET(volatile_read_cache, false, nullptr),
 		DEPRECATED_SET(guided_read_cache, false, nullptr),
 		SET(no_atime_storage, true, nullptr),
@@ -186,13 +186,13 @@ namespace libtorrent
 		SET(anonymous_mode, false, &session_impl::update_anonymous_mode),
 		SET(report_web_seed_downloads, true, &session_impl::update_report_web_seed_downloads),
 		DEPRECATED_SET(rate_limit_utp, false, &session_impl::update_rate_limit_utp),
-		SET(announce_double_nat, false, nullptr),
+		DEPRECATED_SET(announce_double_nat, false, nullptr),
 		SET(seeding_outgoing_connections, true, nullptr),
 		SET(no_connect_privileged_ports, false, &session_impl::update_privileged_ports),
 		SET(smooth_connects, true, nullptr),
 		SET(always_send_user_agent, false, nullptr),
 		SET(apply_ip_filter_to_trackers, true, nullptr),
-		SET(use_disk_read_ahead, true, nullptr),
+		DEPRECATED_SET(use_disk_read_ahead, true, nullptr),
 		SET(lock_files, false, nullptr),
 		DEPRECATED_SET(contiguous_recv_buffer, true, nullptr),
 		SET(ban_web_seeds, true, nullptr),