92 files changed, 195 insertions, 194 deletions

diff --git a/app/app.vcproj b/app/app.vcproj
index aeee826..ad6a6eb 100644
--- a/app/app.vcproj
+++ b/app/app.vcproj
@@ -144,6 +144,30 @@
 				RelativePath=".\gfx\chrome_font_win.cc"

 				>

 			</File>

+			<File

+				RelativePath=".\gfx\favicon_size.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\icon_util.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\icon_util.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\insets.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\path.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\path_win.cc"

+				>

+			</File>

 		</Filter>

 		<File

 			RelativePath=".\animation.cc"

@@ -154,6 +178,14 @@
 			>

 		</File>

 		<File

+			RelativePath=".\drag_drop_types.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\drag_drop_types.h"

+			>

+		</File>

+		<File

 			RelativePath=".\l10n_util.cc"

 			>

 		</File>

@@ -170,6 +202,18 @@
 			>

 		</File>

 		<File

+			RelativePath=".\message_box_flags.h"

+			>

+		</File>

+		<File

+			RelativePath=".\os_exchange_data.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\os_exchange_data.h"

+			>

+		</File>

+		<File

 			RelativePath=".\resource_bundle.cc"

 			>

 		</File>

diff --git a/chrome/common/drag_drop_types.cc b/app/drag_drop_types.cc
index 17e49a0..5944868 100644
--- a/chrome/common/drag_drop_types.cc
+++ b/app/drag_drop_types.cc
@@ -2,7 +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/drag_drop_types.h"
+#include "app/drag_drop_types.h"
 
 #include <oleidl.h>
 
diff --git a/chrome/common/drag_drop_types.h b/app/drag_drop_types.h
index ce2c73b..52f35c9 100644
--- a/chrome/common/drag_drop_types.h
+++ b/app/drag_drop_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_DRAG_DROP_TYPES_H_
-#define CHROME_COMMON_DRAG_DROP_TYPES_H_
+#ifndef APP_DRAG_DROP_TYPES_H_
+#define APP_DRAG_DROP_TYPES_H_
 
 #include "base/basictypes.h"
 
@@ -20,4 +20,4 @@ class DragDropTypes {
   static int DropEffectToDragOperation(uint32 effect);
 };
 
-#endif  // CHROME_COMMON_DRAG_DROP_TYPES_H_
+#endif  // APP_DRAG_DROP_TYPES_H_
diff --git a/chrome/common/gfx/favicon_size.h b/app/gfx/favicon_size.h
index bf805d3..fb66411 100644
--- a/chrome/common/gfx/favicon_size.h
+++ b/app/gfx/favicon_size.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_GFX_FAVICON_SIZE_H__
-#define CHROME_COMMON_GFX_FAVICON_SIZE_H__
+#ifndef APP_GFX_FAVICON_SIZE_H_
+#define APP_GFX_FAVICON_SIZE_H_
 
 #include "base/compiler_specific.h"
 
@@ -30,4 +30,4 @@ void calc_favicon_target_size(int* width, int* height) {
   }
 }
 
-#endif // CHROME_COMMON_GFX_FAVICON_SIZE_H__
+#endif // APP_GFX_FAVICON_SIZE_H_
diff --git a/chrome/common/gfx/icon_util.cc b/app/gfx/icon_util.cc
index 520faed..1e9e3c9 100644
--- a/chrome/common/gfx/icon_util.cc
+++ b/app/gfx/icon_util.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/gfx/icon_util.h"
+#include "app/gfx/icon_util.h"
+
 #include "base/file_util.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
diff --git a/chrome/common/gfx/icon_util.h b/app/gfx/icon_util.h
index 9066df9..9066df9 100644
--- a/chrome/common/gfx/icon_util.h
+++ b/app/gfx/icon_util.h
diff --git a/chrome/common/gfx/icon_util_unittest.cc b/app/gfx/icon_util_unittest.cc
index 116589d..0b9c200 100644
--- a/chrome/common/gfx/icon_util_unittest.cc
+++ b/app/gfx/icon_util_unittest.cc
@@ -6,7 +6,7 @@
 #include <atlapp.h>
 #include <atlmisc.h>
 
