Reduce header dependencies in chrome/browser/

In my scan of headers I got up to browser/gtk/

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

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

49 files changed, 93 insertions, 71 deletions

diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index 5dca83e..6d8b675 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -9,6 +9,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
+#include "base/thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h
index 0b3bc31..9706d4a 100644
--- a/chrome/browser/download/download_file.h
+++ b/chrome/browser/download/download_file.h
@@ -41,24 +41,23 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 
-#include <string>
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
-#include "base/thread.h"
 #include "base/timer.h"
-#include "chrome/browser/history/download_types.h"
+#include "googleurl/src/gurl.h"
 
 namespace net {
 class IOBuffer;
 }
+struct DownloadCreateInfo;
 class DownloadManager;
-class FilePath;
-class GURL;
 class MessageLoop;
 class ResourceDispatcherHost;
 class URLRequestContext;
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index e22821a..417d40c 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -4,10 +4,11 @@
 //
 // Download utility implementation
 
-#include <string>
-
 #include "chrome/browser/download/download_util.h"
 
+#include <string>
+
+#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index deb9468e..11edd5e 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -10,7 +10,6 @@
 #include <set>
 #include <string>
 
-#include "app/gfx/canvas.h"
 #include "base/basictypes.h"
 #include "base/task.h"
 
@@ -18,6 +17,10 @@
 #include "views/view.h"
 #endif
 
+namespace gfx {
+class Canvas;
+}
+
 class BaseDownloadItemModel;
 class DownloadItem;
 class SkBitmap;
diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index 48a3797..83106a2 100644
--- a/chrome/browser/download/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -11,6 +11,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
+#include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_package.h"
diff --git a/chrome/browser/download/save_file_manager.h b/chrome/browser/download/save_file_manager.h
index ac6c1c8..34c2f12 100644
--- a/chrome/browser/download/save_file_manager.h
+++ b/chrome/browser/download/save_file_manager.h
@@ -58,13 +58,10 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
 #define CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
 
-#include <utility>
-
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "base/thread.h"
 #include "chrome/browser/download/save_types.h"
 
 namespace net {
diff --git a/chrome/browser/download/save_item.h b/chrome/browser/download/save_item.h
index 8855692..7857b97 100644
--- a/chrome/browser/download/save_item.h
+++ b/chrome/browser/download/save_item.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 #define CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "chrome/browser/download/save_types.h"
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index a457053..7e90cbb 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_file_manager.h"
+#include "chrome/browser/download/save_item.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index 5c75936..ef475db 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -7,21 +7,17 @@
 
 #include <queue>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "chrome/common/pref_member.h"
-#include "chrome/browser/download/save_item.h"
-#include "chrome/browser/download/save_types.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/shell_dialogs.h"
 
 class SaveFileManager;
+class SaveItem;
 class SavePackage;
 class DownloadItem;
 class DownloadManager;
@@ -38,6 +34,7 @@ class Thread;
 class Time;
 }
 
+struct SaveFileCreateInfo;
 struct SavePackageParam;
 
 // The SavePackage object manages the process of saving a page as only-html or
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h
index 5a22f58..8dc795e 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/extensions/extension_bookmarks_module.h
@@ -6,12 +6,10 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_H_
 
 #include <string>
-#include <vector>
 
 #include "base/singleton.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/common/notification_registrar.h"
 
 // Observes BookmarkModel and then routes the notifications as events to
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index 034b2fd..a134169 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_
 
 #include <map>
-#include <vector>
 #include <string>
 
 #include "base/basictypes.h"
diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h
index 129e152..e2446e3 100755
--- a/chrome/browser/extensions/extension_creator.h
+++ b/chrome/browser/extensions/extension_creator.h
@@ -5,10 +5,16 @@
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_CREATOR_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_CREATOR_H_
 
-#include "base/command_line.h"
-#include "base/crypto/rsa_private_key.h"
-#include "base/file_path.h"
-#include "base/values.h"
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+
+namespace base {
+class RSAPrivateKey;
+}
+
+class FilePath;
 
 // This class create an installable extension (.crx file) given an input
 // directory that contains a valid manifest.json and the extension's resources
diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h
index 8375ae4..b59e256 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.h
+++ b/chrome/browser/extensions/extension_function_dispatcher.h
@@ -5,12 +5,10 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_
 
