13 files changed, 13 insertions, 10 deletions
diff --git a/content/browser/debugger/worker_devtools_message_filter.h b/content/browser/debugger/worker_devtools_message_filter.h
index db49a95..23cd549 100644
--- a/content/browser/debugger/worker_devtools_message_filter.h
+++ b/content/browser/debugger/worker_devtools_message_filter.h
@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_DEBUGGER_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
 #pragma once
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "content/browser/browser_message_filter.h"
 
 class WorkerDevToolsMessageFilter : public BrowserMessageFilter {
diff --git a/content/browser/font_list_async.h b/content/browser/font_list_async.h
index e9e9435..3f73ab2 100644
--- a/content/browser/font_list_async.h
+++ b/content/browser/font_list_async.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_FONT_LIST_ASYNC_H_
 #define CONTENT_BROWSER_FONT_LIST_ASYNC_H_
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index 939bbd0..da64174 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/task.h"
 #include "base/memory/linked_ptr.h"
diff --git a/content/browser/renderer_host/backing_store.h b/content/browser/renderer_host/backing_store.h
index d17a7b9..ddb7369e 100644
--- a/content/browser/renderer_host/backing_store.h
+++ b/content/browser/renderer_host/backing_store.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/surface/transport_dib.h"
diff --git a/content/browser/renderer_host/backing_store_gtk.h b/content/browser/renderer_host/backing_store_gtk.h
index cede176..5956188 100644
--- a/content/browser/renderer_host/backing_store_gtk.h
+++ b/content/browser/renderer_host/backing_store_gtk.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/backing_store_manager.h b/content/browser/renderer_host/backing_store_manager.h
index beb4f28..c170034 100644
--- a/content/browser/renderer_host/backing_store_manager.h
+++ b/content/browser/renderer_host/backing_store_manager.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/process.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/rect.h"
diff --git a/content/browser/renderer_host/backing_store_win.h b/content/browser/renderer_host/backing_store_win.h
index bf0e408..89c9cea 100644
--- a/content/browser/renderer_host/backing_store_win.h
+++ b/content/browser/renderer_host/backing_store_win.h
@@ -9,6 +9,7 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "content/browser/renderer_host/backing_store.h"
 
 class BackingStoreWin : public BackingStore {
diff --git a/content/browser/renderer_host/render_widget_host_view.h b/content/browser/renderer_host/render_widget_host_view.h
index 6ed0974..da26576 100644
--- a/content/browser/renderer_host/render_widget_host_view.h
+++ b/content/browser/renderer_host/render_widget_host_view.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "base/process_util.h"
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "content/common/content_export.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/content/browser/renderer_host/test_backing_store.h b/content/browser/renderer_host/test_backing_store.h
index 05da4e6..d3bfa64 100644
--- a/content/browser/renderer_host/test_backing_store.h
+++ b/content/browser/renderer_host/test_backing_store.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "content/browser/renderer_host/backing_store.h"
 
 class TestBackingStore : public BackingStore {
diff --git a/content/browser/resource_context.h b/content/browser/resource_context.h
index f5f8f52..39358f5 100644
--- a/content/browser/resource_context.h
+++ b/content/browser/resource_context.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 18fd551..080a403 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "content/public/common/window_container_type.h"
 #include "content/public/common/content_client.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h
index 51a4cd8..63dad1d 100644
--- a/content/renderer/gpu/input_event_filter.h
+++ b/content/renderer/gpu/input_event_filter.h
@@ -8,7 +8,7 @@
 #include <queue>
 #include <set>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_channel_proxy.h"
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 0f3a0a9..7501ee8 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -21,7 +21,7 @@
 
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/observer_list_threadsafe.h"