-#include "chrome/common/gfx/icon_util.h"
+#include "app/gfx/icon_util.h"
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/file_util.h"
diff --git a/chrome/common/gfx/insets.h b/app/gfx/insets.h
index 741de3a2..741de3a2 100644
--- a/chrome/common/gfx/insets.h
+++ b/app/gfx/insets.h
diff --git a/chrome/common/gfx/path.h b/app/gfx/path.h
index ac7537c..ac7537c 100644
--- a/chrome/common/gfx/path.h
+++ b/app/gfx/path.h
diff --git a/chrome/common/gfx/path_gtk.cc b/app/gfx/path_gtk.cc
index aeab76f..bc35857 100644
--- a/chrome/common/gfx/path_gtk.cc
+++ b/app/gfx/path_gtk.cc
@@ -2,7 +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/gfx/path.h"
+#include "app/gfx/path.h"
 
 #include <gdk/gdk.h>
 
diff --git a/chrome/common/gfx/path_win.cc b/app/gfx/path_win.cc
index aa2fe02..72fce71 100644
--- a/chrome/common/gfx/path_win.cc
+++ b/app/gfx/path_win.cc
@@ -2,7 +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/gfx/path.h"
+#include "app/gfx/path.h"
 
 #include "base/scoped_ptr.h"
 
diff --git a/chrome/common/message_box_flags.h b/app/message_box_flags.h
index 8520c56..f690cd2 100644
--- a/chrome/common/message_box_flags.h
+++ b/app/message_box_flags.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_MESSAGE_BOX_FLAGS_H_
-#define CHROME_COMMON_MESSAGE_BOX_FLAGS_H_
+#ifndef APP_MESSAGE_BOX_FLAGS_H_
+#define APP_MESSAGE_BOX_FLAGS_H_
 
 #include "base/basictypes.h"
 
@@ -54,4 +54,4 @@ class MessageBoxFlags {
   DISALLOW_COPY_AND_ASSIGN(MessageBoxFlags);
 };
 
-#endif  // CHROME_COMMON_MESSAGE_BOX_FLAGS_H_
+#endif  // APP_MESSAGE_BOX_FLAGS_H_
diff --git a/chrome/common/os_exchange_data.cc b/app/os_exchange_data.cc
index 969724f..489539ff 100644
--- a/chrome/common/os_exchange_data.cc
+++ b/app/os_exchange_data.cc
@@ -4,7 +4,7 @@
 
 #include <shlobj.h>
 
-#include "chrome/common/os_exchange_data.h"
+#include "app/os_exchange_data.h"
 
 #include "app/l10n_util.h"
 #include "base/clipboard_util.h"
diff --git a/chrome/common/os_exchange_data.h b/app/os_exchange_data.h
index 735e366..5668008 100644
--- a/chrome/common/os_exchange_data.h
+++ b/app/os_exchange_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_OS_EXCHANGE_DATA_H__
-#define CHROME_COMMON_OS_EXCHANGE_DATA_H__
+#ifndef APP_OS_EXCHANGE_DATA_H_
+#define APP_OS_EXCHANGE_DATA_H_
 
 #include <atlbase.h>
 #include <objidl.h>
@@ -141,4 +141,4 @@ class OSExchangeData : public IDataObject {
   DISALLOW_EVIL_CONSTRUCTORS(OSExchangeData);
 };
 
-#endif  // #ifndef CHROME_COMMON_OS_EXCHANGE_DATA_H__
+#endif  // #ifndef APP_OS_EXCHANGE_DATA_H_
diff --git a/chrome/common/os_exchange_data_unittest.cc b/app/os_exchange_data_unittest.cc
index 205eb40..6911985 100644
--- a/chrome/common/os_exchange_data_unittest.cc
+++ b/app/os_exchange_data_unittest.cc
@@ -5,12 +5,12 @@
 #include <atlbase.h>
 #include <shlobj.h>
 
