7 files changed, 11 insertions, 12 deletions
diff --git a/chrome/common/child_process_info.h b/chrome/common/child_process_info.h
index fff0959..eee468d 100644
--- a/chrome/common/child_process_info.h
+++ b/chrome/common/child_process_info.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/process.h"
 
 // Holds information about a child process.
diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/common/chrome_plugin_unittest.cc
index 795c43a..ef4aaf7 100644
--- a/chrome/common/chrome_plugin_unittest.cc
+++ b/chrome/common/chrome_plugin_unittest.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/test/chrome_plugin/test_chrome_plugin.h"
 #include "net/base/io_buffer.h"
+#include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index 0c80c8c..07f99e4 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/chrome/common/chrome_plugin_util.h
@@ -13,7 +13,7 @@
 
 class ChromePluginLib;
 class MessageLoop;
-namespace net{
+namespace net {
 class HttpResponseHeaders;
 }
 
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index 08da43a..81d1a78 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.cc
@@ -13,6 +13,8 @@
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
+#include "net/url_request/url_request.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/common/net/url_request_intercept_job.h b/chrome/common/net/url_request_intercept_job.h
index 794a418..bc422af 100644
--- a/chrome/common/net/url_request_intercept_job.h
+++ b/chrome/common/net/url_request_intercept_job.h
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__
-#define CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__
+#ifndef CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_
+#define CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_
 
-#include "base/basictypes.h"
-#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_api.h"
@@ -14,6 +12,7 @@
 #include "chrome/common/notification_observer.h"
 
 class ChromePluginLib;
+class URLRequest;
 
 // A request job that handles network requests intercepted by a Chrome plugin.
 class URLRequestInterceptJob
@@ -56,9 +55,7 @@ class URLRequestInterceptJob
   net::IOBuffer* read_buffer_;
   int read_buffer_size_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequestInterceptJob);
+  DISALLOW_COPY_AND_ASSIGN(URLRequestInterceptJob);
 };
 
-
-#endif  // CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__
-
+#endif  // CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_
diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h
index cb81467..8cc375f 100644
--- a/chrome/common/pref_service.h
+++ b/chrome/common/pref_service.h
@@ -15,9 +15,8 @@
 #ifndef CHROME_COMMON_PREF_SERVICE_H_
 #define CHROME_COMMON_PREF_SERVICE_H_
 
-#include <string>
+#include <set>
 
-#include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/non_thread_safe.h"
 #include "base/observer_list.h"
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index c96d787..c814b84 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -23,6 +23,7 @@
 #include "googleurl/src/gurl.h"
 #include "media/audio/audio_output.h"
 #include "net/base/upload_data.h"
+#include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/cache_manager.h"