diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp
index 260163e81..1d3d922e9 100644
--- a/include/libtorrent/aux_/session_impl.hpp
+++ b/include/libtorrent/aux_/session_impl.hpp
@@ -579,10 +579,12 @@ namespace libtorrent
 			virtual void announce(sha1_hash const& ih, address const& addr, int port) TORRENT_OVERRIDE;
 			virtual void outgoing_get_peers(sha1_hash const& target
 				, sha1_hash const& sent_target, udp::endpoint const& ep) TORRENT_OVERRIDE;
+#ifndef TORRENT_DISABLE_LOGGING
 			virtual void log(libtorrent::dht::dht_logger::module_t m, char const* fmt, ...)
 				TORRENT_OVERRIDE TORRENT_FORMAT(3,4);
 			virtual void log_packet(message_direction_t dir, char const* pkt, int len
 				, udp::endpoint node) TORRENT_OVERRIDE;
+#endif
 
 			virtual bool on_dht_request(char const* query, int query_len
 				, dht::msg const& request, entry& response) TORRENT_OVERRIDE;
diff --git a/include/libtorrent/kademlia/dht_observer.hpp b/include/libtorrent/kademlia/dht_observer.hpp
index 9ea84eee7..ba9412791 100644
--- a/include/libtorrent/kademlia/dht_observer.hpp
+++ b/include/libtorrent/kademlia/dht_observer.hpp
@@ -41,6 +41,7 @@ namespace libtorrent { namespace dht
 {
 	struct TORRENT_EXTRA_EXPORT dht_logger
 	{
+#ifndef TORRENT_DISABLE_LOGGING
 		enum module_t
 		{
 			tracker,
@@ -62,6 +63,7 @@ namespace libtorrent { namespace dht
 
 	protected:
 		~dht_logger() {}
+#endif
 	};
 
 	struct TORRENT_EXTRA_EXPORT dht_observer : dht_logger
diff --git a/src/kademlia/dos_blocker.cpp b/src/kademlia/dos_blocker.cpp
index f4808657e..962962358 100644
--- a/src/kademlia/dos_blocker.cpp
+++ b/src/kademlia/dos_blocker.cpp
@@ -52,6 +52,8 @@ namespace libtorrent { namespace dht
 
 	bool dos_blocker::incoming(address addr, time_point now, dht_logger* logger)
 	{
+		TORRENT_UNUSED(logger);
+
 		node_ban_entry* match = 0;
 		node_ban_entry* min = m_ban_nodes;
 		for (node_ban_entry* i = m_ban_nodes; i < m_ban_nodes + num_ban_nodes; ++i)
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index d5e1f6465..3922c65e8 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -6929,8 +6929,7 @@ retry:
 		m_alerts.emplace_alert<dht_outgoing_get_peers_alert>(target, sent_target, ep);
 	}
 
-	// TODO: 2 perhaps DHT logging should be disabled by TORRENT_DISABLE_LOGGING
-	// too
+#ifndef TORRENT_DISABLE_LOGGING
 	TORRENT_FORMAT(3,4)
 	void session_impl::log(libtorrent::dht::dht_logger::module_t m, char const* fmt, ...)
 	{
@@ -6954,6 +6953,7 @@ retry:
 
 		m_alerts.emplace_alert<dht_pkt_alert>(pkt, len, d, node);
 	}
+#endif
 
 	bool session_impl::on_dht_request(char const* query, int query_len
 		, dht::msg const& request, entry& response)
diff --git a/test/test_dht.cpp b/test/test_dht.cpp
index 0ac2b730b..59e08f421 100644
--- a/test/test_dht.cpp
+++ b/test/test_dht.cpp
@@ -484,6 +484,7 @@ struct obs : dht::dht_observer
 	virtual void outgoing_get_peers(sha1_hash const& target
 		, sha1_hash const& sent_target, udp::endpoint const& ep) TORRENT_OVERRIDE {}
 	virtual void announce(sha1_hash const& ih, address const& addr, int port) TORRENT_OVERRIDE {}
+#ifndef TORRENT_DISABLE_LOGGING
 	virtual void log(dht_logger::module_t l, char const* fmt, ...) TORRENT_OVERRIDE
 	{
 		va_list v;
@@ -495,6 +496,7 @@ struct obs : dht::dht_observer
 	}
 	virtual void log_packet(message_direction_t dir, char const* pkt, int len
 		, udp::endpoint node) TORRENT_OVERRIDE {}
+#endif
 	virtual bool on_dht_request(char const* query, int query_len
 		, dht::msg const& request, entry& response) TORRENT_OVERRIDE { return false; }
 
@@ -2485,6 +2487,9 @@ TORRENT_TEST(read_only_node)
 	TEST_CHECK(!parsed[3]);
 }
 
+#ifndef TORRENT_DISABLE_LOGGING
+// these tests rely on logging being enabled
+
 TORRENT_TEST(invalid_error_msg)
 {
 	dht_settings sett = test_settings();
@@ -2582,6 +2587,7 @@ TORRENT_TEST(rpc_invalid_error_msg)
 
 	TEST_EQUAL(found, true);
 }
+#endif
 
 // test bucket distribution
 TORRENT_TEST(node_id_bucket_distribution)
diff --git a/test/test_dos_blocker.cpp b/test/test_dos_blocker.cpp
index 3d0fdb267..461f73a56 100644
--- a/test/test_dos_blocker.cpp
+++ b/test/test_dos_blocker.cpp
@@ -44,6 +44,7 @@ using namespace libtorrent;
 
 struct log_t : libtorrent::dht::dht_logger
 {
+#ifndef TORRENT_DISABLE_LOGGING
 	virtual void log(dht_logger::module_t m, char const* fmt, ...)
 		TORRENT_OVERRIDE TORRENT_FORMAT(3, 4)
 	{
@@ -68,6 +69,7 @@ struct log_t : libtorrent::dht::dht_logger
 		printf("%s [%s] %s", prefix[dir], print_endpoint(node).c_str()
 			, msg.c_str());
 	}
+#endif
 };
 
 TORRENT_TEST(dos_blocker)