+#include "app/os_exchange_data.h"
 #include "base/clipboard_util.h"
 #include "base/pickle.h"
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/win_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc
index 99ea2f5..1ffbd39 100644
--- a/chrome/browser/app_modal_dialog_gtk.cc
+++ b/chrome/browser/app_modal_dialog_gtk.cc
@@ -7,11 +7,11 @@
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/common/message_box_flags.h"
 #include "grit/generated_resources.h"
 
 namespace {
diff --git a/chrome/browser/app_modal_dialog_mac.mm b/chrome/browser/app_modal_dialog_mac.mm
index 6df038f..26c1dcf 100644
--- a/chrome/browser/app_modal_dialog_mac.mm
+++ b/chrome/browser/app_modal_dialog_mac.mm
@@ -7,8 +7,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/common/message_box_flags.h"
 #include "grit/generated_resources.h"
 
 // Helper object that receives the notification that the dialog/sheet is
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 70df68c..e544f76 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -9,6 +9,7 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
+#include "app/os_exchange_data.h"
 #include "base/base_drag_source.h"
 #include "base/base_drop_target.h"
 #include "base/basictypes.h"
@@ -35,7 +36,6 @@
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/gfx/utils.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/focus/focus_util_win.h"
 #include "googleurl/src/url_util.h"
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index ec2284f..395e02e 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/automation/automation_provider.h"
 
+#include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -29,7 +30,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index b64562e..4b3bdb6 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -4,6 +4,12 @@
 
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 
+// TODO(port): Port this file.
+#if defined(OS_WIN)
+#include "app/os_exchange_data.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
@@ -11,12 +17,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/url_constants.h"
 
-// TODO(port): Port this file.
-#if defined(OS_WIN)
-#include "chrome/common/os_exchange_data.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
 
 #if defined(OS_WIN)
 static CLIPFORMAT clipboard_format = 0;
diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
index c952471..1d1e1f2 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/os_exchange_data.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.cc b/chrome/browser/bookmarks/bookmark_menu_controller.cc
index 4376c92..7f90a52 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_menu_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/bookmarks/bookmark_menu_controller.h"
 
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -12,7 +13,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/event_utils.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 80a9fbd..201b063 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -4,7 +4,14 @@
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
+#include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
+// TODO(port): Port these files.
+#if defined(OS_WIN)
+#include "app/os_exchange_data.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ -16,7 +23,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ -25,13 +31,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
-// TODO(port): Port these files.
-#if defined(OS_WIN)
-#include "chrome/common/os_exchange_data.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 using base::Time;
 
 namespace {
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 2c6e77f..5dc8c26 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/browser_main_win.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/win_util.h"
@@ -18,7 +19,6 @@
 #include "chrome/browser/views/uninstall_dialog.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc
index 7df2490..677cab7 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.cc
+++ b/chrome/browser/download/download_request_dialog_delegate_win.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/download/download_request_dialog_delegate_win.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index b5269d1..f5589b84 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -10,6 +10,7 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/base_drag_source.h"
 #include "base/file_util.h"
@@ -19,7 +20,6 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/views/view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc
index a715492..8bb7949 100644
--- a/chrome/browser/drag_utils.cc
+++ b/chrome/browser/drag_utils.cc
@@ -11,13 +11,13 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/button/text_button.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index fda769c..3cf5af5 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -6,6 +6,7 @@
 
 #include "build/build_config.h"
 
+#include "app/gfx/favicon_size.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -13,7 +14,6 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/gfx/favicon_size.h"
 #include "skia/ext/image_operations.h"
 
 FavIconHelper::FavIconHelper(TabContents* tab_contents)
diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc
index 0fe2b79..d01bd55 100644
--- a/chrome/browser/gtk/info_bubble_gtk.cc
+++ b/chrome/browser/gtk/info_bubble_gtk.cc
@@ -6,11 +6,11 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/path.h"
 #include "base/basictypes.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/path.h"
 
 namespace {
 
diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc
index cb873b0..2215015 100644
--- a/chrome/browser/gtk/tabs/tab_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_gtk.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/gtk/tabs/tab_gtk.h"
 
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/common/gfx/path.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc
index 5004e5e..99dbe40 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <shellapi.h>
 
+#include "app/gfx/icon_util.h"
 #include "base/file_util.h"
 #include "base/gfx/size.h"
 #include "base/message_loop.h"
@@ -15,7 +16,6 @@
 #include "base/task.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/gfx/icon_util.h"
 
 #include "SkBitmap.h"
 
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 333ad8c..2209541 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -7,6 +7,7 @@
 #include <map>
 #include <set>
 
+#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/gfx/png_encoder.h"
@@ -28,7 +29,6 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc
index 41edfec..061e469 100644
--- a/chrome/browser/jsmessage_box_handler.cc
+++ b/chrome/browser/jsmessage_box_handler.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/jsmessage_box_handler.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "build/build_config.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 61b8da8..9e9a5c9 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/search_engines/template_url.h"
 
+#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ -11,7 +12,6 @@
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/common/gfx/favicon_size.h"
 #include "net/base/escape.h"
 
 // The TemplateURLRef has any number of terms that need to be replaced. Each of
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc
index 8ea2160..79c3b85 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_win.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/os_exchange_data.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/browser.h"  // TODO(beng): this dependency is awful.
 #include "chrome/browser/browser_process.h"
@@ -22,7 +23,6 @@
 #include "chrome/browser/tab_contents/web_drag_source.h"
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/views/focus/view_storage.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/browser/tab_contents/web_drop_target.cc b/chrome/browser/tab_contents/web_drop_target.cc
index 7f9cbf7..bad7e1d 100644
--- a/chrome/browser/tab_contents/web_drop_target.cc
+++ b/chrome/browser/tab_contents/web_drop_target.cc
@@ -7,11 +7,11 @@
 
 #include "chrome/browser/tab_contents/web_drop_target.h"
 
+#include "app/os_exchange_data.h"
 #include "base/clipboard_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/os_exchange_data.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "webkit/glue/webdropdata.h"
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index 49c4473..b13ac31 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/task_manager_resource_providers.h"
 
+#if defined(OS_WIN)
+#include "app/gfx/icon_util.h"
+#endif  // defined(OS_WIN)
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
@@ -21,9 +24,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/child_process_host.h"
 #include "chrome/common/notification_service.h"
-#if defined(OS_WIN)
-#include "chrome/common/gfx/icon_util.h"
-#endif  // defined(OS_WIN)
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index e4401f7..a44f792 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/message_box_flags.h"
 #include "base/file_util.h"
 #include "base/platform_thread.h"
 #include "chrome/browser/automation/url_request_mock_http_job.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index 70efbc9..f7e8aaa 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -7,14 +7,14 @@
 #include <dwmapi.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/insets.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 #include "chrome/common/gfx/color_utils.h"
-#include "chrome/common/gfx/insets.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
index aa40435..4fd599d 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
@@ -10,6 +10,7 @@
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/views/view.h"
+#include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
 class AutocompleteEditViewWin;
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
index baf9903..469561e 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 
+#include "app/gfx/insets.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
-#include "chrome/common/gfx/insets.h"
 #include "chrome/common/win_util.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 3d8bf6b..c6db1c6 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -13,13 +13,13 @@
 #include <math.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/views/background.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 19dfa90..82e532b 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -8,6 +8,7 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/base_drag_source.h"
@@ -28,7 +29,6 @@
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc
index 3e79ffe..7986d8f 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.cc
+++ b/chrome/browser/views/bookmark_folder_tree_view.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 
+#include "app/drag_drop_types.h"
+#include "app/os_exchange_data.h"
 #include "base/base_drag_source.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/profile.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/views/view_constants.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index 4ac62e9..e92e5bb 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -5,12 +5,12 @@
 #include "chrome/browser/views/bookmark_menu_button.h"
 
 #include "app/resource_bundle.h"
+#include "app/os_exchange_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc
index d3da5e8..12d1d9f 100644
--- a/chrome/browser/views/bookmark_table_view.cc
+++ b/chrome/browser/views/bookmark_table_view.cc
@@ -4,16 +4,16 @@
 
 #include "chrome/browser/views/bookmark_table_view.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/base_drag_source.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/browser/profile.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/view_constants.h"
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index a99eb60..cdcd078 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -6,6 +6,7 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
@@ -19,7 +20,6 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 57c9bef..2d60738 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/views/external_protocol_dialog.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/histogram.h"
 #include "base/registry.h"
 #include "base/string_util.h"
@@ -13,7 +14,6 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/frame/browser_root_view.cc b/chrome/browser/views/frame/browser_root_view.cc
index c404b2c..78f6ef0 100644
--- a/chrome/browser/views/frame/browser_root_view.cc
+++ b/chrome/browser/views/frame/browser_root_view.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/views/frame/browser_root_view.h"
 
+#include "app/drag_drop_types.h"
+#include "app/os_exchange_data.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/os_exchange_data.h"
 
 BrowserRootView::BrowserRootView(views::Widget* widget)
     : views::RootView(widget),
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 880f011..fad5dd1 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/views/frame/browser_view.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_version_info.h"
@@ -47,9 +49,7 @@
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 56c1d17..4958b13 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -6,12 +6,12 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/button/image_button.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index fb048b3..ebe2e93 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/views/grid_layout.h"
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 8fe97d8..38e36f75 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/views/info_bubble.h"
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc
index 3375af2..fab95a4 100644
--- a/chrome/browser/views/jsmessage_box_dialog.cc
+++ b/chrome/browser/views/jsmessage_box_dialog.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/views/jsmessage_box_dialog.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc
index b50424a..1c5faa6 100644
--- a/chrome/browser/views/new_profile_dialog.cc
+++ b/chrome/browser/views/new_profile_dialog.cc
@@ -7,10 +7,10 @@
 #include <string>
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index cccbf69..5e84ef3e 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/views/options/advanced_page_view.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/options/advanced_contents_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/controls/message_box_view.h"
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index a1bd302..13618fd 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/views/repost_form_warning_view.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 3624f5c..bffbb82 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/restart_message_box.h"
 
 #include "app/l10n_util.h"
-#include "chrome/common/message_box_flags.h"
+#include "app/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index 0ae41cc..578c917 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -8,13 +8,13 @@
 #include <shellapi.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/favicon_size.h"
+#include "app/gfx/icon_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/gfx/favicon_size.h"
-#include "chrome/common/gfx/icon_util.h"
 #include "grit/theme_resources.h"
 
 static bool g_initialized = false;
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index 0ed0368..f2193dc 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/views/tabs/tab.h"
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/size.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/views/controls/menu/chrome_menu.h"
 #include "chrome/views/widget/tooltip_manager.h"
 #include "chrome/views/widget/widget.h"
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index ec487aa..fce1297 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/browser/views/tabs/tab_strip.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/gfx/size.h"
@@ -18,9 +21,6 @@
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/path.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/image_view.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 333cc6c..6d0f02b 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -6,8 +6,10 @@
 
 #include <string>
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -33,9 +35,7 @@
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/views/uninstall_dialog.cc b/chrome/browser/views/uninstall_dialog.cc
index 59ff2d5..f9b2c04 100644
--- a/chrome/browser/views/uninstall_dialog.cc
+++ b/chrome/browser/views/uninstall_dialog.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/views/uninstall_dialog.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/message_loop.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index c670ce8..7c30c85 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 0da07eb..cb98c55 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -127,6 +127,8 @@
         # All .cc, .h, and .mm files under app/ except for tests.
         '../app/animation.cc',
         '../app/animation.h',
+        '../app/drag_drop_types.cc',
+        '../app/drag_drop_types.h',
         '../app/gfx/chrome_canvas.cc',
         '../app/gfx/chrome_canvas.h',
         '../app/gfx/chrome_canvas_linux.cc',
@@ -136,11 +138,21 @@
         '../app/gfx/chrome_font_mac.mm',
         '../app/gfx/chrome_font_skia.cc',
         '../app/gfx/chrome_font_win.cc',
+        '../app/gfx/favicon_size.h',
+        '../app/gfx/icon_util.cc',
+        '../app/gfx/icon_util.h',
+        '../app/gfx/insets.h',        
+        '../app/gfx/path_gtk.cc',
+        '../app/gfx/path_win.cc',
+        '../app/gfx/path.h',
         '../app/l10n_util.cc',
         '../app/l10n_util.h',
         '../app/l10n_util_posix.cc',
         '../app/l10n_util_win.cc',
         '../app/l10n_util_win.h',        
+        '../app/message_box_flags.h',
+        '../app/os_exchange_data.cc',
+        '../app/os_exchange_data.h',
         '../app/resource_bundle.cc',
         '../app/resource_bundle.h',
         '../app/resource_bundle_win.cc',
@@ -162,6 +174,16 @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
+        ['OS!="win"', {
+          'sources!': [
+            '../app/drag_drop_types.cc',
+            '../app/drag_drop_types.h',
+            '../app/gfx/icon_util.cc',
+            '../app/gfx/icon_util.h',
+            '../app/os_exchange_data.cc',
+            '../app/os_exchange_data.h',
+          ],
+        }],        
       ],
     },
     {
@@ -230,13 +252,6 @@
         'common/gfx/color_utils.h',
         'common/gfx/emf.cc',
         'common/gfx/emf.h',
-        'common/gfx/favicon_size.h',
-        'common/gfx/icon_util.cc',
-        'common/gfx/icon_util.h',
-        'common/gfx/insets.h',
-        'common/gfx/path_gtk.cc',
-        'common/gfx/path_win.cc',
-        'common/gfx/path.h',
         'common/gfx/text_elider.cc',
         'common/gfx/text_elider.h',
         'common/gfx/utils.h',
@@ -287,8 +302,6 @@
         'common/debug_flags.h',
         'common/devtools_messages.h',
         'common/devtools_messages_internal.h',
-        'common/drag_drop_types.cc',
-        'common/drag_drop_types.h',
         'common/env_vars.cc',
         'common/env_vars.h',
         'common/file_descriptor_set_posix.cc',
@@ -324,7 +337,6 @@
         'common/logging_chrome.cc',
         'common/logging_chrome.h',
         'common/main_function_params.h',
-        'common/message_box_flags.h',
         'common/message_router.cc',
         'common/message_router.h',
         'common/modal_dialog_event.h',
@@ -342,8 +354,6 @@
         'common/notification_service.h',
         'common/notification_source.h',
         'common/notification_type.h',
-        'common/os_exchange_data.cc',
-        'common/os_exchange_data.h',
         'common/owned_widget_gtk.cc',
         'common/owned_widget_gtk.h',
         'common/page_action.h',
@@ -449,10 +459,7 @@
         }, { # else: OS != "win"
           'sources!': [
             'common/gfx/emf.cc',
-            'common/gfx/icon_util.cc',
             'common/classfactory.cc',
-            'common/drag_drop_types.cc',
-            'common/os_exchange_data.cc',
           ],
         }],
       ],
