diff --git a/include/Makefile.am b/include/Makefile.am
index 4524564bc..6f0744829 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -101,6 +101,55 @@ libtorrent/kademlia/rpc_manager.hpp \
 libtorrent/kademlia/traversal_algorithm.hpp \
 \
 libtorrent/asio.hpp \
+libtorrent/asio/basic_datagram_socket.hpp \
+libtorrent/asio/basic_deadline_timer.hpp \
+libtorrent/asio/basic_io_object.hpp \
+libtorrent/asio/basic_raw_socket.hpp \
+libtorrent/asio/basic_serial_port.hpp \
+libtorrent/asio/basic_socket.hpp \
+libtorrent/asio/basic_socket_acceptor.hpp \
+libtorrent/asio/basic_socket_iostream.hpp \
+libtorrent/asio/basic_socket_streambuf.hpp \
+libtorrent/asio/basic_stream_socket.hpp \
+libtorrent/asio/basic_streambuf.hpp \
+libtorrent/asio/buffer.hpp \
+libtorrent/asio/buffered_read_stream.hpp \
+libtorrent/asio/buffered_read_stream_fwd.hpp \
+libtorrent/asio/buffered_stream.hpp \
+libtorrent/asio/buffered_stream_fwd.hpp \
+libtorrent/asio/buffered_write_stream.hpp \
+libtorrent/asio/buffered_write_stream_fwd.hpp \
+libtorrent/asio/completion_condition.hpp \
+libtorrent/asio/datagram_socket_service.hpp \
+libtorrent/asio/deadline_timer.hpp \
+libtorrent/asio/deadline_timer_service.hpp \
+libtorrent/asio/error.hpp \
+libtorrent/asio/error_code.hpp \
+libtorrent/asio/handler_alloc_hook.hpp \
+libtorrent/asio/handler_invoke_hook.hpp \
+libtorrent/asio/io_service.hpp \
+libtorrent/asio/is_read_buffered.hpp \
+libtorrent/asio/is_write_buffered.hpp \
+libtorrent/asio/placeholders.hpp \
+libtorrent/asio/raw_socket_service.hpp \
+libtorrent/asio/read.hpp \
+libtorrent/asio/read_at.hpp \
+libtorrent/asio/read_until.hpp \
+libtorrent/asio/serial_port.hpp \
+libtorrent/asio/serial_port_base.hpp \
+libtorrent/asio/serial_port_service.hpp \
+libtorrent/asio/socket_acceptor_service.hpp \
+libtorrent/asio/socket_base.hpp \
+libtorrent/asio/ssl.hpp \
+libtorrent/asio/strand.hpp \
+libtorrent/asio/stream_socket_service.hpp \
+libtorrent/asio/streambuf.hpp \
+libtorrent/asio/system_error.hpp \
+libtorrent/asio/thread.hpp \
+libtorrent/asio/time_traits.hpp \
+libtorrent/asio/version.hpp \
+libtorrent/asio/write.hpp \
+libtorrent/asio/write_at.hpp \
 libtorrent/asio/detail/bind_handler.hpp \
 libtorrent/asio/detail/buffer_resize_guard.hpp \
 libtorrent/asio/detail/buffered_stream_storage.hpp \
@@ -185,55 +234,6 @@ libtorrent/asio/detail/win_tss_ptr.hpp \
 libtorrent/asio/detail/wince_thread.hpp \
 libtorrent/asio/detail/winsock_init.hpp \
 libtorrent/asio/detail/wrapped_handler.hpp \
-libtorrent/asio/basic_datagram_socket.hpp \
-libtorrent/asio/basic_deadline_timer.hpp \
-libtorrent/asio/basic_io_object.hpp \
-libtorrent/asio/basic_raw_socket.hpp \
-libtorrent/asio/basic_serial_port.hpp \
-libtorrent/asio/basic_socket.hpp \
-libtorrent/asio/basic_socket_acceptor.hpp \
-libtorrent/asio/basic_socket_iostream.hpp \
-libtorrent/asio/basic_socket_streambuf.hpp \
-libtorrent/asio/basic_stream_socket.hpp \
-libtorrent/asio/basic_streambuf.hpp \
-libtorrent/asio/buffer.hpp \
-libtorrent/asio/buffered_read_stream.hpp \
-libtorrent/asio/buffered_read_stream_fwd.hpp \
-libtorrent/asio/buffered_stream.hpp \
-libtorrent/asio/buffered_stream_fwd.hpp \
-libtorrent/asio/buffered_write_stream.hpp \
-libtorrent/asio/buffered_write_stream_fwd.hpp \
-libtorrent/asio/completion_condition.hpp \
-libtorrent/asio/datagram_socket_service.hpp \
-libtorrent/asio/deadline_timer.hpp \
-libtorrent/asio/deadline_timer_service.hpp \
-libtorrent/asio/error.hpp \
-libtorrent/asio/error_code.hpp \
-libtorrent/asio/handler_alloc_hook.hpp \
-libtorrent/asio/handler_invoke_hook.hpp \
-libtorrent/asio/io_service.hpp \
-libtorrent/asio/is_read_buffered.hpp \
-libtorrent/asio/is_write_buffered.hpp \
-libtorrent/asio/placeholders.hpp \
-libtorrent/asio/raw_socket_service.hpp \
-libtorrent/asio/read.hpp \
-libtorrent/asio/read_at.hpp \
-libtorrent/asio/read_until.hpp \
-libtorrent/asio/serial_port.hpp \
-libtorrent/asio/serial_port_base.hpp \
-libtorrent/asio/serial_port_service.hpp \
-libtorrent/asio/socket_acceptor_service.hpp \
-libtorrent/asio/socket_base.hpp \
-libtorrent/asio/ssl.hpp \
-libtorrent/asio/strand.hpp \
-libtorrent/asio/stream_socket_service.hpp \
-libtorrent/asio/streambuf.hpp \
-libtorrent/asio/system_error.hpp \
-libtorrent/asio/thread.hpp \
-libtorrent/asio/time_traits.hpp \
-libtorrent/asio/version.hpp \
-libtorrent/asio/write.hpp \
-libtorrent/asio/write_at.hpp \
 libtorrent/asio/impl/error_code.ipp \
 libtorrent/asio/impl/io_service.ipp \
 libtorrent/asio/impl/read.ipp \
