10 files changed, 31 insertions, 8 deletions
diff --git a/chrome/renderer/about_handler.cc b/chrome/renderer/about_handler.cc
index 56618df..5e6659e 100644
--- a/chrome/renderer/about_handler.cc
+++ b/chrome/renderer/about_handler.cc
@@ -6,6 +6,7 @@
 
 #include "base/platform_thread.h"
 #include "chrome/common/about_handler.h"
+#include "googleurl/src/gurl.h"
 
 typedef void (*AboutHandlerFuncPtr)();
 
diff --git a/chrome/renderer/audio_message_filter.cc b/chrome/renderer/audio_message_filter.cc
index d9c3a44..59b82c4 100644
--- a/chrome/renderer/audio_message_filter.cc
+++ b/chrome/renderer/audio_message_filter.cc
@@ -5,6 +5,7 @@
 #include "chrome/renderer/audio_message_filter.h"
 
 #include "base/message_loop.h"
+#include "base/time.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_logging.h"
 
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index cb397bc..25e5bb7 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -15,11 +15,14 @@
 #include "base/id_map.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
-#include "base/time.h"
 #include "ipc/ipc_channel_proxy.h"
 
 struct ViewMsg_AudioStreamState_Params;
 
+namespace base {
+class Time;
+}
+
 class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter {
  public:
   class Delegate {
diff --git a/chrome/renderer/command_buffer_proxy.cc b/chrome/renderer/command_buffer_proxy.cc
index 00138a6..aade75f 100644
--- a/chrome/renderer/command_buffer_proxy.cc
+++ b/chrome/renderer/command_buffer_proxy.cc
@@ -4,10 +4,13 @@
 
 #include "base/logging.h"
 #include "base/process_util.h"
+#include "base/shared_memory.h"
+#include "base/task.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/plugin_channel_host.h"
+#include "gfx/size.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 
 using gpu::Buffer;
@@ -211,6 +214,10 @@ void CommandBufferProxy::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
   Send(message);
 }
 
+void CommandBufferProxy::SetNotifyRepaintTask(Task* task) {
+  notify_repaint_task_.reset(task);
+}
+
 #if defined(OS_MACOSX)
 void CommandBufferProxy::SetWindowSize(const gfx::Size& size) {
   Send(new GpuCommandBufferMsg_SetWindowSize(route_id_, size));
diff --git a/chrome/renderer/command_buffer_proxy.h b/chrome/renderer/command_buffer_proxy.h
index 39421c7..9b8e3f7 100644
--- a/chrome/renderer/command_buffer_proxy.h
+++ b/chrome/renderer/command_buffer_proxy.h
@@ -13,16 +13,21 @@
 
 #include "base/callback.h"
 #include "base/linked_ptr.h"
-#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/shared_memory.h"
-#include "base/task.h"
-#include "gfx/size.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 
+namespace base {
+class SharedMemory;
+}
+
+namespace gfx {
+class Size;
+}
+
 class PluginChannelHost;
+class Task;
 
 // Client side proxy that forwards messages synchronously to a
 // CommandBufferStub.
@@ -64,9 +69,7 @@ class CommandBufferProxy : public gpu::CommandBuffer,
 
   // Set a task that will be invoked the next time the window becomes invalid
   // and needs to be repainted. Takes ownership of task.
-  void SetNotifyRepaintTask(Task* task) {
-    notify_repaint_task_.reset(task);
-  }
+  void SetNotifyRepaintTask(Task* task);
 
 #if defined(OS_MACOSX)
   virtual void SetWindowSize(const gfx::Size& size);
diff --git a/chrome/renderer/mock_render_thread.cc b/chrome/renderer/mock_render_thread.cc
index 57e9d80..6644634 100644
--- a/chrome/renderer/mock_render_thread.cc
+++ b/chrome/renderer/mock_render_thread.cc
@@ -10,6 +10,7 @@
 #include "base/process_util.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_message_utils.h"
+#include "ipc/ipc_sync_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockRenderThread::MockRenderThread()
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index 19ff4e4..d4ee0aa 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -13,6 +13,10 @@
 #include "chrome/renderer/render_thread.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 
+namespace IPC {
+class MessageReplyDeserializer;
+}
+
 struct ViewMsg_Print_Params;
 struct ViewMsg_PrintPages_Params;
 struct ViewHostMsg_ScriptedPrint_Params;
diff --git a/chrome/renderer/render_process_unittest.cc b/chrome/renderer/render_process_unittest.cc
index e99e44a..a1005b9 100644
--- a/chrome/renderer/render_process_unittest.cc
+++ b/chrome/renderer/render_process_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/string_util.h"
 #include "chrome/renderer/render_process_impl.h"
 #include "gfx/rect.h"
+#include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 55d53d6..4990b553 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -18,6 +18,7 @@
 #include "chrome/common/css_colors.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "gfx/native_widget_types.h"
+#include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_platform_file.h"
 
 class AppCacheDispatcher;
diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h
index f85d2a9d0..2164f66 100644
--- a/chrome/renderer/webplugin_delegate_pepper.h
+++ b/chrome/renderer/webplugin_delegate_pepper.h
@@ -14,6 +14,7 @@
 #include "base/id_map.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
+#include "base/task.h"
 #include "chrome/renderer/pepper_devices.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "gfx/native_widget_types.h"