@@ -2498,7 +2505,7 @@
         'common/file_descriptor_set_unittest.cc',
         '../app/gfx/chrome_font_unittest.cc',
         'common/gfx/emf_unittest.cc',
-        'common/gfx/icon_util_unittest.cc',
+        '../app/gfx/icon_util_unittest.cc',
         'common/gfx/text_elider_unittest.cc',
         'common/important_file_writer_unittest.cc',
         'common/ipc_message_unittest.cc',
@@ -2510,7 +2517,7 @@
         'common/mru_cache_unittest.cc',
         'common/net/url_util_unittest.cc',
         'common/notification_service_unittest.cc',
-        'common/os_exchange_data_unittest.cc',
+        '../app/os_exchange_data_unittest.cc',
         'common/pref_member_unittest.cc',
         'common/pref_service_unittest.cc',
         'common/property_bag_unittest.cc',
@@ -2627,9 +2634,9 @@
             'browser/window_sizer_unittest.cc',
             'common/chrome_plugin_unittest.cc',
             'common/gfx/emf_unittest.cc',
-            'common/gfx/icon_util_unittest.cc',
+            '../app/gfx/icon_util_unittest.cc',
             'common/net/url_util_unittest.cc',
-            'common/os_exchange_data_unittest.cc',
+            '../app/os_exchange_data_unittest.cc',
             'test/browser_with_test_window_test.cc',
             'test/browser_with_test_window_test.h',
             'views/controls/label_unittest.cc',
diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj
index d359d59..839f6f2 100644
--- a/chrome/common/common.vcproj
+++ b/chrome/common/common.vcproj
@@ -165,22 +165,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\gfx\favicon_size.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\icon_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\icon_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\insets.h"
-				>
-			</File>
-			<File
 				RelativePath=".\gfx\path.h"
 				>
 			</File>
@@ -466,14 +450,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\drag_drop_types.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\drag_drop_types.h"
-			>
-		</File>
-		<File
 			RelativePath=".\env_vars.cc"
 			>
 		</File>
@@ -534,10 +510,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\message_box_flags.h"
-			>
-		</File>
-		<File
 			RelativePath=".\message_router.cc"
 			>
 		</File>
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index c5407d5..3e62e11 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -8,7 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ -19,10 +21,8 @@
 #include "build/build_config.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/jstemplate_builder.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/thumbnail_score.h"
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 7669c6d..fca1078 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "app/message_box_flags.h"
 #include "base/basictypes.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
@@ -16,7 +17,6 @@
 #include "chrome/common/ipc_channel_proxy.h"
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/ipc_sync_channel.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/automation_messages.h"
 
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index e3bca00..b782a6c 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
@@ -13,7 +14,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/test/automation/constrained_window_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index f274c23..7488c28 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -960,10 +960,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\gfx\icon_util_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\common\ipc_message_unittest.cc"
 				>
 			</File>