@@ -242,7 +242,6 @@ libtorrent/asio/impl/read_until.ipp \
 libtorrent/asio/impl/serial_port_base.ipp \
 libtorrent/asio/impl/write.ipp \
 libtorrent/asio/impl/write_at.ipp \
-libtorrent/asio/ip/detail/socket_option.hpp \
 libtorrent/asio/ip/address.hpp \
 libtorrent/asio/ip/address_v4.hpp \
 libtorrent/asio/ip/address_v6.hpp \
@@ -260,6 +259,7 @@ libtorrent/asio/ip/tcp.hpp \
 libtorrent/asio/ip/udp.hpp \
 libtorrent/asio/ip/unicast.hpp \
 libtorrent/asio/ip/v6_only.hpp \
+libtorrent/asio/ip/detail/socket_option.hpp \
 libtorrent/asio/local/basic_endpoint.hpp \
 libtorrent/asio/local/connect_pair.hpp \
 libtorrent/asio/local/datagram_protocol.hpp \
@@ -269,11 +269,6 @@ libtorrent/asio/posix/basic_stream_descriptor.hpp \
 libtorrent/asio/posix/descriptor_base.hpp \
 libtorrent/asio/posix/stream_descriptor.hpp \
 libtorrent/asio/posix/stream_descriptor_service.hpp \
-libtorrent/asio/ssl/detail/openssl_context_service.hpp \
-libtorrent/asio/ssl/detail/openssl_init.hpp \
-libtorrent/asio/ssl/detail/openssl_operation.hpp \
-libtorrent/asio/ssl/detail/openssl_stream_service.hpp \
-libtorrent/asio/ssl/detail/openssl_types.hpp \
 libtorrent/asio/ssl/basic_context.hpp \
 libtorrent/asio/ssl/context.hpp \
 libtorrent/asio/ssl/context_base.hpp \
@@ -281,10 +276,15 @@ libtorrent/asio/ssl/context_service.hpp \
 libtorrent/asio/ssl/stream.hpp \
 libtorrent/asio/ssl/stream_base.hpp \
 libtorrent/asio/ssl/stream_service.hpp \
+libtorrent/asio/ssl/detail/openssl_context_service.hpp \
+libtorrent/asio/ssl/detail/openssl_init.hpp \
+libtorrent/asio/ssl/detail/openssl_operation.hpp \
+libtorrent/asio/ssl/detail/openssl_stream_service.hpp \
+libtorrent/asio/ssl/detail/openssl_types.hpp \
 libtorrent/asio/windows/basic_handle.hpp \
 libtorrent/asio/windows/basic_random_access_handle.hpp \
 libtorrent/asio/windows/basic_stream_handle.hpp \
 libtorrent/asio/windows/random_access_handle.hpp \
 libtorrent/asio/windows/random_access_handle_service.hpp \
 libtorrent/asio/windows/stream_handle.hpp \
-libtorrent/asio/windows/stream_handle_service.hpp
+libtorrent/asio/windows/stream_handle_service.hpp \
diff --git a/list_files.py b/list_files.py
index 07f52e556..9a4e5f9ef 100755
--- a/list_files.py
+++ b/list_files.py
@@ -6,8 +6,9 @@ import sys
 def list_directory(path):
 	tree = os.walk(path)
 	for i in tree:
-		if os.path.split(i[0])[1] == 'CVS': continue
-		if os.path.split(i[0])[1] == '.svn': continue
+		dirs = i[0].split('/')
+		if 'CVS' in dirs: continue
+		if '.svn' in dirs: continue
 
 		for file in i[2]:
 			if file.startswith('.#'): continue