diff --git a/include/libtorrent/http_stream.hpp b/include/libtorrent/http_stream.hpp
index 2bd124b43..041b7c84f 100644
--- a/include/libtorrent/http_stream.hpp
+++ b/include/libtorrent/http_stream.hpp
@@ -1,36 +1,53 @@
-#include "libtorrent/io.hpp"
-#include "libtorrent/socket.hpp"
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/function.hpp>
-#include <asio/read.hpp>
-#include <asio/write.hpp>
+/*
 
+Copyright (c) 2007, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TORRENT_HTTP_STREAM_HPP_INCLUDED
+#define TORRENT_HTTP_STREAM_HPP_INCLUDED
+
+#include "libtorrent/proxy_base.hpp"
 
 namespace libtorrent {
 
-class http_stream : boost::noncopyable
+class http_stream : public proxy_base
 {
 public:
 
-	typedef stream_socket::lowest_layer_type lowest_layer_type;
-	typedef stream_socket::endpoint_type endpoint_type;
-	typedef stream_socket::protocol_type protocol_type;
-
 	explicit http_stream(asio::io_service& io_service)
-		: m_sock(io_service)
-		, m_resolver(io_service)
+		: proxy_base(io_service)
 		, m_no_connect(false)
 	{}
 
 	void set_no_connect(bool c) { m_no_connect = c; }
 
-	void set_proxy(std::string hostname, int port)
-	{
-		m_hostname = hostname;
-		m_port = port;
-	}
-
 	void set_username(std::string const& user
 		, std::string const& password)
 	{
@@ -38,108 +55,6 @@ public:
 		m_password = password;
 	}
 
-	template <class Mutable_Buffers, class Handler>
-	void async_read_some(Mutable_Buffers const& buffers, Handler const& handler)
-	{
-		m_sock.async_read_some(buffers, handler);
-	}
-
-	template <class Mutable_Buffers>
-	std::size_t read_some(Mutable_Buffers const& buffers, asio::error_code& ec)
-	{
-		return m_sock.read_some(buffers, ec);
-	}
-
-	template <class Mutable_Buffers>
-	std::size_t read_some(Mutable_Buffers const& buffers)
-	{
-		return m_sock.read_some(buffers);
-	}
-
-	template <class IO_Control_Command>
-	void io_control(IO_Control_Command& ioc)
-	{
-		m_sock.io_control(ioc);
-	}
-
-	template <class IO_Control_Command>
-	void io_control(IO_Control_Command& ioc, asio::error_code& ec)
-	{
-		m_sock.io_control(ioc, ec);
-	}
-
-	template <class Const_Buffers, class Handler>
-	void async_write_some(Const_Buffers const& buffers, Handler const& handler)
-	{
-		m_sock.async_write_some(buffers, handler);
-	}
-
-	void bind(endpoint_type const& endpoint)
-	{
-		m_sock.bind(endpoint);
-	}
-
-	template <class Error_Handler>
-	void bind(endpoint_type const& endpoint, Error_Handler const& error_handler)
-	{
-		m_sock.bind(endpoint, error_handler);
-	}
-
-	void open(protocol_type const& p)
-	{
-		m_sock.open(p);
-	}
-
-	template <class Error_Handler>
-	void open(protocol_type const& p, Error_Handler const& error_handler)
-	{
-		m_sock.open(p, error_handler);
-	}
-
-	void close()
-	{
-		m_remote_endpoint = endpoint_type();
-		m_sock.close();
-	}
-
-	template <class Error_Handler>
-	void close(Error_Handler const& error_handler)
-	{
-		m_sock.close(error_handler);
-	}
-
-	endpoint_type remote_endpoint()
-	{
-		return m_remote_endpoint;
-	}
-
-	template <class Error_Handler>
-	endpoint_type remote_endpoint(Error_Handler const& error_handler)
-	{
-		return m_remote_endpoint;
-	}
-
-	endpoint_type local_endpoint()
-	{
-		return m_sock.local_endpoint();
-	}
-
-	template <class Error_Handler>
-	endpoint_type local_endpoint(Error_Handler const& error_handler)
-	{
-		return m_sock.local_endpoint(error_handler);
-	}
-
-	asio::io_service& io_service()
-	{
-		return m_sock.io_service();
-	}
-
-	lowest_layer_type& lowest_layer()
-	{
-		return m_sock.lowest_layer();
-	}
-
 	typedef boost::function<void(asio::error_code const&)> handler_type;
 
 	template <class Handler>
@@ -171,19 +86,12 @@ private:
 	void handshake1(asio::error_code const& e, boost::shared_ptr<handler_type> h);
 	void handshake2(asio::error_code const& e, boost::shared_ptr<handler_type> h);
 
-	stream_socket m_sock;
-	// the http proxy
-	std::string m_hostname;
-	int m_port;
 	// send and receive buffer
 	std::vector<char> m_buffer;
 	// proxy authentication
 	std::string m_user;
 	std::string m_password;
 
-	endpoint_type m_remote_endpoint;
-
-	tcp::resolver m_resolver;
 	// this is true if the connection is HTTP based and
 	// want to talk directly to the proxy
 	bool m_no_connect;
@@ -191,3 +99,4 @@ private:
 
 }
 
+#endif
diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp
new file mode 100644
index 000000000..021802dd0
--- /dev/null
+++ b/include/libtorrent/proxy_base.hpp
@@ -0,0 +1,183 @@
+/*
+
+Copyright (c) 2007, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TORRENT_PROXY_BASE_HPP_INCLUDED
+#define TORRENT_PROXY_BASE_HPP_INCLUDED
+
+#include "libtorrent/io.hpp"
+#include "libtorrent/socket.hpp"
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/function.hpp>
+#include <asio/read.hpp>
+#include <asio/write.hpp>
+
+
+namespace libtorrent {
+
+class proxy_base : boost::noncopyable
+{
+public:
+
+	typedef stream_socket::lowest_layer_type lowest_layer_type;
+	typedef stream_socket::endpoint_type endpoint_type;
+	typedef stream_socket::protocol_type protocol_type;
+
+	explicit proxy_base(asio::io_service& io_service)
+		: m_sock(io_service)
+		, m_resolver(io_service)
+	{}
+
+	void set_proxy(std::string hostname, int port)
+	{
+		m_hostname = hostname;
+		m_port = port;
+	}
+
+	template <class Mutable_Buffers, class Handler>
+	void async_read_some(Mutable_Buffers const& buffers, Handler const& handler)
+	{
+		m_sock.async_read_some(buffers, handler);
+	}
+
+	template <class Mutable_Buffers>
+	std::size_t read_some(Mutable_Buffers const& buffers, asio::error_code& ec)
+	{
+		return m_sock.read_some(buffers, ec);
+	}
+
+	template <class Mutable_Buffers>
+	std::size_t read_some(Mutable_Buffers const& buffers)
+	{
+		return m_sock.read_some(buffers);
+	}
+
+	template <class IO_Control_Command>
+	void io_control(IO_Control_Command& ioc)
+	{
+		m_sock.io_control(ioc);
+	}
+
+	template <class IO_Control_Command>
+	void io_control(IO_Control_Command& ioc, asio::error_code& ec)
+	{
+		m_sock.io_control(ioc, ec);
+	}
+
+	template <class Const_Buffers, class Handler>
+	void async_write_some(Const_Buffers const& buffers, Handler const& handler)
+	{
+		m_sock.async_write_some(buffers, handler);
+	}
+
+	void bind(endpoint_type const& endpoint)
+	{
+		m_sock.bind(endpoint);
+	}
+
+	template <class Error_Handler>
+	void bind(endpoint_type const& endpoint, Error_Handler const& error_handler)
+	{
+		m_sock.bind(endpoint, error_handler);
+	}
+
+	void open(protocol_type const& p)
+	{
+		m_sock.open(p);
+	}
+
+	template <class Error_Handler>
+	void open(protocol_type const& p, Error_Handler const& error_handler)
+	{
+		m_sock.open(p, error_handler);
+	}
+
+	void close()
+	{
+		m_remote_endpoint = endpoint_type();
+		m_sock.close();
+	}
+
+	template <class Error_Handler>
+	void close(Error_Handler const& error_handler)
+	{
+		m_sock.close(error_handler);
+	}
+
+	endpoint_type remote_endpoint()
+	{
+		return m_remote_endpoint;
+	}
+
+	template <class Error_Handler>
+	endpoint_type remote_endpoint(Error_Handler const& error_handler)
+	{
+		return m_remote_endpoint;
+	}
+
+	endpoint_type local_endpoint()
+	{
+		return m_sock.local_endpoint();
+	}
+
+	template <class Error_Handler>
+	endpoint_type local_endpoint(Error_Handler const& error_handler)
+	{
+		return m_sock.local_endpoint(error_handler);
+	}
+
+	asio::io_service& io_service()
+	{
+		return m_sock.io_service();
+	}
+
+	lowest_layer_type& lowest_layer()
+	{
+		return m_sock.lowest_layer();
+	}
+	
+protected:
+
+	stream_socket m_sock;
+	// the socks5 proxy
+	std::string m_hostname;
+	int m_port;
+
+	endpoint_type m_remote_endpoint;
+
+	tcp::resolver m_resolver;
+};
+
+}
+
+#endif
+
diff --git a/include/libtorrent/socks5_stream.hpp b/include/libtorrent/socks5_stream.hpp
index 9e8a0d04b..8bfc74c59 100644
--- a/include/libtorrent/socks5_stream.hpp
+++ b/include/libtorrent/socks5_stream.hpp
@@ -1,33 +1,50 @@
-#include "libtorrent/io.hpp"
-#include "libtorrent/socket.hpp"
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/function.hpp>
-#include <asio/read.hpp>
-#include <asio/write.hpp>
+/*
 
+Copyright (c) 2007, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TORRENT_SOCKS5_STREAM_HPP_INCLUDED
+#define TORRENT_SOCKS5_STREAM_HPP_INCLUDED
+
+#include "libtorrent/proxy_base.hpp"
 
 namespace libtorrent {
 
-class socks5_stream : boost::noncopyable
+class socks5_stream : public proxy_base
 {
 public:
 
-	typedef stream_socket::lowest_layer_type lowest_layer_type;
-	typedef stream_socket::endpoint_type endpoint_type;
-	typedef stream_socket::protocol_type protocol_type;
-
 	explicit socks5_stream(asio::io_service& io_service)
-		: m_sock(io_service)
-		, m_resolver(io_service)
+		: proxy_base(io_service)
 	{}
 
-	void set_proxy(std::string hostname, int port)
-	{
-		m_hostname = hostname;
-		m_port = port;
-	}
-
 	void set_username(std::string const& user
 		, std::string const& password)
 	{
@@ -35,108 +52,6 @@ public:
 		m_password = password;
 	}
 
-	template <class Mutable_Buffers, class Handler>
-	void async_read_some(Mutable_Buffers const& buffers, Handler const& handler)
-	{
-		m_sock.async_read_some(buffers, handler);
-	}
-
-	template <class Mutable_Buffers>
-	std::size_t read_some(Mutable_Buffers const& buffers, asio::error_code& ec)
-	{
-		return m_sock.read_some(buffers, ec);
-	}
-
-	template <class Mutable_Buffers>
-	std::size_t read_some(Mutable_Buffers const& buffers)
-	{
-		return m_sock.read_some(buffers);
-	}
-
-	template <class IO_Control_Command>
-	void io_control(IO_Control_Command& ioc)
-	{
-		m_sock.io_control(ioc);
-	}
-
-	template <class IO_Control_Command>
-	void io_control(IO_Control_Command& ioc, asio::error_code& ec)
-	{
-		m_sock.io_control(ioc, ec);
-	}
-
-	template <class Const_Buffers, class Handler>
-	void async_write_some(Const_Buffers const& buffers, Handler const& handler)
-	{
-		m_sock.async_write_some(buffers, handler);
-	}
-
-	void bind(endpoint_type const& endpoint)
-	{
-		m_sock.bind(endpoint);
-	}
-
-	template <class Error_Handler>
-	void bind(endpoint_type const& endpoint, Error_Handler const& error_handler)
-	{
-		m_sock.bind(endpoint, error_handler);
-	}
-
-	void open(protocol_type const& p)
-	{
-		m_sock.open(p);
-	}
-
-	template <class Error_Handler>
-	void open(protocol_type const& p, Error_Handler const& error_handler)
-	{
-		m_sock.open(p, error_handler);
-	}
-
-	void close()
-	{
-		m_remote_endpoint = endpoint_type();
-		m_sock.close();
-	}
-
-	template <class Error_Handler>
-	void close(Error_Handler const& error_handler)
-	{
-		m_sock.close(error_handler);
-	}
-
-	endpoint_type remote_endpoint()
-	{
-		return m_remote_endpoint;
-	}
-
-	template <class Error_Handler>
-	endpoint_type remote_endpoint(Error_Handler const& error_handler)
-	{
-		return m_remote_endpoint;
-	}
-
-	endpoint_type local_endpoint()
-	{
-		return m_sock.local_endpoint();
-	}
-
-	template <class Error_Handler>
-	endpoint_type local_endpoint(Error_Handler const& error_handler)
-	{
-		return m_sock.local_endpoint(error_handler);
-	}
-
-	asio::io_service& io_service()
-	{
-		return m_sock.io_service();
-	}
-
-	lowest_layer_type& lowest_layer()
-	{
-		return m_sock.lowest_layer();
-	}
-
 	typedef boost::function<void(asio::error_code const&)> handler_type;
 
 	template <class Handler>
@@ -176,20 +91,13 @@ private:
 	void connect2(asio::error_code const& e, boost::shared_ptr<handler_type> h);
 	void connect3(asio::error_code const& e, boost::shared_ptr<handler_type> h);
 
-	stream_socket m_sock;
-	// the socks5 proxy
-	std::string m_hostname;
-	int m_port;
 	// send and receive buffer
 	std::vector<char> m_buffer;
 	// proxy authentication
 	std::string m_user;
 	std::string m_password;
-
-	endpoint_type m_remote_endpoint;
-
-	tcp::resolver m_resolver;
 };
 
 }
 
+#endif