-#include <map>
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
-#include "base/values.h"
 
 class Browser;
 class ExtensionFunction;
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 4b7ba14..39570a1 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_view.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h
index ef6c1ec..2a0a2bc 100644
--- a/chrome/browser/extensions/extension_message_service.h
+++ b/chrome/browser/extensions/extension_message_service.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/lock.h"
-#include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/common/notification_registrar.h"
 
 class MessageLoop;
diff --git a/chrome/browser/extensions/extension_protocols.h b/chrome/browser/extensions/extension_protocols.h
index b76c31c..b4fc7da 100644
--- a/chrome/browser/extensions/extension_protocols.h
+++ b/chrome/browser/extensions/extension_protocols.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_
 
-#include "base/file_path.h"
-
 // Registers support for the extension URL scheme.
 void RegisterExtensionProtocols();
 
diff --git a/chrome/browser/extensions/extension_shelf.cc b/chrome/browser/extensions/extension_shelf.cc
index 3978d19..72b168f 100644
--- a/chrome/browser/extensions/extension_shelf.cc
+++ b/chrome/browser/extensions/extension_shelf.cc
@@ -4,10 +4,14 @@
 
 #include "chrome/browser/extensions/extension_shelf.h"
 
+#include <algorithm>
+
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extensions_service.h"
diff --git a/chrome/browser/extensions/extension_shelf_model.h b/chrome/browser/extensions/extension_shelf_model.h
index 5b03795..5ff1b45 100644
--- a/chrome/browser/extensions/extension_shelf_model.h
+++ b/chrome/browser/extensions/extension_shelf_model.h
@@ -11,10 +11,10 @@
 #include "base/observer_list.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 
 class Browser;
+class ExtensionHost;
 class ExtensionView;
 
 // Objects implement this interface when they wish to be notified of changes to
diff --git a/chrome/browser/extensions/extension_shelf_model_unittest.cc b/chrome/browser/extensions/extension_shelf_model_unittest.cc
index 82ce02e..513f281 100644
--- a/chrome/browser/extensions/extension_shelf_model_unittest.cc
+++ b/chrome/browser/extensions/extension_shelf_model_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
+#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_shelf_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/test_extension_loader.h"
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index b759349..8bf49f8 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -10,15 +10,12 @@
 #include <string>
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/linked_ptr.h"
-#include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/task.h"
+#include "base/tuple.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/external_extension_provider.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 
 class Browser;
@@ -26,6 +23,7 @@ class DictionaryValue;
 class Extension;
 class ExtensionsServiceBackend;
 class GURL;
+class MessageLoop;
 class PrefService;
 class Profile;
 class ResourceDispatcherHost;
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index af69ec6..02ad15f 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 417fd00..80e0137 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -8,14 +8,16 @@
 #include <string>
 #include <vector>
 
-#include "base/values.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
-#include "chrome/browser/extensions/extensions_service.h"
 #include "googleurl/src/gurl.h"
 
-class GURL;
+class DictionaryValue;
+class Extension;
+class ExtensionsService;
+class FilePath;
 class UserScript;
+class Value;
 
 // Information about a page running in an extension, for example a toolstrip,
 // a background page, or a tab contents.
diff --git a/chrome/browser/extensions/test_extension_loader.h b/chrome/browser/extensions/test_extension_loader.h
index e0ef193..ddf5585 100644
--- a/chrome/browser/extensions/test_extension_loader.h
+++ b/chrome/browser/extensions/test_extension_loader.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_LOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_LOADER_H_
 
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index 5d28cb4..5cf3696 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -34,6 +34,11 @@ static bool GetDeclarationValue(const StringPiece& line,
   return true;
 }
 
