Reduce header dependencies in net/

TEST=none

Review URL: http://codereview.chromium.org/115870

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17178 0039d316-1c4b-4281-b951-d872f2087c98

51 files changed, 61 insertions, 19 deletions

diff --git a/chrome/browser/automation/url_request_slow_download_job.cc b/chrome/browser/automation/url_request_slow_download_job.cc
index 630eca1..76857f8 100644
--- a/chrome/browser/automation/url_request_slow_download_job.cc
+++ b/chrome/browser/automation/url_request_slow_download_job.cc
@@ -7,6 +7,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index a8b5b17..d1f960e 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -39,6 +39,7 @@
 #include "chrome/common/render_messages.h"
 #include "net/base/base64.h"
 #include "net/base/cookie_monster.h"
+#include "net/base/io_buffer.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 7fadbed..ff4fa9f 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -16,6 +16,8 @@
 #include "chrome/common/ref_counted_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
+#include "net/base/io_buffer.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_job.h"
diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc
index e8a86ee..5ac037a 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.cc
+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc
@@ -7,6 +7,7 @@
 #include "base/histogram.h"
 #include "base/string_util.h"
 #include "net/base/mime_sniffer.h"
+#include "net/base/net_errors.h"
 #include "chrome/browser/renderer_host/download_throttling_resource_handler.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 3b8a575..2a9d95b 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/render_messages.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_test_job.h"
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
index b94fe49..583a6dd 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/notification_service.h"
+#include "net/base/net_errors.h"
 
 // Maximum time to wait for a gethash response from the Safe Browsing servers.
 static const int kMaxGetHashMs = 1000;
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index 34f4de0..bb5dd8c 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.cc
@@ -12,6 +12,7 @@
 #include "base/string_util.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/notification_service.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index 4874e41..0a9c85b 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -18,6 +18,7 @@
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "net/base/data_url.h"
+#include "net/base/io_buffer.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/glue/plugins/plugin_instance.h"
diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc
index a7023c1..9b1eab5 100644
--- a/net/base/bzip2_filter_unittest.cc
+++ b/net/base/bzip2_filter_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/scoped_ptr.h"
 #include "net/base/bzip2_filter.h"
 #include "net/base/filter_unittest.h"