@@ -996,10 +992,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\os_exchange_data_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\common\pref_member_unittest.cc"
 				>
 			</File>
@@ -1100,9 +1092,17 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\app\gfx\icon_util_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\app\l10n_util_unittest.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\app\os_exchange_data_unittest.cc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/chrome/views/border.h b/chrome/views/border.h
index ae6831c..c53a92d 100644
--- a/chrome/views/border.h
+++ b/chrome/views/border.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_VIEWS_BORDER_H_
 #define CHROME_VIEWS_BORDER_H_
 
-#include "chrome/common/gfx/insets.h"
+#include "app/gfx/insets.h"
 #include "chrome/views/view.h"
 #include "SkColor.h"
 
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index f7e7136..6f82b16 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/controls/button/menu_button.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc
index 7cd8920..be9918f 100644
--- a/chrome/views/controls/label.cc
+++ b/chrome/views/controls/label.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/gfx/insets.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "chrome/common/gfx/insets.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/views/background.h"
 
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index c591a7e..1b1e475 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.cc
@@ -11,6 +11,7 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
+#include "app/os_exchange_data.h"
 #include "base/base_drag_source.h"
 #include "base/gfx/native_theme.h"
 #include "base/message_loop.h"
@@ -20,7 +21,6 @@
 // TODO(beng): (Cleanup) remove this browser dep.
 #include "chrome/browser/drag_utils.h"
 #include "chrome/common/gfx/color_utils.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/views/border.h"
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/controls/menu/chrome_menu.h b/chrome/views/controls/menu/chrome_menu.h
index 5258742..6f18abb 100644
--- a/chrome/views/controls/menu/chrome_menu.h
+++ b/chrome/views/controls/menu/chrome_menu.h
@@ -8,12 +8,12 @@
 #include <list>
 #include <vector>
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_font.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/views/controls/menu/controller.h"
 #include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc
index 191b78c..6fb895a 100644
--- a/chrome/views/controls/message_box_view.cc
+++ b/chrome/views/controls/message_box_view.cc
@@ -5,13 +5,13 @@
 #include "chrome/views/controls/message_box_view.h"
 
 #include "app/l10n_util.h"
+#include "app/message_box_flags.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/window/client_view.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc
index ecb9773..445c262 100644
--- a/chrome/views/controls/table/table_view.cc
+++ b/chrome/views/controls/table/table_view.cc
@@ -8,12 +8,12 @@
 #include <windowsx.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/favicon_size.h"
+#include "app/gfx/icon_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "chrome/common/gfx/favicon_size.h"
-#include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/hwnd_view.h"
 #include "SkBitmap.h"
diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc
index 4e61afd..0871cdf 100644
--- a/chrome/views/controls/text_field.cc
+++ b/chrome/views/controls/text_field.cc
@@ -11,6 +11,7 @@
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
+#include "app/gfx/insets.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/clipboard.h"
@@ -19,8 +20,6 @@
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/gfx/insets.h"
-#include "chrome/common/logging_chrome.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/hwnd_view.h"
 #include "chrome/views/controls/menu/menu.h"
diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc
index de2a651..64d18e5 100644
--- a/chrome/views/controls/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -7,7 +7,6 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
-#include "chrome/common/logging_chrome.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index e657658..1bf668c 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/chrome/views/controls/tree/tree_view.cc
@@ -7,12 +7,12 @@
 #include <shellapi.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/icon_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "chrome/common/gfx/icon_util.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/views/event.cc b/chrome/views/event.cc
index d0b375c..a968adc 100644
--- a/chrome/views/event.cc
+++ b/chrome/views/event.cc
@@ -5,9 +5,6 @@
 #include "chrome/views/event.h"
 
 #include "chrome/views/view.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-