+UserScriptMaster::ScriptReloader::ScriptReloader(UserScriptMaster* master)
+    : master_(master),
+      master_message_loop_(MessageLoop::current()) {
+}
+
 // static
 bool UserScriptMaster::ScriptReloader::ParseMetadataHeader(
       const StringPiece& script_text, UserScript* script) {
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 4367c7e..7a73323 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -9,15 +9,13 @@
 
 #include "base/directory_watcher.h"
 #include "base/file_path.h"
-#include "base/message_loop.h"
-#include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/notification_registrar.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
+class MessageLoop;
 class StringPiece;
 
 // Manages a segment of shared memory that contains the user scripts the user
@@ -78,8 +76,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
     static void LoadScriptsFromDirectory(const FilePath script_dir,
                                          UserScriptList* result);
 
-    explicit ScriptReloader(UserScriptMaster* master)
-        : master_(master), master_message_loop_(MessageLoop::current()) {}
+    explicit ScriptReloader(UserScriptMaster* master);
 
     // Start a scan for scripts.
     // Will always send a message to the master upon completion.
diff --git a/chrome/browser/external_protocol_handler.h b/chrome/browser/external_protocol_handler.h
index 2cc81a4..20a1375 100644
--- a/chrome/browser/external_protocol_handler.h
+++ b/chrome/browser/external_protocol_handler.h
@@ -5,10 +5,12 @@
 #ifndef CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
 #define CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
 
-#include "chrome/common/pref_service.h"
+#include <string>
 
+class DictionaryValue;
 class GURL;
 class MessageLoop;
+class PrefService;
 
 class ExternalProtocolHandler {
  public:
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index a1b3f16..cc8b4db 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -5,13 +5,14 @@
 #ifndef CHROME_BROWSER_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/command_line.h"
 #include "base/gfx/native_widget_types.h"
 #include "chrome/browser/browser_process_impl.h"
 
+class CommandLine;
 class FilePath;
 class Profile;
 class ProcessSingleton;
diff --git a/chrome/browser/gtk/blocked_popup_container_view_gtk.h b/chrome/browser/gtk/blocked_popup_container_view_gtk.h
index 970f0a7..c5fdc1a 100644
--- a/chrome/browser/gtk/blocked_popup_container_view_gtk.h
+++ b/chrome/browser/gtk/blocked_popup_container_view_gtk.h
@@ -7,19 +7,10 @@
 
 #include <gtk/gtk.h>
 
-#include <set>
-#include <utility>
-#include <vector>
-
-#include "app/slide_animation.h"
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
-#include "base/string_util.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/owned_widget_gtk.h"
 
 class BlockedPopupContainerInternalView;
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 08bd6fb..f4b1384 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 
+#include <vector>
+
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index f0b2d06..9ad0763 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 
 #include <string>
-#include <vector>
 
 #include "app/slide_animation.h"
 #include "chrome/common/owned_widget_gtk.h"
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
index e410818..54ab5c1 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
index eddc8bb..46a3c73 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
@@ -5,11 +5,14 @@
 #ifndef CHROME_BROWSER_GTK_CLEAR_BROWSING_DATA_DIALOG_GTK_H_
 #define CHROME_BROWSER_GTK_CLEAR_BROWSING_DATA_DIALOG_GTK_H_
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "base/basictypes.h"
 
-class Profile;
+typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 
+class BrowsingDataRemover;
+class Profile;
+
 class ClearBrowsingDataDialogGtk {
  public:
   // Displays the dialog box to clear browsing data from |profile|.
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 0972513..744f8fc 100755..100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/gtk/download_shelf_gtk.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
+#include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/gtk/import_dialog_gtk.h b/chrome/browser/gtk/import_dialog_gtk.h
index f3d4f03..1a62ddd 100644
--- a/chrome/browser/gtk/import_dialog_gtk.h
+++ b/chrome/browser/gtk/import_dialog_gtk.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/importer/importer.h"
 
-#include "chrome/browser/profile.h"
+class Profile;
 
 class ImportDialogGtk : public ImportObserver {
  public:
diff --git a/chrome/browser/gtk/import_lock_dialog_gtk.cc b/chrome/browser/gtk/import_lock_dialog_gtk.cc
index e2a9e17..465ccea 100644
--- a/chrome/browser/gtk/import_lock_dialog_gtk.cc
+++ b/chrome/browser/gtk/import_lock_dialog_gtk.cc
@@ -6,6 +6,8 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/message_loop.h"
+#include "chrome/browser/importer/importer.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/gtk/import_lock_dialog_gtk.h b/chrome/browser/gtk/import_lock_dialog_gtk.h
index 99087d3..ebcee7f 100644
--- a/chrome/browser/gtk/import_lock_dialog_gtk.h
+++ b/chrome/browser/gtk/import_lock_dialog_gtk.h
@@ -5,10 +5,13 @@
 #ifndef CHROME_BROWSER_GTK_IMPORT_LOCK_DIALOG_GTK_H_
 #define CHROME_BROWSER_GTK_IMPORT_LOCK_DIALOG_GTK_H_
 
-#include "chrome/browser/importer/importer.h"
-
 #include <gtk/gtk.h>
 
+#include "base/basictypes.h"
+#include "base/ref_counted.h"
+
+class ImporterHost;
+
 class ImportLockDialogGtk {
  public:
   // Displays the Firefox profile locked warning
diff --git a/chrome/browser/gtk/import_progress_dialog_gtk.h b/chrome/browser/gtk/import_progress_dialog_gtk.h
index bc8d6c9..c98472f 100644
--- a/chrome/browser/gtk/import_progress_dialog_gtk.h
+++ b/chrome/browser/gtk/import_progress_dialog_gtk.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_GTK_IMPORT_PROGRESS_DIALOG_GTK_H_
 #define CHROME_BROWSER_GTK_IMPORT_PROGRESS_DIALOG_GTK_H_
 
-#include "chrome/browser/importer/importer.h"
-
 #include <gtk/gtk.h>
 
-#include "chrome/browser/profile.h"
+#include "chrome/browser/importer/importer.h"
+
+class Profile;
 
 class ImportProgressDialogGtk : public ImporterHost::Observer {
  public:
diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc
index 1a7b53f..727eff4 100644
--- a/chrome/browser/gtk/infobar_gtk.cc
+++ b/chrome/browser/gtk/infobar_gtk.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/infobar_container_gtk.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/gtk_util.h"
 
 namespace {
diff --git a/chrome/browser/gtk/infobar_gtk.h b/chrome/browser/gtk/infobar_gtk.h
index e3d5b1b..98d14bc 100644
--- a/chrome/browser/gtk/infobar_gtk.h
+++ b/chrome/browser/gtk/infobar_gtk.h
@@ -8,11 +8,11 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/slide_animator_gtk.h"
-#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/owned_widget_gtk.h"
 
 class CustomDrawButton;
 class InfoBarContainerGtk;
+class InfoBarDelegate;
 
 class InfoBar : public SlideAnimatorGtk::Delegate {
  public:
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index f259b39..6cecfcb 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/common/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h
index 975580d..2249e3d 100644
--- a/chrome/browser/gtk/menu_gtk.h
+++ b/chrome/browser/gtk/menu_gtk.h
@@ -6,14 +6,15 @@
 #define CHROME_BROWSER_GTK_MENU_GTK_H_
 
 #include <gtk/gtk.h>
+
 #include <string>
-#include <vector>
 
-#include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/common/owned_widget_gtk.h"
 
 class SkBitmap;
 
+struct MenuCreateMaterial;
+
 class MenuGtk {
  public:
   // Delegate class that lets another class control the status of the menu.
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index 21a8549..395adca 100644
--- a/chrome/browser/gtk/options/general_page_gtk.cc
+++ b/chrome/browser/gtk/options/general_page_gtk.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
+#include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/session_startup_pref.h"
diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h
index e8e8e15..606948e 100644
--- a/chrome/browser/gtk/options/general_page_gtk.h
+++ b/chrome/browser/gtk/options/general_page_gtk.h
@@ -6,16 +6,18 @@
 #define CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_
 
 #include <gtk/gtk.h>
+
+#include <string>
 #include <vector>
 
-#include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/options_page_base.h"
-#include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_member.h"
 #include "googleurl/src/gurl.h"
 
+class Profile;
+
 class GeneralPageGtk : public OptionsPageBase,
                        public TemplateURLModelObserver {
  public:
diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
index b485544..12de582 100644
--- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
+++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/gtk_util.h"
+#include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.h b/chrome/browser/gtk/options/url_picker_dialog_gtk.h
index 38c32a2..261b686 100644
--- a/chrome/browser/gtk/options/url_picker_dialog_gtk.h
+++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.h
@@ -7,8 +7,9 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/browser/profile.h"
-#include "googleurl/src/gurl.h"
+
+class GURL;
+class Profile;
 
 class UrlPickerDialogGtk {
  public:
diff --git a/chrome/browser/renderer_host/save_file_resource_handler.cc b/chrome/browser/renderer_host/save_file_resource_handler.cc
index 2f469f1..b55795c 100644
--- a/chrome/browser/renderer_host/save_file_resource_handler.cc
+++ b/chrome/browser/renderer_host/save_file_resource_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/renderer_host/save_file_resource_handler.h"
 
+#include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 7ebfbc6..0e097b1 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -10,6 +10,7 @@
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "base/string_util.h"
+#include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.h b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
index 51f5cf35..444d0f2 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_gtk.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
@@ -11,6 +11,7 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/menu_gtk.h"
+#include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 class ContextMenuParams;
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 7ef658a..60282bd 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -7,6 +7,7 @@
 #include "base/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"