+#include "net/base/io_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/bzip2/bzlib.h"
diff --git a/net/base/dns_resolution_observer.h b/net/base/dns_resolution_observer.h
index f01eaf2..9dd9a90 100644
--- a/net/base/dns_resolution_observer.h
+++ b/net/base/dns_resolution_observer.h
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "googleurl/src/gurl.h"
+class GURL;
 
 namespace net {
 
diff --git a/net/base/file_stream.h b/net/base/file_stream.h
index 807ea55..6b7f3dc 100644
--- a/net/base/file_stream.h
+++ b/net/base/file_stream.h
@@ -10,11 +10,12 @@
 #ifndef NET_BASE_FILE_STREAM_H_
 #define NET_BASE_FILE_STREAM_H_
 
-#include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 
+class FilePath;
+
 namespace net {
 
 // TODO(darin): Move this to a more generic location.
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc
index 8fca162..7bc685c 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -15,6 +15,7 @@
 
 #include "base/basictypes.h"
 #include "base/eintr_wrapper.h"
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc
index 93a3fd9..caa636f 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -6,6 +6,7 @@
 
 #include <windows.h>
 
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
diff --git a/net/base/filter.cc b/net/base/filter.cc
index d12124c..ceae763 100644
--- a/net/base/filter.cc
+++ b/net/base/filter.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/bzip2_filter.h"
+#include "net/base/io_buffer.h"
 #include "net/base/sdch_filter.h"
 
 namespace {
diff --git a/net/base/filter.h b/net/base/filter.h
index 295d80f..cb28031 100644
--- a/net/base/filter.h
+++ b/net/base/filter.h
@@ -33,12 +33,17 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "net/base/io_buffer.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
+class GURL;
+
+namespace net {
+class IOBuffer;
+}
+
 //------------------------------------------------------------------------------
 // Define an interface class that allows access to contextual information
 // supplied by the owner of this filter.  In the case where there are a chain of
diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
index 74fbc2b..5d1b9c5 100644
--- a/net/base/gzip_filter_unittest.cc
+++ b/net/base/gzip_filter_unittest.cc
@@ -8,8 +8,9 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "net/base/gzip_filter.h"
 #include "net/base/filter_unittest.h"
+#include "net/base/gzip_filter.h"
+#include "net/base/io_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/zlib/zlib.h"
diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h
index cadc962..17fa50d 100644
--- a/net/base/listen_socket.h
+++ b/net/base/listen_socket.h
@@ -11,6 +11,8 @@
 #ifndef NET_BASE_LISTEN_SOCKET_H_
 #define NET_BASE_LISTEN_SOCKET_H_
 
+#include "build/build_config.h"
+
 #if defined(OS_WIN)
 #include <winsock2.h>
 #endif
@@ -19,8 +21,6 @@
 #include "base/object_watcher.h"
 #elif defined(OS_POSIX)
 #include "base/message_loop.h"
-#include "net/base/net_util.h"
-#include "net/base/net_errors.h"
 #endif
 
 #include "base/basictypes.h"
diff --git a/net/base/net_module.h b/net/base/net_module.h
index fa9c965..06404d0 100644
--- a/net/base/net_module.h
+++ b/net/base/net_module.h
@@ -5,8 +5,6 @@
 #ifndef NET_BASE_NET_MODULE_H__
 #define NET_BASE_NET_MODULE_H__
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/string_piece.h"
 
diff --git a/net/base/sdch_filter.h b/net/base/sdch_filter.h
index 012de89..20a3b6e 100644
--- a/net/base/sdch_filter.h
+++ b/net/base/sdch_filter.h
@@ -15,10 +15,8 @@
 #define NET_BASE_SDCH_FILTER_H_
 
 #include <string>
-#include <vector>
 
 #include "base/scoped_ptr.h"
-#include "base/time.h"
 #include "net/base/filter.h"
 #include "net/base/sdch_manager.h"
 
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
index 532bba6..abab262 100644
--- a/net/base/sdch_filter_unittest.cc
+++ b/net/base/sdch_filter_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/scoped_ptr.h"
 #include "net/base/filter.h"
 #include "net/base/filter_unittest.h"
+#include "net/base/io_buffer.h"
 #include "net/base/sdch_filter.h"
 #include "net/url_request/url_request_http_job.cc"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/socket.h b/net/base/socket.h
index 843104b..b03b6c2 100644
--- a/net/base/socket.h
+++ b/net/base/socket.h
@@ -6,10 +6,11 @@
 #define NET_BASE_SOCKET_H_
 
 #include "net/base/completion_callback.h"
-#include "net/base/io_buffer.h"
 
 namespace net {
 
+class IOBuffer;
+
 // Represents a read/write socket.
 class Socket {
  public:
diff --git a/net/base/socket_test_util.cc b/net/base/socket_test_util.cc
index de21c81..fa7f63e 100644
--- a/net/base/socket_test_util.cc
+++ b/net/base/socket_test_util.cc
@@ -7,6 +7,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
+#include "net/base/io_buffer.h"
 #include "net/base/socket.h"
 #include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_info.h"
diff --git a/net/base/ssl_client_socket_mac.cc b/net/base/ssl_client_socket_mac.cc
index 2d68771..2148a2b 100644
--- a/net/base/ssl_client_socket_mac.cc
+++ b/net/base/ssl_client_socket_mac.cc
@@ -6,6 +6,7 @@
 
 #include "base/singleton.h"
 #include "base/string_util.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
diff --git a/net/base/ssl_client_socket_nss.cc b/net/base/ssl_client_socket_nss.cc
index 12ef11e..ec2b961 100644
--- a/net/base/ssl_client_socket_nss.cc
+++ b/net/base/ssl_client_socket_nss.cc
@@ -66,6 +66,7 @@
 #include "base/logging.h"
 #include "base/nss_init.h"
 #include "base/string_util.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc
index 324f3b6..d372e95 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/base/ssl_client_socket_unittest.cc
@@ -5,6 +5,7 @@
 #include "net/base/address_list.h"
 #include "net/base/client_socket_factory.h"
 #include "net/base/host_resolver.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_client_socket.h"
 #include "net/base/ssl_config_service.h"
diff --git a/net/base/ssl_client_socket_win.cc b/net/base/ssl_client_socket_win.cc
index 62790d5..7c76b99 100644
--- a/net/base/ssl_client_socket_win.cc
+++ b/net/base/ssl_client_socket_win.cc
@@ -10,6 +10,7 @@
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/connection_type_histograms.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h
index 4c661b2..203b6de 100644
--- a/net/base/ssl_info.h
+++ b/net/base/ssl_info.h
@@ -6,7 +6,6 @@
 #define NET_BASE_SSL_INFO_H_
 
 #include "net/base/cert_status_flags.h"
-#include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
 
 namespace net {
diff --git a/net/base/tcp_client_socket_libevent.cc b/net/base/tcp_client_socket_libevent.cc
index e011100..7d42e4a 100644
--- a/net/base/tcp_client_socket_libevent.cc
+++ b/net/base/tcp_client_socket_libevent.cc
@@ -13,6 +13,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/trace_event.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "third_party/libevent/event.h"
 
diff --git a/net/base/tcp_client_socket_unittest.cc b/net/base/tcp_client_socket_unittest.cc
index abd1c0d..9dad6e2 100644
--- a/net/base/tcp_client_socket_unittest.cc
+++ b/net/base/tcp_client_socket_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/basictypes.h"
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
+#include "net/base/io_buffer.h"
 #include "net/base/listen_socket.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
diff --git a/net/base/tcp_client_socket_win.cc b/net/base/tcp_client_socket_win.cc
index 7151aca..d073485 100644
--- a/net/base/tcp_client_socket_win.cc
+++ b/net/base/tcp_client_socket_win.cc
@@ -10,6 +10,7 @@
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/winsock_init.h"
 
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index 56a1339..f1d4369 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -5,7 +5,6 @@
 #ifndef NET_BASE_UPLOAD_DATA_H_
 #define NET_BASE_UPLOAD_DATA_H_
 
-#include <string>
 #include <vector>
 
 #include "base/file_path.h"
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index 468ef6b..7a97846 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -5,6 +5,7 @@
 #include "net/base/upload_data_stream.h"
 
 #include "base/logging.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h
index e65d08b..d703c3d 100644
--- a/net/base/upload_data_stream.h
+++ b/net/base/upload_data_stream.h
@@ -6,11 +6,12 @@
 #define NET_BASE_UPLOAD_DATA_STREAM_H_
 
 #include "net/base/file_stream.h"
-#include "net/base/io_buffer.h"
 #include "net/base/upload_data.h"
 
 namespace net {
 
+class IOBuffer;
+
 class UploadDataStream {
  public:
   explicit UploadDataStream(const UploadData* data);
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index dfbbe23..63eacc1 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -16,6 +16,7 @@
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_client_socket.h"
 #include "net/base/upload_data_stream.h"
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 291091a..57bd6cc 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -13,6 +13,7 @@
 #include "net/base/address_list.h"
 #include "net/base/client_socket_handle.h"
 #include "net/base/host_resolver.h"
+#include "net/base/io_buffer.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_handler.h"
diff --git a/net/proxy/proxy_script_fetcher.cc b/net/proxy/proxy_script_fetcher.cc
index f2e5a39..87732c8 100644
--- a/net/proxy/proxy_script_fetcher.cc
+++ b/net/proxy/proxy_script_fetcher.cc
@@ -11,6 +11,7 @@
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 // TODO(eroman):
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index bb4e18a..7798fa7 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "base/file_path.h"
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
@@ -29,6 +28,7 @@ class UploadData;
 class X509Certificate;
 }  // namespace net
 
+class FilePath;
 class URLRequestContext;
 class URLRequestJob;
 
diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
index 1b37304..c242ef9 100644
--- a/net/url_request/url_request_file_dir_job.cc
+++ b/net/url_request/url_request_file_dir_job.cc
@@ -9,6 +9,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc
index b369216..7941424 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -25,6 +25,7 @@
 #include "base/string_util.h"
 #include "base/worker_pool.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index 6cb16b3..108a7cf 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -8,13 +8,16 @@
 #include <string>
 
 #include "base/file_path.h"
-#include "base/file_util.h"
 #include "net/base/completion_callback.h"
 #include "net/base/file_stream.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
+namespace file_util {
+struct FileInfo;
+}
+
 // A request job that handles reading file URLs
 class URLRequestFileJob : public URLRequestJob {
  public:
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index 1ea92a3..2b74277 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -24,9 +24,9 @@
 
 #include "base/hash_tables.h"
 #include "net/url_request/url_request.h"
-#include "net/url_request/url_request_job.h"
 
 class GURL;
+class URLRequestJob;
 
 class URLRequestFilter {
  public:
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index 13287a8..bdfb0b3 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -13,6 +13,7 @@
 #include "net/base/auth.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/wininet_util.h"
 #include "net/url_request/url_request.h"
diff --git a/net/url_request/url_request_inet_job.cc b/net/url_request/url_request_inet_job.cc
index 5cc14d5..e642bce 100644
--- a/net/url_request/url_request_inet_job.cc
+++ b/net/url_request/url_request_inet_job.cc
@@ -10,6 +10,7 @@
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/auth.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/wininet_util.h"
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index bbc40e1..d964532 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -9,6 +9,7 @@
 #include "build/build_config.h"
 #include "base/string_util.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/url_request_about_job.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_file_job.h"
diff --git a/net/url_request/url_request_new_ftp_job.cc b/net/url_request/url_request_new_ftp_job.cc
index d6e0ada..47dfef5 100644
--- a/net/url_request/url_request_new_ftp_job.cc
+++ b/net/url_request/url_request_new_ftp_job.cc
@@ -7,6 +7,7 @@
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "net/base/escape.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/ftp/ftp_directory_parser.h"
 #include "net/ftp/ftp_response_info.h"
diff --git a/net/url_request/url_request_new_ftp_job.h b/net/url_request/url_request_new_ftp_job.h
index 6c0a9fb..1a90a5e 100644
--- a/net/url_request/url_request_new_ftp_job.h
+++ b/net/url_request/url_request_new_ftp_job.h
@@ -6,7 +6,6 @@
 #define NET_URL_REQUEST_URL_REQUEST_NEW_FTP_JOB_H_
 
 #include <string>
-#include <vector>
 
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index 7c02875..2f23d58 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -5,6 +5,7 @@
 #include "net/url_request/url_request_simple_job.h"
 
 #include "base/message_loop.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 4953b19..b1e3b5c 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -8,6 +8,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
diff --git a/net/url_request/url_request_view_cache_job.cc b/net/url_request/url_request_view_cache_job.cc
index 81431c6..6fd4e23 100644
--- a/net/url_request/url_request_view_cache_job.cc
+++ b/net/url_request/url_request_view_cache_job.cc
@@ -6,6 +6,7 @@
 
 #include "base/string_util.h"
 #include "net/base/escape.h"
+#include "net/base/io_buffer.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_response_headers.h"
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 6da1489..cfaeb7c 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -40,6 +40,7 @@
 #include "net/base/cookie_monster.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 4cba4ad..2ec3f00 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -12,6 +12,7 @@
 #include <wininet.h>  // For INTERNET_MAX_URL_LENGTH
 
 #include "base/command_line.h"
+#include "base/file_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"