-using WebKit::WebInputEvent;
 
 namespace views {
 
@@ -21,18 +18,6 @@ Event::Event(EventType type, int flags)
       flags_(flags) {
 }
 
-// static
-int Event::ConvertWebInputEventFlags(int web_input_event_flags) {
-  int r = 0;
-  if (web_input_event_flags & WebInputEvent::ShiftKey)
-    r |= EF_SHIFT_DOWN;
-  if (web_input_event_flags & WebInputEvent::ControlKey)
-    r |= EF_CONTROL_DOWN;
-  if (web_input_event_flags & WebInputEvent::AltKey)
-    r |= EF_ALT_DOWN;
-  return r;
-}
-
 LocatedEvent::LocatedEvent(const LocatedEvent& model, View* from, View* to)
     : Event(model),
       location_(model.location_) {
diff --git a/chrome/views/event.h b/chrome/views/event.h
index 3171ad4..d3dbb61 100644
--- a/chrome/views/event.h
+++ b/chrome/views/event.h
@@ -12,7 +12,6 @@
 #endif
 
 #include "base/gfx/point.h"
-#include "webkit/glue/window_open_disposition.h"
 
 class OSExchangeData;
 
@@ -100,10 +99,6 @@ class Event {
   static int GetFlagsFromGdkState(int state);
 #endif
 
-  // Convert WebInputEvent::Modifiers flags to views::Event flags.
-  // Note that this only deals with keyboard modifiers.
-  static int ConvertWebInputEventFlags(int web_input_event_flags);
-
  protected:
   Event(EventType type, int flags);
 
diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index 22ab762..8c2a888 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -9,13 +9,13 @@
 #include <iostream>
 #endif
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/views/background.h"
 #include "chrome/views/layout_manager.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index ad14e81..da8c6ff 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/background.h"
 #include "chrome/views/controls/button/checkbox.h"
diff --git a/chrome/views/view_win.cc b/chrome/views/view_win.cc
index 41e97a9..382e169 100644
--- a/chrome/views/view_win.cc
+++ b/chrome/views/view_win.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/views/view.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/path.h"
+#include "app/os_exchange_data.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/path.h"
-#include "chrome/common/os_exchange_data.h"
 #include "chrome/views/accessibility/view_accessibility_wrapper.h"
 #include "chrome/views/border.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/widget/root_view.cc b/chrome/views/widget/root_view.cc
index 8d7b047..bd57fe4 100644
--- a/chrome/views/widget/root_view.cc
+++ b/chrome/views/widget/root_view.cc
@@ -6,13 +6,13 @@
 
 #include <algorithm>
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #if defined(OS_WIN)
 #include "base/base_drag_source.h"
 #endif
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/common/notification_service.h"
 #if defined(OS_WIN)
 #include "chrome/views/widget/root_view_drop_target.h"
diff --git a/chrome/views/widget/root_view_drop_target.cc b/chrome/views/widget/root_view_drop_target.cc
index 60324c5..832caac 100644
--- a/chrome/views/widget/root_view_drop_target.cc
+++ b/chrome/views/widget/root_view_drop_target.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/widget/root_view_drop_target.h"
 
+#include "app/drag_drop_types.h"
 #include "base/gfx/point.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 
diff --git a/chrome/views/widget/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h
index 02ce6c6..3e3aec1 100644
--- a/chrome/views/widget/root_view_drop_target.h
+++ b/chrome/views/widget/root_view_drop_target.h
@@ -9,8 +9,8 @@
 #include <atlapp.h>
 #include <atlmisc.h>
 
+#include "app/os_exchange_data.h"
 #include "base/base_drop_target.h"
-#include "chrome/common/os_exchange_data.h"
 
 namespace gfx {
 class Point;
diff --git a/chrome/views/widget/root_view_win.cc b/chrome/views/widget/root_view_win.cc
index 17efd54..14bd9c5 100644
--- a/chrome/views/widget/root_view_win.cc
+++ b/chrome/views/widget/root_view_win.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/widget/root_view.h"
 
+#include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
 #include "base/base_drag_source.h"
 #include "base/logging.h"
-#include "chrome/common/drag_drop_types.h"
 #include "chrome/views/widget/root_view_drop_target.h"
 
 namespace views {
diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc
index d5d587e..4c824af 100644
--- a/chrome/views/window/custom_frame_view.cc
+++ b/chrome/views/window/custom_frame_view.cc
@@ -6,9 +6,9 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window_delegate.h"
diff --git a/chrome/views/window/dialog_delegate.h b/chrome/views/window/dialog_delegate.h
index 8add450..a38100c 100644
--- a/chrome/views/window/dialog_delegate.h
+++ b/chrome/views/window/dialog_delegate.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 #define CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
-#include "chrome/common/message_box_flags.h"
+#include "app/message_box_flags.h"
 #include "chrome/views/window/dialog_client_view.h"
 #include "chrome/views/window/window_delegate.h"
 
diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc
index 58301f5..0093b3a 100644
--- a/chrome/views/window/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -8,12 +8,12 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
+#include "app/gfx/icon_util.h"
+#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/common/gfx/icon_util.h"
-#include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"