17 files changed, 43 insertions, 13 deletions
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index f9e7673..5e78245 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/chrome/common/chrome_plugin_util.h
@@ -12,6 +12,7 @@
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "chrome/common/chrome_plugin_api.h"
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class ChromePluginLib;
diff --git a/chrome/common/notification_observer_mock.h b/chrome/common/notification_observer_mock.h
index 8bd096e..0385f26 100644
--- a/chrome/common/notification_observer_mock.h
+++ b/chrome/common/notification_observer_mock.h
@@ -6,12 +6,13 @@
 #define CHROME_COMMON_NOTIFICATION_OBSERVER_MOCK_H_
 #pragma once
 
-#include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+class NotificationDetails;
+class NotificationSource;
+
 class NotificationObserverMock : public NotificationObserver {
  public:
   NotificationObserverMock() {}
diff --git a/chrome/common/notification_registrar.h b/chrome/common/notification_registrar.h
index eb83712..1207d99 100644
--- a/chrome/common/notification_registrar.h
+++ b/chrome/common/notification_registrar.h
@@ -9,7 +9,10 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_type.h"
+
+class NotificationObserver;
+class NotificationSource;
 
 // Aids in registering for notifications and ensures that all registered
 // notifications are unregistered when the class is destroyed.
diff --git a/chrome/common/notification_service.cc b/chrome/common/notification_service.cc
index e127ccf..be4b1b7 100644
--- a/chrome/common/notification_service.cc
+++ b/chrome/common/notification_service.cc
@@ -6,6 +6,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/thread_local.h"
+#include "chrome/common/notification_observer.h"
 
 static base::LazyInstance<base::ThreadLocalPointer<NotificationService> >
     lazy_tls_ptr(base::LINKER_INITIALIZED);
diff --git a/chrome/common/notification_service.h b/chrome/common/notification_service.h
index 8945c63..c20b98d 100644
--- a/chrome/common/notification_service.h
+++ b/chrome/common/notification_service.h
@@ -14,7 +14,6 @@
 
 #include "base/observer_list.h"
 #include "chrome/common/notification_details.h"
-#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 
diff --git a/chrome/common/notification_service_unittest.cc b/chrome/common/notification_service_unittest.cc
index d65f6e5..8578eb9 100644
--- a/chrome/common/notification_service_unittest.cc
+++ b/chrome/common/notification_service_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/page_zoom.h b/chrome/common/page_zoom.h
index 0f3ad65..25fd3886 100644
--- a/chrome/common/page_zoom.h
+++ b/chrome/common/page_zoom.h
@@ -6,6 +6,8 @@
 #define CHROME_COMMON_PAGE_ZOOM_H_
 #pragma once
 
+#include "base/basictypes.h"
+
 class PageZoom {
  public:
   // This enum is the parameter to various text/page zoom commands so we know
diff --git a/chrome/common/pepper_plugin_registry.h b/chrome/common/pepper_plugin_registry.h
index 562d26c..9b12f7e 100644
--- a/chrome/common/pepper_plugin_registry.h
+++ b/chrome/common/pepper_plugin_registry.h
@@ -6,8 +6,8 @@
 #define CHROME_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/file_path.h"
diff --git a/chrome/common/plugin_group.cc b/chrome/common/plugin_group.cc
index 5673fc5..5d3a933 100644
--- a/chrome/common/plugin_group.cc
+++ b/chrome/common/plugin_group.cc
@@ -4,11 +4,13 @@
 
 #include "chrome/common/plugin_group.h"
 
+#include "base/linked_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
diff --git a/chrome/common/plugin_group.h b/chrome/common/plugin_group.h
index 0518c9f..22acb88 100644
--- a/chrome/common/plugin_group.h
+++ b/chrome/common/plugin_group.h
@@ -10,13 +10,16 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/linked_ptr.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "webkit/glue/plugins/webplugininfo.h"
 
 class DictionaryValue;
+class FilePath;
 class Version;
+struct WebPluginInfo;
+
+template <typename T>
+class linked_ptr;
 
 // Hard-coded definitions of plugin groups.
 struct PluginGroupDefinition {
diff --git a/chrome/common/process_watcher.h b/chrome/common/process_watcher.h
index f28eca6..54550aa 100644
--- a/chrome/common/process_watcher.h
+++ b/chrome/common/process_watcher.h
@@ -9,7 +9,7 @@
 #include "build/build_config.h"
 
 #include "base/basictypes.h"
-#include "base/process_util.h"
+#include "base/process.h"
 
 class ProcessWatcher {
  public:
diff --git a/chrome/common/property_bag.cc b/chrome/common/property_bag.cc
index dc25961..6974f3c 100644
--- a/chrome/common/property_bag.cc
+++ b/chrome/common/property_bag.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/linked_ptr.h"
 #include "chrome/common/property_bag.h"
 
 PropertyBag::PropertyBag() {
diff --git a/chrome/common/property_bag.h b/chrome/common/property_bag.h
index dffcf7c..d0d7c89 100644
--- a/chrome/common/property_bag.h
+++ b/chrome/common/property_bag.h
@@ -9,8 +9,9 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/linked_ptr.h"
 
+template <typename T>
+class linked_ptr;
 class PropertyAccessorBase;
 
 // A property bag holds a generalized list of arbitrary metadata called
diff --git a/chrome/common/serialized_script_value.cc b/chrome/common/serialized_script_value.cc
index 776cfc7..deff44c 100644
--- a/chrome/common/serialized_script_value.cc
+++ b/chrome/common/serialized_script_value.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/common/serialized_script_value.h"
 
+#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
 using WebKit::WebSerializedScriptValue;
diff --git a/chrome/common/serialized_script_value.h b/chrome/common/serialized_script_value.h
index 75baef6..9848d13 100644
--- a/chrome/common/serialized_script_value.h
+++ b/chrome/common/serialized_script_value.h
@@ -7,7 +7,10 @@
 #pragma once
 
 #include "base/string16.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
+
+namespace WebKit {
+class WebSerializedScriptValue;
+}
 
 class SerializedScriptValue {
  public:
diff --git a/chrome/common/socket_stream_dispatcher.cc b/chrome/common/socket_stream_dispatcher.cc
index 83ef0e1..1ad0be6 100644
--- a/chrome/common/socket_stream_dispatcher.cc
+++ b/chrome/common/socket_stream_dispatcher.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/net/socket_stream.h"
 #include "googleurl/src/gurl.h"
+#include "ipc/ipc_message.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
diff --git a/chrome/common/socket_stream_dispatcher.h b/chrome/common/socket_stream_dispatcher.h
index 2640ed4..e0bf58f 100644
--- a/chrome/common/socket_stream_dispatcher.h
+++ b/chrome/common/socket_stream_dispatcher.h
@@ -9,9 +9,19 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ipc/ipc_channel.h"
-#include "ipc/ipc_message.h"
-#include "webkit/glue/websocketstreamhandle_bridge.h"
+
+namespace IPC {
+class Message;
+}
+
+namespace WebKit {
+class WebSocketStreamHandle;
+}
+
+namespace webkit_glue {
+class WebSocketStreamHandleBridge;
+class WebSocketStreamHandleDelegate;
+}
 
 // Dispatches socket stream related messages sent to a child process from the
 // main browser process.  There is one instance per child process.  Messages