Move src/chrome/views to src/views. RS=darin http://crbug.com/11387

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

380 files changed, 3603 insertions, 4133 deletions

diff --git a/chrome/DEPS b/chrome/DEPS
index 5c73a5a0..964c03a 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+app",
   "+net",
   "+printing",
+  "+views",
 
   # The subdirectories in chrome/ will manually allow their own include
   # directories in chrome/ so we disallow all of them.
diff --git a/chrome/browser/app_modal_dialog_win.cc b/chrome/browser/app_modal_dialog_win.cc
index ab01474..897c811 100644
--- a/chrome/browser/app_modal_dialog_win.cc
+++ b/chrome/browser/app_modal_dialog_win.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/views/jsmessage_box_dialog.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 
 AppModalDialog::~AppModalDialog() {
 }
diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc
index 8fefe91..4583ab5 100644
--- a/chrome/browser/autocomplete/autocomplete_accessibility.cc
+++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc
@@ -7,9 +7,9 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
-#include "chrome/views/view.h"
 #include "grit/generated_resources.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
+#include "views/view.h"
 
 HRESULT AutocompleteAccessibility::Initialize(
     const AutocompleteEditViewWin* edit_box) {
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index e544f76..8bf5b83 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -37,10 +37,10 @@
 #include "chrome/common/gfx/utils.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/focus/focus_util_win.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
+#include "views/focus/focus_util_win.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
index da73d98..6c74cc9 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
@@ -19,7 +19,7 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompletePopupModel;
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
index 10f32b1..98be163 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc
@@ -30,9 +30,9 @@
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/view.h"
 #include "grit/theme_resources.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "views/view.h"
 
 // Padding between text and the star indicator, in pixels.
 static const int kStarPadding = 4;
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index fe442ba..74eac52 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -50,8 +50,8 @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/bookmark_bar_view.h"
-#include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/widget_win.h"
+#include "views/window/window.h"
 #endif
 
 using base::Time;
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 6a64b0c..de84e86 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -27,7 +27,7 @@
 #include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/test/automation/automation_messages.h"
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 #if defined(OS_WIN)
 // TODO(port): enable these.
diff --git a/chrome/browser/automation/ui_controls.cc b/chrome/browser/automation/ui_controls.cc
index 8a0b349e..e15f1d4 100644
--- a/chrome/browser/automation/ui_controls.cc
+++ b/chrome/browser/automation/ui_controls.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace ui_controls {
 
diff --git a/chrome/browser/back_forward_menu_model_win.h b/chrome/browser/back_forward_menu_model_win.h
index c144862..e1805cb 100644
--- a/chrome/browser/back_forward_menu_model_win.h
+++ b/chrome/browser/back_forward_menu_model_win.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 
 #include "chrome/browser/back_forward_menu_model.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 00935b4..93dd7c0 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -23,7 +23,7 @@
 #if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h
index b015f6c..8aea2f1 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu.h
@@ -13,7 +13,7 @@
 
 // TODO(port): Port this file.
 #if defined(OS_WIN)
-#include "chrome/views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/chrome_menu.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/gtk/menu_gtk.h"
 #else
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc
index 0e39cd7..e6032b5 100644
--- a/chrome/browser/bookmarks/bookmark_drop_info.cc
+++ b/chrome/browser/bookmarks/bookmark_drop_info.cc
@@ -9,8 +9,8 @@
 #endif
 
 #include "base/basictypes.h"
-#include "chrome/views/event.h"
-#include "chrome/views/view_constants.h"
+#include "views/event.h"
+#include "views/view_constants.h"
 
 BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin)
     : source_operations_(0),
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index aa83756..ce62ed0 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_FOLDER_TREE_MODEL_H_
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
+#include "views/controls/tree/tree_node_model.h"
 
 // The type of nodes created by BookmarkFolderTreeModel.
 typedef views::TreeNodeWithValue<BookmarkNode*> FolderNode;
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
index 693069d..0fe6ce9 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
@@ -5,9 +5,9 @@
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/controls/tree/tree_view.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/tree/tree_view.h"
 
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:
diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_win.h b/chrome/browser/bookmarks/bookmark_menu_controller_win.h
index 1f83233..5263281 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller_win.h
+++ b/chrome/browser/bookmarks/bookmark_menu_controller_win.h
@@ -10,7 +10,7 @@
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/chrome_menu.h"
 
 class BookmarkContextMenu;
 class BookmarkNode;
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 7afaee5..e406e27 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -19,10 +19,10 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
+#include "views/controls/tree/tree_node_model.h"
 
 class BookmarkEditorView;
 class BookmarkModel;
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 40edbb8..8c1b7c2 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -11,8 +11,8 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/tree/tree_node_model.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h
index 4b55759..77ad787 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.h
+++ b/chrome/browser/bookmarks/bookmark_table_model.h
@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "chrome/views/controls/table/table_view.h"
+#include "views/controls/table/table_view.h"
 #elif defined(OS_POSIX)
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 201b063..e21e230 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -26,10 +26,10 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/tree/tree_node_iterator.h"
-#include "chrome/views/event.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "views/controls/tree/tree_node_iterator.h"
+#include "views/event.h"
 
 using base::Time;
 
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index a6021c9..cd46616 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -12,11 +12,11 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "views/focus/focus_manager.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 79e6378..9824586 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -89,12 +89,12 @@
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
-#include "chrome/views/widget/accelerator_handler.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_network_layer.h"
 #include "sandbox/src/sandbox.h"
+#include "views/widget/accelerator_handler.h"
 
 #endif  // defined(OS_WIN)
 
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 5dc8c26..28c849b 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -23,11 +23,11 @@
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/widget/accelerator_handler.h"
+#include "views/window/window.h"
 
 // Displays a warning message if the user is running chrome on windows 2000.
 // Returns true if the OS is win2000, false otherwise.
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 72e06f1..a031374 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -34,8 +34,8 @@
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/widget/accelerator_handler.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/accelerator_handler.h"
 #elif defined(OS_POSIX)
 // TODO(port): Remove the temporary scaffolding as we port the above headers.
 #include "chrome/common/temp_scaffolding_stubs.h"
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc
index 225bf4c..865635f 100644
--- a/chrome/browser/debugger/debugger_view.cc
+++ b/chrome/browser/debugger/debugger_view.cc
@@ -22,13 +22,12 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-
 #include "grit/debugger_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/controls/scroll_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
 
 DebuggerView::DebuggerView(DebuggerWindow* window)
     : window_(window), output_ready_(false) {
diff --git a/chrome/browser/debugger/debugger_view.h b/chrome/browser/debugger/debugger_view.h
index 616afce..6d52686 100644
--- a/chrome/browser/debugger/debugger_view.h
+++ b/chrome/browser/debugger/debugger_view.h
@@ -12,8 +12,8 @@
 
 #include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/view.h"
-#include "chrome/views/controls/text_field.h"
+#include "views/view.h"
+#include "views/controls/text_field.h"
 
 class DebuggerView;
 class DebuggerWindow;
diff --git a/chrome/browser/debugger/debugger_window.h b/chrome/browser/debugger/debugger_window.h
index ab916ff..258396f 100644
--- a/chrome/browser/debugger/debugger_window.h
+++ b/chrome/browser/debugger/debugger_window.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_DEBUGGER_DEBUGGER_WINDOW_H__
 
 #include "chrome/browser/debugger/debugger_io.h"
-#include "chrome/views/window/window.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window.h"
+#include "views/window/window_delegate.h"
 
 class DebuggerView;
 class ListValue;
diff --git a/chrome/browser/debugger/devtools_view.h b/chrome/browser/debugger/devtools_view.h
index aeb9b07..5fe90e3 100644
--- a/chrome/browser/debugger/devtools_view.h
+++ b/chrome/browser/debugger/devtools_view.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace IPC {
 class Message;
diff --git a/chrome/browser/debugger/devtools_window_win.cc b/chrome/browser/debugger/devtools_window_win.cc
index 9392a7b..463f1cfe 100644
--- a/chrome/browser/debugger/devtools_window_win.cc
+++ b/chrome/browser/debugger/devtools_window_win.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_view.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #include "grit/generated_resources.h"
 
 // static
diff --git a/chrome/browser/debugger/devtools_window_win.h b/chrome/browser/debugger/devtools_window_win.h
index 066388d..03889a4 100644
--- a/chrome/browser/debugger/devtools_window_win.h
+++ b/chrome/browser/debugger/devtools_window_win.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 class Window;
diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc
index 677cab7..cbecc7b 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.cc
+++ b/chrome/browser/download/download_request_dialog_delegate_win.cc
@@ -8,8 +8,8 @@
 #include "app/message_box_flags.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
 
 // static
 DownloadRequestDialogDelegate* DownloadRequestDialogDelegate::Create(
diff --git a/chrome/browser/download/download_request_dialog_delegate_win.h b/chrome/browser/download/download_request_dialog_delegate_win.h
index f0167e6..b8edd38 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.h
+++ b/chrome/browser/download/download_request_dialog_delegate_win.h
@@ -9,7 +9,7 @@
 
 #include "chrome/browser/download/download_request_dialog_delegate.h"
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class ConstrainedWindow;
 class MessageBoxView;
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index f5589b84..74a5d85 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/views/view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
-#include "SkPath.h"
-#include "SkShader.h"
+#include "skia/include/SkPath.h"
+#include "skia/include/SkShader.h"
+#include "views/view.h"
 
 namespace download_util {
 
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index 1b3f777..a8122ce 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -14,9 +14,9 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/event.h"
-#include "chrome/views/view.h"
+#include "views/controls/menu/menu.h"
+#include "views/event.h"
+#include "views/view.h"
 
 class BaseDownloadItemModel;
 class DownloadItem;
diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc
index 8bb7949..e40e1d0 100644
--- a/chrome/browser/drag_utils.cc
+++ b/chrome/browser/drag_utils.cc
@@ -19,9 +19,9 @@
 #include "base/string_util.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/text_button.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/text_button.h"
 
 namespace drag_utils {
 
diff --git a/chrome/browser/encoding_menu_controller_delegate.h b/chrome/browser/encoding_menu_controller_delegate.h
index 12d9bf4..83d42ec 100644
--- a/chrome/browser/encoding_menu_controller_delegate.h
+++ b/chrome/browser/encoding_menu_controller_delegate.h
@@ -5,7 +5,7 @@
 #ifndef CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 #define CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__
 
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 
 class Browser;
 class Controller;
diff --git a/chrome/browser/extensions/extension_shelf.h b/chrome/browser/extensions/extension_shelf.h
index cd7340f..60312bd 100644
--- a/chrome/browser/extensions/extension_shelf.h
+++ b/chrome/browser/extensions/extension_shelf.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "app/gfx/chrome_canvas.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class Browser;
 
diff --git a/chrome/browser/extensions/extension_view.cc b/chrome/browser/extensions/extension_view.cc
index 8070bf3..f15a7a3 100755
--- a/chrome/browser/extensions/extension_view.cc
+++ b/chrome/browser/extensions/extension_view.cc
@@ -7,11 +7,10 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/views/widget/widget.h"
-
 #if defined(OS_WIN)
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #endif
+#include "views/widget/widget.h"
 
 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser,
                              const GURL& content_url)
diff --git a/chrome/browser/extensions/extension_view.h b/chrome/browser/extensions/extension_view.h
index 7715c5b..5b3efc5 100755
--- a/chrome/browser/extensions/extension_view.h
+++ b/chrome/browser/extensions/extension_view.h
@@ -14,9 +14,9 @@
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
-#include "chrome/views/controls/hwnd_view.h"
+#include "views/controls/hwnd_view.h"
 #else
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index bf6dfd8..e8ece07 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -16,9 +16,9 @@
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/win_util.h"
-// Included for SetRootViewForHWND.
-#include "chrome/views/widget/widget_win.h"
 #include "chrome/test/automation/automation_messages.h"
+// Included for SetRootViewForHWND.
+#include "views/widget/widget_win.h"
 
 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
 
diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h
index a9aab87..b55c84d 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container.h
@@ -16,9 +16,9 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/focus/focus_manager.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 class AutomationProvider;
 class TabContents;
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 8bb247a..df1687c 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -43,13 +43,10 @@
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
-#include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/window/window.h"
-
 #include "google_update_idl.h"
-
 #include "grit/locale_settings.h"
-
+#include "views/widget/accelerator_handler.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/google_update.cc b/chrome/browser/google_update.cc
index c6ca0f5..773c105 100644
--- a/chrome/browser/google_update.cc
+++ b/chrome/browser/google_update.cc
@@ -18,7 +18,7 @@
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #include "google_update_idl_i.c"
 
 using views::Window;
diff --git a/chrome/browser/history/starred_url_database.h b/chrome/browser/history/starred_url_database.h
index 174e1da..6b91d69 100644
--- a/chrome/browser/history/starred_url_database.h
+++ b/chrome/browser/history/starred_url_database.h
@@ -12,8 +12,8 @@
 #include "base/file_path.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/url_database.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
+#include "views/controls/tree/tree_node_model.h"
 
 struct sqlite3;
 class SqliteStatementCache;
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index d46b4de..c97e9e1 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -40,7 +40,7 @@
 #if defined(OS_WIN)
 #include "chrome/browser/views/importer_lock_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/window/window.h"
+#include "views/window/window.h"
 #endif
 
 // ProfileWriter.
diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc
index f92d6e5..73f10a3 100644
--- a/chrome/browser/input_window_dialog_win.cc
+++ b/chrome/browser/input_window_dialog_win.cc
@@ -8,11 +8,11 @@
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 #include "grit/generated_resources.h"
 
 // Width to make the text field, in pixels.
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index 8ddb96a..49b5da9 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -19,10 +19,10 @@
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/window/dialog_delegate.h"
 #include "grit/generated_resources.h"
 #include "net/base/auth.h"
 #include "net/url_request/url_request.h"
+#include "views/window/dialog_delegate.h"
 
 using namespace std;
 using views::LoginView;
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 7a2122a..cbbbad7 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webtextdirection.h"
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 31fc946..ee995e0 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -27,13 +27,13 @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/focus/focus_util_win.h"
-// Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
-#include "chrome/views/widget/widget_win.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
+#include "views/focus/focus_util_win.h"
+// Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
+#include "views/widget/widget_win.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 01125a0..9d8da4b 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -34,7 +34,7 @@
 #if defined(OS_WIN)
 // TODO(port): Port these files.
 #include "chrome/browser/load_notification_details.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/link.h"
 #else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index c062977..3c3226b 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -16,9 +16,9 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/window/window_delegate.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
+#include "views/window/window_delegate.h"
 
 namespace {
 
diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.h b/chrome/browser/tab_contents/render_view_context_menu_win.h
index 32426b4..bc9578e 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_win.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_win.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_WIN_H_
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/accelerator.h"
+#include "views/controls/menu/menu.h"
 
 class RenderViewContextMenuWin : public RenderViewContextMenu,
                                  public Menu::Delegate{
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 4582bbe..451d5b5 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -56,7 +56,7 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/blocked_popup_container.h"
 #include "chrome/browser/views/download_started_animation.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
 #endif
 
 // Cross-Site Navigations
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc
index 79c3b85..887857e 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_win.cc
@@ -24,9 +24,9 @@
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/widget/root_view.h"
 #include "net/base/net_util.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/root_view.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webdropdata.h"
 
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.h b/chrome/browser/tab_contents/tab_contents_view_win.h
index 001b770..6e36549 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.h
+++ b/chrome/browser/tab_contents/tab_contents_view_win.h
@@ -8,7 +8,7 @@
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class SadTabView;
 struct WebDropData;
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index ced9fc9..b48f304 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -18,19 +18,19 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
+#include "views/accelerator.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/link.h"
+#include "views/controls/menu/menu.h"
+#include "views/widget/widget.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 // The task manager window default size.
 static const int kDefaultWidth = 460;
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 5538f16..1992fb7 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -19,7 +19,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(OS_WIN)
 // TODO(port): Port or produce equivalent.
-#include "chrome/views/controls/table/group_table_view.h"
+#include "views/controls/table/group_table_view.h"
 #endif  // defined(OS_WIN)
 #include "net/url_request/url_request_job_tracker.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc
index e72e98c..b262d35 100644
--- a/chrome/browser/task_manager_unittest.cc
+++ b/chrome/browser/task_manager_unittest.cc
@@ -6,10 +6,10 @@
 
 #include <string>
 
-#include "chrome/views/controls/table/table_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/table/table_view.h"
 
 namespace {
 
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 0e9b385..faa8744 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/install_util.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/text_field.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index d4cc3fd..7d33641 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
 
 #include "chrome/browser/google_update.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/link.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class TextField;
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 9304c64..9d11334 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -25,15 +25,15 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/text_button.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/hwnd_view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
index 92cc284..db9d39a 100644
--- a/chrome/browser/views/about_ipc_dialog.h
+++ b/chrome/browser/views/about_ipc_dialog.h
@@ -7,9 +7,9 @@
 
 #include "base/singleton.h"
 #include "chrome/common/ipc_logging.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/window/dialog_delegate.h"
 
 #if defined(OS_WIN) && defined(IPC_MESSAGE_LOG_ENABLED)
 
diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 90d59a5..aced9e3 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -8,13 +8,13 @@
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/text_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/window.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/text_field.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/about_network_dialog.h b/chrome/browser/views/about_network_dialog.h
index b10cf04..d49da4e 100644
--- a/chrome/browser/views/about_network_dialog.h
+++ b/chrome/browser/views/about_network_dialog.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_NETWORK_DIALOG_H_
 
 #include "base/singleton.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class TextButton;
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index 51f59e3..a6c9366 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkShader.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
+#include "views/widget/widget.h"
 
 // Colors for various components of the view.
 static const SkColor kBackgroundColor =
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
index 4fd599d..1f4b04a 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
index 91d8d88..d77ba7b 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
 #define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
 
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class AutocompleteEditViewWin;
 class AutocompletePopupContentsView;
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 82b9590..abb0f35 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -22,11 +22,11 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/button/menu_button.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/button/menu_button.h"
 
 namespace {
 // Menu item ID for the "Notify me when a popup is blocked" checkbox. (All
@@ -316,7 +316,7 @@ void BlockedPopupContainer::OnPopupOpenedFromWhitelistedHost(
 void BlockedPopupContainer::LaunchPopupIndex(int index) {
   if (static_cast<size_t>(index) >= blocked_popups_.size())
     return;
-  
+
   BlockedPopups::iterator i(blocked_popups_.begin() + index);
   TabContents* contents = i->tab_contents;
   gfx::Rect bounds(i->bounds);
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 80112e5..acd0e13 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -18,10 +18,10 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/controls/button/button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 class BlockedPopupContainer;
 class Profile;
@@ -268,7 +268,7 @@ class BlockedPopupContainer : public ConstrainedWindow,
   // iterator into |popup_hosts_|.  Returns popup_hosts_.end() if |index| is
   // invalid.
   PopupHosts::const_iterator ConvertHostIndexToIterator(int index) const;
-  
+
   // If the popup at |i| is the last one associated with its host, removes the
   // host from the host list.
   void EraseHostIfNeeded(BlockedPopups::iterator i);
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index e377397..d54e5ff 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -33,15 +33,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
-#include "chrome/views/view_constants.h"
-#include "chrome/views/widget/tooltip_manager.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/view_constants.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 using views::CustomButton;
 using views::DropTargetEvent;
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index a6c7ca8..f9d3ee0 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -10,11 +10,11 @@
 #include "chrome/browser/bookmarks/bookmark_menu_controller_win.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/label.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/view.h"
 #include "skia/include/corecg/SkRect.h"
 
 class Browser;
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 3fe05c1..73eb686 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -13,9 +13,9 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
-#include "chrome/views/controls/button/text_button.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/text_button.h"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index d731fac..abae95f 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -16,10 +16,10 @@
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/text_field.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
 
 using views::ComboBox;
 using views::ColumnSet;
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
index f94039a..76b3a27 100644
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ b/chrome/browser/views/bookmark_bubble_view.h
@@ -7,11 +7,11 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/link.h"
+#include "views/view.h"
 
 class Profile;
 
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 347ba5d..40472cb 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -13,17 +13,17 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/background.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/background.h"
+#include "views/focus/focus_manager.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 using views::Button;
 using views::ColumnSet;
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 8414544..e7cba63 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -9,12 +9,12 @@
 
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
-#include "chrome/views/controls/tree/tree_view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/text_field.h"
+#include "views/controls/tree/tree_node_model.h"
+#include "views/controls/tree/tree_view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class NativeButton;
diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc
index 7986d8f..e092670 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.cc
+++ b/chrome/browser/views/bookmark_folder_tree_view.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/profile.h"
-#include "chrome/views/view_constants.h"
 #include "grit/generated_resources.h"
+#include "views/view_constants.h"
 
 void BookmarkFolderTreeView::DropInfo::Scrolled() {
   view_->UpdateDropInfo();
diff --git a/chrome/browser/views/bookmark_folder_tree_view.h b/chrome/browser/views/bookmark_folder_tree_view.h
index cfae928..2a47b1b 100644
--- a/chrome/browser/views/bookmark_folder_tree_view.h
+++ b/chrome/browser/views/bookmark_folder_tree_view.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_drop_info.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
-#include "chrome/views/controls/tree/tree_view.h"
+#include "views/controls/tree/tree_view.h"
 
 class BookmarkModel;
 class BookmarkNode;
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 4be9ec3..ec28029 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -26,15 +26,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/single_split_view.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "skia/ext/skia_utils.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/label.h"
+#include "views/controls/single_split_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 
 // If non-null, there is an open editor and this is the window it is contained
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 9f986aa..a624281 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -10,12 +10,12 @@
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/controls/tree/tree_view.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/controls/tree/tree_view.h"
+#include "views/view.h"
+#include "views/window/window_delegate.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class BookmarkFolderTreeModel;
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index e92e5bb..0074e61 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
+#include "views/widget/widget.h"
 
 BookmarkMenuButton::BookmarkMenuButton(Browser* browser)
     : views::MenuButton(NULL, std::wstring(), NULL, false),
diff --git a/chrome/browser/views/bookmark_menu_button.h b/chrome/browser/views/bookmark_menu_button.h
index ed6dc5b..0ebb59f 100644
--- a/chrome/browser/views/bookmark_menu_button.h
+++ b/chrome/browser/views/bookmark_menu_button.h
@@ -8,8 +8,8 @@
 #include "base/timer.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_menu_controller_win.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/view_menu_delegate.h"
 
 class BookmarkModel;
 class Browser;
diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc
index 12d1d9f..c1b4023 100644
--- a/chrome/browser/views/bookmark_table_view.cc
+++ b/chrome/browser/views/bookmark_table_view.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/view_constants.h"
 #include "grit/generated_resources.h"
+#include "views/view_constants.h"
 
 namespace {
 
diff --git a/chrome/browser/views/bookmark_table_view.h b/chrome/browser/views/bookmark_table_view.h
index ab9b865..cde2bd0 100644
--- a/chrome/browser/views/bookmark_table_view.h
+++ b/chrome/browser/views/bookmark_table_view.h
@@ -7,8 +7,8 @@
 
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_drop_info.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/table/table_view.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/table/table_view.h"
 
 class BookmarkModel;
 class BookmarkNode;
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index c339eba..7bebdc5 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -18,16 +18,16 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/grid_layout.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h
index d17e569..0688a1dc 100644
--- a/chrome/browser/views/bug_report_view.h
+++ b/chrome/browser/views/bug_report_view.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_BUG_REPORT_VIEW_H_
 
 #include "chrome/browser/net/url_fetcher.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 1d9070f..6502cd4 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -8,16 +8,16 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/window/window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/url_request/url_request_context.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index de4ea31..f51979e 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__
 
 #include "chrome/browser/browsing_data_remover.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/label.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 11ab3b5..142a983 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -25,16 +25,16 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/hwnd_view.h"
+#include "views/focus/focus_manager.h"
+#include "views/window/client_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window_resources.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index a4ff2bd..bb29031 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -8,7 +8,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 class ConstrainedTabContentsWindowDelegate;
 class ConstrainedWindowAnimation;
diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
index 7990d21..3faf68a 100644
--- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
+++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
@@ -14,9 +14,9 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
+#include "views/event.h"
 
 class InteractiveConstrainedWindowTest : public UITest {
  protected:
diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h
index cf60430..da26bc4 100644
--- a/chrome/browser/views/dom_view.h
+++ b/chrome/browser/views/dom_view.h
@@ -9,8 +9,8 @@
 #define CHROME_BROWSER_VIEWS_DOM_VIEW_H_
 
 #include "base/scoped_ptr.h"
-#include "chrome/views/controls/hwnd_view.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/hwnd_view.h"
 
 class Profile;
 class SiteInstance;
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 17a6108..4f1d349 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -17,12 +17,12 @@
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h
index c5df73d..264d98d 100644
--- a/chrome/browser/views/download_item_view.h
+++ b/chrome/browser/views/download_item_view.h
@@ -27,9 +27,9 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/views/event.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/event.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index 9b97983..e2fd9f6 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/download_item_view.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/image_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/image_view.h"
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 5de3d34..325439f 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -7,8 +7,8 @@
 
 #include "app/slide_animation.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/button/button.h"
+#include "views/controls/link.h"
 
 namespace views {
 class ImageButton;
diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc
index b6ec708..3fddcd4 100644
--- a/chrome/browser/views/download_started_animation.cc
+++ b/chrome/browser/views/download_started_animation.cc
@@ -7,8 +7,8 @@
 #include "app/resource_bundle.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/widget/widget_win.h"
 #include "grit/theme_resources.h"
+#include "views/widget/widget_win.h"
 
 // How long to spend moving downwards and fading out after waiting.
 static const int kMoveTimeMs = 600;
diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h
index 162560d..ec84244 100644
--- a/chrome/browser/views/download_started_animation.h
+++ b/chrome/browser/views/download_started_animation.h
@@ -8,7 +8,7 @@
 #include "app/animation.h"
 #include "base/gfx/rect.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/controls/image_view.h"
+#include "views/controls/image_view.h"
 
 namespace views {
 class WidgetWin;
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index c481d69..c18e94f 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -14,14 +14,14 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/label.h"
+#include "views/controls/image_view.h"
+#include "views/controls/table/table_view.h"
+#include "views/grid_layout.h"
+#include "views/window/window.h"
 
 using views::GridLayout;
 using views::ImageView;
diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h
index e9a8f36..36e9370 100644
--- a/chrome/browser/views/edit_keyword_controller.h
+++ b/chrome/browser/views/edit_keyword_controller.h
@@ -10,10 +10,10 @@
 #ifndef CHROME_BROWSER_VIEWS_EDIT_KEYWORD_CONTROLLER_H_
 #define CHROME_BROWSER_VIEWS_EDIT_KEYWORD_CONTROLLER_H_
 
-#include <Windows.h>
+#include <windows.h>
 
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/event_utils.cc b/chrome/browser/views/event_utils.cc
index 989deab..06b9f0d 100644
--- a/chrome/browser/views/event_utils.cc
+++ b/chrome/browser/views/event_utils.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/event_utils.h"
 
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 using views::Event;
 
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 2d60738..2feb0d7 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -14,10 +14,10 @@
 #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/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h
index 548c54e..d74df51 100644
--- a/chrome/browser/views/external_protocol_dialog.h
+++ b/chrome/browser/views/external_protocol_dialog.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__
 
 #include "base/time.h"
-#include "chrome/views/window/dialog_delegate.h"
 #include "googleurl/src/gurl.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class TabContents;
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 1ca1c22..246857f 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -14,12 +14,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/label.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkGradientShader.h"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/label.h"
 
 // The amount of whitespace to have before the find button.
 static const int kWhiteSpaceAfterMatchCountLabel = 3;
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index 970c21b..9987118 100644
--- a/chrome/browser/views/find_bar_view.h
+++ b/chrome/browser/views/find_bar_view.h
@@ -7,8 +7,8 @@
 
 #include "base/gfx/size.h"
 #include "chrome/browser/find_notification_details.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/text_field.h"
+#include "views/controls/button/button.h"
+#include "views/controls/text_field.h"
 
 class FindBarWin;
 
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index 7ada890..0a56f61 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -14,11 +14,11 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/views/focus/external_focus_tracker.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/focus/external_focus_tracker.h"
+#include "views/focus/view_storage.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h
index 1073e76..182f65e 100644
--- a/chrome/browser/views/find_bar_win.h
+++ b/chrome/browser/views/find_bar_win.h
@@ -9,7 +9,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 class BrowserView;
 class FindBarController;
diff --git a/chrome/browser/views/find_bar_win_interactive_uitest.cc b/chrome/browser/views/find_bar_win_interactive_uitest.cc
index ddc0f17..21d2db0 100644
--- a/chrome/browser/views/find_bar_win_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_win_interactive_uitest.cc
@@ -4,12 +4,12 @@
 
 
 #include "chrome/browser/view_ids.h"
-#include "chrome/views/view.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
+#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index e487b5f..61bcdb2 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -14,14 +14,14 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/event.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/event.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/focus/focus_manager.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 190a89a..1ac1eb7 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -10,16 +10,16 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
                                              ImporterHost* importer_host,
diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h
index b394254..d7e12b576 100644
--- a/chrome/browser/views/first_run_customize_view.h
+++ b/chrome/browser/views/first_run_customize_view.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_CUSTOMIZE_VIEW_H_
 
 #include "chrome/browser/views/first_run_view_base.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/combo_box.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index e5e14a5..866b114 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -11,16 +11,16 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/first_run_customize_view.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/controls/separator.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/controls/separator.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h
index 267756b..54f8515 100644
--- a/chrome/browser/views/first_run_view.h
+++ b/chrome/browser/views/first_run_view.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/views/first_run_view_base.h"
 #include "chrome/browser/views/first_run_customize_view.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/link.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index cba6080..5a3788a 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -18,17 +18,17 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/controls/separator.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/controls/separator.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
 
 FirstRunViewBase::FirstRunViewBase(Profile* profile)
     : preferred_width_(0),
diff --git a/chrome/browser/views/first_run_view_base.h b/chrome/browser/views/first_run_view_base.h
index 365f6dd..2e19947 100644
--- a/chrome/browser/views/first_run_view_base.h
+++ b/chrome/browser/views/first_run_view_base.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_VIEW_BASE_H_
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/frame/browser_frame.cc b/chrome/browser/views/frame/browser_frame.cc
index f8e0ed3..60187d8 100644
--- a/chrome/browser/views/frame/browser_frame.cc
+++ b/chrome/browser/views/frame/browser_frame.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/views/frame/glass_browser_frame_view.h"
 #include "chrome/browser/views/frame/opaque_browser_frame_view.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/window/window_delegate.h"
 #include "grit/theme_resources.h"
+#include "views/window/window_delegate.h"
 
 // static
 static const int kClientEdgeThickness = 3;
diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h
index f90451a..140f25e 100644
--- a/chrome/browser/views/frame/browser_frame.h
+++ b/chrome/browser/views/frame/browser_frame.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_
 
-#include "chrome/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 class AeroGlassNonClientView;
 class BrowserView;
diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h
index 9753a17..a0460793 100644
--- a/chrome/browser/views/frame/browser_root_view.h
+++ b/chrome/browser/views/frame/browser_root_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
 
-#include "chrome/views/widget/root_view.h"
+#include "views/widget/root_view.h"
 
 class OSExchangeData;
 class TabStrip;
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 694c109..90c6d3a 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -55,16 +55,16 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/fill_layout.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/fill_layout.h"
+#include "views/view.h"
+#include "views/widget/root_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window_win.h"
 
 
 using base::TimeDelta;
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index a636883..3146ade 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -11,8 +11,8 @@
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/client_view.h"
+#include "views/window/window_delegate.h"
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 49488ba..bbebd3a 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -8,9 +8,9 @@
 #include "app/resource_bundle.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window_resources.h"
 #include "grit/theme_resources.h"
+#include "views/window/client_view.h"
+#include "views/window/window_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
index b6aa5f9..d110fe9 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/views/frame/glass_browser_frame_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
 
 #include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/non_client_view.h"
+#include "views/controls/button/button.h"
+#include "views/window/non_client_view.h"
 
 class BrowserView;
 class GlassBrowserWindowResources;
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 4958b13..a132119 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -13,12 +13,12 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/image_button.h"
+#include "views/widget/root_view.h"
+#include "views/window/window_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index 88d44e4..1e917e9 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -7,8 +7,8 @@
 
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/tab_icon_view.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/non_client_view.h"
+#include "views/controls/button/button.h"
+#include "views/window/non_client_view.h"
 
 class BrowserView;
 class ChromeFont;
diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc
index ad534f5..ff491a0 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/views/fullscreen_exit_bubble.cc
@@ -9,8 +9,8 @@
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/generated_resources.h"
+#include "views/widget/root_view.h"
 
 // FullscreenExitView ----------------------------------------------------------
 
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
index 59825d3..dca2cb8 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ b/chrome/browser/views/fullscreen_exit_bubble.h
@@ -8,8 +8,8 @@
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/controls/link.h"
+#include "views/widget/widget_win.h"
 
 // FullscreenExitBubble is responsible for showing a bubble atop the screen in
 // fullscreen mode, telling users how to exit and providing a click target.
diff --git a/chrome/browser/views/go_button.h b/chrome/browser/views/go_button.h
index 61b528e..818999c 100644
--- a/chrome/browser/views/go_button.h
+++ b/chrome/browser/views/go_button.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/views/controls/button/image_button.h"
+#include "views/controls/button/image_button.h"
 
 class Browser;
 class LocationBarView;
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 4a30c10..1e9569c 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/root_view.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, public:
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 0043252..d9edf50 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -11,7 +11,7 @@
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/views/dom_view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window_delegate.h"
 
 class Browser;
 namespace views {
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 593b312..bb13f3e 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -14,17 +14,17 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/table/group_table_view.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/table/group_table_view.h"
+#include "views/window/client_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class HungRendererDialogView;
 
diff --git a/chrome/browser/views/hwnd_html_view.cc b/chrome/browser/views/hwnd_html_view.cc
index 6856f57..bbda2c3 100644
--- a/chrome/browser/views/hwnd_html_view.cc
+++ b/chrome/browser/views/hwnd_html_view.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/site_instance.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_win.h"
 
 HWNDHtmlView::HWNDHtmlView(const GURL& content_url,
                            RenderViewHostDelegate* delegate,
diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h
index 275c891..699b67f 100644
--- a/chrome/browser/views/hwnd_html_view.h
+++ b/chrome/browser/views/hwnd_html_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_HWND_HTML_VIEW_H_
 
 #include "googleurl/src/gurl.h"
-#include "chrome/views/controls/hwnd_view.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/hwnd_view.h"
 
 class RenderViewHost;
 class RenderViewHostDelegate;
diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index e1224d4..e2fc249 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -7,11 +7,11 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/label.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/importer_lock_view.h b/chrome/browser/views/importer_lock_view.h
index 7b17e78..337b381 100644
--- a/chrome/browser/views/importer_lock_view.h
+++ b/chrome/browser/views/importer_lock_view.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_IMPORTER_LOCK_VIEW_H__
 #define CHROME_BROWSER_VIEWS_IMPORTER_LOCK_VIEW_H__
 
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index baa7387..7f03c3b 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -7,12 +7,12 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/label.h"
+#include "views/grid_layout.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
index 903764f..7ce6f62 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H__
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/combo_box.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index b2b41d0..2c917d2 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -6,13 +6,13 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/throbber.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/throbber.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, public:
diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h
index 3de6cfc..da3afbd 100644
--- a/chrome/browser/views/importing_progress_view.h
+++ b/chrome/browser/views/importing_progress_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class CheckmarkThrobber;
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 38e36f75..674141c 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -13,9 +13,9 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/theme_resources.h"
+#include "views/widget/root_view.h"
+#include "views/window/window.h"
 
 using views::View;
 
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index 235a2b6..7368235 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
 
 #include "app/slide_animation.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 // InfoBubble is used to display an arbitrary view above all other windows.
 // Think of InfoBubble as a tooltip that allows you to embed an arbitrary view
diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h
index dba3149..6cf02fa 100644
--- a/chrome/browser/views/infobars/infobar_container.h
+++ b/chrome/browser/views/infobars/infobar_container.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class BrowserView;
 class InfoBarDelegate;
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index c22fa5c..4a04040 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -11,15 +11,15 @@
 #include "base/message_loop.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/focus/external_focus_tracker.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/focus/external_focus_tracker.h"
+#include "views/widget/widget.h"
 
 // static
 const double InfoBar::kTargetHeight = 37.0;
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 2daefa9..4b468a8 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -7,8 +7,8 @@
 
 #include "app/animation.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/link.h"
+#include "views/controls/button/button.h"
+#include "views/controls/link.h"
 
 class InfoBarContainer;
 class SlideAnimation;
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc
index fab95a4..336a427 100644
--- a/chrome/browser/views/jsmessage_box_dialog.cc
+++ b/chrome/browser/views/jsmessage_box_dialog.cc
@@ -8,9 +8,9 @@
 #include "app/message_box_flags.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 JavascriptMessageBoxDialog::JavascriptMessageBoxDialog(
     AppModalDialog* parent,
diff --git a/chrome/browser/views/jsmessage_box_dialog.h b/chrome/browser/views/jsmessage_box_dialog.h
index cd64c9a..41f7e31 100644
--- a/chrome/browser/views/jsmessage_box_dialog.h
+++ b/chrome/browser/views/jsmessage_box_dialog.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/app_modal_dialog.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class TabContents;
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index f650ba2..bfb90dc 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -20,18 +20,18 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/background.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/widget/widget.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 using views::GridLayout;
 using views::NativeButton;
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 7d2a95f..ef8b456 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -9,10 +9,10 @@
 #include <map>
 
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 61a409f..7683626 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -27,12 +27,12 @@
 #include "chrome/browser/views/first_run_bubble.h"
 #include "chrome/browser/views/page_info_window.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/border.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/background.h"
+#include "views/border.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using views::View;
 
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 6d690d0..a6ea987 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -17,10 +17,10 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/painter.h"
+#include "views/controls/hwnd_view.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/painter.h"
 
 class AutocompletePopupPositioner;
 class CommandUpdater;
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index cef889a..150e447 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -9,11 +9,11 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/generated_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
diff --git a/chrome/browser/views/login_view.h b/chrome/browser/views/login_view.h
index 36e2591..fa0a837 100644
--- a/chrome/browser/views/login_view.h
+++ b/chrome/browser/views/login_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_LOGIN_VIEW_H__
 
 #include "base/task.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc
index 1c5faa6..9b3b5fa 100644
--- a/chrome/browser/views/new_profile_dialog.cc
+++ b/chrome/browser/views/new_profile_dialog.cc
@@ -11,13 +11,13 @@
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/message_box_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 // static
 void NewProfileDialog::RunDialog() {
diff --git a/chrome/browser/views/new_profile_dialog.h b/chrome/browser/views/new_profile_dialog.h
index 4564ec2..863b2ad 100644
--- a/chrome/browser/views/new_profile_dialog.h
+++ b/chrome/browser/views/new_profile_dialog.h
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/text_field.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 namespace views {
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index c3ef712..fb2862b 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -33,17 +33,17 @@
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/cookie_policy.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/scroll_view.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 using views::GridLayout;
 using views::ColumnSet;
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index 5e84ef3e..7b0e1c9 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -14,15 +14,15 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/message_box_view.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/scroll_view.h"
+#include "views/grid_layout.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
index 1a9119e..63f0ede 100644
--- a/chrome/browser/views/options/advanced_page_view.h
+++ b/chrome/browser/views/options/advanced_page_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
 
 #include "chrome/browser/views/options/options_page_view.h"
-#include "chrome/views/controls/button/button.h"
+#include "views/controls/button/button.h"
 
 class AdvancedOptionsListModel;
 class AdvancedScrollViewContainer;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index f289f09..955ea3e 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -22,14 +22,14 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/radio_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index 7102f63..7d96e00 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index b539aec..012e6ab 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -15,17 +15,17 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/border.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/controls/table/table_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
+#include "views/border.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/controls/table/table_view.h"
 
 // static
 views::Window* CookiesView::instance_ = NULL;
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index c05bce7..f2bc98a 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -6,12 +6,12 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 
 #include "base/task.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index 65c38f9..6492640 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -10,10 +10,10 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/grid_layout.h"
 #include "grit/generated_resources.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/grid_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index 6219f87..cf26d1f 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -12,10 +12,10 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/window/window.h"
 
 // static
 static FontsLanguagesWindowView* instance_ = NULL;
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
index 5d0fae3..e33d74a 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ b/chrome/browser/views/options/fonts_languages_window_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class Profile;
 class FontsPageView;
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index fb1c57a..7e497c0 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -24,14 +24,14 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
index a47f9ec..0b54c18 100644
--- a/chrome/browser/views/options/fonts_page_view.h
+++ b/chrome/browser/views/options/fonts_page_view.h
@@ -8,9 +8,9 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 
 namespace views {
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index bf7c4a7..505d85a 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -29,15 +29,15 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/views/controls/button/radio_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/grid_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/label.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 4887e1b..800cd04 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -8,9 +8,9 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/shelf_item_dialog.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h
index a3dfac6..c102902 100644
--- a/chrome/browser/views/options/language_combobox_model.h
+++ b/chrome/browser/views/options/language_combobox_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGE_COMBOBOX_MODEL_H_
 
 #include "chrome/browser/profile.h"
-#include "chrome/views/controls/combo_box.h"
+#include "views/controls/combo_box.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // LanguageComboboxModel
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 4752c80..c3b6a29 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -24,18 +24,18 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/radio_button.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 #include "unicode/uloc.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/controls/text_field.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 static const char* const accept_language_list[] = {
   "af",     // Afrikaans
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 1da0a88..308df34 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.h
@@ -7,10 +7,10 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/view.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/button/button.h"
+#include "views/controls/table/table_view.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 7985a41..fa7d3cd 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -13,11 +13,11 @@
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/separator.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
+#include "views/grid_layout.h"
+#include "views/controls/label.h"
+#include "views/controls/separator.h"
 
 static const int kLeftColumnWidthChars = 20;
 static const int kOptionsGroupViewColumnSpacing = 30;
diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h
index 8620030..1cabd1d 100644
--- a/chrome/browser/views/options/options_group_view.h
+++ b/chrome/browser/views/options/options_group_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
 #define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/views/options/options_page_view.cc b/chrome/browser/views/options/options_page_view.cc
index ed303ad..f0d5dfb 100644
--- a/chrome/browser/views/options/options_page_view.cc
+++ b/chrome/browser/views/options/options_page_view.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsPageView
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
index 6c7c4fd..c902e14e 100644
--- a/chrome/browser/views/options/options_page_view.h
+++ b/chrome/browser/views/options/options_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/controls/button/native_button.h"
+#include "views/controls/link.h"
+#include "views/controls/button/native_button.h"
 
 class PrefService;
 
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index 15f4181..6bdd1f0 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -18,13 +18,13 @@
 #include "chrome/personalization/personalization.h"
 #include "chrome/personalization/views/user_data_page_view.h"
 #endif
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/widget/root_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView
diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.h b/chrome/browser/views/options/passwords_exceptions_window_view.h
index e3e8705..8170f90 100644
--- a/chrome/browser/views/options/passwords_exceptions_window_view.h
+++ b/chrome/browser/views/options/passwords_exceptions_window_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
 
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 class Profile;
 class PasswordsPageView;
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index 04c13f4..f7f02cd 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -10,10 +10,10 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/grid_layout.h"
 #include "grit/generated_resources.h"
+#include "views/background.h"
+#include "views/controls/button/native_button.h"
+#include "views/grid_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
index b585159..a7a30b5 100644
--- a/chrome/browser/views/options/passwords_page_view.h
+++ b/chrome/browser/views/options/passwords_page_view.h
@@ -12,11 +12,11 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/label.h"
+#include "views/controls/table/table_view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 #include "webkit/glue/password_form.h"
 
 class Profile;
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index 059ec52..ad37f7b 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -20,18 +20,18 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/separator.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "skia/include/SkColor.h"
+#include "views/background.h"
+#include "views/grid_layout.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/separator.h"
 
 using base::Time;
 
diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h
index 35b2ee0..6a27558 100644
--- a/chrome/browser/views/page_info_window.h
+++ b/chrome/browser/views/page_info_window.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__
 
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "googleurl/src/gurl.h"
+#include "views/controls/button/button.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 // The page info window displays information regarding the current page,
 // including security information.
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index 13618fd..4c91b20 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 // Implementation of function declared in
 // browser/tab_contents/repost_form_warning.h
diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h
index 809b7b5..a7da41c 100644
--- a/chrome/browser/views/repost_form_warning_view.h
+++ b/chrome/browser/views/repost_form_warning_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_
 
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 class NavigationController;
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index bffbb82..3d4ffae 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -6,10 +6,10 @@
 
 #include "app/l10n_util.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"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, public:
diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h
index 8180de4..5394e69 100644
--- a/chrome/browser/views/restart_message_box.h
+++ b/chrome/browser/views/restart_message_box.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
 
 #include "base/basictypes.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 
diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h
index 8605c1d..2053fba 100644
--- a/chrome/browser/views/sad_tab_view.h
+++ b/chrome/browser/views/sad_tab_view.h
@@ -7,7 +7,7 @@
 
 #include "app/gfx/chrome_font.h"
 #include "base/basictypes.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc
index 2a2af8b..074fec6 100644
--- a/chrome/browser/views/select_profile_dialog.cc
+++ b/chrome/browser/views/select_profile_dialog.cc
@@ -12,15 +12,15 @@
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "views/controls/combo_box.h"
+#include "views/controls/label.h"
+#include "views/controls/message_box_view.h"
+#include "views/grid_layout.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/select_profile_dialog.h b/chrome/browser/views/select_profile_dialog.h
index 723efb2..2e2d328 100644
--- a/chrome/browser/views/select_profile_dialog.h
+++ b/chrome/browser/views/select_profile_dialog.h
@@ -15,8 +15,8 @@
 #include "base/ref_counted.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/views/controls/combo_box.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/controls/combo_box.h"
+#include "views/window/dialog_delegate.h"
 
 class SelectProfileDialogHelper;
 namespace views {
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index fdfae82..70c4e71 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -16,16 +16,16 @@
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/background.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/focus/focus_manager.h"
+#include "views/grid_layout.h"
+#include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h
index e1c932e..5e49625 100644
--- a/chrome/browser/views/shelf_item_dialog.h
+++ b/chrome/browser/views/shelf_item_dialog.h
@@ -7,12 +7,12 @@
 
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/table/table_view.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 class Button;
diff --git a/chrome/browser/views/standard_layout.h b/chrome/browser/views/standard_layout.h
index 3c3d5b63..d72c7f3 100644
--- a/chrome/browser/views/standard_layout.h
+++ b/chrome/browser/views/standard_layout.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
 #define CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
 
-#include "chrome/views/grid_layout.h"
+#include "views/grid_layout.h"
 
 //
 // This file contains some constants we use to implement our standard panel
diff --git a/chrome/browser/views/star_toggle.h b/chrome/browser/views/star_toggle.h
index 1475ab4..08d1791 100644
--- a/chrome/browser/views/star_toggle.h
+++ b/chrome/browser/views/star_toggle.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_STAR_TOGGLE_H_
 #define CHROME_BROWSER_VIEWS_STAR_TOGGLE_H_
 
-#include "chrome/views/view.h"
-#include "chrome/views/event.h"
+#include "views/view.h"
+#include "views/event.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index 38eebbd..d44c967 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -13,16 +13,16 @@
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkRect.h"
+#include "skia/include/SkPaint.h"
+#include "skia/include/SkPath.h"
+#include "skia/include/corecg/SkRect.h"
+#include "views/controls/label.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 // The color of the background bubble.
 static const SkColor kBubbleColor = SkColorSetRGB(222, 234, 248);
diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h
index 4985d51..cdda382 100644
--- a/chrome/browser/views/status_bubble_views.h
+++ b/chrome/browser/views/status_bubble_views.h
@@ -7,8 +7,8 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/status_bubble.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_win.h"
 
 class GURL;
 
diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc
index 4a3311d..cb08fcb 100644
--- a/chrome/browser/views/tab_contents_container_view.cc
+++ b/chrome/browser/views/tab_contents_container_view.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using views::FocusTraversable;
 using views::FocusManager;
diff --git a/chrome/browser/views/tab_contents_container_view.h b/chrome/browser/views/tab_contents_container_view.h
index 6840460..cc901ba 100644
--- a/chrome/browser/views/tab_contents_container_view.h
+++ b/chrome/browser/views/tab_contents_container_view.h
@@ -13,8 +13,8 @@ class RenderViewHost;
 class TabContents;
 
 #include "chrome/common/notification_registrar.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/focus/focus_manager.h"
+#include "views/controls/hwnd_view.h"
+#include "views/focus/focus_manager.h"
 
 // This View contains the TabContents.
 // It takes care of linking the TabContents to the browser RootView so that the
diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h
index d210ba4..2860699 100644
--- a/chrome/browser/views/tab_icon_view.h
+++ b/chrome/browser/views/tab_icon_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
 #define CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class SkBitmap;
 class TabContents;
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index c53622f..56ed9c7 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -21,10 +21,10 @@
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/event.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/event.h"
+#include "views/widget/root_view.h"
 
 static const int kHorizontalMoveThreshold = 16; // pixels
 
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index 90e6d23..1977f56 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/browser/views/tabs/tab_renderer.h"
-#include "chrome/views/widget/widget_win.h"
 #include "skia/include/SkShader.h"
+#include "views/widget/widget_win.h"
 
 const int kTransparentAlpha = 200;
 const int kOpaqueAlpha = 255;
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index 5802ec2..1b55654 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_tab_view.h
@@ -9,8 +9,8 @@
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/task.h"
-#include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
+#include "views/view.h"
 
 namespace views {
 class WidgetWin;
diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc
index ba825b0..8d59592 100644
--- a/chrome/browser/views/tabs/hwnd_photobooth.cc
+++ b/chrome/browser/views/tabs/hwnd_photobooth.cc
@@ -6,8 +6,8 @@
 #include "base/gfx/point.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
-#include "chrome/views/widget/widget_win.h"
 #include "skia/include/SkBitmap.h"
+#include "views/widget/widget_win.h"
 
 namespace {
 
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index f2193dc..3975604 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -9,10 +9,10 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/size.h"
-#include "chrome/views/controls/menu/chrome_menu.h"
-#include "chrome/views/widget/tooltip_manager.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
+#include "views/controls/menu/chrome_menu.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget.h"
 
 const std::string Tab::kTabClassName = "browser/tabs/Tab";
 
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 94ea24d..18226a1 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -13,9 +13,9 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "views/event.h"
 
 
 class TabDraggingTest : public UITest {
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index ca69bdd..9bb88ae 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -15,12 +15,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
+#include "views/widget/widget.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index 67c4639..f498c2a 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -9,9 +9,9 @@
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/gfx/point.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
 
 class TabContents;
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 5f41cc8..365e000 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -23,12 +23,12 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/painter.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/image_view.h"
+#include "views/painter.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 #undef min
 #undef max
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index 8e10b5e..1c52a45 100644
--- a/chrome/browser/views/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.h
@@ -8,10 +8,10 @@
 #include "base/gfx/point.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/widget_win.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/view.h"
+#include "views/widget/widget_win.h"
 
 class DraggedTabController;
 class ScopedMouseCloseWidthCalculator;
diff --git a/chrome/browser/views/toolbar_star_toggle.h b/chrome/browser/views/toolbar_star_toggle.h
index efd3bd3..f63cffc7 100644
--- a/chrome/browser/views/toolbar_star_toggle.h
+++ b/chrome/browser/views/toolbar_star_toggle.h
@@ -7,7 +7,7 @@
 
 #include "base/time.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/views/controls/button/image_button.h"
+#include "views/controls/button/image_button.h"
 
 class BrowserToolbarView;
 class GURL;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 6d0f02b..f4657eb 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -42,17 +42,17 @@
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/button_dropdown.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/widget/tooltip_manager.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "views/background.h"
+#include "views/controls/button/button_dropdown.h"
+#include "views/controls/hwnd_view.h"
+#include "views/controls/label.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 static const int kControlHorizOffset = 4;
 static const int kControlVertOffset = 6;
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index ca2502a..c5a9f83 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -18,10 +18,10 @@
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/controls/button/menu_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
-#include "chrome/views/view.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/view.h"
 
 class Browser;
 class Profile;
diff --git a/chrome/browser/views/uninstall_dialog.cc b/chrome/browser/views/uninstall_dialog.cc
index f9b2c04..f54fbc8 100644
--- a/chrome/browser/views/uninstall_dialog.cc
+++ b/chrome/browser/views/uninstall_dialog.cc
@@ -8,9 +8,9 @@
 #include "app/message_box_flags.h"
 #include "base/message_loop.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
+#include "views/controls/message_box_view.h"
+#include "views/window/window.h"
 
 // static
 void UninstallDialog::ShowUninstallDialog(int& user_selection) {
diff --git a/chrome/browser/views/uninstall_dialog.h b/chrome/browser/views/uninstall_dialog.h
index bf9a6c9..6987cb2 100644
--- a/chrome/browser/views/uninstall_dialog.h
+++ b/chrome/browser/views/uninstall_dialog.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_UNINSTALL_DIALOG_H_
 
 #include "base/basictypes.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index 00aef5f..c6b17f3 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -6,11 +6,11 @@
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
-#include "chrome/views/controls/message_box_view.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "views/controls/message_box_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 // static
 std::wstring UserDataDirDialog::RunUserDataDirDialog(
diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h
index 7408132..5e658c23 100644
--- a/chrome/browser/views/user_data_dir_dialog.h
+++ b/chrome/browser/views/user_data_dir_dialog.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
 namespace views {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 83ed025..f9dd449 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2557,12 +2557,12 @@
         'test/test_notification_tracker.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
-        'views/controls/label_unittest.cc',
-        'views/controls/table/table_view_unittest.cc',
-        'views/controls/tree/tree_node_iterator_unittest.cc',
-        'views/focus/focus_manager_unittest.cc',
-        'views/grid_layout_unittest.cc',
-        'views/view_unittest.cc',
+        '../views/controls/label_unittest.cc',
+        '../views/controls/table/table_view_unittest.cc',
+        '../views/controls/tree/tree_node_iterator_unittest.cc',
+        '../views/focus/focus_manager_unittest.cc',
+        '../views/grid_layout_unittest.cc',
+        '../views/view_unittest.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
@@ -2651,11 +2651,11 @@
             '../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',
-            'views/controls/table/table_view_unittest.cc',
-            'views/focus/focus_manager_unittest.cc',
-            'views/grid_layout_unittest.cc',
-            'views/view_unittest.cc',
+            '../views/controls/label_unittest.cc',
+            '../views/controls/table/table_view_unittest.cc',
+            '../views/focus/focus_manager_unittest.cc',
+            '../views/grid_layout_unittest.cc',
+            '../views/view_unittest.cc',
           ],
         }],
       ],
@@ -2850,154 +2850,154 @@
           ],
           'sources': [
             # All .cc, .h under views, except unittests
-            'views/accelerator.cc',
-            'views/accelerator.h',
-            'views/accessibility/view_accessibility.cc',
-            'views/accessibility/view_accessibility.h',
-            'views/accessibility/view_accessibility_wrapper.cc',
-            'views/accessibility/view_accessibility_wrapper.h',
-            'views/background.cc',
-            'views/background.h',
-            'views/border.cc',
-            'views/border.h',
-            'views/controls/button/button.cc',
-            'views/controls/button/button.h',
-            'views/controls/button/button_dropdown.cc',
-            'views/controls/button/button_dropdown.h',
-            'views/controls/button/checkbox.cc',
-            'views/controls/button/checkbox.h',
-            'views/controls/button/custom_button.cc',
-            'views/controls/button/custom_button.h',
-            'views/controls/button/image_button.cc',
-            'views/controls/button/image_button.h',
-            'views/controls/button/menu_button.cc',
-            'views/controls/button/menu_button.h',
-            'views/controls/button/native_button.cc',
-            'views/controls/button/native_button.h',
-            'views/controls/button/native_button_win.cc',
-            'views/controls/button/native_button_win.h',
-            'views/controls/button/native_button_wrapper.h',
-            'views/controls/button/radio_button.cc',
-            'views/controls/button/radio_button.h',
-            'views/controls/button/text_button.cc',
-            'views/controls/button/text_button.h',
-            'views/controls/combo_box.cc',
-            'views/controls/combo_box.h',
-            'views/controls/hwnd_view.cc',
-            'views/controls/hwnd_view.h',
-            'views/controls/image_view.cc',
-            'views/controls/image_view.h',
-            'views/controls/label.cc',
-            'views/controls/label.h',
-            'views/controls/link.cc',
-            'views/controls/link.h',
-            'views/controls/menu/chrome_menu.cc',
-            'views/controls/menu/chrome_menu.h',
-            'views/controls/menu/controller.h',
-            'views/controls/menu/menu.cc',
-            'views/controls/menu/menu.h',
-            'views/controls/menu/view_menu_delegate.h',
-            'views/controls/message_box_view.cc',
-            'views/controls/message_box_view.h',
-            'views/controls/native_control.cc',
-            'views/controls/native_control.h',
-            'views/controls/native_control_win.cc',
-            'views/controls/native_control_win.h',
-            'views/controls/native_view_host.cc',
-            'views/controls/native_view_host.h',
-            'views/controls/scroll_view.cc',
-            'views/controls/scroll_view.h',
-            'views/controls/scrollbar/bitmap_scroll_bar.cc',
-            'views/controls/scrollbar/bitmap_scroll_bar.h',
-            'views/controls/scrollbar/native_scroll_bar.cc',
-            'views/controls/scrollbar/native_scroll_bar.h',
-            'views/controls/scrollbar/scroll_bar.cc',
-            'views/controls/scrollbar/scroll_bar.h',
-            'views/controls/separator.cc',
-            'views/controls/separator.h',
-            'views/controls/single_split_view.cc',
-            'views/controls/single_split_view.h',
-            'views/controls/tabbed_pane.cc',
-            'views/controls/tabbed_pane.h',
-            'views/controls/table/group_table_view.cc',
-            'views/controls/table/group_table_view.h',
-            'views/controls/table/table_view.cc',
-            'views/controls/table/table_view.h',
-            'views/controls/text_field.cc',
-            'views/controls/text_field.h',
-            'views/controls/throbber.cc',
-            'views/controls/throbber.h',
-            'views/controls/tree/tree_model.h',
-            'views/controls/tree/tree_node_iterator.h',
-            'views/controls/tree/tree_node_model.h',
-            'views/controls/tree/tree_view.cc',
-            'views/controls/tree/tree_view.h',
-            'views/event.cc',
-            'views/event.h',
-            'views/event_gtk.cc',
-            'views/event_win.cc',
-            'views/fill_layout.cc',
-            'views/fill_layout.h',
-            'views/focus/external_focus_tracker.cc',
-            'views/focus/external_focus_tracker.h',
-            'views/focus/focus_manager.cc',
-            'views/focus/focus_manager.h',
-            'views/focus/focus_util_win.cc',
-            'views/focus/focus_util_win.h',
-            'views/focus/view_storage.cc',
-            'views/focus/view_storage.h',
-            'views/grid_layout.cc',
-            'views/grid_layout.h',
-            'views/layout_manager.cc',
-            'views/layout_manager.h',
-            'views/painter.cc',
-            'views/painter.h',
-            'views/repeat_controller.cc',
-            'views/repeat_controller.h',
-            'views/view.cc',
-            'views/view.h',
-            'views/view_constants.cc',
-            'views/view_constants.h',
-            'views/view_gtk.cc',
-            'views/view_win.cc',
-            'views/widget/accelerator_handler.cc',
-            'views/widget/accelerator_handler.h',
-            'views/widget/aero_tooltip_manager.cc',
-            'views/widget/aero_tooltip_manager.h',
-            'views/widget/root_view.cc',
-            'views/widget/root_view.h',
-            'views/widget/root_view_drop_target.cc',
-            'views/widget/root_view_drop_target.h',
-            'views/widget/root_view_gtk.cc',
-            'views/widget/root_view_win.cc',
-            'views/widget/tooltip_manager.cc',
-            'views/widget/tooltip_manager.h',
-            'views/widget/widget.h',
-            'views/widget/widget_gtk.cc',
-            'views/widget/widget_gtk.h',
-            'views/widget/widget_win.cc',
-            'views/widget/widget_win.h',
-            'views/window/client_view.cc',
-            'views/window/client_view.h',
-            'views/window/custom_frame_view.cc',
-            'views/window/custom_frame_view.h',
-            'views/window/dialog_client_view.cc',
-            'views/window/dialog_client_view.h',
-            'views/window/dialog_delegate.cc',
-            'views/window/dialog_delegate.h',
-            'views/window/hit_test.h',
-            'views/window/native_frame_view.cc',
-            'views/window/native_frame_view.h',
-            'views/window/non_client_view.cc',
-            'views/window/non_client_view.h',
-            'views/window/window.h',
-            'views/window/window_delegate.cc',
-            'views/window/window_delegate.h',
-            'views/window/window_gtk.cc',
-            'views/window/window_gtk.h',
-            'views/window/window_resources.h',
-            'views/window/window_win.cc',
-            'views/window/window_win.h',
+            '../views/accelerator.cc',
+            '../views/accelerator.h',
+            '../views/accessibility/view_accessibility.cc',
+            '../views/accessibility/view_accessibility.h',
+            '../views/accessibility/view_accessibility_wrapper.cc',
+            '../views/accessibility/view_accessibility_wrapper.h',
+            '../views/background.cc',
+            '../views/background.h',
+            '../views/border.cc',
+            '../views/border.h',
+            '../views/controls/button/button.cc',
+            '../views/controls/button/button.h',
+            '../views/controls/button/button_dropdown.cc',
+            '../views/controls/button/button_dropdown.h',
+            '../views/controls/button/checkbox.cc',
+            '../views/controls/button/checkbox.h',
+            '../views/controls/button/custom_button.cc',
+            '../views/controls/button/custom_button.h',
+            '../views/controls/button/image_button.cc',
+            '../views/controls/button/image_button.h',
+            '../views/controls/button/menu_button.cc',
+            '../views/controls/button/menu_button.h',
+            '../views/controls/button/native_button.cc',
+            '../views/controls/button/native_button.h',
+            '../views/controls/button/native_button_win.cc',
+            '../views/controls/button/native_button_win.h',
+            '../views/controls/button/native_button_wrapper.h',
+            '../views/controls/button/radio_button.cc',
+            '../views/controls/button/radio_button.h',
+            '../views/controls/button/text_button.cc',
+            '../views/controls/button/text_button.h',
+            '../views/controls/combo_box.cc',
+            '../views/controls/combo_box.h',
+            '../views/controls/hwnd_view.cc',
+            '../views/controls/hwnd_view.h',
+            '../views/controls/image_view.cc',
+            '../views/controls/image_view.h',
+            '../views/controls/label.cc',
+            '../views/controls/label.h',
+            '../views/controls/link.cc',
+            '../views/controls/link.h',
+            '../views/controls/menu/chrome_menu.cc',
+            '../views/controls/menu/chrome_menu.h',
+            '../views/controls/menu/controller.h',
+            '../views/controls/menu/menu.cc',
+            '../views/controls/menu/menu.h',
+            '../views/controls/menu/view_menu_delegate.h',
+            '../views/controls/message_box_view.cc',
+            '../views/controls/message_box_view.h',
+            '../views/controls/native_control.cc',
+            '../views/controls/native_control.h',
+            '../views/controls/native_control_win.cc',
+            '../views/controls/native_control_win.h',
+            '../views/controls/native_view_host.cc',
+            '../views/controls/native_view_host.h',
+            '../views/controls/scroll_view.cc',
+            '../views/controls/scroll_view.h',
+            '../views/controls/scrollbar/bitmap_scroll_bar.cc',
+            '../views/controls/scrollbar/bitmap_scroll_bar.h',
+            '../views/controls/scrollbar/native_scroll_bar.cc',
+            '../views/controls/scrollbar/native_scroll_bar.h',
+            '../views/controls/scrollbar/scroll_bar.cc',
+            '../views/controls/scrollbar/scroll_bar.h',
+            '../views/controls/separator.cc',
+            '../views/controls/separator.h',
+            '../views/controls/single_split_view.cc',
+            '../views/controls/single_split_view.h',
+            '../views/controls/tabbed_pane.cc',
+            '../views/controls/tabbed_pane.h',
+            '../views/controls/table/group_table_view.cc',
+            '../views/controls/table/group_table_view.h',
+            '../views/controls/table/table_view.cc',
+            '../views/controls/table/table_view.h',
+            '../views/controls/text_field.cc',
+            '../views/controls/text_field.h',
+            '../views/controls/throbber.cc',
+            '../views/controls/throbber.h',
+            '../views/controls/tree/tree_model.h',
+            '../views/controls/tree/tree_node_iterator.h',
+            '../views/controls/tree/tree_node_model.h',
+            '../views/controls/tree/tree_view.cc',
+            '../views/controls/tree/tree_view.h',
+            '../views/event.cc',
+            '../views/event.h',
+            '../views/event_gtk.cc',
+            '../views/event_win.cc',
+            '../views/fill_layout.cc',
+            '../views/fill_layout.h',
+            '../views/focus/external_focus_tracker.cc',
+            '../views/focus/external_focus_tracker.h',
+            '../views/focus/focus_manager.cc',
+            '../views/focus/focus_manager.h',
+            '../views/focus/focus_util_win.cc',
+            '../views/focus/focus_util_win.h',
+            '../views/focus/view_storage.cc',
+            '../views/focus/view_storage.h',
+            '../views/grid_layout.cc',
+            '../views/grid_layout.h',
+            '../views/layout_manager.cc',
+            '../views/layout_manager.h',
+            '../views/painter.cc',
+            '../views/painter.h',
+            '../views/repeat_controller.cc',
+            '../views/repeat_controller.h',
+            '../views/view.cc',
+            '../views/view.h',
+            '../views/view_constants.cc',
+            '../views/view_constants.h',
+            '../views/view_gtk.cc',
+            '../views/view_win.cc',
+            '../views/widget/accelerator_handler.cc',
+            '../views/widget/accelerator_handler.h',
+            '../views/widget/aero_tooltip_manager.cc',
+            '../views/widget/aero_tooltip_manager.h',
+            '../views/widget/root_view.cc',
+            '../views/widget/root_view.h',
+            '../views/widget/root_view_drop_target.cc',
+            '../views/widget/root_view_drop_target.h',
+            '../views/widget/root_view_gtk.cc',
+            '../views/widget/root_view_win.cc',
+            '../views/widget/tooltip_manager.cc',
+            '../views/widget/tooltip_manager.h',
+            '../views/widget/widget.h',
+            '../views/widget/widget_gtk.cc',
+            '../views/widget/widget_gtk.h',
+            '../views/widget/widget_win.cc',
+            '../views/widget/widget_win.h',
+            '../views/window/client_view.cc',
+            '../views/window/client_view.h',
+            '../views/window/custom_frame_view.cc',
+            '../views/window/custom_frame_view.h',
+            '../views/window/dialog_client_view.cc',
+            '../views/window/dialog_client_view.h',
+            '../views/window/dialog_delegate.cc',
+            '../views/window/dialog_delegate.h',
+            '../views/window/hit_test.h',
+            '../views/window/native_frame_view.cc',
+            '../views/window/native_frame_view.h',
+            '../views/window/non_client_view.cc',
+            '../views/window/non_client_view.h',
+            '../views/window/window.h',
+            '../views/window/window_delegate.cc',
+            '../views/window/window_delegate.h',
+            '../views/window/window_gtk.cc',
+            '../views/window/window_gtk.h',
+            '../views/window/window_resources.h',
+            '../views/window/window_win.cc',
+            '../views/window/window_win.h',
           ],
           'conditions': [
             ['OS=="linux"', {
@@ -3005,44 +3005,44 @@
                 '../build/linux/system.gyp:gtk',
               ],
               'sources!': [
-                'views/accelerator.cc',
-                'views/accessibility/accessible_wrapper.cc',
-                'views/accessibility/view_accessibility.cc',
-                'views/controls/scrollbar/bitmap_scroll_bar.cc',
-                'views/controls/button/button_dropdown.cc',
-                'views/controls/button/checkbox.cc',
-                'views/controls/button/image_button.cc',
-                'views/controls/button/menu_button.cc',
-                'views/controls/combo_box.cc',
-                'views/controls/hwnd_view.cc',
-                'views/controls/link.cc',
-                'views/controls/menu/chrome_menu.cc',
-                'views/controls/menu/menu.cc',
-                'views/controls/message_box_view.cc',
-                'views/controls/scroll_view.cc',
-                'views/controls/table/group_table_view.cc',
-                'views/focus/external_focus_tracker.cc',
-                'views/focus/focus_manager.cc',
-                'views/controls/button/native_button.cc',
-                'views/controls/native_control.cc',
-                'views/controls/scrollbar/native_scroll_bar.cc',
-                'views/controls/button/radio_button.cc',
-                'views/resize_corner.cc',
-                'views/controls/separator.cc',
-                'views/controls/single_split_view.cc',
-                'views/controls/tabbed_pane.cc',
-                'views/controls/table/table_view.cc',
-                'views/controls/text_field.cc',
-                'views/controls/tree/tree_view.cc',
-                'views/event_win.cc',
-                'views/widget/accelerator_handler.cc',
-                'views/widget/aero_tooltip_manager.cc',
-                'views/widget/root_view_drop_target.cc',
-                'views/widget/tooltip_manager.cc',
-                'views/window/dialog_delegate.cc',
-                'views/window/dialog_client_view.cc',
-                'views/window/hit_test.cc',
-                'views/window/native_frame_view.cc',
+                '../views/accelerator.cc',
+                '../views/accessibility/accessible_wrapper.cc',
+                '../views/accessibility/view_accessibility.cc',
+                '../views/controls/scrollbar/bitmap_scroll_bar.cc',
+                '../views/controls/button/button_dropdown.cc',
+                '../views/controls/button/checkbox.cc',
+                '../views/controls/button/image_button.cc',
+                '../views/controls/button/menu_button.cc',
+                '../views/controls/combo_box.cc',
+                '../views/controls/hwnd_view.cc',
+                '../views/controls/link.cc',
+                '../views/controls/menu/chrome_menu.cc',
+                '../views/controls/menu/menu.cc',
+                '../views/controls/message_box_view.cc',
+                '../views/controls/scroll_view.cc',
+                '../views/controls/table/group_table_view.cc',
+                '../views/focus/external_focus_tracker.cc',
+                '../views/focus/focus_manager.cc',
+                '../views/controls/button/native_button.cc',
+                '../views/controls/native_control.cc',
+                '../views/controls/scrollbar/native_scroll_bar.cc',
+                '../views/controls/button/radio_button.cc',
+                '../views/resize_corner.cc',
+                '../views/controls/separator.cc',
+                '../views/controls/single_split_view.cc',
+                '../views/controls/tabbed_pane.cc',
+                '../views/controls/table/table_view.cc',
+                '../views/controls/text_field.cc',
+                '../views/controls/tree/tree_view.cc',
+                '../views/event_win.cc',
+                '../views/widget/accelerator_handler.cc',
+                '../views/widget/aero_tooltip_manager.cc',
+                '../views/widget/root_view_drop_target.cc',
+                '../views/widget/tooltip_manager.cc',
+                '../views/window/dialog_delegate.cc',
+                '../views/window/dialog_client_view.cc',
+                '../views/window/hit_test.cc',
+                '../views/window/native_frame_view.cc',
               ],
             }],
             ['OS=="win"', {
@@ -3057,43 +3057,43 @@
             },],
             ['OS=="linux"', {
               'sources!': [
-                'views/accelerator.cc',
-                'views/accessibility/accessible_wrapper.cc',
-                'views/accessibility/view_accessibility.cc',
-                'views/accessibility/view_accessibility_wrapper.cc',
-                'views/controls/scrollbar/bitmap_scroll_bar.cc',
-                'views/controls/button/image_button.cc',
-                'views/controls/button/button_dropdown.cc',
-                'views/controls/button/checkbox.cc',
-                'views/controls/menu/chrome_menu.cc',
-                'views/controls/combo_box.cc',
-                'views/focus/focus_manager.cc',
-                'views/controls/table/group_table_view.cc',
-                'views/controls/hwnd_view.cc',
-                'views/controls/link.cc',
-                'views/controls/menu/menu.cc',
-                'views/controls/button/menu_button.cc',
-                'views/controls/message_box_view.cc',
-                'views/controls/button/native_button.cc',
-                'views/controls/native_control.cc',
-                'views/controls/scrollbar/native_scroll_bar.cc',
-                'views/controls/button/radio_button.cc',
-                'views/resize_corner.cc',
-                'views/controls/separator.cc',
-                'views/controls/single_split_view.cc',
-                'views/controls/tabbed_pane.cc',
-                'views/controls/table/table_view.cc',
-                'views/controls/text_field.cc',
-                'views/controls/tree/tree_view.cc',
-                'views/widget/accelerator_handler.cc',
-                'views/widget/aero_tooltip_manager.cc',
-                'views/widget/root_view_drop_target.cc',
-                'views/widget/tooltip_manager.cc',
-                'views/widget/widget_win.cc',
-                'views/window/dialog_delegate.cc',
-                'views/window/dialog_client_view.cc',
-                'views/window/native_frame_view.cc',
-                'views/window/window_win.cc',
+                '../views/accelerator.cc',
+                '../views/accessibility/accessible_wrapper.cc',
+                '../views/accessibility/view_accessibility.cc',
+                '../views/accessibility/view_accessibility_wrapper.cc',
+                '../views/controls/scrollbar/bitmap_scroll_bar.cc',
+                '../views/controls/button/image_button.cc',
+                '../views/controls/button/button_dropdown.cc',
+                '../views/controls/button/checkbox.cc',
+                '../views/controls/menu/chrome_menu.cc',
+                '../views/controls/combo_box.cc',
+                '../views/focus/focus_manager.cc',
+                '../views/controls/table/group_table_view.cc',
+                '../views/controls/hwnd_view.cc',
+                '../views/controls/link.cc',
+                '../views/controls/menu/menu.cc',
+                '../views/controls/button/menu_button.cc',
+                '../views/controls/message_box_view.cc',
+                '../views/controls/button/native_button.cc',
+                '../views/controls/native_control.cc',
+                '../views/controls/scrollbar/native_scroll_bar.cc',
+                '../views/controls/button/radio_button.cc',
+                '../views/resize_corner.cc',
+                '../views/controls/separator.cc',
+                '../views/controls/single_split_view.cc',
+                '../views/controls/tabbed_pane.cc',
+                '../views/controls/table/table_view.cc',
+                '../views/controls/text_field.cc',
+                '../views/controls/tree/tree_view.cc',
+                '../views/widget/accelerator_handler.cc',
+                '../views/widget/aero_tooltip_manager.cc',
+                '../views/widget/root_view_drop_target.cc',
+                '../views/widget/tooltip_manager.cc',
+                '../views/widget/widget_win.cc',
+                '../views/window/dialog_delegate.cc',
+                '../views/window/dialog_client_view.cc',
+                '../views/window/native_frame_view.cc',
+                '../views/window/window_win.cc',
               ],
             }],
           ],
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 85475a0..60bb624 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -6,57 +6,57 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{9755
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser.vcproj", "{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcproj", "{9301A569-5D2B-4D11-9332-B1E30AEACB8D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "common\ipc_tests.vcproj", "{B92AE829-E1CD-4781-824A-DCB1603A1672}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{899F1280-3441-4D1F-BA04-CCD6208D9146}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (readonly)", "WebKit (readonly)", "{1088577A-0C49-4DE0-85CD-B68AD0BE55AA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\webkit\build\WebCore\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
+		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Port", "..\webkit\build\port\port.vcproj", "{5597AD47-3494-4750-A235-4F9C2F864700}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\glue\glue.vcproj", "{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
-		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
+		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\skia\skia.vcproj", "{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}"
@@ -66,12 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\webkit\build\Java
 		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj", "{6F9258E5-294F-47B2-919D-17FFE7A8B751}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sqlite\sqlite.vcproj", "{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
@@ -88,8 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automati
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {F22022F0-2D3B-5610-4E80-C674A8E01C5A}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudata", "..\third_party\icu38\icudata.vcproj", "{A0D94973-D355-47A5-A1E2-3456F321F010}"
@@ -106,12 +100,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "..\third_party\ff
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image_diff", "tools\test\image_diff\image_diff.vcproj", "{50B079C7-CD01-42D3-B8C4-9F8D9322E822}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breakpad", "Breakpad", "{873D095E-150E-4262-8C41-2D8ED02F0F57}"
@@ -135,52 +129,52 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_strings", "app\chrom
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings", "..\webkit\build\V8Bindings\V8Bindings.vcproj", "{625A8F11-2B4E-45B4-BD99-C6D629C606C0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dll.vcproj", "{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C564F145-9172-42C3-BFCB-60FDEA124321} = {C564F145-9172-42C3-BFCB-60FDEA124321}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {C78D02D0-A366-4EC6-A248-AA8E64C4BA18}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {D703D7A0-EDC1-4FE6-9E22-56154155B24E}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {D703D7A0-EDC1-4FE6-9E22-56154155B24E}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {C78D02D0-A366-4EC6-A248-AA8E64C4BA18}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-60FDEA124321} = {C564F145-9172-42C3-BFCB-60FDEA124321}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\third_party\bzip2\bzip2.vcproj", "{2A70CBF0-847E-4E3A-B926-542A656DC7FE}"
@@ -189,35 +183,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_layout_test_plugin",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\tools\test_shell\test_shell.vcproj", "{FA39524D-3067-4141-888D-28A86C66F2B9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110} = {3E03D462-780D-4C4D-B22E-5E095E6CF110}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110} = {3E03D462-780D-4C4D-B22E-5E095E6CF110}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "plugin\plugin.vcproj", "{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}"
@@ -226,217 +220,217 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "V8", "V8", "{B353A6A5-9551-
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_exe", "app\chrome_exe.vcproj", "{7B219FAA-E360-43C8-B341-804A94EEFFAC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{881F6A97-D539-4C48-B401-DF04385B2343} = {881F6A97-D539-4C48-B401-DF04385B2343}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
+		{881F6A97-D539-4C48-B401-DF04385B2343} = {881F6A97-D539-4C48-B401-DF04385B2343}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\perftests.vcproj", "{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\unittests.vcproj", "{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1174D37F-6ABB-45DA-81B3-C631281273B7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "page_cycler_tests", "test\page_cycler\page_cycler_tests.vcproj", "{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\reliability\reliability_tests.vcproj", "{8A3E1774-1DE9-445C-982D-3EE37C8A752A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\selenium\selenium_tests.vcproj", "{E3749617-BA3D-4230-B54C-B758E56D9FA5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\startup\startup_tests.vcproj", "{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_tests.vcproj", "{76235B67-1C27-4627-8A33-4B2E1EF93EDE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
@@ -445,72 +439,72 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{846901FD
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_profile", "tools\profiles\generate_profile.vcproj", "{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "..\webkit\tools\test_shell\test_shell_tests.vcproj", "{E6766F81-1FCD-4CD7-BC16-E36964A14867}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Config", "..\webkit\build\JSConfig\V8Config.vcproj", "{2E2D3301-2EC4-4C0F-B889-87073B30F673}"
@@ -519,9 +513,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "stats_viewer", "..\tools\st
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-US", "app\locales\en-US.vcproj", "{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325D8C4-8EF5-42AC-8900-492225750DE4}"
@@ -544,67 +538,67 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googleurl", "..\build\temp_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_test_plugin", "..\webkit\glue\plugins\test\npapi_test_plugin.vcproj", "{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush_cache", "tools\perf\flush_cache\flush_cache.vcproj", "{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modp_b64", "..\third_party\modp_b64\modp_b64.vcproj", "{7100F41F-868D-4E99-80A2-AF8E6574749D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim", "..\webkit\activex_shim\activex_shim.vcproj", "{F4F4BCAA-EA59-445C-A119-3E6C29647A51}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\net.vcproj", "{326E9795-E760-410A-B69A-3F79DB3F5243}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
 		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7} = {ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tld_cleanup", "..\net\tld_cleanup.vcproj", "{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_unittests", "..\net\net_unittests.vcproj", "{E99DA267-BE90-4F45-88A1-6919DB2C7567}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_perftests", "..\net\net_perftests.vcproj", "{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1846F110-8263-413F-9924-36F64DD8FE41} = {1846F110-8263-413F-9924-36F64DD8FE41}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1846F110-8263-413F-9924-36F64DD8FE41} = {1846F110-8263-413F-9924-36F64DD8FE41}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\media.vcproj", "{6AE76406-B03B-11DD-94B1-80B556D89593}"
@@ -614,9 +608,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\media.vcp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media\media_unittests.vcproj", "{C8C6183C-B03C-11DD-B471-DFD256D89593}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\base.vcproj", "{1832A374-8A74-4F9E-B536-69A699B3E165}"
@@ -630,100 +624,100 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_message", "..\base\de
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base_unittests", "..\base\base_unittests.vcproj", "{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin\plugin_tests.vcproj", "{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {414D4D24-5D65-498B-A33F-3A29AD3CDEDC}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {414D4D24-5D65-498B-A33F-3A29AD3CDEDC}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup", "installer\setup\setup.vcproj", "{21C76E6E-8B38-44D6-8148-B589C13B9554}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "installer\util\util.vcproj", "{EFBB1436-A63F-4CD8-9E99-B89226E782EC}"
@@ -733,88 +727,88 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "installer\util\util
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer", "installer\mini_installer\mini_installer.vcproj", "{24A5AC7C-280B-4899-9153-6BA570A081E7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {182D578D-2DAC-4BB7-AFEC-9A2855E56F94}
-		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {21C76E6E-8B38-44D6-8148-B589C13B9554}
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {226B3533-1FF3-42F6-A8E3-C4DDBC955290}
-		{228DD844-9926-420E-B193-6973BF2A4D0B} = {228DD844-9926-420E-B193-6973BF2A4D0B}
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {256DECCE-9886-4C21-96A5-EE47DF5E07E9}
-		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {275F2993-EE9B-4E00-9C85-10A182FD423A}
-		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2F914112-2657-49EC-8EA6-3BA63340DE27}
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {300C6A09-663E-48B6-8E07-A0D50CAF8F25}
-		{32167995-4014-4E4C-983B-F7E17C24EB25} = {32167995-4014-4E4C-983B-F7E17C24EB25}
-		{34231B28-C51C-4C1C-AF07-C763668B1404} = {34231B28-C51C-4C1C-AF07-C763668B1404}
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {3A932C39-AFA9-4BDC-B775-F71A426D04BF}
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {3E6B24F6-9FA9-4066-859E-BF747FA3080A}
-		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {4B60E8B8-416F-40B2-8A54-F75970A21992}
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685} = {4EA8CE12-9C6F-45E5-9D08-720383FE3685}
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {5AEA4BF6-27CD-47FC-9370-D87771CFA196}
-		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {5BDB7EE1-A1FD-410C-9598-21519A1B7952}
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}
-		{64D81334-DE73-457D-8FC1-9492508A2663} = {64D81334-DE73-457D-8FC1-9492508A2663}
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {65C78BBB-8FCB-48E4-94C8-1F0F981929AF}
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7D456640-3619-4D23-A56D-E0084400CCBF} = {7D456640-3619-4D23-A56D-E0084400CCBF}
-		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}
-		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {80E37CB5-059D-4F4B-AEF6-08265468D368}
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {82F5BFE5-FDCE-47D4-8B38-BEEBED561681}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {9D13D9B8-6C28-42A7-935C-B769EBC55BAA}
-		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {9F53807E-9382-47BD-8371-E5D04F517E9C}
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
-		{A464166F-8507-49B4-9B02-5CB77C498B25} = {A464166F-8507-49B4-9B02-5CB77C498B25}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
-		{A5C5D801-4026-49F2-BBF1-250941855306} = {A5C5D801-4026-49F2-BBF1-250941855306}
-		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {AFF332BF-AF3D-4D35-86FC-42A727F01D36}
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}
-		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
-		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {C70D3509-57C4-4326-90C1-2EC0AE34848D}
-		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {CAB69303-0F02-4C68-A12E-FFE55DB52526}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {CE1426F6-7D2B-4574-9929-58387BF7B05F}
-		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {D314F1B3-9299-4866-8362-08BF811B0FA3}
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}
-		{E07D267C-34C3-4DDB-8B41-94697808714A} = {E07D267C-34C3-4DDB-8B41-94697808714A}
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}
-		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {E3DF045F-2174-4685-9CF7-0630A79F324B}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {F7790A54-4078-4E4A-8231-818BE9FB1F94}
-		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {FA660037-EB40-4A43-AA9D-9653C57F2789}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {FA660037-EB40-4A43-AA9D-9653C57F2789}
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {F7790A54-4078-4E4A-8231-818BE9FB1F94}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
+		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {E3DF045F-2174-4685-9CF7-0630A79F324B}
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}
+		{E07D267C-34C3-4DDB-8B41-94697808714A} = {E07D267C-34C3-4DDB-8B41-94697808714A}
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}
+		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {D314F1B3-9299-4866-8362-08BF811B0FA3}
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {CE1426F6-7D2B-4574-9929-58387BF7B05F}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {CAB69303-0F02-4C68-A12E-FFE55DB52526}
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {C70D3509-57C4-4326-90C1-2EC0AE34848D}
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
+		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
+		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}
+		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {AFF332BF-AF3D-4D35-86FC-42A727F01D36}
+		{A5C5D801-4026-49F2-BBF1-250941855306} = {A5C5D801-4026-49F2-BBF1-250941855306}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
+		{A464166F-8507-49B4-9B02-5CB77C498B25} = {A464166F-8507-49B4-9B02-5CB77C498B25}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {9F53807E-9382-47BD-8371-E5D04F517E9C}
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {9D13D9B8-6C28-42A7-935C-B769EBC55BAA}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {82F5BFE5-FDCE-47D4-8B38-BEEBED561681}
+		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {80E37CB5-059D-4F4B-AEF6-08265468D368}
+		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}
+		{7D456640-3619-4D23-A56D-E0084400CCBF} = {7D456640-3619-4D23-A56D-E0084400CCBF}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {65C78BBB-8FCB-48E4-94C8-1F0F981929AF}
+		{64D81334-DE73-457D-8FC1-9492508A2663} = {64D81334-DE73-457D-8FC1-9492508A2663}
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}
+		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {5BDB7EE1-A1FD-410C-9598-21519A1B7952}
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {5AEA4BF6-27CD-47FC-9370-D87771CFA196}
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685} = {4EA8CE12-9C6F-45E5-9D08-720383FE3685}
+		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {4B60E8B8-416F-40B2-8A54-F75970A21992}
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {3E6B24F6-9FA9-4066-859E-BF747FA3080A}
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {3A932C39-AFA9-4BDC-B775-F71A426D04BF}
+		{34231B28-C51C-4C1C-AF07-C763668B1404} = {34231B28-C51C-4C1C-AF07-C763668B1404}
+		{32167995-4014-4E4C-983B-F7E17C24EB25} = {32167995-4014-4E4C-983B-F7E17C24EB25}
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {300C6A09-663E-48B6-8E07-A0D50CAF8F25}
+		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2F914112-2657-49EC-8EA6-3BA63340DE27}
+		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {275F2993-EE9B-4E00-9C85-10A182FD423A}
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {256DECCE-9886-4C21-96A5-EE47DF5E07E9}
+		{228DD844-9926-420E-B193-6973BF2A4D0B} = {228DD844-9926-420E-B193-6973BF2A4D0B}
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {226B3533-1FF3-42F6-A8E3-C4DDBC955290}
+		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {21C76E6E-8B38-44D6-8148-B589C13B9554}
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {182D578D-2DAC-4BB7-AFEC-9A2855E56F94}
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsdiff", "..\third_party\bsdiff\bsdiff.vcproj", "{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
 		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bspatch", "..\third_party\bspatch\bspatch.vcproj", "{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer_unittests", "installer\util\installer_unittests.vcproj", "{903F8C1E-537A-4C9E-97BE-075147CBE769}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "da", "app\locales\da.vcproj", "{A493331B-3180-49FE-8D0E-D121645E63AD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "test\activex_test_control\activex_test_control.vcproj", "{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}"
@@ -826,63 +820,63 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-TW", "app\locales\zh-TW.vcproj", "{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "he", "app\locales\he.vcproj", "{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chrome_plugin", "test\chrome_plugin\test_chrome_plugin.vcproj", "{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\automated_ui_tests\automated_ui_tests.vcproj", "{D2250C20-3A94-4FB9-AF73-11BC5B73884B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test\mini_installer_test\mini_installer_test.vcproj", "{4B6E199A-034A-49BD-AB93-458DD37E45B1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore_pcre", "..\webkit\build\JavaScriptCore\JavaScriptCore_pcre.vcproj", "{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings_prebuild", "..\webkit\build\V8Bindings\V8Bindings_prebuild.vcproj", "{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}"
 	ProjectSection(ProjectDependencies) = postProject
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "..\gears\gears.vcproj", "{D703D7A0-EDC1-4FE6-9E22-56154155B24E}"
@@ -946,384 +940,384 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "terms", "terms", "{D13F055D
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ar", "app\locales\ar.vcproj", "{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bg", "app\locales\bg.vcproj", "{5BDB7EE1-A1FD-410C-9598-21519A1B7952}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ca", "app\locales\ca.vcproj", "{F7790A54-4078-4E4A-8231-818BE9FB1F94}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cs", "app\locales\cs.vcproj", "{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "de", "app\locales\de.vcproj", "{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "el", "app\locales\el.vcproj", "{D314F1B3-9299-4866-8362-08BF811B0FA3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-GB", "app\locales\en-GB.vcproj", "{34231B28-C51C-4C1C-AF07-C763668B1404}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es", "app\locales\es.vcproj", "{5AEA4BF6-27CD-47FC-9370-D87771CFA196}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "et", "app\locales\et.vcproj", "{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fi", "app\locales\fi.vcproj", "{64D81334-DE73-457D-8FC1-9492508A2663}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fil", "app\locales\fil.vcproj", "{3A932C39-AFA9-4BDC-B775-F71A426D04BF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fr", "app\locales\fr.vcproj", "{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi", "app\locales\hi.vcproj", "{228DD844-9926-420E-B193-6973BF2A4D0B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr", "app\locales\hr.vcproj", "{CE1426F6-7D2B-4574-9929-58387BF7B05F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hu", "app\locales\hu.vcproj", "{AFF332BF-AF3D-4D35-86FC-42A727F01D36}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "id", "app\locales\id.vcproj", "{E3DF045F-2174-4685-9CF7-0630A79F324B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "it", "app\locales\it.vcproj", "{275F2993-EE9B-4E00-9C85-10A182FD423A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja", "app\locales\ja.vcproj", "{B2D715CE-4CBB-415A-A032-E700C90ADF91}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ko", "app\locales\ko.vcproj", "{32167995-4014-4E4C-983B-F7E17C24EB25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lt", "app\locales\lt.vcproj", "{80E37CB5-059D-4F4B-AEF6-08265468D368}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv", "app\locales\lv.vcproj", "{A5C5D801-4026-49F2-BBF1-250941855306}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nl", "app\locales\nl.vcproj", "{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nb", "app\locales\nb.vcproj", "{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pl", "app\locales\pl.vcproj", "{9F53807E-9382-47BD-8371-E5D04F517E9C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-BR", "app\locales\pt-BR.vcproj", "{2F914112-2657-49EC-8EA6-3BA63340DE27}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-PT", "app\locales\pt-PT.vcproj", "{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ro", "app\locales\ro.vcproj", "{C70D3509-57C4-4326-90C1-2EC0AE34848D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ru", "app\locales\ru.vcproj", "{7D456640-3619-4D23-A56D-E0084400CCBF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sk", "app\locales\sk.vcproj", "{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "app\locales\sl.vcproj", "{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sr", "app\locales\sr.vcproj", "{300C6A09-663E-48B6-8E07-A0D50CAF8F25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "th", "app\locales\th.vcproj", "{226B3533-1FF3-42F6-A8E3-C4DDBC955290}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv", "app\locales\sv.vcproj", "{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tr", "app\locales\tr.vcproj", "{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uk", "app\locales\uk.vcproj", "{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vi", "app\locales\vi.vcproj", "{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-CN", "app\locales\zh-CN.vcproj", "{C0C7DA58-C90D-4BDE-AE44-588997339F5D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_service", "tools\crash_service\crash_service.vcproj", "{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9946A048-043B-4F8F-9E07-9297B204714C} = {9946A048-043B-4F8F-9E07-9297B204714C}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9946A048-043B-4F8F-9E07-9297B204714C} = {9946A048-043B-4F8F-9E07-9297B204714C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_watcher", "..\tools\memory_watcher\memory_watcher.vcproj", "{3BD81303-4E14-4559-AA69-B30C3BAB08DD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rlz", "..\rlz\rlz.vcproj", "{BF4F447B-72B5-4059-BE1B-F94337B1F385}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es-419", "app\locales\es-419.vcproj", "{FA660037-EB40-4A43-AA9D-9653C57F2789}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tab_switching_test", "test\tab_switching\tab_switching.vcproj", "{A34770EA-A574-43E8-9327-F79C04770E98}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {76235B67-1C27-4627-8A33-4B2E1EF93EDE}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {76235B67-1C27-4627-8A33-4B2E1EF93EDE}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_prebuild", "installer\util\prebuild\util_prebuild.vcproj", "{0026A376-C4F1-4575-A1BA-578C69F07013}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_dict", "tools\convert_dict\convert_dict.vcproj", "{42ECD5EC-722F-41DE-B6B8-83764C8016DF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.vcproj", "{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugger", "browser\debugger\debugger.vcproj", "{57823D8C-A317-4713-9125-2C91FDFD12D6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_test", "test\memory_test\memory_test.vcproj", "{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\gyp\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\v8\tools\gyp\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"
 	ProjectSection(ProjectDependencies) = postProject
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {865575D0-37E2-405E-8CBA-5F6C485B5A26}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {865575D0-37E2-405E-8CBA-5F6C485B5A26}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mksnapshot", "..\v8\tools\gyp\mksnapshot.vcproj", "{865575D0-37E2-405E-8CBA-5F6C485B5A26}"
 	ProjectSection(ProjectDependencies) = postProject
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {879286C0-3234-D14B-BB2C-32D4D1B809CE}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {879286C0-3234-D14B-BB2C-32D4D1B809CE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell", "..\v8\tools\gyp\v8_shell.vcproj", "{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdch", "..\sdch\sdch.vcproj", "{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kn", "app\locales\kn.vcproj", "{3E6B24F6-9FA9-4066-859E-BF747FA3080A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bn", "app\locales\bn.vcproj", "{4B60E8B8-416F-40B2-8A54-F75970A21992}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gu", "app\locales\gu.vcproj", "{256DECCE-9886-4C21-96A5-EE47DF5E07E9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "app\locales\ml.vcproj", "{CAB69303-0F02-4C68-A12E-FFE55DB52526}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr", "app\locales\mr.vcproj", "{A464166F-8507-49B4-9B02-5CB77C498B25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "or", "app\locales\or.vcproj", "{E07D267C-34C3-4DDB-8B41-94697808714A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ta", "app\locales\ta.vcproj", "{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "te", "app\locales\te.vcproj", "{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gcapi_lib", "installer\gcapi\gcapi_lib.vcproj", "{CD2FD73A-6AAB-4886-B887-760D18E8B635}"
@@ -1338,8 +1332,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gcapi_dll", "installer\gcap
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gcapi_test", "installer\gcapi\gcapi_test.vcproj", "{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954} = {B802A2FE-E4E2-4F5A-905A-D5128875C954}
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635} = {CD2FD73A-6AAB-4886-B887-760D18E8B635}
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954} = {B802A2FE-E4E2-4F5A-905A-D5128875C954}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
@@ -1350,37 +1344,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore_prebuild", "..\webk
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_cache", "..\net\crash_cache.vcproj", "{B0EE0599-2913-46A0-A847-A3EC813658D3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dump_cache", "..\net\dump_cache.vcproj", "{7D1EC571-687B-5D48-E259-C5BA78E717D0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress_cache", "..\net\stress_cache.vcproj", "{A763D879-02F0-B744-E6D5-E94C0197057C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing", "..\printing\printing.vcproj", "{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing_unittests", "..\printing\printing_unittests.vcproj", "{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F} = {A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F} = {A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\webkit\build\WebKit\WebKit.vcproj", "{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
+		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "worker", "worker\worker.vcproj", "{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}"
@@ -1393,114 +1387,114 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_support_base", "..\bas
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "url_fetch_test", "test\url_fetch_test\url_fetch_test.vcproj", "{7EFD0C91-198E-4043-9E71-4A4C7879B929}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\webkit\tools\test_shell\test_worker\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js2c", "..\v8\tools\gyp\js2c.vcproj", "{82BC22B5-1D58-28BA-8735-58B591E1D154}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_nosnapshot", "..\v8\tools\gyp\v8_nosnapshot.vcproj", "{879286C0-3234-D14B-BB2C-32D4D1B809CE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {82BC22B5-1D58-28BA-8735-58B591E1D154}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {82BC22B5-1D58-28BA-8735-58B591E1D154}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_tests_dll", "test\browser\browser_tests_dll.vcproj", "{D7589D0D-304E-4589-85A4-153B7D84B07F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_tests_launcher", "test\browser\browser_tests_launcher.vcproj", "{9B87804D-2502-480B-95AE-5A572CE91809}"
@@ -1516,40 +1510,46 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "courgette_lib", "..\third_p
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "courgette_fuzz", "..\third_party\courgette\courgette_fuzz.vcproj", "{57C27529-8CA9-4FC3-9C02-DA05B172F785}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {F22022F0-2D3B-5610-4E80-C674A8E01C5A}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "courgette_unittests", "..\third_party\courgette\courgette_unittests.vcproj", "{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {F22022F0-2D3B-5610-4E80-C674A8E01C5A}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "courgette_tool", "..\third_party\courgette\courgette_tool.vcproj", "{4EA8CE12-9C6F-45E5-9D08-720383FE3685}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {F22022F0-2D3B-5610-4E80-C674A8E01C5A}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "courgette_minimal_tool", "..\third_party\courgette\courgette_minimal_tool.vcproj", "{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {F22022F0-2D3B-5610-4E80-C674A8E01C5A}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {9A72A362-E617-4205-B9F2-43C6FB280FA1}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtestmain", "..\testing\gtestmain.vcproj", "{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "..\views\views.vcproj", "{6F9258E5-294F-47B2-919D-17FFE7A8B751}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -1558,102 +1558,38 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.Build.0 = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.ActiveCfg = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.Build.0 = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.Build.0 = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.ActiveCfg = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.Build.0 = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.Build.0 = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.ActiveCfg = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.Build.0 = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.Build.0 = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.Build.0 = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.ActiveCfg = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.Build.0 = Release|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.Build.0 = Debug|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.ActiveCfg = Release|Win32
-		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.Build.0 = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.Build.0 = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.ActiveCfg = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.Build.0 = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.Build.0 = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.ActiveCfg = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.Build.0 = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.Build.0 = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.ActiveCfg = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.Build.0 = Release|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Win32.Build.0 = Debug|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.ActiveCfg = Release|Win32
-		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.Build.0 = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.Build.0 = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.ActiveCfg = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.Build.0 = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.Build.0 = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.ActiveCfg = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.Build.0 = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.Build.0 = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.ActiveCfg = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.Build.0 = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.ActiveCfg = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.Build.0 = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.ActiveCfg = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.Build.0 = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1662,45 +1598,86 @@ Global
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.Build.0 = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.ActiveCfg = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.Build.0 = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.ActiveCfg = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.Build.0 = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.Build.0 = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.ActiveCfg = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.Build.0 = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.ActiveCfg = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.Build.0 = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.ActiveCfg = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.Build.0 = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.Build.0 = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.ActiveCfg = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.Build.0 = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.Build.0 = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.Build.0 = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.ActiveCfg = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.Build.0 = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.Build.0 = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.ActiveCfg = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.Build.0 = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.Build.0 = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.Build.0 = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.ActiveCfg = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.Build.0 = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.Build.0 = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.Build.0 = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.ActiveCfg = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.Build.0 = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.Build.0 = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1709,42 +1686,94 @@ Global
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Win32.ActiveCfg = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Win32.Build.0 = Release|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Win32.Build.0 = Debug|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Win32.ActiveCfg = Release|Win32
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Win32.Build.0 = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.ActiveCfg = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.Build.0 = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.Build.0 = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.ActiveCfg = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.Build.0 = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.Build.0 = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.ActiveCfg = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.Build.0 = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Win32.ActiveCfg = Release|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.Build.0 = Debug|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.ActiveCfg = Release|Win32
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.Build.0 = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.Build.0 = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.ActiveCfg = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.Build.0 = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.Build.0 = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.ActiveCfg = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.Build.0 = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.Build.0 = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.Build.0 = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.Build.0 = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.ActiveCfg = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.Build.0 = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.Build.0 = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.ActiveCfg = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.Build.0 = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.Build.0 = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.ActiveCfg = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.Build.0 = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.Build.0 = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.ActiveCfg = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.Build.0 = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.Build.0 = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.ActiveCfg = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.Build.0 = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1753,14 +1782,100 @@ Global
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.ActiveCfg = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.Build.0 = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.Build.0 = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.ActiveCfg = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.Build.0 = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.Build.0 = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.ActiveCfg = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.Build.0 = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.Build.0 = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.ActiveCfg = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.Build.0 = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.Build.0 = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.ActiveCfg = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.Build.0 = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.Build.0 = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.ActiveCfg = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.Build.0 = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.Build.0 = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.ActiveCfg = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.Build.0 = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.Build.0 = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.ActiveCfg = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.Build.0 = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.Build.0 = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.ActiveCfg = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.Build.0 = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.Build.0 = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.Build.0 = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.ActiveCfg = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.Build.0 = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.ActiveCfg = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.Build.0 = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.ActiveCfg = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.Build.0 = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1769,46 +1884,107 @@ Global
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.ActiveCfg = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.Build.0 = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.Build.0 = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.ActiveCfg = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.Build.0 = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.Build.0 = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Win32.Build.0 = Debug|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Win32.ActiveCfg = Release|Win32
-		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Win32.Build.0 = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.Build.0 = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.ActiveCfg = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.Build.0 = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.ActiveCfg = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.Build.0 = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.Build.0 = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.ActiveCfg = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.Build.0 = Release|Win32
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Win32.ActiveCfg = Release|Any CPU
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.Build.0 = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.ActiveCfg = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.Build.0 = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.Build.0 = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.ActiveCfg = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.Build.0 = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.Build.0 = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.ActiveCfg = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.Build.0 = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.Build.0 = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.ActiveCfg = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.Build.0 = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.Build.0 = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.ActiveCfg = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.Build.0 = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.Build.0 = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.ActiveCfg = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.Build.0 = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.Build.0 = Release|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Win32.Build.0 = Debug|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.ActiveCfg = Release|Win32
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.Build.0 = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.Build.0 = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.Build.0 = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.ActiveCfg = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.Build.0 = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1817,62 +1993,141 @@ Global
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.Build.0 = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.ActiveCfg = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.Build.0 = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.ActiveCfg = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.Build.0 = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.Build.0 = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.ActiveCfg = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.Build.0 = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.Build.0 = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.ActiveCfg = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.Build.0 = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.Build.0 = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.ActiveCfg = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.Build.0 = Release|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.Build.0 = Debug|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.ActiveCfg = Release|Win32
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.Build.0 = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.Build.0 = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.ActiveCfg = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.Build.0 = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.Build.0 = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.ActiveCfg = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.Build.0 = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.Build.0 = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.ActiveCfg = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.Build.0 = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.ActiveCfg = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.Build.0 = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.Build.0 = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.ActiveCfg = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.Build.0 = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.Build.0 = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.ActiveCfg = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.Build.0 = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.Build.0 = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.ActiveCfg = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.Build.0 = Release|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Win32.Build.0 = Debug|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Win32.ActiveCfg = Release|Win32
+		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Win32.Build.0 = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Win32.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.Build.0 = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.Build.0 = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.Build.0 = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.ActiveCfg = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.Build.0 = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.ActiveCfg = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.Build.0 = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.Build.0 = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.ActiveCfg = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.Build.0 = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.ActiveCfg = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.Build.0 = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.Build.0 = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.ActiveCfg = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.Build.0 = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.Build.0 = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.ActiveCfg = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.Build.0 = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.ActiveCfg = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.Build.0 = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.ActiveCfg = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.Build.0 = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.Build.0 = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.ActiveCfg = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.Build.0 = Release|Win32
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1881,99 +2136,6 @@ Global
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.ActiveCfg = Release|Win32
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.Build.0 = Release|Win32
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Win32.ActiveCfg = Release|Any CPU
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.Build.0 = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.ActiveCfg = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.Build.0 = Release|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Win32.Build.0 = Debug|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.ActiveCfg = Release|Win32
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.Build.0 = Release|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Win32.Build.0 = Debug|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Win32.ActiveCfg = Release|Win32
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Win32.Build.0 = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.ActiveCfg = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.Build.0 = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.ActiveCfg = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.Build.0 = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Win32.Build.0 = Debug|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Win32.ActiveCfg = Release|Win32
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Win32.Build.0 = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.ActiveCfg = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.Build.0 = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.ActiveCfg = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.Build.0 = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.Build.0 = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.Build.0 = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.ActiveCfg = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.Build.0 = Release|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Win32.Build.0 = Debug|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Win32.ActiveCfg = Release|Win32
-		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Win32.Build.0 = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1982,14 +2144,85 @@ Global
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Win32.ActiveCfg = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Win32.Build.0 = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.Build.0 = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.ActiveCfg = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.Build.0 = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.Build.0 = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.ActiveCfg = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.Build.0 = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.Build.0 = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.ActiveCfg = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.Build.0 = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.Build.0 = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.ActiveCfg = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.Build.0 = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.Build.0 = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.ActiveCfg = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.Build.0 = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.ActiveCfg = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.Build.0 = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.Build.0 = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.ActiveCfg = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.Build.0 = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.Build.0 = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.ActiveCfg = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.Build.0 = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1998,134 +2231,14 @@ Global
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Win32.ActiveCfg = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Win32.Build.0 = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.Build.0 = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.ActiveCfg = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.Build.0 = Release|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Win32.Build.0 = Debug|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.ActiveCfg = Release|Win32
-		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.Build.0 = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.Build.0 = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.ActiveCfg = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.Build.0 = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.Build.0 = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.ActiveCfg = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.Build.0 = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.Build.0 = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.ActiveCfg = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.Build.0 = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.Build.0 = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.ActiveCfg = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.Build.0 = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.Build.0 = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.Build.0 = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.ActiveCfg = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.Build.0 = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.Build.0 = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.Build.0 = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.ActiveCfg = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.Build.0 = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.Build.0 = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.ActiveCfg = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.Build.0 = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.Build.0 = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.ActiveCfg = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.Build.0 = Release|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Win32.Build.0 = Debug|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Win32.ActiveCfg = Release|Win32
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Win32.Build.0 = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.Build.0 = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.ActiveCfg = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.Build.0 = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.Build.0 = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.ActiveCfg = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.Build.0 = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2134,300 +2247,86 @@ Global
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Win32.ActiveCfg = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Win32.Build.0 = Release|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Win32.Build.0 = Debug|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Win32.ActiveCfg = Release|Win32
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Win32.Build.0 = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.Build.0 = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.ActiveCfg = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.Build.0 = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.ActiveCfg = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.Build.0 = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.ActiveCfg = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.Build.0 = Release|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.Build.0 = Debug|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.ActiveCfg = Release|Win32
-		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.Build.0 = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.Build.0 = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.ActiveCfg = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.Build.0 = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.Build.0 = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.ActiveCfg = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.Build.0 = Debug|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.ActiveCfg = Release|Win32
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.Build.0 = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.ActiveCfg = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.Build.0 = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.ActiveCfg = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.Build.0 = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.ActiveCfg = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.Build.0 = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.ActiveCfg = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.Build.0 = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.Build.0 = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.ActiveCfg = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.Build.0 = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.Build.0 = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.Build.0 = Debug|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.ActiveCfg = Release|Win32
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.Build.0 = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.Build.0 = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.ActiveCfg = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.Build.0 = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.ActiveCfg = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.Build.0 = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.Build.0 = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.ActiveCfg = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.Build.0 = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.Build.0 = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.ActiveCfg = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.Build.0 = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.Build.0 = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Win32.Build.0 = Debug|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Win32.ActiveCfg = Release|Win32
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Win32.Build.0 = Release|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Win32.Build.0 = Debug|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Win32.ActiveCfg = Release|Win32
-		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Win32.Build.0 = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.Build.0 = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.ActiveCfg = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.Build.0 = Release|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.Build.0 = Debug|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.ActiveCfg = Release|Win32
-		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.Build.0 = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.Build.0 = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.ActiveCfg = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.Build.0 = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.Build.0 = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.ActiveCfg = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.Build.0 = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.Build.0 = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.ActiveCfg = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.Build.0 = Release|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Win32.Build.0 = Debug|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Win32.ActiveCfg = Release|Win32
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Win32.Build.0 = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.Build.0 = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.ActiveCfg = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.Build.0 = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.Build.0 = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.ActiveCfg = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.Build.0 = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.Build.0 = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.ActiveCfg = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.Build.0 = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.Build.0 = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.ActiveCfg = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.Build.0 = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.Build.0 = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.ActiveCfg = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.Build.0 = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.Build.0 = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.ActiveCfg = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.Build.0 = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.Build.0 = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.ActiveCfg = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.Build.0 = Release|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Win32.Build.0 = Debug|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Win32.ActiveCfg = Release|Win32
-		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Win32.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.Build.0 = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.Build.0 = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.Build.0 = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.ActiveCfg = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.Build.0 = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.Build.0 = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.ActiveCfg = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.Build.0 = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.Build.0 = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.ActiveCfg = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.Build.0 = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.Build.0 = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.ActiveCfg = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.Build.0 = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.Build.0 = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.ActiveCfg = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.Build.0 = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.Build.0 = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.ActiveCfg = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.Build.0 = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.Build.0 = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.ActiveCfg = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.Build.0 = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.Build.0 = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.ActiveCfg = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.Build.0 = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.Build.0 = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.ActiveCfg = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.Build.0 = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2436,22 +2335,22 @@ Global
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Win32.ActiveCfg = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Win32.Build.0 = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.Build.0 = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.ActiveCfg = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.Build.0 = Release|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Win32.Build.0 = Debug|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Win32.ActiveCfg = Release|Win32
-		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Win32.Build.0 = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.Build.0 = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.ActiveCfg = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.Build.0 = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.Build.0 = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.ActiveCfg = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.Build.0 = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2460,6 +2359,38 @@ Global
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Win32.ActiveCfg = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Win32.Build.0 = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.Build.0 = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.ActiveCfg = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.Build.0 = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.Build.0 = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.ActiveCfg = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.Build.0 = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.Build.0 = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.ActiveCfg = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.Build.0 = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.Build.0 = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.ActiveCfg = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.Build.0 = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2468,70 +2399,134 @@ Global
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Win32.ActiveCfg = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Win32.Build.0 = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.Build.0 = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.ActiveCfg = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.Build.0 = Release|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Win32.Build.0 = Debug|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Win32.ActiveCfg = Release|Win32
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Win32.Build.0 = Release|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Win32.Build.0 = Debug|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Win32.ActiveCfg = Release|Win32
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Win32.Build.0 = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.Build.0 = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.Build.0 = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.ActiveCfg = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.Build.0 = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.Build.0 = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.ActiveCfg = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.Build.0 = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.Build.0 = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.Build.0 = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.Build.0 = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.ActiveCfg = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.Build.0 = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.Build.0 = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.ActiveCfg = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.Build.0 = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.Build.0 = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.Build.0 = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.ActiveCfg = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.Build.0 = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.Build.0 = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.ActiveCfg = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.Build.0 = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.Build.0 = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.ActiveCfg = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.Build.0 = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.Build.0 = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.ActiveCfg = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.Build.0 = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.Build.0 = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.ActiveCfg = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.Build.0 = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.ActiveCfg = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.Build.0 = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.Build.0 = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.ActiveCfg = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.Build.0 = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.Build.0 = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.ActiveCfg = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.Build.0 = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.Build.0 = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.ActiveCfg = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.Build.0 = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.Build.0 = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.ActiveCfg = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.Build.0 = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.Build.0 = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.ActiveCfg = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.Build.0 = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.Build.0 = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.ActiveCfg = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.Build.0 = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.Build.0 = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.ActiveCfg = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.Build.0 = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2540,6 +2535,38 @@ Global
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Win32.ActiveCfg = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Win32.Build.0 = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.Build.0 = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.ActiveCfg = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.Build.0 = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.Build.0 = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.ActiveCfg = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.Build.0 = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.Build.0 = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.ActiveCfg = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.Build.0 = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.Build.0 = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.ActiveCfg = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.Build.0 = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2548,86 +2575,94 @@ Global
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Win32.ActiveCfg = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Win32.Build.0 = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.Build.0 = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.ActiveCfg = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.Build.0 = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.Build.0 = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.ActiveCfg = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.Build.0 = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.Build.0 = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.ActiveCfg = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.Build.0 = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.Build.0 = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.Build.0 = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.ActiveCfg = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.Build.0 = Release|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Win32.Build.0 = Debug|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Win32.ActiveCfg = Release|Win32
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Win32.Build.0 = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.Build.0 = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.Build.0 = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.ActiveCfg = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.Build.0 = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.Build.0 = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.ActiveCfg = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.Build.0 = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.Build.0 = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.ActiveCfg = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.Build.0 = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.Build.0 = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.ActiveCfg = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.Build.0 = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.Build.0 = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.ActiveCfg = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.Build.0 = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Debug|Win32.Build.0 = Debug|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Win32.ActiveCfg = Release|Win32
+		{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}.Release|Win32.Build.0 = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.Build.0 = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.ActiveCfg = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.Build.0 = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.Build.0 = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.ActiveCfg = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.Build.0 = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.Build.0 = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.ActiveCfg = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.Build.0 = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.Build.0 = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.ActiveCfg = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.Build.0 = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2636,14 +2671,38 @@ Global
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Win32.ActiveCfg = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Win32.Build.0 = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.Build.0 = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.ActiveCfg = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.Build.0 = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.Build.0 = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.ActiveCfg = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.Build.0 = Release|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Win32.Build.0 = Debug|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.ActiveCfg = Release|Win32
+		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.Build.0 = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.Build.0 = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.ActiveCfg = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.Build.0 = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.Build.0 = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.ActiveCfg = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.Build.0 = Release|Win32
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2652,70 +2711,158 @@ Global
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Release|Win32.ActiveCfg = Release|Win32
 		{CD2FD73A-6AAB-4886-B887-760D18E8B635}.Release|Win32.Build.0 = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.Build.0 = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.ActiveCfg = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.Build.0 = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.Build.0 = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.ActiveCfg = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.Build.0 = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.Build.0 = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.ActiveCfg = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.Build.0 = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.Build.0 = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.ActiveCfg = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.Build.0 = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.Build.0 = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.ActiveCfg = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.Build.0 = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.Build.0 = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.ActiveCfg = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.Build.0 = Release|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Debug|Win32.Build.0 = Debug|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Win32.ActiveCfg = Release|Win32
-		{D6047981-23AE-4623-9373-514FDAFAE60F}.Release|Win32.Build.0 = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.Build.0 = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Debug|Win32.Build.0 = Debug|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Win32.ActiveCfg = Release|Win32
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954}.Release|Win32.Build.0 = Release|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Debug|Win32.Build.0 = Debug|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Win32.ActiveCfg = Release|Win32
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}.Release|Win32.Build.0 = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.Build.0 = Debug|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.ActiveCfg = Release|Win32
+		{1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.Build.0 = Release|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Debug|Win32.Build.0 = Debug|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Win32.ActiveCfg = Release|Win32
+		{B0EE0599-2913-46A0-A847-A3EC813658D3}.Release|Win32.Build.0 = Release|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Debug|Win32.Build.0 = Debug|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Win32.ActiveCfg = Release|Win32
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0}.Release|Win32.Build.0 = Release|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Debug|Win32.Build.0 = Debug|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Win32.ActiveCfg = Release|Win32
+		{A763D879-02F0-B744-E6D5-E94C0197057C}.Release|Win32.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Debug|Win32.Build.0 = Debug|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.ActiveCfg = Release|Win32
+		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}.Release|Win32.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Debug|Win32.Build.0 = Debug|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.ActiveCfg = Release|Win32
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}.Release|Win32.Build.0 = Release|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Debug|Win32.Build.0 = Debug|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.ActiveCfg = Release|Win32
+		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.Build.0 = Release|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Debug|Win32.Build.0 = Debug|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Win32.ActiveCfg = Release|Win32
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}.Release|Win32.Build.0 = Release|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Win32.Build.0 = Debug|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Win32.ActiveCfg = Release|Win32
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Win32.Build.0 = Release|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Win32.Build.0 = Debug|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Win32.ActiveCfg = Release|Win32
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Win32.Build.0 = Release|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Debug|Win32.Build.0 = Debug|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.ActiveCfg = Release|Win32
+		{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.Build.0 = Release|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Debug|Win32.Build.0 = Debug|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Win32.ActiveCfg = Release|Win32
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929}.Release|Win32.Build.0 = Release|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.Build.0 = Debug|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.ActiveCfg = Release|Win32
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.Build.0 = Release|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Debug|Win32.Build.0 = Debug|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.ActiveCfg = Release|Win32
+		{82BC22B5-1D58-28BA-8735-58B591E1D154}.Release|Win32.Build.0 = Release|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Debug|Win32.Build.0 = Debug|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.ActiveCfg = Release|Win32
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE}.Release|Win32.Build.0 = Release|Win32
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2724,106 +2871,62 @@ Global
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Release|Win32.ActiveCfg = Release|Win32
 		{D7589D0D-304E-4589-85A4-153B7D84B07F}.Release|Win32.Build.0 = Release|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Debug|Win32.Build.0 = Debug|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.ActiveCfg = Release|Win32
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}.Release|Win32.Build.0 = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.Build.0 = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.ActiveCfg = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.Build.0 = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.Build.0 = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.ActiveCfg = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.Build.0 = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.Build.0 = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.ActiveCfg = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.Build.0 = Release|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Win32.Build.0 = Debug|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.ActiveCfg = Release|Win32
-		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.Build.0 = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.Build.0 = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.ActiveCfg = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.Build.0 = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.Build.0 = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.ActiveCfg = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.Build.0 = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.ActiveCfg = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.Build.0 = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.Build.0 = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.ActiveCfg = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.Build.0 = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.ActiveCfg = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.Build.0 = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.Build.0 = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.ActiveCfg = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.Build.0 = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.Build.0 = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.ActiveCfg = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.Build.0 = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.ActiveCfg = Release|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Debug|Win32.Build.0 = Debug|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Win32.ActiveCfg = Release|Win32
+		{9B87804D-2502-480B-95AE-5A572CE91809}.Release|Win32.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.Build.0 = Release|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Debug|Win32.Build.0 = Debug|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Win32.ActiveCfg = Release|Win32
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE}.Release|Win32.Build.0 = Release|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Debug|Win32.Build.0 = Debug|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Win32.ActiveCfg = Release|Win32
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1}.Release|Win32.Build.0 = Release|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Debug|Win32.Build.0 = Debug|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Win32.ActiveCfg = Release|Win32
+		{57C27529-8CA9-4FC3-9C02-DA05B172F785}.Release|Win32.Build.0 = Release|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Debug|Win32.Build.0 = Debug|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Win32.ActiveCfg = Release|Win32
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8}.Release|Win32.Build.0 = Release|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Win32.Build.0 = Debug|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Win32.ActiveCfg = Release|Win32
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Release|Win32.Build.0 = Release|Win32
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2832,308 +2935,205 @@ Global
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Release|Win32.ActiveCfg = Release|Win32
 		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73}.Release|Win32.Build.0 = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.Build.0 = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.Build.0 = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.Build.0 = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.ActiveCfg = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.Build.0 = Release|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Debug|Win32.Build.0 = Debug|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Win32.ActiveCfg = Release|Win32
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7}.Release|Win32.Build.0 = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.Build.0 = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.ActiveCfg = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.Build.0 = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.Build.0 = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.ActiveCfg = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.Build.0 = Release|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Win32.Build.0 = Debug|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Win32.ActiveCfg = Release|Win32
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Release|Win32.Build.0 = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.Build.0 = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.ActiveCfg = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.Build.0 = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.Build.0 = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.ActiveCfg = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.Build.0 = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.Build.0 = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.ActiveCfg = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.Build.0 = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.Build.0 = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.Build.0 = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.ActiveCfg = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.Build.0 = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.Build.0 = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.ActiveCfg = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.Build.0 = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.Build.0 = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.ActiveCfg = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.Build.0 = Release|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Debug|Win32.Build.0 = Debug|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Win32.ActiveCfg = Release|Win32
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F}.Release|Win32.Build.0 = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.Build.0 = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.ActiveCfg = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1846F110-8263-413F-9924-36F64DD8FE41} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{228DD844-9926-420E-B193-6973BF2A4D0B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {B6867423-23BD-4588-9321-2D500F128A3D}
 		{2325D8C4-8EF5-42AC-8900-492225750DE4} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{238CE175-76CE-4A25-A676-69D115885601} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{24A5AC7C-280B-4899-9153-6BA570A081E7} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{C8C6183C-B03C-11DD-B471-DFD256D89593} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{3E03D462-780D-4C4D-B22E-5E095E6CF110} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{4EA8CE12-9C6F-45E5-9D08-720383FE3685} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{A34770EA-A574-43E8-9327-F79C04770E98} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{7EFD0C91-198E-4043-9E71-4A4C7879B929} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{3E03D462-780D-4C4D-B22E-5E095E6CF110} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{D7589D0D-304E-4589-85A4-153B7D84B07F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{9B87804D-2502-480B-95AE-5A572CE91809} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{57C27529-8CA9-4FC3-9C02-DA05B172F785} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{24309F1A-4035-46F9-A3D8-F47DC4BCC2B8} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{1444235E-0E97-4C80-A73E-EE73F3706C32} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
 		{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{60B43839-95E6-4526-A661-209F16335E0E} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{7D1EC571-687B-5D48-E259-C5BA78E717D0} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{7D456640-3619-4D23-A56D-E0084400CCBF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7EFD0C91-198E-4043-9E71-4A4C7879B929} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{873D095E-150E-4262-8C41-2D8ED02F0F57} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{881F6A97-D539-4C48-B401-DF04385B2343} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D6047981-23AE-4623-9373-514FDAFAE60F} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
-		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
-		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{9B87804D-2502-480B-95AE-5A572CE91809} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{1846F110-8263-413F-9924-36F64DD8FE41} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{C564F145-9172-42C3-BFCB-60FDEA124321} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{9A72A362-E617-4205-B9F2-43C6FB280FA1} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{A1CE1DC3-3800-E6A1-F8ED-CC5D3B9D8B6F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A34770EA-A574-43E8-9327-F79C04770E98} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{A464166F-8507-49B4-9B02-5CB77C498B25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{A5C5D801-4026-49F2-BBF1-250941855306} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
+		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
+		{9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{82BC22B5-1D58-28BA-8735-58B591E1D154} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{879286C0-3234-D14B-BB2C-32D4D1B809CE} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{B0EE0599-2913-46A0-A847-A3EC813658D3} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{7D1EC571-687B-5D48-E259-C5BA78E717D0} = {846901FD-A619-4BD5-A303-38174730CDD6}
 		{A763D879-02F0-B744-E6D5-E94C0197057C} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{4EA8CE12-9C6F-45E5-9D08-720383FE3685} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D13F055D-4428-48F4-ABF6-18359C76EDB0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{228DD844-9926-420E-B193-6973BF2A4D0B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{B0EE0599-2913-46A0-A847-A3EC813658D3} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A5C5D801-4026-49F2-BBF1-250941855306} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
-		{B64B396B-8EF1-4B6B-A07E-48D40EB961AB} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{B802A2FE-E4E2-4F5A-905A-D5128875C954} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{C564F145-9172-42C3-BFCB-60FDEA124321} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{C8C6183C-B03C-11DD-B471-DFD256D89593} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{CD2FD73A-6AAB-4886-B887-760D18E8B635} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D13F055D-4428-48F4-ABF6-18359C76EDB0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D6047981-23AE-4623-9373-514FDAFAE60F} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{D7589D0D-304E-4589-85A4-153B7D84B07F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{D7A94F58-576A-45D9-A45F-EB87C63ABBB0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{7D456640-3619-4D23-A56D-E0084400CCBF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A464166F-8507-49B4-9B02-5CB77C498B25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{E07D267C-34C3-4DDB-8B41-94697808714A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{EB79415F-2F17-4BDC-AADD-4CA4C2D21B73} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{24A5AC7C-280B-4899-9153-6BA570A081E7} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{CD2FD73A-6AAB-4886-B887-760D18E8B635} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{B802A2FE-E4E2-4F5A-905A-D5128875C954} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 	EndGlobalSection
 EndGlobal
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 4db143d..1c2f7c4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -86,8 +86,8 @@
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/common/gfx/emf.h"
-#include "chrome/views/controls/message_box_view.h"
 #include "skia/ext/vector_canvas.h"
+#include "views/controls/message_box_view.h"
 #endif
 
 using base::Time;
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index bd66201..098ddd7 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -25,8 +25,8 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
+#include "views/view.h"
 
 namespace {
 
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 5489745..f005b92 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -18,10 +18,9 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-
 #if defined(OS_WIN)
 // TODO(port): Enable when dialog_delegate is ported.
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 #endif
 
 using base::TimeDelta;
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index b782a6c..f997166 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -19,8 +19,8 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
 #include "net/base/net_util.h"
+#include "views/event.h"
 
 class AutomationProxyTest : public UITest {
  protected:
diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc
index 0af65ef..785688e 100644
--- a/chrome/test/interactive_ui/view_event_test_base.cc
+++ b/chrome/test/interactive_ui/view_event_test_base.cc
@@ -6,8 +6,8 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
+#include "views/view.h"
+#include "views/window/window.h"
 
 namespace {
 
diff --git a/chrome/test/interactive_ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h
index fa01e81..1bb7bd0 100644
--- a/chrome/test/interactive_ui/view_event_test_base.h
+++ b/chrome/test/interactive_ui/view_event_test_base.h
@@ -7,8 +7,8 @@
 
 #include "base/message_loop.h"
 #include "base/thread.h"
-#include "chrome/views/window/window_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/window/window_delegate.h"
 
 class Task;
 
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 6d9094b..2e92105 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/widget/accelerator_handler.h"
 #include "googleurl/src/gurl.h"
+#include "views/widget/accelerator_handler.h"
 
 namespace ui_test_utils {
 
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index a27f4b8..9ea93b5 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -1044,27 +1044,27 @@
 			Name="views"
 			>
 			<File
-				RelativePath="..\..\views\focus\focus_manager_unittest.cc"
+				RelativePath="..\..\..\views\focus\focus_manager_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\grid_layout_unittest.cc"
+				RelativePath="..\..\..\views\grid_layout_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\controls\label_unittest.cc"
+				RelativePath="..\..\..\views\controls\label_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\controls\table\table_view_unittest.cc"
+				RelativePath="..\..\..\views\controls\table\table_view_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\controls\tree\tree_node_iterator_unittest.cc"
+				RelativePath="..\..\..\views\controls\tree\tree_node_iterator_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\view_unittest.cc"
+				RelativePath="..\..\..\views\view_unittest.cc"
 				>
 			</File>
 		</Filter>
diff --git a/chrome/views/window/hit_test.h b/chrome/views/window/hit_test.h
deleted file mode 100644
index 8b8caba..0000000
--- a/chrome/views/window/hit_test.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_VIEWS_WINDOW_HIT_TEST_H_
-#define CHROME_VIEWS_WINDOW_HIT_TEST_H_
-
-// Defines the same symbolic names used by the WM_NCHITTEST Notification under
-// win32 (the integer values are not guaranteed to be equivalent). We do this
-// because we have a whole bunch of code that deals with window resizing and
-// such that requires these values.
-enum HitTestCompat {
-  HTBORDER = 1,
-  HTBOTTOM,
-  HTBOTTOMLEFT,
-  HTBOTTOMRIGHT,
-  HTCAPTION,
-  HTCLIENT,
-  HTCLOSE,
-  HTERROR,
-  HTGROWBOX,
-  HTHELP,
-  HTHSCROLL,
-  HTLEFT,
-  HTMENU,
-  HTMAXBUTTON,
-  HTMINBUTTON,
-  HTNOWHERE,
-  HTREDUCE,
-  HTRIGHT,
-  HTSIZE,
-  HTSYSMENU,
-  HTTOP,
-  HTTOPLEFT,
-  HTTOPRIGHT,
-  HTTRANSPARENT,
-  HTVSCROLL,
-  HTZOOM
-};
-
-#endif  // CHROME_VIEWS_WINDOW_HIT_TEST_H_
diff --git a/chrome/views/window/window_gtk.cc b/chrome/views/window/window_gtk.cc
deleted file mode 100644
index 612a416..0000000
--- a/chrome/views/window/window_gtk.cc
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/views/window/window_gtk.h"
-
-#include "app/l10n_util.h"
-#include "base/gfx/rect.h"
-#include "chrome/views/window/custom_frame_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_delegate.h"
-
-namespace views {
-
-WindowGtk::~WindowGtk() {
-}
-
-// static
-Window* Window::CreateChromeWindow(gfx::NativeWindow parent,
-                                   const gfx::Rect& bounds,
-                                   WindowDelegate* window_delegate) {
-  WindowGtk* window = new WindowGtk(window_delegate);
-  window->GetNonClientView()->SetFrameView(window->CreateFrameViewForWindow());
-  window->Init(bounds);
-  return window;
-}
-
-gfx::Rect WindowGtk::GetBounds() const {
-  gfx::Rect bounds;
-  WidgetGtk::GetBounds(&bounds, true);
-  return bounds;
-}
-
-gfx::Rect WindowGtk::GetNormalBounds() const {
-  NOTIMPLEMENTED();
-  return GetBounds();
-}
-
-void WindowGtk::SetBounds(const gfx::Rect& bounds) {
-  // TODO: this may need to set an initial size if not showing.
-  // TODO: need to constrain based on screen size.
-  gtk_window_resize(GTK_WINDOW(GetNativeView()), bounds.width(),
-                    bounds.height());
-
-  gtk_window_move(GTK_WINDOW(GetNativeView()), bounds.x(), bounds.y());
-}
-
-void WindowGtk::SetBounds(const gfx::Rect& bounds,
-                          gfx::NativeWindow other_window) {
-  // TODO: need to deal with other_window.
-  SetBounds(bounds);
-}
-
-void WindowGtk::Show() {
-  gtk_widget_show_all(GetNativeView());
-}
-
-void WindowGtk::Activate() {
-  NOTIMPLEMENTED();
-}
-
-void WindowGtk::Close() {
-  NOTIMPLEMENTED();
-}
-
-void WindowGtk::Maximize() {
-  gtk_window_maximize(GetNativeWindow());
-}
-
-void WindowGtk::Minimize() {
-  gtk_window_iconify(GetNativeWindow());
-}
-
-void WindowGtk::Restore() {
-  NOTIMPLEMENTED();
-}
-
-bool WindowGtk::IsActive() const {
-  return gtk_window_is_active(GetNativeWindow());
-}
-
-bool WindowGtk::IsVisible() const {
-  return GTK_WIDGET_VISIBLE(GetNativeView());
-}
-
-bool WindowGtk::IsMaximized() const {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool WindowGtk::IsMinimized() const {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void WindowGtk::SetFullscreen(bool fullscreen) {
-  NOTIMPLEMENTED();
-}
-
-bool WindowGtk::IsFullscreen() const {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void WindowGtk::EnableClose(bool enable) {
-  gtk_window_set_deletable(GetNativeWindow(), enable);
-}
-
-void WindowGtk::DisableInactiveRendering() {
-  NOTIMPLEMENTED();
-}
-
-void WindowGtk::UpdateWindowTitle() {
-  // If the non-client view is rendering its own title, it'll need to relayout
-  // now.
-  non_client_view_->Layout();
-
-  // Update the native frame's text. We do this regardless of whether or not
-  // the native frame is being used, since this also updates the taskbar, etc.
-  std::wstring window_title = window_delegate_->GetWindowTitle();
-  std::wstring localized_text;
-  if (l10n_util::AdjustStringForLocaleDirection(window_title, &localized_text))
-    window_title.assign(localized_text);
-
-  gtk_window_set_title(GetNativeWindow(), WideToUTF8(window_title).c_str());
-}
-
-void WindowGtk::UpdateWindowIcon() {
-  NOTIMPLEMENTED();
-}
-
-NonClientFrameView* WindowGtk::CreateFrameViewForWindow() {
-  // TODO(erg): Always use a custom frame view? Are there cases where we let
-  // the window manager deal with the X11 equivalent of the "non-client" area?
-  return new CustomFrameView(this);
-}
-
-void WindowGtk::UpdateFrameAfterFrameChange() {
-  NOTIMPLEMENTED();
-}
-
-WindowDelegate* WindowGtk::GetDelegate() const {
-  return window_delegate_;
-}
-
-NonClientView* WindowGtk::GetNonClientView() const {
-  return non_client_view_;
-}
-
-ClientView* WindowGtk::GetClientView() const {
-  return non_client_view_->client_view();
-}
-
-gfx::NativeWindow WindowGtk::GetNativeWindow() const {
-  return GTK_WINDOW(GetNativeView());
-}
-
-WindowGtk::WindowGtk(WindowDelegate* window_delegate)
-    : WidgetGtk(TYPE_WINDOW),
-      is_modal_(false),
-      is_always_on_top_(false),
-      window_delegate_(window_delegate),
-      non_client_view_(new NonClientView(this)) {
-  window_delegate_->window_.reset(this);
-}
-
-void WindowGtk::Init(const gfx::Rect& bounds) {
-  // We call this after initializing our members since our implementations of
-  // assorted WidgetWin functions may be called during initialization.
-  is_modal_ = window_delegate_->IsModal();
-  if (is_modal_) {
-    // TODO(erg): Fix once modality works.
-    // BecomeModal();
-  }
-  is_always_on_top_ = window_delegate_->IsAlwaysOnTop();
-
-  WidgetGtk::Init(bounds, true);
-
-  // Create the ClientView, add it to the NonClientView and add the
-  // NonClientView to the RootView. This will cause everything to be parented.
-  non_client_view_->set_client_view(window_delegate_->CreateClientView(this));
-  WidgetGtk::SetContentsView(non_client_view_);
-
-  UpdateWindowTitle();
-
-  //  SetInitialBounds(bounds);
-  //  InitAlwaysOnTopState();
-
-  // if (!IsAppWindow()) {
-  //   notification_registrar_.Add(
-  //       this,
-  //       NotificationType::ALL_APPWINDOWS_CLOSED,
-  //       NotificationService::AllSources());
-  // }
-
-  // ResetWindowRegion(false);
-}
-
-}  // namespace views
diff --git a/chrome/views/window/window_gtk.h b/chrome/views/window/window_gtk.h
deleted file mode 100644
index 3a4ef26..0000000
--- a/chrome/views/window/window_gtk.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_VIEWS_WINDOW_WINDOW_GTK_H_
-#define CHROME_VIEWS_WINDOW_WINDOW_GTK_H_
-
-#include "base/basictypes.h"
-#include "chrome/views/widget/widget_gtk.h"
-#include "chrome/views/window/window.h"
-
-namespace gfx {
-class Point;
-class Size;
-};
-
-namespace views {
-
-class Client;
-class WindowDelegate;
-
-// Window implementation for GTK.
-class WindowGtk : public WidgetGtk, public Window {
- public:
-  virtual ~WindowGtk();
-
-  // Window overrides:
-  virtual gfx::Rect GetBounds() const;
-  virtual gfx::Rect GetNormalBounds() const;
-  virtual void SetBounds(const gfx::Rect& bounds);
-  virtual void SetBounds(const gfx::Rect& bounds,
-                         gfx::NativeWindow other_window);
-  virtual void Show();
-  virtual void Activate();
-  virtual void Close();
-  virtual void Maximize();
-  virtual void Minimize();
-  virtual void Restore();
-  virtual bool IsActive() const;
-  virtual bool IsVisible() const;
-  virtual bool IsMaximized() const;
-  virtual bool IsMinimized() const;
-  virtual void SetFullscreen(bool fullscreen);
-  virtual bool IsFullscreen() const;
-  virtual void EnableClose(bool enable);
-  virtual void DisableInactiveRendering();
-  virtual void UpdateWindowTitle();
-  virtual void UpdateWindowIcon();
-  virtual NonClientFrameView* CreateFrameViewForWindow();
-  virtual void UpdateFrameAfterFrameChange();
-  virtual WindowDelegate* GetDelegate() const;
-  virtual NonClientView* GetNonClientView() const;
-  virtual ClientView* GetClientView() const;
-  virtual gfx::NativeWindow GetNativeWindow() const;
-
-  virtual Window* AsWindow() { return this; }
-  virtual const Window* AsWindow() const { return this; }
-
- protected:
-  // For  the constructor.
-  friend class Window;
-
-  // Constructs the WindowGtk. |window_delegate| cannot be NULL.
-  explicit WindowGtk(WindowDelegate* window_delegate);
-
-  // Initializes the window to the passed in bounds.
-  void Init(const gfx::Rect& bounds);
-
- private:
-  // Whether or not the window is modal. This comes from the delegate and is
-  // cached at Init time to avoid calling back to the delegate from the
-  // destructor.
-  bool is_modal_;
-
-  // Whether the window is currently always on top.
-  bool is_always_on_top_;
-
-  // Our window delegate.
-  WindowDelegate* window_delegate_;
-
-  // The View that provides the non-client area of the window (title bar,
-  // window controls, sizing borders etc). To use an implementation other than
-  // the default, this class must be subclassed and this value set to the
-  // desired implementation before calling |Init|.
-  NonClientView* non_client_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowGtk);
-};
-
-}  // namespace views
-
-#endif  // CHROME_VIEWS_WINDOW_WINDOW_GTK_H_
diff --git a/chrome/views/DEPS b/views/DEPS
index e0edd3e..8ff5f48 100644
--- a/chrome/views/DEPS
+++ b/views/DEPS
@@ -1,9 +1,11 @@
 include_rules = [

+  "+app",

   "+chrome/app",

   "+chrome/app/theme",

   "+chrome/browser",

   "+chrome/browser/views",

-  "+grit",  # For generated headers
+  "+chrome/common",

+  "+grit",  # For generated headers

   "+skia/ext",

   "+skia/include",

   "+webkit/glue",

diff --git a/chrome/views/accelerator.cc b/views/accelerator.cc
index b1c6191..b9a474a 100644
--- a/chrome/views/accelerator.cc
+++ b/views/accelerator.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/views/accelerator.h"
+#include "views/accelerator.h"
 
 #include <windows.h>
 
diff --git a/chrome/views/accelerator.h b/views/accelerator.h
index a851b0c..bb8f91f 100644
--- a/chrome/views/accelerator.h
+++ b/views/accelerator.h
@@ -8,12 +8,12 @@
 // It also defines the < operator so that it can be used as a key in a std::map.
 //
 
-#ifndef CHROME_VIEWS_ACCELERATOR_H_
-#define CHROME_VIEWS_ACCELERATOR_H_
+#ifndef VIEWS_ACCELERATOR_H_
+#define VIEWS_ACCELERATOR_H_
 
 #include <string>
 
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 namespace views {
 
@@ -98,4 +98,4 @@ class AcceleratorTarget {
 };
 }
 
-#endif  // CHROME_VIEWS_ACCELERATOR_H_
+#endif  // VIEWS_ACCELERATOR_H_
diff --git a/chrome/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc
index be91849..0e2f874 100644
--- a/chrome/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/view_accessibility.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 "chrome/views/accessibility/view_accessibility.h"
+#include "views/accessibility/view_accessibility.h"
 
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
-#include "chrome/views/widget/widget.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
+#include "views/widget/widget.h"
 
 HRESULT ViewAccessibility::Initialize(views::View* view) {
   if (!view) {
diff --git a/chrome/views/accessibility/view_accessibility.h b/views/accessibility/view_accessibility.h
index ba3d995..840a685 100644
--- a/chrome/views/accessibility/view_accessibility.h
+++ b/views/accessibility/view_accessibility.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
-#define CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+#ifndef VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+#define VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include <oleacc.h>
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -141,4 +141,4 @@ class ATL_NO_VTABLE ViewAccessibility
   DISALLOW_EVIL_CONSTRUCTORS(ViewAccessibility);
 };
 
-#endif  // CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+#endif  // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
diff --git a/chrome/views/accessibility/view_accessibility_wrapper.cc b/views/accessibility/view_accessibility_wrapper.cc
index c52c42d..ff336ae 100644
--- a/chrome/views/accessibility/view_accessibility_wrapper.cc
+++ b/views/accessibility/view_accessibility_wrapper.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
 
-#include "chrome/views/accessibility/view_accessibility.h"
+#include "views/accessibility/view_accessibility.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/chrome/views/accessibility/view_accessibility_wrapper.h b/views/accessibility/view_accessibility_wrapper.h
index 6d4a842..4390662 100644
--- a/chrome/views/accessibility/view_accessibility_wrapper.h
+++ b/views/accessibility/view_accessibility_wrapper.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_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
-#define CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
+#ifndef VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
+#define VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
 
 #include <atlcomcli.h>
 #include <oleacc.h>
@@ -52,4 +52,4 @@ class ViewAccessibilityWrapper {
   DISALLOW_COPY_AND_ASSIGN(ViewAccessibilityWrapper);
 };
 
-#endif  // CHROME_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
+#endif  // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
diff --git a/chrome/views/background.cc b/views/background.cc
index 656d0a1..f2bd176 100644
--- a/chrome/views/background.cc
+++ b/views/background.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/background.h"
+#include "views/background.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "chrome/views/painter.h"
-#include "chrome/views/view.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkPaint.h"
+#include "views/painter.h"
+#include "views/view.h"
 
 namespace views {
 
diff --git a/chrome/views/background.h b/views/background.h
index 3ab7662..acc3948 100644
--- a/chrome/views/background.h
+++ b/views/background.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_VIEWS_BACKGROUND_H_
-#define CHROME_VIEWS_BACKGROUND_H_
+#ifndef VIEWS_BACKGROUND_H_
+#define VIEWS_BACKGROUND_H_
 
 #include "build/build_config.h"
 
@@ -12,7 +12,7 @@
 #endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
-#include "SkColor.h"
+#include "skia/include/SkColor.h"
 
 class ChromeCanvas;
 
@@ -88,4 +88,4 @@ class Background {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_BACKGROUND_H_
+#endif  // VIEWS_BACKGROUND_H_
diff --git a/chrome/views/border.cc b/views/border.cc
index ccc4185..9127bce 100644
--- a/chrome/views/border.cc
+++ b/views/border.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/views/border.h"
+#include "views/border.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
diff --git a/chrome/views/border.h b/views/border.h
index c53a92d..7e7e2bd 100644
--- a/chrome/views/border.h
+++ b/views/border.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_BORDER_H_
-#define CHROME_VIEWS_BORDER_H_
+#ifndef VIEWS_BORDER_H_
+#define VIEWS_BORDER_H_
 
 #include "app/gfx/insets.h"
-#include "chrome/views/view.h"
-#include "SkColor.h"
+#include "skia/include/SkColor.h"
+#include "views/view.h"
 
 class ChromeCanvas;
 
@@ -56,4 +56,4 @@ class Border {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_BORDER_H_
+#endif  // VIEWS_BORDER_H_
diff --git a/chrome/views/controls/button/button.cc b/views/controls/button/button.cc
index 605b409..cbb42bf 100644
--- a/chrome/views/controls/button/button.cc
+++ b/views/controls/button/button.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/views/controls/button/button.h"
+#include "views/controls/button/button.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/button.h b/views/controls/button/button.h
index 40ee98155..514758f 100644
--- a/chrome/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_BUTTON_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -71,4 +71,4 @@ class Button : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_H_
+#endif  // VIEWS_CONTROLS_BUTTON_BUTTON_H_
diff --git a/chrome/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 5598a18..270894b 100644
--- a/chrome/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/button/button_dropdown.h"
+#include "views/controls/button/button_dropdown.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/button_dropdown.h b/views/controls/button/button_dropdown.h
index 3e43df5..feb5b5c 100644
--- a/chrome/views/controls/button/button_dropdown.h
+++ b/views/controls/button/button_dropdown.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
+#ifndef VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
+#define VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
 
 #include "base/task.h"
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/menu/menu.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
 
 namespace views {
 
@@ -59,4 +59,4 @@ class ButtonDropDown : public ImageButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
+#endif  // VIEWS_CONTROLS_BUTTON_BUTTON_DROPDOWN_H_
diff --git a/chrome/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 2b15938..8783bcf 100644
--- a/chrome/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -2,15 +2,15 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/views/controls/button/checkbox.h"
+#include "views/controls/button/checkbox.h"
 
 #include "app/gfx/chrome_canvas.h"
-#include "chrome/views/controls/label.h"
+#include "views/controls/label.h"
 
 namespace views {
 
 // static
-const char Checkbox::kViewClassName[] = "chrome/views/Checkbox";
+const char Checkbox::kViewClassName[] = "views/Checkbox";
 
 static const int kCheckboxLabelSpacing = 4;
 static const int kLabelFocusPaddingHorizontal = 2;
diff --git a/chrome/views/controls/button/checkbox.h b/views/controls/button/checkbox.h
index 54f4e06..db6706b 100644
--- a/chrome/views/controls/button/checkbox.h
+++ b/views/controls/button/checkbox.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
+#ifndef VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
+#define VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
 
-#include "chrome/views/controls/button/native_button.h"
+#include "views/controls/button/native_button.h"
 
 namespace views {
 
@@ -73,7 +73,7 @@ class Checkbox : public NativeButton {
   // and sizing issues.
   Label* label_;
 
-  // True if the checkbox is checked. 
+  // True if the checkbox is checked.
   bool checked_;
 
   DISALLOW_COPY_AND_ASSIGN(Checkbox);
@@ -81,4 +81,4 @@ class Checkbox : public NativeButton {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
+#endif  // #ifndef VIEWS_CONTROLS_BUTTON_CHECKBOX_H_
diff --git a/chrome/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index 3e9d33d..2b5f43d 100644
--- a/chrome/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.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/views/controls/button/custom_button.h"
+#include "views/controls/button/custom_button.h"
 
 #include "app/throb_animation.h"
 #include "base/keyboard_codes.h"
diff --git a/chrome/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index 6b486a7..32ff76b 100644
--- a/chrome/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include "app/animation.h"
-#include "chrome/views/controls/button/button.h"
+#include "views/controls/button/button.h"
 
 class ThrobAnimation;
 
@@ -102,4 +102,4 @@ class CustomButton : public Button,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
+#endif  // VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
diff --git a/chrome/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 3b0df8c..3c4c7fe 100644
--- a/chrome/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.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/views/controls/button/image_button.h"
+#include "views/controls/button/image_button.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/throb_animation.h"
diff --git a/chrome/views/controls/button/image_button.h b/views/controls/button/image_button.h
index 6d304ba..c687561 100644
--- a/chrome/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 
-#include "chrome/views/controls/button/custom_button.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/button/custom_button.h"
 
 namespace views {
 
@@ -98,4 +98,4 @@ class ToggleImageButton : public ImageButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
+#endif  // VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
diff --git a/chrome/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 6f82b16..888137b 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/button/menu_button.h"
+#include "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/win_util.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/menu/view_menu_delegate.h"
-#include "chrome/views/event.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/button.h"
+#include "views/controls/menu/view_menu_delegate.h"
+#include "views/event.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 83485d0..cbe9ab8 100644
--- a/chrome/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <windows.h>
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/text_button.h"
 #include "base/time.h"
+#include "views/background.h"
+#include "views/controls/button/text_button.h"
 
 namespace views {
 
@@ -89,4 +89,4 @@ class MenuButton : public TextButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
+#endif  // VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
diff --git a/chrome/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 07de95c..0af6f88 100644
--- a/chrome/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -2,11 +2,7 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/views/controls/button/native_button.h"
-
-#if defined(OS_LINUX)
-#include <gdk/gdkkeysyms.h>
-#endif
+#include "views/controls/button/native_button.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
@@ -16,7 +12,7 @@ namespace views {
 static int kButtonBorderHWidth = 8;
 
 // static
-const char NativeButton::kViewClassName[] = "chrome/views/NativeButton";
+const char NativeButton::kViewClassName[] = "views/NativeButton";
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButton, public:
@@ -73,15 +69,10 @@ void NativeButton::SetLabel(const std::wstring& label) {
 void NativeButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
-#if defined(OS_WIN)
-  int return_code = VK_RETURN;
-#else
-  int return_code = GDK_Return;
-#endif
   if (is_default)
-    AddAccelerator(Accelerator(return_code, false, false, false));
+    AddAccelerator(Accelerator(VK_RETURN, false, false, false));
   else
-    RemoveAccelerator(Accelerator(return_code, false, false, false));
+    RemoveAccelerator(Accelerator(VK_RETURN, false, false, false));
   SetAppearsAsDefault(is_default);
 }
 
@@ -115,7 +106,6 @@ gfx::Size NativeButton::GetPreferredSize() {
 
   // Clamp the size returned to at least the minimum size.
   if (!ignore_minimum_size_) {
-#if defined(OS_WIN)
     if (minimum_size_.width()) {
       int min_width = font_.horizontal_dlus_to_pixels(minimum_size_.width());
       sz.set_width(std::max(static_cast<int>(sz.width()), min_width));
@@ -124,10 +114,6 @@ gfx::Size NativeButton::GetPreferredSize() {
       int min_height = font_.vertical_dlus_to_pixels(minimum_size_.height());
       sz.set_height(std::max(static_cast<int>(sz.height()), min_height));
     }
-#else
-    if (minimum_size_.width() || minimum_size_.height())
-      NOTIMPLEMENTED();
-#endif
   }
 
   return sz;
diff --git a/chrome/views/controls/button/native_button.h b/views/controls/button/native_button.h
index bfe6639..52946d7 100644
--- a/chrome/views/controls/button/native_button.h
+++ b/views/controls/button/native_button.h
@@ -2,12 +2,12 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/button/native_button_wrapper.h"
+#include "views/controls/button/button.h"
+#include "views/controls/button/native_button_wrapper.h"
 
 class ChromeFont;
 
@@ -97,4 +97,4 @@ class NativeButton : public Button {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
+#endif  // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
diff --git a/chrome/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc
index 5a254ac..6748241 100644
--- a/chrome/views/controls/button/native_button_win.cc
+++ b/views/controls/button/native_button_win.cc
@@ -2,13 +2,13 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/views/controls/button/native_button_win.h"
+#include "views/controls/button/native_button_win.h"
 
 #include "base/logging.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/button/radio_button.h"
-#include "chrome/views/widget/widget.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/button/radio_button.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/native_button_win.h b/views/controls/button/native_button_win.h
index ce1cc75e..3f5141a 100644
--- a/chrome/views/controls/button/native_button_win.h
+++ b/views/controls/button/native_button_win.h
@@ -2,11 +2,11 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
+#ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
+#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
 
-#include "chrome/views/controls/native_control_win.h"
-#include "chrome/views/controls/button/native_button_wrapper.h"
+#include "views/controls/native_control_win.h"
+#include "views/controls/button/native_button_wrapper.h"
 
 namespace views {
 
@@ -102,4 +102,4 @@ class NativeRadioButtonWin : public NativeCheckboxWin {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
+#endif  // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WIN_H_
diff --git a/chrome/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h
index 2d7fc25..5535ed4 100644
--- a/chrome/views/controls/button/native_button_wrapper.h
+++ b/views/controls/button/native_button_wrapper.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
+#ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
+#define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 
 class ChromeFont;
 
@@ -12,7 +12,6 @@ namespace views {
 class Checkbox;
 class NativeButton;
 class RadioButton;
-class View;
 
 // A specialization of NativeControlWrapper that hosts a platform-native button.
 class NativeButtonWrapper {
@@ -60,4 +59,4 @@ class NativeButtonWrapper {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
+#endif  // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
diff --git a/chrome/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc
index fa18a5d..3f4820d 100644
--- a/chrome/views/controls/button/radio_button.cc
+++ b/views/controls/button/radio_button.cc
@@ -2,14 +2,14 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/views/controls/button/radio_button.h"
+#include "views/controls/button/radio_button.h"
 
-#include "chrome/views/widget/root_view.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
 // static
-const char RadioButton::kViewClassName[] = "chrome/views/RadioButton";
+const char RadioButton::kViewClassName[] = "views/RadioButton";
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, public:
diff --git a/chrome/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index 0fe6d687..ab7fbe2 100644
--- a/chrome/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
 
-#include "chrome/views/controls/button/checkbox.h"
+#include "views/controls/button/checkbox.h"
 
 namespace views {
 
@@ -40,4 +40,4 @@ class RadioButton : public Checkbox {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
+#endif  // #ifndef VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_
diff --git a/chrome/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index d175fd4..4f68b90 100644
--- a/chrome/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/button/text_button.h"
+#include "views/controls/button/text_button.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/event.h"
+#include "views/controls/button/button.h"
+#include "views/event.h"
 #include "grit/theme_resources.h"
 
 namespace views {
diff --git a/chrome/views/controls/button/text_button.h b/views/controls/button/text_button.h
index bdca6cb..16bac57 100644
--- a/chrome/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
-#define CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
+#ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
+#define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/border.h"
-#include "chrome/views/controls/button/custom_button.h"
 #include "skia/include/SkBitmap.h"
+#include "views/border.h"
+#include "views/controls/button/custom_button.h"
 
 namespace views {
 
@@ -135,4 +135,4 @@ class TextButton : public CustomButton {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
+#endif  // VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
diff --git a/chrome/views/controls/combo_box.cc b/views/controls/combo_box.cc
index ca73727..eb079f7 100644
--- a/chrome/views/controls/combo_box.cc
+++ b/views/controls/combo_box.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/views/controls/combo_box.h"
+#include "views/controls/combo_box.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
diff --git a/chrome/views/controls/combo_box.h b/views/controls/combo_box.h
index 826caec..3e8eeae 100644
--- a/chrome/views/controls/combo_box.h
+++ b/views/controls/combo_box.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
-#define CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
+#ifndef VIEWS_CONTROLS_COMBO_BOX_H_
+#define VIEWS_CONTROLS_COMBO_BOX_H_
 
-#include "chrome/views/controls/native_control.h"
+#include "views/controls/native_control.h"
 
 namespace views {
 ////////////////////////////////////////////////////////////////////////////////
@@ -77,4 +77,4 @@ class ComboBox : public NativeControl {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_COMBO_BOX_H_
+#endif  // VIEWS_CONTROLS_COMBO_BOX_H_
diff --git a/chrome/views/controls/hwnd_view.cc b/views/controls/hwnd_view.cc
index 6faa85d..677e60a 100644
--- a/chrome/views/controls/hwnd_view.cc
+++ b/views/controls/hwnd_view.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/hwnd_view.h"
+#include "views/controls/hwnd_view.h"
 
 #include "app/gfx/chrome_canvas.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/widget/widget.h"
 #include "base/logging.h"
+#include "views/focus/focus_manager.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
-static const char kViewClassName[] = "chrome/views/HWNDView";
+static const char kViewClassName[] = "views/HWNDView";
 
 HWNDView::HWNDView() {
 }
diff --git a/chrome/views/controls/hwnd_view.h b/views/controls/hwnd_view.h
index fc08b5d5..a8d52b3 100644
--- a/chrome/views/controls/hwnd_view.h
+++ b/views/controls/hwnd_view.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
+#ifndef VIEWS_CONTROLS_HWND_VIEW_H_
+#define VIEWS_CONTROLS_HWND_VIEW_H_
 
 #include <string>
 
-#include "chrome/views/controls/native_view_host.h"
+#include "views/controls/native_view_host.h"
 
 namespace views {
 
@@ -63,4 +63,4 @@ class HWNDView : public NativeViewHost {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_HWND_VIEW_H_
+#endif  // VIEWS_CONTROLS_HWND_VIEW_H_
diff --git a/chrome/views/controls/image_view.cc b/views/controls/image_view.cc
index f377adc..8f58744 100644
--- a/chrome/views/controls/image_view.cc
+++ b/views/controls/image_view.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/views/controls/image_view.h"
+#include "views/controls/image_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
diff --git a/chrome/views/controls/image_view.h b/views/controls/image_view.h
index 66020bf..b7ac792 100644
--- a/chrome/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
+#ifndef VIEWS_CONTROLS_IMAGE_VIEW_H_
+#define VIEWS_CONTROLS_IMAGE_VIEW_H_
 
-#include "chrome/views/view.h"
-#include "SkBitmap.h"
+#include "skia/include/SkBitmap.h"
+#include "views/view.h"
 
 class ChromeCanvas;
 
@@ -104,4 +104,4 @@ class ImageView : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_IMAGE_VIEW_H_
+#endif  // VIEWS_CONTROLS_IMAGE_VIEW_H_
diff --git a/chrome/views/controls/label.cc b/views/controls/label.cc
index b135538..1dc0b54 100644
--- a/chrome/views/controls/label.cc
+++ b/views/controls/label.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/views/controls/label.h"
+#include "views/controls/label.h"
 
 #include <math.h>
 
@@ -14,11 +14,11 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/text_elider.h"
-#include "chrome/views/background.h"
+#include "views/background.h"
 
 namespace views {
 
-const char Label::kViewClassName[] = "chrome/views/Label";
+const char Label::kViewClassName[] = "views/Label";
 
 static const SkColor kEnabledColor = SK_ColorBLACK;
 static const SkColor kDisabledColor = SkColorSetRGB(161, 161, 146);
diff --git a/chrome/views/controls/label.h b/views/controls/label.h
index cf4dede..fa620e4 100644
--- a/chrome/views/controls/label.h
+++ b/views/controls/label.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_LABEL_H_
-#define CHROME_VIEWS_CONTROLS_LABEL_H_
+#ifndef VIEWS_CONTROLS_LABEL_H_
+#define VIEWS_CONTROLS_LABEL_H_
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkColor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -63,7 +63,7 @@ class Label : public View {
   // GetPreferredSize().height() if the receiver is not multi-line
   virtual int GetHeightForWidth(int w);
 
-  // Returns chrome/views/Label.
+  // Returns views/Label.
   virtual std::string GetClassName() const;
 
   // Overridden to paint
@@ -247,4 +247,4 @@ class Label : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_LABEL_H_
+#endif  // VIEWS_CONTROLS_LABEL_H_
diff --git a/chrome/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 5a152c3..1ac74b1 100644
--- a/chrome/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -5,9 +5,9 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
-#include "chrome/views/border.h"
-#include "chrome/views/controls/label.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/border.h"
+#include "views/controls/label.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/link.cc b/views/controls/link.cc
index 53d2495..aae254503 100644
--- a/chrome/views/controls/link.cc
+++ b/views/controls/link.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 "chrome/views/controls/link.h"
+#include "views/controls/link.h"
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/event.h"
+#include "views/event.h"
 
 namespace views {
 
@@ -16,7 +16,7 @@ static const SkColor kHighlightedColor = SkColorSetRGB(255, 0x00, 0x00);
 static const SkColor kNormalColor = SkColorSetRGB(0, 51, 153);
 static const SkColor kDisabledColor = SkColorSetRGB(0, 0, 0);
 
-const char Link::kViewClassName[] = "chrome/views/Link";
+const char Link::kViewClassName[] = "views/Link";
 
 Link::Link() : Label(L""),
                controller_(NULL),
diff --git a/chrome/views/controls/link.h b/views/controls/link.h
index ee40236..6da6aa3 100644
--- a/chrome/views/controls/link.h
+++ b/views/controls/link.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_LINK_H_
-#define CHROME_VIEWS_CONTROLS_LINK_H_
+#ifndef VIEWS_CONTROLS_LINK_H_
+#define VIEWS_CONTROLS_LINK_H_
 
-#include "chrome/views/controls/label.h"
+#include "views/controls/label.h"
 
 namespace views {
 
@@ -91,4 +91,4 @@ class Link : public Label {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_LINK_H_
+#endif  // VIEWS_CONTROLS_LINK_H_
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/views/controls/menu/chrome_menu.cc
index 1b1e475..a887fd5 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/views/controls/menu/chrome_menu.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/views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/chrome_menu.h"
 
 #include <windows.h>
 #include <uxtheme.h>
@@ -21,12 +21,12 @@
 // TODO(beng): (Cleanup) remove this browser dep.
 #include "chrome/browser/drag_utils.h"
 #include "chrome/common/gfx/color_utils.h"
-#include "chrome/views/border.h"
-#include "chrome/views/view_constants.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
+#include "views/border.h"
+#include "views/view_constants.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 #undef min
 #undef max
diff --git a/chrome/views/controls/menu/chrome_menu.h b/views/controls/menu/chrome_menu.h
index 6f18abb..02caaed 100644
--- a/chrome/views/controls/menu/chrome_menu.h
+++ b/views/controls/menu/chrome_menu.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_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
-#define CHROME_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
+#ifndef VIEWS_CONTROLS_MENU_CHROME_MENU_H_
+#define VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 
 #include <list>
 #include <vector>
@@ -14,9 +14,9 @@
 #include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "chrome/views/controls/menu/controller.h"
-#include "chrome/views/view.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/menu/controller.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -945,4 +945,4 @@ class MenuController : public MessageLoopForUI::Dispatcher {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_MENU_CHROME_MENU_H_
+#endif  // VIEWS_CONTROLS_MENU_CHROME_MENU_H_
diff --git a/chrome/views/controls/menu/controller.h b/views/controls/menu/controller.h
index af8af2e..6a693cc 100644
--- a/chrome/views/controls/menu/controller.h
+++ b/views/controls/menu/controller.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_VIEWS_CONTROLS_MENU_CONTROLLER_H_
-#define CHROME_VIEWS_CONTROLS_MENU_CONTROLLER_H_
+#ifndef VIEWS_CONTROLS_MENU_CONTROLLER_H_
+#define VIEWS_CONTROLS_MENU_CONTROLLER_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ class Controller {
   virtual void ExecuteCommand(int id) = 0;
 };
 
-#endif // CHROME_VIEWS_CONTROLS_MENU_CONTROLLER_H_
+#endif // VIEWS_CONTROLS_MENU_CONTROLLER_H_
diff --git a/chrome/views/controls/menu/menu.cc b/views/controls/menu/menu.cc
index 09ebe8d..1597da5 100644
--- a/chrome/views/controls/menu/menu.cc
+++ b/views/controls/menu/menu.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/views/controls/menu/menu.h"
+#include "views/controls/menu/menu.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -20,7 +20,7 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "chrome/views/accelerator.h"
+#include "views/accelerator.h"
 
 const SkBitmap* Menu::Delegate::kEmptyIcon = 0;
 
diff --git a/chrome/views/controls/menu/menu.h b/views/controls/menu/menu.h
index 67c292a..0be9126 100644
--- a/chrome/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CONTROLS_MENU_VIEWS_MENU_H_
-#define CHROME_CONTROLS_MENU_VIEWS_MENU_H_
+#ifndef CONTROLS_MENU_VIEWS_MENU_H_
+#define CONTROLS_MENU_VIEWS_MENU_H_
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/views/controls/menu/controller.h"
+#include "views/controls/menu/controller.h"
 
 class SkBitmap;
 
@@ -352,4 +352,4 @@ class Menu {
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };
 
-#endif  // CHROME_CONTROLS_MENU_VIEWS_MENU_H_
+#endif  // CONTROLS_MENU_VIEWS_MENU_H_
diff --git a/chrome/views/controls/menu/view_menu_delegate.h b/views/controls/menu/view_menu_delegate.h
index 3f8f190..bb72ed3 100644
--- a/chrome/views/controls/menu/view_menu_delegate.h
+++ b/views/controls/menu/view_menu_delegate.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_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
-#define CHROME_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#ifndef VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#define VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -31,4 +31,4 @@ class ViewMenuDelegate {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#endif  // VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
diff --git a/chrome/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 6fb895a..d9c45c2 100644
--- a/chrome/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.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/views/controls/message_box_view.h"
+#include "views/controls/message_box_view.h"
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ -12,8 +12,8 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/window/client_view.h"
+#include "views/controls/button/checkbox.h"
+#include "views/window/client_view.h"
 #include "grit/generated_resources.h"
 
 static const int kDefaultMessageWidth = 320;
diff --git a/chrome/views/controls/message_box_view.h b/views/controls/message_box_view.h
index c3960ac..6356d84 100644
--- a/chrome/views/controls/message_box_view.h
+++ b/views/controls/message_box_view.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
+#ifndef VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
+#define VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
 
 #include <string>
 
 #include "base/task.h"
-#include "chrome/views/controls/image_view.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/view.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/text_field.h"
+#include "views/view.h"
 
 namespace views {
 class Checkbox;
@@ -91,4 +91,4 @@ class MessageBoxView : public views::View {
   DISALLOW_EVIL_CONSTRUCTORS(MessageBoxView);
 };
 
-#endif  // CHROME_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
+#endif  // VIEWS_CONTROLS_MESSAGE_BOX_VIEW_VIEW_H_
diff --git a/chrome/views/controls/native_control.cc b/views/controls/native_control.cc
index bf40711..ce37193 100644
--- a/chrome/views/controls/native_control.cc
+++ b/views/controls/native_control.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/views/controls/native_control.h"
+#include "views/controls/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -12,11 +12,11 @@
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/border.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/widget/widget.h"
+#include "views/background.h"
+#include "views/border.h"
+#include "views/controls/hwnd_view.h"
+#include "views/focus/focus_manager.h"
+#include "views/widget/widget.h"
 #include "base/gfx/native_theme.h"
 
 namespace views {
diff --git a/chrome/views/controls/native_control.h b/views/controls/native_control.h
index f4dbc35..0573168 100644
--- a/chrome/views/controls/native_control.h
+++ b/views/controls/native_control.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
-#define CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
+#ifndef VIEWS_CONTROLS_NATIVE_CONTROL_H_
+#define VIEWS_CONTROLS_NATIVE_CONTROL_H_
 
 #include <windows.h>
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -129,4 +129,4 @@ class NativeControl : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_H_
+#endif  // VIEWS_CONTROLS_NATIVE_CONTROL_H_
diff --git a/chrome/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index d493f66..0c1baf8 100644
--- a/chrome/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -1,8 +1,8 @@
-// #ifndef CHROME_VIEWS_NATIVE_CONTROL_WIN_H_// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
+// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "chrome/views/controls/native_control_win.h"
+#include "views/controls/native_control_win.h"
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
diff --git a/chrome/views/controls/native_control_win.h b/views/controls/native_control_win.h
index 0ba80eb..6f9923f 100644
--- a/chrome/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -2,10 +2,10 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
-#define CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
+#ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
+#define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 
-#include "chrome/views/controls/hwnd_view.h"
+#include "views/controls/hwnd_view.h"
 
 namespace views {
 
@@ -94,7 +94,7 @@ class NativeControlWin : public HWNDView {
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlWin);
 };
-  
+
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
+#endif  // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
diff --git a/chrome/views/controls/native_view_host.cc b/views/controls/native_view_host.cc
index 525aa497..3fc5fba 100644
--- a/chrome/views/controls/native_view_host.cc
+++ b/views/controls/native_view_host.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/native_view_host.h"
+#include "views/controls/native_view_host.h"
 
-#include "chrome/views/widget/widget.h"
+#include "views/widget/widget.h"
 #include "base/logging.h"
 
 namespace views {
diff --git a/chrome/views/controls/native_view_host.h b/views/controls/native_view_host.h
index e1e123f..99b85b6 100644
--- a/chrome/views/controls/native_view_host.h
+++ b/views/controls/native_view_host.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
-#define CHROME_VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
+#ifndef VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
+#define VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
 
 #include <string>
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 #include "base/gfx/native_widget_types.h"
 
@@ -100,4 +100,4 @@ class NativeViewHost : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
+#endif  // VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
diff --git a/chrome/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index 753f6c5..680b623 100644
--- a/chrome/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/scroll_view.h"
+#include "views/controls/scroll_view.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
-#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
-#include "chrome/views/widget/root_view.h"
 #include "grit/theme_resources.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
-const char* const ScrollView::kViewClassName = "chrome/views/ScrollView";
+const char* const ScrollView::kViewClassName = "views/ScrollView";
 
 // Viewport contains the contents View of the ScrollView.
 class Viewport : public View {
diff --git a/chrome/views/controls/scroll_view.h b/views/controls/scroll_view.h
index fb77fdd..5a578cd 100644
--- a/chrome/views/controls/scroll_view.h
+++ b/views/controls/scroll_view.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
+#ifndef VIEWS_CONTROLS_SCROLL_VIEW_H_
+#define VIEWS_CONTROLS_SCROLL_VIEW_H_
 
-#include "chrome/views/controls/scrollbar/scroll_bar.h"
+#include "views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
@@ -204,4 +204,4 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_SCROLL_VIEW_H_
+#endif  // VIEWS_CONTROLS_SCROLL_VIEW_H_
diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index fbb0e99..4a93782 100644
--- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h"
+#include "views/controls/scrollbar/bitmap_scroll_bar.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "skia/include/SkBitmap.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/scroll_view.h"
+#include "views/widget/widget.h"
 
 #undef min
 #undef max
diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.h b/views/controls/scrollbar/bitmap_scroll_bar.h
index 8bb717c..45e3535 100644
--- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.h
+++ b/views/controls/scrollbar/bitmap_scroll_bar.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
-#define CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
+#ifndef VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
+#define VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
 
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/controls/scrollbar/scroll_bar.h"
-#include "chrome/views/repeat_controller.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/scrollbar/scroll_bar.h"
+#include "views/repeat_controller.h"
 
 namespace views {
 
@@ -189,4 +189,4 @@ class BitmapScrollBar : public ScrollBar,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
+#endif  // #ifndef VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
diff --git a/chrome/views/controls/scrollbar/native_scroll_bar.cc b/views/controls/scrollbar/native_scroll_bar.cc
index 9e0d0eb..52ddd91 100644
--- a/chrome/views/controls/scrollbar/native_scroll_bar.cc
+++ b/views/controls/scrollbar/native_scroll_bar.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/views/controls/scrollbar/native_scroll_bar.h"
+#include "views/controls/scrollbar/native_scroll_bar.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -13,8 +13,8 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/controls/hwnd_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/scrollbar/native_scroll_bar.h b/views/controls/scrollbar/native_scroll_bar.h
index 12bab22..2747bce 100644
--- a/chrome/views/controls/scrollbar/native_scroll_bar.h
+++ b/views/controls/scrollbar/native_scroll_bar.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
-#define CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
+#ifndef VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
+#define VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
 
 #include "build/build_config.h"
 
-#include "chrome/views/controls/scrollbar/scroll_bar.h"
+#include "views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
@@ -64,4 +64,4 @@ class NativeScrollBar : public ScrollBar {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
+#endif  // #ifndef VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLLBAR_H_
diff --git a/chrome/views/controls/scrollbar/scroll_bar.cc b/views/controls/scrollbar/scroll_bar.cc
index 36f37ab9..a475c44 100644
--- a/chrome/views/controls/scrollbar/scroll_bar.cc
+++ b/views/controls/scrollbar/scroll_bar.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/views/controls/scrollbar/scroll_bar.h"
+#include "views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h
index b6509f2..36a9d2e 100644
--- a/chrome/views/controls/scrollbar/scroll_bar.h
+++ b/views/controls/scrollbar/scroll_bar.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
-#define CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
+#ifndef VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
+#define VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
 
-#include "chrome/views/view.h"
-#include "chrome/views/event.h"
+#include "views/view.h"
+#include "views/event.h"
 
 namespace views {
 
@@ -99,4 +99,4 @@ class ScrollBar : public View {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
+#endif  // #ifndef VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
diff --git a/chrome/views/controls/separator.cc b/views/controls/separator.cc
index 0ffc061..f331ce8 100644
--- a/chrome/views/controls/separator.cc
+++ b/views/controls/separator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/controls/separator.h"
+#include "views/controls/separator.h"
 
-#include "chrome/views/controls/hwnd_view.h"
+#include "views/controls/hwnd_view.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/separator.h b/views/controls/separator.h
index 0455044..866beda 100644
--- a/chrome/views/controls/separator.h
+++ b/views/controls/separator.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SEPARATOR_H_
-#define CHROME_VIEWS_CONTROLS_SEPARATOR_H_
+#ifndef VIEWS_CONTROLS_SEPARATOR_H_
+#define VIEWS_CONTROLS_SEPARATOR_H_
 
-#include "chrome/views/controls/native_control.h"
+#include "views/controls/native_control.h"
 
 namespace views {
 
@@ -31,4 +31,4 @@ class Separator : public NativeControl {
 
 }  // namespace views
 
-#endif  // #define CHROME_VIEWS_CONTROLS_SEPARATOR_H_
+#endif  // #define VIEWS_CONTROLS_SEPARATOR_H_
diff --git a/chrome/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index a16a767..4558ffd 100644
--- a/chrome/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.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 "chrome/views/controls/single_split_view.h"
+#include "views/controls/single_split_view.h"
 
 #include "app/gfx/chrome_canvas.h"
-#include "chrome/views/background.h"
 #include "skia/ext/skia_utils_win.h"
+#include "views/background.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/single_split_view.h b/views/controls/single_split_view.h
index 3826769..a531800 100644
--- a/chrome/views/controls/single_split_view.h
+++ b/views/controls/single_split_view.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
+#ifndef VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
+#define VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -54,4 +54,4 @@ class SingleSplitView : public views::View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
+#endif  // VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_
diff --git a/chrome/views/controls/tabbed_pane.cc b/views/controls/tabbed_pane.cc
index 487c0b5..401cb79 100644
--- a/chrome/views/controls/tabbed_pane.cc
+++ b/views/controls/tabbed_pane.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/views/controls/tabbed_pane.h"
+#include "views/controls/tabbed_pane.h"
 
 #include <vssym32.h>
 
@@ -13,12 +13,12 @@
 #include "base/gfx/native_theme.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "chrome/views/background.h"
-#include "chrome/views/fill_layout.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkColor.h"
+#include "views/background.h"
+#include "views/fill_layout.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/tabbed_pane.h b/views/controls/tabbed_pane.h
index 8b51ba6..528a2d5 100644
--- a/chrome/views/controls/tabbed_pane.h
+++ b/views/controls/tabbed_pane.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
-#define CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
+#ifndef VIEWS_CONTROLS_TABBED_PANE_H_
+#define VIEWS_CONTROLS_TABBED_PANE_H_
 
-#include "chrome/views/controls/native_control.h"
+#include "views/controls/native_control.h"
 
 namespace views {
 
@@ -91,4 +91,4 @@ class TabbedPane : public NativeControl {
 
 }  // namespace views
 
-#endif  // #define CHROME_VIEWS_CONTROLS_TABBED_PANE_H_
+#endif  // #define VIEWS_CONTROLS_TABBED_PANE_H_
diff --git a/chrome/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc
index 5c87736..5e6a155 100644
--- a/chrome/views/controls/table/group_table_view.cc
+++ b/views/controls/table/group_table_view.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/views/controls/table/group_table_view.h"
+#include "views/controls/table/group_table_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/message_loop.h"
@@ -13,7 +13,7 @@ namespace views {
 static const COLORREF kSeparatorLineColor = RGB(208, 208, 208);
 static const int kSeparatorLineThickness = 1;
 
-const char GroupTableView::kViewClassName[] = "chrome/views/GroupTableView";
+const char GroupTableView::kViewClassName[] = "views/GroupTableView";
 
 GroupTableView::GroupTableView(GroupTableModel* model,
                                const std::vector<TableColumn>& columns,
diff --git a/chrome/views/controls/table/group_table_view.h b/views/controls/table/group_table_view.h
index 0edd01a..d128759 100644
--- a/chrome/views/controls/table/group_table_view.h
+++ b/views/controls/table/group_table_view.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
+#ifndef VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
+#define VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 
 #include "base/task.h"
-#include "chrome/views/controls/table/table_view.h"
+#include "views/controls/table/table_view.h"
 
 // The GroupTableView adds grouping to the TableView class.
 // It allows to have groups of rows that act as a single row from the selection
@@ -79,4 +79,4 @@ class GroupTableView : public TableView {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
+#endif  // VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
diff --git a/chrome/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 827af95..f8c7303 100644
--- a/chrome/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.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/views/controls/table/table_view.h"
+#include "views/controls/table/table_view.h"
 
 #include <algorithm>
 #include <windowsx.h>
@@ -14,10 +14,10 @@
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "SkBitmap.h"
-#include "SkColorFilter.h"
 #include "skia/ext/skia_utils_win.h"
+#include "skia/include/SkBitmap.h"
+#include "skia/include/SkColorFilter.h"
+#include "views/controls/hwnd_view.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/table/table_view.h b/views/controls/table/table_view.h
index e411d8a..8061d27 100644
--- a/chrome/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.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_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
+#ifndef VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
+#define VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 
 #include "build/build_config.h"
 
@@ -18,11 +18,11 @@
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
+#include "skia/include/SkColor.h"
 #if defined(OS_WIN)
 // TODO(port): remove the ifdef when native_control.h is ported.
-#include "chrome/views/controls/native_control.h"
+#include "views/controls/native_control.h"
 #endif  // defined(OS_WIN)
-#include "skia/include/SkColor.h"
 
 class SkBitmap;
 
@@ -673,4 +673,4 @@ class TableView : public NativeControl,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
+#endif  // VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
diff --git a/chrome/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
index 7248015..e0f08e2 100644
--- a/chrome/views/controls/table/table_view_unittest.cc
+++ b/views/controls/table/table_view_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "chrome/views/controls/table/table_view.h"
-#include "chrome/views/window/window_delegate.h"
-#include "chrome/views/window/window_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/table/table_view.h"
+#include "views/window/window_delegate.h"
+#include "views/window/window_win.h"
 
 using views::TableView;
 
diff --git a/chrome/views/controls/text_field.cc b/views/controls/text_field.cc
index 0871cdf..2981282 100644
--- a/chrome/views/controls/text_field.cc
+++ b/views/controls/text_field.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/views/controls/text_field.h"
+#include "views/controls/text_field.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -21,12 +21,12 @@
 #include "base/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/controls/hwnd_view.h"
-#include "chrome/views/controls/menu/menu.h"
-#include "chrome/views/focus/focus_util_win.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
+#include "views/controls/hwnd_view.h"
+#include "views/controls/menu/menu.h"
+#include "views/focus/focus_util_win.h"
+#include "views/widget/widget.h"
 
 using gfx::NativeTheme;
 
diff --git a/chrome/views/controls/text_field.h b/views/controls/text_field.h
index 6de2218..3b030ba 100644
--- a/chrome/views/controls/text_field.h
+++ b/views/controls/text_field.h
@@ -5,14 +5,14 @@
 // These classes define a text field widget that can be used in the views UI
 // toolkit.
 
-#ifndef CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
-#define CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
+#ifndef VIEWS_CONTROLS_TEXT_FIELD_H_
+#define VIEWS_CONTROLS_TEXT_FIELD_H_
 
 #include <string>
 
 #include "app/gfx/chrome_font.h"
 #include "base/basictypes.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 #include "skia/include/SkColor.h"
 
 namespace views {
@@ -205,4 +205,4 @@ class TextField : public View {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TEXT_FIELD_H_
+#endif  // VIEWS_CONTROLS_TEXT_FIELD_H_
diff --git a/chrome/views/controls/throbber.cc b/views/controls/throbber.cc
index 64d18e5..d230c55 100644
--- a/chrome/views/controls/throbber.cc
+++ b/views/controls/throbber.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/views/controls/throbber.h"
+#include "views/controls/throbber.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/views/controls/throbber.h b/views/controls/throbber.h
index b356466..bd0e67a 100644
--- a/chrome/views/controls/throbber.h
+++ b/views/controls/throbber.h
@@ -4,13 +4,13 @@
 
 // Throbbers display an animation, usually used as a status indicator.
 
-#ifndef CHROME_VIEWS_CONTROLS_THROBBER_H_
-#define CHROME_VIEWS_CONTROLS_THROBBER_H_
+#ifndef VIEWS_CONTROLS_THROBBER_H_
+#define VIEWS_CONTROLS_THROBBER_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 class SkBitmap;
 
@@ -108,4 +108,4 @@ class CheckmarkThrobber : public Throbber {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_THROBBER_H_
+#endif  // VIEWS_CONTROLS_THROBBER_H_
diff --git a/chrome/views/controls/tree/tree_model.h b/views/controls/tree/tree_model.h
index 8c54b75..7fec5a8 100644
--- a/chrome/views/controls/tree/tree_model.h
+++ b/views/controls/tree/tree_model.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_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
-#define CHROME_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
+#ifndef VIEWS_CONTROLS_TREE_TREE_MODEL_H_
+#define VIEWS_CONTROLS_TREE_TREE_MODEL_H_
 
 #include <string>
 
@@ -88,4 +88,4 @@ class TreeModel {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_MODEL_H_
+#endif  // VIEWS_CONTROLS_TREE_TREE_MODEL_H_
diff --git a/chrome/views/controls/tree/tree_node_iterator.h b/views/controls/tree/tree_node_iterator.h
index fa28b3e..76618e7 100644
--- a/chrome/views/controls/tree/tree_node_iterator.h
+++ b/views/controls/tree/tree_node_iterator.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_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
-#define CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
+#ifndef VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
+#define VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
 
 #include <stack>
 
@@ -71,4 +71,4 @@ class TreeNodeIterator {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
+#endif  // VIEWS_CONTROLS_TREE_TREE_NODE_ITERATOR_H_
diff --git a/chrome/views/controls/tree/tree_node_iterator_unittest.cc b/views/controls/tree/tree_node_iterator_unittest.cc
index 3aec1af..e5353fc 100644
--- a/chrome/views/controls/tree/tree_node_iterator_unittest.cc
+++ b/views/controls/tree/tree_node_iterator_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "chrome/views/controls/tree/tree_node_iterator.h"
-#include "chrome/views/controls/tree/tree_node_model.h"
+#include "views/controls/tree/tree_node_iterator.h"
+#include "views/controls/tree/tree_node_model.h"
 
 typedef testing::Test TreeNodeIteratorTest;
 
diff --git a/chrome/views/controls/tree/tree_node_model.h b/views/controls/tree/tree_node_model.h
index 14e5748..f1e1c16 100644
--- a/chrome/views/controls/tree/tree_node_model.h
+++ b/views/controls/tree/tree_node_model.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_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
-#define CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
+#ifndef VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
+#define VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
 
 #include <algorithm>
 #include <vector>
@@ -12,7 +12,7 @@
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
-#include "chrome/views/controls/tree/tree_model.h"
+#include "views/controls/tree/tree_model.h"
 
 namespace views {
 
@@ -280,4 +280,4 @@ class TreeNodeModel : public TreeModel {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
+#endif  // VIEWS_CONTROLS_TREE_TREE_NODE_MODEL_H_
diff --git a/chrome/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 1bf668c..08f2255 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.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/views/controls/tree/tree_view.h"
+#include "views/controls/tree/tree_view.h"
 
 #include <shellapi.h>
 
@@ -13,9 +13,9 @@
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/widget/widget.h"
 #include "grit/theme_resources.h"
+#include "views/focus/focus_manager.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index ca6f784..1ded058 100644
--- a/chrome/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
-#define CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
+#ifndef VIEWS_CONTROLS_TREE_TREE_VIEW_H_
+#define VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "chrome/views/controls/native_control.h"
-#include "chrome/views/controls/tree/tree_model.h"
+#include "views/controls/native_control.h"
+#include "views/controls/tree/tree_model.h"
 
 namespace views {
 
@@ -302,4 +302,4 @@ class TreeView : public NativeControl, TreeModelObserver {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_CONTROLS_TREE_TREE_VIEW_H_
+#endif  // VIEWS_CONTROLS_TREE_TREE_VIEW_H_
diff --git a/chrome/views/event.cc b/views/event.cc
index a968adc..8e6a0f1 100644
--- a/chrome/views/event.cc
+++ b/views/event.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/event.h"
+#include "views/event.h"
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
diff --git a/chrome/views/event.h b/views/event.h
index 40aca37..f0ab24a 100644
--- a/chrome/views/event.h
+++ b/views/event.h
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_EVENT_H_
-#define CHROME_VIEWS_EVENT_H_
+#ifndef VIEWS_EVENT_H_
+#define VIEWS_EVENT_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
 
 #if defined(OS_LINUX)
-typedef struct _GdkEventKey GdkEventKey;
+#include <gdk/gdk.h>
 #endif
+
+#include "base/gfx/point.h"
+
 class OSExchangeData;
 
 namespace views {
@@ -216,7 +218,7 @@ class MouseEvent : public LocatedEvent {
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MouseEvent);
+  DISALLOW_EVIL_CONSTRUCTORS(MouseEvent);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -233,7 +235,7 @@ class KeyEvent : public Event {
   // Create a new key event
   KeyEvent(EventType type, int ch, int repeat_count, int message_flags);
 #elif defined(OS_LINUX)
-  explicit KeyEvent(GdkEventKey* event);
+  KeyEvent(GdkEventKey* event);
 #endif
 
   int GetCharacter() const {
@@ -319,4 +321,4 @@ class DropTargetEvent : public LocatedEvent {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_EVENT_H_
+#endif  // VIEWS_EVENT_H_
diff --git a/chrome/views/event_gtk.cc b/views/event_gtk.cc
index 6a6482a..ac5a2ce 100644
--- a/chrome/views/event_gtk.cc
+++ b/views/event_gtk.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/event.h"
-
-#include <gdk/gdk.h>
+#include "views/event.h"
 
 namespace views {
 
diff --git a/chrome/views/event_win.cc b/views/event_win.cc
index 8d5e805..28d1330 100644
--- a/chrome/views/event_win.cc
+++ b/views/event_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/views/event.h"
+#include "views/event.h"
 
 #include <windows.h>
 
diff --git a/chrome/views/fill_layout.cc b/views/fill_layout.cc
index 8c2beee..7bd1430a 100644
--- a/chrome/views/fill_layout.cc
+++ b/views/fill_layout.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/views/fill_layout.h"
+#include "views/fill_layout.h"
 
 #include "base/logging.h"
 
diff --git a/chrome/views/fill_layout.h b/views/fill_layout.h
index a7ef21b..e47a639 100644
--- a/chrome/views/fill_layout.h
+++ b/views/fill_layout.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_FILL_LAYOUT_H_
-#define CHROME_VIEWS_FILL_LAYOUT_H_
+#ifndef VIEWS_FILL_LAYOUT_H_
+#define VIEWS_FILL_LAYOUT_H_
 
-#include "chrome/views/layout_manager.h"
-#include "chrome/views/view.h"
+#include "views/layout_manager.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -32,4 +32,4 @@ class FillLayout : public LayoutManager {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_FILL_LAYOUT_H_
+#endif  // VIEWS_FILL_LAYOUT_H_
diff --git a/chrome/views/focus/external_focus_tracker.cc b/views/focus/external_focus_tracker.cc
index 89ea93e..8f8bfdf 100644
--- a/chrome/views/focus/external_focus_tracker.cc
+++ b/views/focus/external_focus_tracker.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 "chrome/views/focus/external_focus_tracker.h"
+#include "views/focus/external_focus_tracker.h"
 
-#include "chrome/views/view.h"
-#include "chrome/views/focus/view_storage.h"
+#include "views/view.h"
+#include "views/focus/view_storage.h"
 
 namespace views {
 
diff --git a/chrome/views/focus/external_focus_tracker.h b/views/focus/external_focus_tracker.h
index 01bb864..22e9b7e 100644
--- a/chrome/views/focus/external_focus_tracker.h
+++ b/views/focus/external_focus_tracker.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
-#define CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
+#ifndef VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
+#define VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
 
-#include "chrome/views/focus/focus_manager.h"
+#include "views/focus/focus_manager.h"
 
 namespace views {
 
@@ -73,4 +73,4 @@ class ExternalFocusTracker : public FocusChangeListener {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
+#endif  // VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
diff --git a/chrome/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 9e477e9..5653e7a 100644
--- a/chrome/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -8,12 +8,12 @@
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/accelerator.h"
+#include "views/focus/focus_manager.h"
+#include "views/focus/view_storage.h"
+#include "views/view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 // The following keys are used in SetProp/GetProp to associate additional
 // information needed for focus tracking with a window.
diff --git a/chrome/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 4a32c0d..8c33036 100644
--- a/chrome/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.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_VIEWS_FOCUS_FOCUS_MANAGER_H_
-#define CHROME_VIEWS_FOCUS_FOCUS_MANAGER_H_
+#ifndef VIEWS_FOCUS_FOCUS_MANAGER_H_
+#define VIEWS_FOCUS_FOCUS_MANAGER_H_
 
 #include "base/basictypes.h"
 
@@ -13,7 +13,7 @@
 #include <vector>
 #include <map>
 
-#include "chrome/views/accelerator.h"
+#include "views/accelerator.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
 // focused views and handle keyboard accelerators.
@@ -340,4 +340,4 @@ class FocusManager {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_FOCUS_MANAGER_H_
+#endif  // VIEWS_FOCUS_FOCUS_MANAGER_H_
diff --git a/chrome/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 613f701..234db1d 100644
--- a/chrome/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -10,22 +10,23 @@
 
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
-#include "chrome/views/background.h"
-#include "chrome/views/border.h"
-#include "chrome/views/controls/button/checkbox.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/controls/button/radio_button.h"
-#include "chrome/views/controls/label.h"
-#include "chrome/views/controls/link.h"
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/controls/tabbed_pane.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window/window.h"
-#include "chrome/views/window/window_delegate.h"
-#include "SkColor.h"
+#include "skia/include/SkColor.h"
+#include "views/background.h"
+#include "views/border.h"
+#include "views/controls/button/checkbox.h"
+#include "views/controls/button/native_button.h"
+#include "views/controls/button/radio_button.h"
+#include "views/controls/label.h"
+#include "views/controls/link.h"
+#include "views/controls/scroll_view.h"
+#include "views/controls/tabbed_pane.h"
+#include "views/controls/text_field.h"
+#include "views/widget/accelerator_handler.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
+#include "views/window/window.h"
+#include "views/window/window_delegate.h"
+
 
 
 namespace {
diff --git a/chrome/views/focus/focus_util_win.cc b/views/focus/focus_util_win.cc
index bde8d27..046df70 100644
--- a/chrome/views/focus/focus_util_win.cc
+++ b/views/focus/focus_util_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/views/focus/focus_util_win.h"
+#include "views/focus/focus_util_win.h"
 
 #include <windowsx.h>
 
diff --git a/chrome/views/focus/focus_util_win.h b/views/focus/focus_util_win.h
index d613e47..832a6df 100644
--- a/chrome/views/focus/focus_util_win.h
+++ b/views/focus/focus_util_win.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_VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
-#define CHROME_VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
+#ifndef VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
+#define VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
 
 #include <windows.h>
 
@@ -25,4 +25,4 @@ bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param);
 
 }   // namespace views
 
-#endif  // CHROME_VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
+#endif  // VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
diff --git a/chrome/views/focus/view_storage.cc b/views/focus/view_storage.cc
index d8196b2..a108530 100644
--- a/chrome/views/focus/view_storage.cc
+++ b/views/focus/view_storage.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/views/focus/view_storage.h"
+#include "views/focus/view_storage.h"
 
 #include <algorithm>
 
diff --git a/chrome/views/focus/view_storage.h b/views/focus/view_storage.h
index 09bb674..9182429 100644
--- a/chrome/views/focus/view_storage.h
+++ b/views/focus/view_storage.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_FOCUS_VIEW_STORAGE_H_
-#define CHROME_VIEWS_FOCUS_VIEW_STORAGE_H_
+#ifndef VIEWS_FOCUS_VIEW_STORAGE_H_
+#define VIEWS_FOCUS_VIEW_STORAGE_H_
 
 #include "base/singleton.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 // This class is a simple storage place for storing/retrieving views.  It is
 // used for example in the FocusManager to store/restore focused views when the
@@ -75,4 +75,4 @@ class ViewStorage {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_VIEW_STORAGE_H_
+#endif  // #ifndef VIEWS_FOCUS_VIEW_STORAGE_H_
diff --git a/chrome/views/grid_layout.cc b/views/grid_layout.cc
index fe4a0f3..7eb07d1 100644
--- a/chrome/views/grid_layout.cc
+++ b/views/grid_layout.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/grid_layout.h"
+#include "views/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
diff --git a/chrome/views/grid_layout.h b/views/grid_layout.h
index 9cddd95..e3e7a62 100644
--- a/chrome/views/grid_layout.h
+++ b/views/grid_layout.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_GRID_LAYOUT_H_
-#define CHROME_VIEWS_GRID_LAYOUT_H_
+#ifndef VIEWS_GRID_LAYOUT_H_
+#define VIEWS_GRID_LAYOUT_H_
 
 #include <string>
 #include <vector>
 
-#include "chrome/views/layout_manager.h"
-#include "chrome/views/view.h"
+#include "views/layout_manager.h"
+#include "views/view.h"
 
 // GridLayout is a LayoutManager that positions child Views in a grid. You
 // define the structure of the Grid first, then add the Views.
@@ -351,4 +351,4 @@ class ColumnSet {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_GRID_LAYOUT_H_
+#endif // VIEWS_GRID_LAYOUT_H_
diff --git a/chrome/views/grid_layout_unittest.cc b/views/grid_layout_unittest.cc
index ed52ed0..57bfa83 100644
--- a/chrome/views/grid_layout_unittest.cc
+++ b/views/grid_layout_unittest.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/grid_layout.h"
-#include "chrome/views/view.h"
-
 #include "testing/gtest/include/gtest/gtest.h"
+#include "views/grid_layout.h"
+#include "views/view.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/views/layout_manager.cc b/views/layout_manager.cc
index 35028432..800dbc2 100644
--- a/chrome/views/layout_manager.cc
+++ b/views/layout_manager.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/layout_manager.h"
+#include "views/layout_manager.h"
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
diff --git a/chrome/views/layout_manager.h b/views/layout_manager.h
index 5b8eaf1..48a9c96 100644
--- a/chrome/views/layout_manager.h
+++ b/views/layout_manager.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_LAYOUT_MANAGER_H_
-#define CHROME_VIEWS_LAYOUT_MANAGER_H_
+#ifndef VIEWS_LAYOUT_MANAGER_H_
+#define VIEWS_LAYOUT_MANAGER_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace gfx {
 class Size;
@@ -57,4 +57,4 @@ class LayoutManager {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_LAYOUT_MANAGER_H_
+#endif // VIEWS_LAYOUT_MANAGER_H_
diff --git a/chrome/views/painter.cc b/views/painter.cc
index 464bba4..a2ad4ee 100644
--- a/chrome/views/painter.cc
+++ b/views/painter.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/views/painter.h"
+#include "views/painter.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/views/painter.h b/views/painter.h
index 37edd64..83610c3 100644
--- a/chrome/views/painter.h
+++ b/views/painter.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_VIEWS_PAINTER_H_
-#define CHROME_VIEWS_PAINTER_H_
+#ifndef VIEWS_PAINTER_H_
+#define VIEWS_PAINTER_H_
 
 #include <vector>
 
@@ -117,4 +117,4 @@ class HorizontalPainter : public Painter {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_PAINTER_H_
+#endif  // VIEWS_PAINTER_H_
diff --git a/chrome/views/repeat_controller.cc b/views/repeat_controller.cc
index 2d52783..bb70852 100644
--- a/chrome/views/repeat_controller.cc
+++ b/views/repeat_controller.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/views/repeat_controller.h"
+#include "views/repeat_controller.h"
 
 using base::TimeDelta;
 
diff --git a/chrome/views/repeat_controller.h b/views/repeat_controller.h
index b7712d0..9e01dd1 100644
--- a/chrome/views/repeat_controller.h
+++ b/views/repeat_controller.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_VIEWS_REPEAT_CONTROLLER_H_
-#define CHROME_VIEWS_REPEAT_CONTROLLER_H_
+#ifndef VIEWS_REPEAT_CONTROLLER_H_
+#define VIEWS_REPEAT_CONTROLLER_H_
 
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
@@ -50,4 +50,4 @@ class RepeatController {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_REPEAT_CONTROLLER_H_
+#endif  // #ifndef VIEWS_REPEAT_CONTROLLER_H_
diff --git a/chrome/views/view.cc b/views/view.cc
index 8c2a888..cb73d74 100644
--- a/chrome/views/view.cc
+++ b/views/view.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/views/view.h"
+#include "views/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
@@ -16,21 +16,21 @@
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/views/background.h"
-#include "chrome/views/layout_manager.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
+#include "skia/include/SkShader.h"
+#include "views/background.h"
+#include "views/layout_manager.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 #if defined(OS_WIN)
-#include "chrome/views/widget/tooltip_manager.h"
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
 #endif
-#include "SkShader.h"
 
 namespace views {
 
 // static
-char View::kViewClassName[] = "chrome/views/View";
+char View::kViewClassName[] = "views/View";
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/chrome/views/view.h b/views/view.h
index 98f143c..d2d8e52 100644
--- a/chrome/views/view.h
+++ b/views/view.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_VIEWS_VIEW_H_
-#define CHROME_VIEWS_VIEW_H_
+#ifndef VIEWS_VIEW_H_
+#define VIEWS_VIEW_H_
 
 #include "build/build_config.h"
 
@@ -21,9 +21,9 @@
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/accessibility_types.h"
-#include "chrome/views/accelerator.h"
-#include "chrome/views/background.h"
-#include "chrome/views/border.h"
+#include "views/accelerator.h"
+#include "views/background.h"
+#include "views/border.h"
 
 namespace gfx {
 class Insets;
@@ -1348,4 +1348,4 @@ class View : public AcceleratorTarget {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_VIEW_H_
+#endif  // VIEWS_VIEW_H_
diff --git a/chrome/views/view_constants.cc b/views/view_constants.cc
index 84b7452..0e2ed17 100644
--- a/chrome/views/view_constants.cc
+++ b/views/view_constants.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/views/view_constants.h"
+#include "views/view_constants.h"
 
 namespace views {
 
diff --git a/chrome/views/view_constants.h b/views/view_constants.h
index a8e9fd2..d36dbb4 100644
--- a/chrome/views/view_constants.h
+++ b/views/view_constants.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_VIEWS_VIEW_CONSTANTS_H_
-#define CHROME_VIEWS_VIEW_CONSTANTS_H_
+#ifndef VIEWS_VIEW_CONSTANTS_H_
+#define VIEWS_VIEW_CONSTANTS_H_
 
 namespace views {
 
@@ -22,4 +22,4 @@ extern const int kDropBetweenPixels;
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_VIEW_CONSTANTS_H_
+#endif  // VIEWS_VIEW_CONSTANTS_H_
diff --git a/chrome/views/view_gtk.cc b/views/view_gtk.cc
index 701001a..61ca6ca 100644
--- a/chrome/views/view_gtk.cc
+++ b/views/view_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/views/view.h"
+#include "views/view.h"
 
 #include "base/logging.h"
 
diff --git a/chrome/views/view_unittest.cc b/views/view_unittest.cc
index b8cac1f..d509940e 100644
--- a/chrome/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -8,21 +8,21 @@
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/views/background.h"
-#include "chrome/views/controls/button/checkbox.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "views/background.h"
+#include "views/controls/button/checkbox.h"
 #if defined(OS_WIN)
-#include "chrome/views/controls/button/native_button_win.h"
+#include "views/controls/button/native_button_win.h"
 #endif
-#include "chrome/views/controls/scroll_view.h"
-#include "chrome/views/controls/text_field.h"
-#include "chrome/views/event.h"
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "views/controls/scroll_view.h"
+#include "views/controls/text_field.h"
+#include "views/event.h"
+#include "views/focus/view_storage.h"
+#include "views/view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 using namespace views;
 
diff --git a/chrome/views/view_win.cc b/views/view_win.cc
index 382e169..6dfe183 100644
--- a/chrome/views/view_win.cc
+++ b/views/view_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/views/view.h"
+#include "views/view.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/chrome_canvas.h"
@@ -10,10 +10,10 @@
 #include "app/os_exchange_data.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "chrome/views/accessibility/view_accessibility_wrapper.h"
-#include "chrome/views/border.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/accessibility/view_accessibility_wrapper.h"
+#include "views/border.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/views.vcproj b/views/views.vcproj
index f972022..c10e68d 100644
--- a/chrome/views/views.vcproj
+++ b/views/views.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\views.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled_wtl.vsprops;..\..\third_party\icu38\build\using_icu.vsprops"
+			InheritedPropertySheets=".\views.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)\tools\build\win\precompiled_wtl.vsprops;..\third_party\icu38\build\using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\views.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\third_party\icu38\build\using_icu.vsprops"
+			InheritedPropertySheets=".\views.vsprops;$(SolutionDir)..\build\release.vsprops;..\third_party\icu38\build\using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -820,7 +820,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\tools\build\win\precompiled_wtl.cc"
+			RelativePath="$(SolutionDir)\tools\build\win\precompiled_wtl.cc"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -832,7 +832,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\tools\build\win\precompiled_wtl.h"
+			RelativePath="$(SolutionDir)\tools\build\win\precompiled_wtl.h"
 			>
 		</File>
 		<File
diff --git a/chrome/views/views.vsprops b/views/views.vsprops
index 72a6e0d..72a6e0d 100644
--- a/chrome/views/views.vsprops
+++ b/views/views.vsprops
diff --git a/chrome/views/widget/accelerator_handler.cc b/views/widget/accelerator_handler.cc
index b7f9cb4..386357f 100644
--- a/chrome/views/widget/accelerator_handler.cc
+++ b/views/widget/accelerator_handler.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/widget/accelerator_handler.h"
+#include "views/widget/accelerator_handler.h"
 
-#include "chrome/views/focus/focus_manager.h"
+#include "views/focus/focus_manager.h"
 
 namespace views {
 
diff --git a/chrome/views/widget/accelerator_handler.h b/views/widget/accelerator_handler.h
index 6c2278c..5ee896c 100644
--- a/chrome/views/widget/accelerator_handler.h
+++ b/views/widget/accelerator_handler.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_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
-#define CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
+#ifndef VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
+#define VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
 
 #include "base/message_loop.h"
 
@@ -27,4 +27,4 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
+#endif  // VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
diff --git a/chrome/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index 6e1a5fa..ca58c24 100644
--- a/chrome/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.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/views/widget/aero_tooltip_manager.h"
+#include "views/widget/aero_tooltip_manager.h"
 
 #include <windows.h>
 #include <atlbase.h>
diff --git a/chrome/views/widget/aero_tooltip_manager.h b/views/widget/aero_tooltip_manager.h
index fac5a39..fe5856d 100644
--- a/chrome/views/widget/aero_tooltip_manager.h
+++ b/views/widget/aero_tooltip_manager.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
-#define CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
+#ifndef VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
+#define VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
 
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/views/widget/tooltip_manager.h"
+#include "views/widget/tooltip_manager.h"
 
 namespace views {
 
@@ -54,4 +54,4 @@ class AeroTooltipManager : public TooltipManager {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
+#endif  // #ifndef VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/root_view.cc b/views/widget/root_view.cc
index 07680e6..fd9f1c0 100644
--- a/chrome/views/widget/root_view.cc
+++ b/views/widget/root_view.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/views/widget/root_view.h"
+#include "views/widget/root_view.h"
 
 #include <algorithm>
 
@@ -14,11 +14,11 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #if defined(OS_WIN)
-#include "chrome/views/focus/view_storage.h"
-#include "chrome/views/widget/root_view_drop_target.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/root_view_drop_target.h"
 #endif
-#include "chrome/views/widget/widget.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 namespace views {
 
@@ -49,7 +49,7 @@ class PaintTask : public Task {
   DISALLOW_EVIL_CONSTRUCTORS(PaintTask);
 };
 
-const char RootView::kViewClassName[] = "chrome/views/RootView";
+const char RootView::kViewClassName[] = "views/RootView";
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/chrome/views/widget/root_view.h b/views/widget/root_view.h
index 3b6a5e7..d775ac1 100644
--- a/chrome/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
-#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
+#ifndef VIEWS_WIDGET_ROOT_VIEW_H_
+#define VIEWS_WIDGET_ROOT_VIEW_H_
 
-#include <string>
-
-#include "base/ref_counted.h"
 #include "build/build_config.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/view.h"
 
 #if defined(OS_LINUX)
-typedef struct _GdkEventExpose GdkEventExpose;
+#include <gtk/gtk.h>
 #endif
 
+#if defined(OS_WIN)
+#include "base/ref_counted.h"
+#endif
+
+#include "views/focus/focus_manager.h"
+#include "views/view.h"
+
 namespace views {
 
 class PaintTask;
@@ -172,7 +174,7 @@ class RootView : public View,
   // Used to set the View parent after the view has been created.
   virtual void SetFocusTraversableParentView(View* view);
 
-  // Returns the name of this class: chrome/views/RootView
+  // Returns the name of this class: views/RootView
   virtual std::string GetClassName() const;
 
   // Clears the region that is schedule to be painted. You nearly never need
@@ -358,4 +360,4 @@ class RootView : public View,
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
+#endif // VIEWS_WIDGET_ROOT_VIEW_H_
diff --git a/chrome/views/widget/root_view_drop_target.cc b/views/widget/root_view_drop_target.cc
index 832caac..9c1f087 100644
--- a/chrome/views/widget/root_view_drop_target.cc
+++ b/views/widget/root_view_drop_target.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/widget/root_view_drop_target.h"
+#include "views/widget/root_view_drop_target.h"
 
 #include "app/drag_drop_types.h"
 #include "base/gfx/point.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/widget/root_view_drop_target.h b/views/widget/root_view_drop_target.h
index 3e3aec1..a3c3afd 100644
--- a/chrome/views/widget/root_view_drop_target.h
+++ b/views/widget/root_view_drop_target.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_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
-#define CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
+#ifndef VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
+#define VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -72,4 +72,4 @@ class RootViewDropTarget : public BaseDropTarget {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
+#endif  // VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
diff --git a/chrome/views/widget/root_view_gtk.cc b/views/widget/root_view_gtk.cc
index 8ff19e4..428c695 100644
--- a/chrome/views/widget/root_view_gtk.cc
+++ b/views/widget/root_view_gtk.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/widget/root_view.h"
-
-#include <gtk/gtk.h>
+#include "views/widget/root_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
diff --git a/chrome/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index 14bd9c5..ac4a50d 100644
--- a/chrome/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/widget/root_view.h"
+#include "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/views/widget/root_view_drop_target.h"
+#include "views/widget/root_view_drop_target.h"
 
 namespace views {
 
diff --git a/chrome/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc
index 1584c29..18faf4a 100644
--- a/chrome/views/widget/tooltip_manager.cc
+++ b/views/widget/tooltip_manager.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/views/widget/tooltip_manager.h"
+#include "views/widget/tooltip_manager.h"
 
 #include <limits>
 
@@ -12,9 +12,9 @@
 #include "base/message_loop.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/view.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
+#include "views/view.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
diff --git a/chrome/views/widget/tooltip_manager.h b/views/widget/tooltip_manager.h
index 03e56a1..3d5620d 100644
--- a/chrome/views/widget/tooltip_manager.h
+++ b/views/widget/tooltip_manager.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_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
-#define CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
+#ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_H_
+#define VIEWS_WIDGET_TOOLTIP_MANAGER_H_
 
 #include <windows.h>
 #include <commctrl.h>
@@ -165,4 +165,4 @@ class TooltipManager {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
+#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/widget.h b/views/widget/widget.h
index 1b390bc..8dd3f2e 100644
--- a/chrome/views/widget/widget.h
+++ b/views/widget/widget.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_VIEWS_WIDGET_WIDGET_H_
-#define CHROME_VIEWS_WIDGET_WIDGET_H_
+#ifndef VIEWS_WIDGET_WIDGET_H_
+#define VIEWS_WIDGET_WIDGET_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -78,4 +78,4 @@ class Widget {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_WIDGET_WIDGET_H_
+#endif // VIEWS_WIDGET_WIDGET_H_
diff --git a/chrome/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 39bbd00..25869f6 100644
--- a/chrome/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -2,64 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/widget/widget_gtk.h"
+#include "views/widget/widget_gtk.h"
 
-#include "chrome/views/fill_layout.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window_gtk.h"
+#include "views/fill_layout.h"
+#include "views/widget/root_view.h"
 
 namespace views {
 
-// Returns the position of a widget on screen.
-static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
-  GtkWidget* parent = widget;
-  while (parent) {
-    if (GTK_IS_WINDOW(widget)) {
-      int window_x, window_y;
-      gtk_window_get_position(GTK_WINDOW(widget), &window_x, &window_y);
-      *x += window_x;
-      *y += window_y;
-      return;
-    }
-    // Not a window.
-    *x += widget->allocation.x;
-    *y += widget->allocation.y;
-    parent = gtk_widget_get_parent(parent);
-  }
-}
-
-WidgetGtk::WidgetGtk(Type type)
-    : type_(type),
-      widget_(NULL),
-      child_widget_parent_(NULL),
+WidgetGtk::WidgetGtk()
+    : widget_(NULL),
       is_mouse_down_(false),
       last_mouse_event_was_move_(false) {
 }
 
 WidgetGtk::~WidgetGtk() {
-  if (widget_) {
-    // TODO: make sure this is right.
-    gtk_widget_destroy(widget_);
-    child_widget_parent_ = widget_ = NULL;
-  }
+  gtk_widget_unref(widget_);
+
   // MessageLoopForUI::current()->RemoveObserver(this);
 }
 
 void WidgetGtk::Init(const gfx::Rect& bounds,
                      bool has_own_focus_manager) {
+
   // Force creation of the RootView if it hasn't been created yet.
   GetRootView();
 
   // Make container here.
-  CreateGtkWidget();
+  widget_ = gtk_drawing_area_new();
+  gtk_drawing_area_size(GTK_DRAWING_AREA(widget_), 100, 100);
+  gtk_widget_show(widget_);
 
   // Make sure we receive our motion events.
-
-  // We register everything on the parent of all widgets. At a minimum we need
-  // painting to happen on the parent (otherwise painting doesn't work at all),
-  // and similarly we need mouse release events on the parent as windows don't
-  // get mouse releases.
-  gtk_widget_add_events(child_widget_parent_,
+  gtk_widget_set_events(widget_,
+                        gtk_widget_get_events(widget_) |
                         GDK_ENTER_NOTIFY_MASK |
                         GDK_LEAVE_NOTIFY_MASK |
                         GDK_BUTTON_PRESS_MASK |
@@ -72,35 +47,36 @@ void WidgetGtk::Init(const gfx::Rect& bounds,
 
   // TODO(port): if(has_own_focus_manager) block
 
+  SetViewForNative(widget_, this);
   SetRootViewForWidget(widget_, root_view_.get());
 
   // MessageLoopForUI::current()->AddObserver(this);
 
-  g_signal_connect_after(G_OBJECT(child_widget_parent_), "size_allocate",
+  g_signal_connect_after(G_OBJECT(widget_), "size_allocate",
                          G_CALLBACK(CallSizeAllocate), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "expose_event",
+  g_signal_connect(G_OBJECT(widget_), "expose_event",
                    G_CALLBACK(CallPaint), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "enter_notify_event",
+  g_signal_connect(G_OBJECT(widget_), "enter_notify_event",
                    G_CALLBACK(CallEnterNotify), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "leave_notify_event",
+  g_signal_connect(G_OBJECT(widget_), "leave_notify_event",
                    G_CALLBACK(CallLeaveNotify), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "motion_notify_event",
+  g_signal_connect(G_OBJECT(widget_), "motion_notify_event",
                    G_CALLBACK(CallMotionNotify), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "button_press_event",
+  g_signal_connect(G_OBJECT(widget_), "button_press_event",
                    G_CALLBACK(CallButtonPress), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "button_release_event",
+  g_signal_connect(G_OBJECT(widget_), "button_release_event",
                    G_CALLBACK(CallButtonRelease), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "focus_in_event",
+  g_signal_connect(G_OBJECT(widget_), "focus_in_event",
                    G_CALLBACK(CallFocusIn), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "focus_out_event",
+  g_signal_connect(G_OBJECT(widget_), "focus_out_event",
                    G_CALLBACK(CallFocusOut), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "key_press_event",
+  g_signal_connect(G_OBJECT(widget_), "key_press_event",
                    G_CALLBACK(CallKeyPress), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "key_release_event",
+  g_signal_connect(G_OBJECT(widget_), "key_release_event",
                    G_CALLBACK(CallKeyRelease), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "scroll_event",
+  g_signal_connect(G_OBJECT(widget_), "scroll_event",
                    G_CALLBACK(CallScroll), NULL);
-  g_signal_connect(G_OBJECT(child_widget_parent_), "visibility_notify_event",
+  g_signal_connect(G_OBJECT(widget_), "visibility_notify_event",
                    G_CALLBACK(CallVisibilityNotify), NULL);
 
   // TODO(erg): Ignore these signals for now because they're such a drag.
@@ -115,23 +91,8 @@ void WidgetGtk::Init(const gfx::Rect& bounds,
   //                  G_CALLBACK(drag_data_received_event_cb), NULL);
 }
 
-void WidgetGtk::AddChild(GtkWidget* child) {
-  gtk_container_add(GTK_CONTAINER(child_widget_parent_), child);
-}
-
-void WidgetGtk::RemoveChild(GtkWidget* child) {
-  gtk_container_remove(GTK_CONTAINER(child_widget_parent_), child);
-}
-
-void WidgetGtk::PositionChild(GtkWidget* child, int x, int y, int w, int h) {
-  GtkAllocation alloc = { x, y, w, h };
-  gtk_widget_size_allocate(child, &alloc);
-  gtk_fixed_move(GTK_FIXED(child_widget_parent_), child, x, y);
-}
-
 void WidgetGtk::SetContentsView(View* view) {
-  DCHECK(view && widget_)
-      << "Can't be called until after the HWND is created!";
+  DCHECK(view && widget_) << "Can't be called until after the HWND is created!";
   // The ContentsView must be set up _after_ the window is created so that its
   // Widget pointer is valid.
   root_view_->SetLayoutManager(new FillLayout);
@@ -139,34 +100,26 @@ void WidgetGtk::SetContentsView(View* view) {
     root_view_->RemoveAllChildViews(true);
   root_view_->AddChildView(view);
 
-  DCHECK(widget_);  // Widget must have been created by now.
-
-  OnSizeAllocate(widget_, &(widget_->allocation));
+  // TODO(erg): Terrible hack to work around lack of real sizing mechanics for
+  // now.
+  root_view_->SetBounds(0, 0, 100, 100);
+  root_view_->Layout();
+  root_view_->SchedulePaint();
+  NOTIMPLEMENTED();
 }
 
 void WidgetGtk::GetBounds(gfx::Rect* out, bool including_frame) const {
-  DCHECK(widget_);
-
-  int x = 0, y = 0, w, h;
-  if (GTK_IS_WINDOW(widget_)) {
-    gtk_window_get_position(GTK_WINDOW(widget_), &x, &y);
-    gtk_window_get_size(GTK_WINDOW(widget_), &w, &h);
-  } else {
-    // TODO: make sure this is right. Docs indicate gtk_window_get_position
-    // returns a value useful to the window manager, which may not be the same
-    // as the actual location on the screen.
-    GetWidgetPositionOnScreen(widget_, &x, &y);
-    w = widget_->allocation.width;
-    h = widget_->allocation.height;
-  }
-
   if (including_frame) {
-    // TODO: Docs indicate it isn't possible to get at this value. We may need
-    // to turn off all decorations so that the frame is always of a 0x0 size.
     NOTIMPLEMENTED();
+    *out = gfx::Rect();
+    return;
   }
 
-  return out->SetRect(x, y, w, h);
+  // TODO(erg): Not sure how to implement this. gtk_widget_size_request()
+  // returns a widget's requested size--not it's actual size. The system of
+  // containers and such do auto sizing tricks to make everything work within
+  // the constraints and requested sizes...
+  NOTIMPLEMENTED();
 }
 
 gfx::NativeView WidgetGtk::GetNativeView() const {
@@ -174,6 +127,7 @@ gfx::NativeView WidgetGtk::GetNativeView() const {
 }
 
 void WidgetGtk::PaintNow(const gfx::Rect& update_rect) {
+  // TODO(erg): This is woefully incomplete and is a straw man implementation.
   gtk_widget_queue_draw_area(widget_, update_rect.x(), update_rect.y(),
                              update_rect.width(), update_rect.height());
 }
@@ -191,9 +145,8 @@ bool WidgetGtk::IsVisible() const {
 }
 
 bool WidgetGtk::IsActive() const {
-  // If this only applies to windows, it shouldn't be in widget.
-  DCHECK(GTK_IS_WINDOW(widget_));
-  return gtk_window_is_active(GTK_WINDOW(widget_));
+  NOTIMPLEMENTED();
+  return false;
 }
 
 TooltipManager* WidgetGtk::GetTooltipManager() {
@@ -206,43 +159,6 @@ bool WidgetGtk::GetAccelerator(int cmd_id, Accelerator* accelerator) {
   return false;
 }
 
-Window* WidgetGtk::GetWindow() {
-  return GetWindowImpl(widget_);
-}
-
-const Window* WidgetGtk::GetWindow() const {
-  return GetWindowImpl(widget_);
-}
-
-void WidgetGtk::CreateGtkWidget() {
-  if (type_ == TYPE_CHILD) {
-    child_widget_parent_ = widget_ = gtk_fixed_new();
-    SetViewForNative(widget_, this);
-  } else {
-    widget_ = gtk_window_new(
-        type_ == TYPE_WINDOW ? GTK_WINDOW_TOPLEVEL : GTK_WINDOW_POPUP);
-    gtk_window_set_decorated(GTK_WINDOW(widget_), false);
-    // We'll take care of positioning our window.
-    gtk_window_set_position(GTK_WINDOW(widget_), GTK_WIN_POS_NONE);
-    SetWindowForNative(widget_, static_cast<WindowGtk*>(this));
-    SetViewForNative(widget_, this);
-
-    child_widget_parent_ = gtk_fixed_new();
-    gtk_fixed_set_has_window(GTK_FIXED(child_widget_parent_), true);
-    gtk_container_add(GTK_CONTAINER(widget_), child_widget_parent_);
-    gtk_widget_show(child_widget_parent_);
-
-    SetViewForNative(child_widget_parent_, this);
-  }
-  gtk_widget_show(widget_);
-}
-
-void WidgetGtk::OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation) {
-  root_view_->SetBounds(0, 0, allocation->width, allocation->height);
-  root_view_->Layout();
-  root_view_->SchedulePaint();
-}
-
 gboolean WidgetGtk::OnMotionNotify(GtkWidget* widget, GdkEventMotion* event) {
   gfx::Point screen_loc(event->x_root, event->y_root);
   if (last_mouse_event_was_move_ && last_mouse_move_x_ == screen_loc.x() &&
@@ -262,8 +178,7 @@ gboolean WidgetGtk::OnMotionNotify(GtkWidget* widget, GdkEventMotion* event) {
 }
 
 gboolean WidgetGtk::OnButtonPress(GtkWidget* widget, GdkEventButton* event) {
-  ProcessMousePressed(event);
-  return true;
+  return ProcessMousePressed(event);
 }
 
 gboolean WidgetGtk::OnButtonRelease(GtkWidget* widget, GdkEventButton* event) {
@@ -271,8 +186,9 @@ gboolean WidgetGtk::OnButtonRelease(GtkWidget* widget, GdkEventButton* event) {
   return true;
 }
 
-void WidgetGtk::OnPaint(GtkWidget* widget, GdkEventExpose* event) {
+gboolean WidgetGtk::OnPaint(GtkWidget* widget, GdkEventExpose* event) {
   root_view_->OnPaint(event);
+  return true;
 }
 
 gboolean WidgetGtk::OnEnterNotify(GtkWidget* widget, GdkEventCrossing* event) {
@@ -297,42 +213,16 @@ gboolean WidgetGtk::OnKeyRelease(GtkWidget* widget, GdkEventKey* event) {
   return root_view_->ProcessKeyEvent(key_event);
 }
 
-// static
-WindowGtk* WidgetGtk::GetWindowForNative(GtkWidget* widget) {
-  gpointer user_data = g_object_get_data(G_OBJECT(widget), "chrome-window");
-  return static_cast<WindowGtk*>(user_data);
-}
-
-// static
-void WidgetGtk::SetWindowForNative(GtkWidget* widget, WindowGtk* window) {
-  g_object_set_data(G_OBJECT(widget), "chrome-window", window);
-}
-
 RootView* WidgetGtk::CreateRootView() {
   return new RootView(this);
 }
 
 bool WidgetGtk::ProcessMousePressed(GdkEventButton* event) {
   last_mouse_event_was_move_ = false;
-  // TODO: move this code into a common place. Also need support for
-  // double/triple click.
-  int flags = Event::GetFlagsFromGdkState(event->state);
-  switch (event->button) {
-    case 1:
-      flags |= Event::EF_LEFT_BUTTON_DOWN;
-      break;
-    case 2:
-      flags |= Event::EF_MIDDLE_BUTTON_DOWN;
-      break;
-    case 3:
-      flags |= Event::EF_MIDDLE_BUTTON_DOWN;
-      break;
-    default:
-      // We only deal with 1-3.
-      break;
-  }
   MouseEvent mouse_pressed(Event::ET_MOUSE_PRESSED,
-                           event->x, event->y, flags);
+                           event->x, event->y,
+//                         (dbl_click ? MouseEvent::EF_IS_DOUBLE_CLICK : 0) |
+                           Event::GetFlagsFromGdkState(event->state));
   if (root_view_->OnMousePressed(mouse_pressed)) {
     is_mouse_down_ = true;
     // TODO(port): Enable this once I figure out what capture is.
@@ -398,9 +288,10 @@ void WidgetGtk::CallSizeAllocate(GtkWidget* widget, GtkAllocation* allocation) {
 
 gboolean WidgetGtk::CallPaint(GtkWidget* widget, GdkEventExpose* event) {
   WidgetGtk* widget_gtk = GetViewForNative(widget);
-  if (widget_gtk)
-    widget_gtk->OnPaint(widget, event);
-  return false;  // False indicates other widgets should get the event as well.
+  if (!widget_gtk)
+    return false;
+
+  return widget_gtk->OnPaint(widget, event);
 }
 
 gboolean WidgetGtk::CallEnterNotify(GtkWidget* widget, GdkEventCrossing* event) {
@@ -492,17 +383,4 @@ gboolean WidgetGtk::CallVisibilityNotify(GtkWidget* widget,
   return widget_gtk->OnVisibilityNotify(widget, event);
 }
 
-// Returns the first ancestor of |widget| that is a window.
-// static
-Window* WidgetGtk::GetWindowImpl(GtkWidget* widget) {
-  GtkWidget* parent = widget;
-  while (parent) {
-    WindowGtk* window = GetWindowForNative(widget);
-    if (window)
-      return window;
-    parent = gtk_widget_get_parent(parent);
-  }
-  return NULL;
-}
-
 }
diff --git a/chrome/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index ba3ba74..4bbc0dd 100644
--- a/chrome/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_WIDGET_GTK_H_
-#define CHROME_VIEWS_WIDGET_WIDGET_GTK_H_
+#ifndef VIEWS_WIDGET_WIDGET_GTK_H_
+#define VIEWS_WIDGET_WIDGET_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/message_loop.h"
-#include "chrome/views/widget/widget.h"
+#include "views/widget/widget.h"
 
 namespace gfx {
 class Rect;
@@ -17,39 +17,22 @@ class Rect;
 namespace views {
 
 class View;
-class WindowGtk;
 
-// Widget implementation for GTK.
 class WidgetGtk : public Widget {
  public:
-  // Type of widget.
-  enum Type {
-    // Used for popup type windows (bubbles, menus ...).
-    TYPE_POPUP,
-
-    // A top level window.
-    TYPE_WINDOW,
-
-    // A child widget.
-    TYPE_CHILD
-  };
+  static WidgetGtk* Construct() {
+    // This isn't used, but exists to force WidgetGtk to be instantiable.
+    return new WidgetGtk;
+  }
 
-  explicit WidgetGtk(Type type);
+  WidgetGtk();
   virtual ~WidgetGtk();
 
-  // Initializes this widget.
+  // Initializes this widget and returns the gtk drawing area for the caller to
+  // add to its hierarchy. (We can't pass in the parent to this method because
+  // there are no standard adding semantics in gtk...)
   void Init(const gfx::Rect& bounds, bool has_own_focus_manager);
 
-  void AddChild(GtkWidget* child);
-  void RemoveChild(GtkWidget* child);
-
-  // Positions a child GtkWidget at the specified location and bounds.
-  void PositionChild(GtkWidget* child, int x, int y, int w, int h);
-
-  // Parent GtkWidget all children are added to. This is not necessarily
-  // the same as returned by GetNativeView.
-  GtkWidget* child_widget_parent() const { return child_widget_parent_; }
-
   virtual void SetContentsView(View* view);
 
   // Overridden from Widget:
@@ -61,12 +44,10 @@ class WidgetGtk : public Widget {
   virtual bool IsActive() const;
   virtual TooltipManager* GetTooltipManager();
   virtual bool GetAccelerator(int cmd_id, Accelerator* accelerator);
-  virtual Window* GetWindow();
-  virtual const Window* GetWindow() const;
 
  protected:
-  virtual void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation);
-  virtual void OnPaint(GtkWidget* widget, GdkEventExpose* event);
+  virtual void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation) {}
+  virtual gboolean OnPaint(GtkWidget* widget, GdkEventExpose* event);
   virtual gboolean OnEnterNotify(GtkWidget* widget, GdkEventCrossing* event);
   virtual gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event);
   virtual gboolean OnMotionNotify(GtkWidget* widget, GdkEventMotion* event);
@@ -88,10 +69,6 @@ class WidgetGtk : public Widget {
     return false;
   }
 
-  // Sets and retrieves the WidgetGtk in the userdata section of the widget.
-  static WindowGtk* GetWindowForNative(GtkWidget* widget);
-  static void SetWindowForNative(GtkWidget* widget, WindowGtk* window);
-
  private:
   virtual RootView* CreateRootView();
 
@@ -122,18 +99,8 @@ class WidgetGtk : public Widget {
   static gboolean CallVisibilityNotify(GtkWidget* widget,
                                        GdkEventVisibility* event);
 
-  static Window* GetWindowImpl(GtkWidget* widget);
-
-  // Creates the GtkWidget.
-  void CreateGtkWidget();
-
-  const Type type_;
-
-  // Our native views. If we're a window/popup, then widget_ is the window and
-  // child_widget_parent_ is a GtkFixed. If we're not a window/popup, then
-  // widget_ and child_widget_parent_ are a GtkFixed.
+  // Our native view.
   GtkWidget* widget_;
-  GtkWidget* child_widget_parent_;
 
   // The root of the View hierarchy attached to this window.
   scoped_ptr<RootView> root_view_;
@@ -151,10 +118,8 @@ class WidgetGtk : public Widget {
   // Coordinates of the last mouse move event, in screen coordinates.
   int last_mouse_move_x_;
   int last_mouse_move_y_;
-
-  DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
 };
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WIDGET_WIDGET_GTK_H_
+#endif  // VIEWS_WIDGET_WIDGET_GTK_H_
diff --git a/chrome/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 5ee065a..2bc9b0c 100644
--- a/chrome/views/widget/widget_win.cc
+++ b/views/widget/widget_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/views/widget/widget_win.h"
+#include "views/widget/widget_win.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/gfx/native_theme.h"
@@ -10,13 +10,13 @@
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/accessibility/view_accessibility.h"
-#include "chrome/views/controls/native_control_win.h"
-#include "chrome/views/fill_layout.h"
-#include "chrome/views/focus/focus_util_win.h"
-#include "chrome/views/widget/aero_tooltip_manager.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/window_win.h"
+#include "views/accessibility/view_accessibility.h"
+#include "views/controls/native_control_win.h"
+#include "views/fill_layout.h"
+#include "views/focus/focus_util_win.h"
+#include "views/widget/aero_tooltip_manager.h"
+#include "views/widget/root_view.h"
+#include "views/window/window_win.h"
 
 namespace views {
 
diff --git a/chrome/views/widget/widget_win.h b/views/widget/widget_win.h
index 00ecb93..09efa21 100644
--- a/chrome/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
-#define CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
+#ifndef VIEWS_WIDGET_WIDGET_WIN_H_
+#define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlcrack.h>
 
 #include "base/message_loop.h"
 #include "base/system_monitor.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/layout_manager.h"
-#include "chrome/views/widget/widget.h"
+#include "views/focus/focus_manager.h"
+#include "views/layout_manager.h"
+#include "views/widget/widget.h"
 
 class ChromeCanvas;
 
@@ -538,7 +538,7 @@ class WidgetWin : public Widget,
   // Implementation of GetWindow. Ascends the parents of |hwnd| returning the
   // first ancestor that is a Window.
   static Window* GetWindowImpl(HWND hwnd);
- 
+
   // Resize the bitmap used to contain the contents of the layered window. This
   // recreates the entire bitmap.
   void SizeContents(const CRect& window_rect);
@@ -633,4 +633,4 @@ class WidgetWin : public Widget,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
+#endif  // #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
diff --git a/chrome/views/window/client_view.cc b/views/window/client_view.cc
index 9b1e578..5b5afb1 100644
--- a/chrome/views/window/client_view.cc
+++ b/views/window/client_view.cc
@@ -3,12 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "chrome/views/window/client_view.h"
-#if defined(OS_LINUX)
-#include "chrome/views/window/hit_test.h"
-#endif
-#include "chrome/views/window/window.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 
diff --git a/chrome/views/window/client_view.h b/views/window/client_view.h
index 9db0c69..b56fcfd 100644
--- a/chrome/views/window/client_view.h
+++ b/views/window/client_view.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
-#define CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
+#ifndef VIEWS_WINDOW_CLIENT_VIEW_H_
+#define VIEWS_WINDOW_CLIENT_VIEW_H_
 
-#include "chrome/views/view.h"
+#include "views/view.h"
 
 namespace views {
 
@@ -81,4 +81,4 @@ class ClientView : public View {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_
+#endif  // #ifndef VIEWS_WINDOW_CLIENT_VIEW_H_
diff --git a/chrome/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index c8a33fd..cf8173f 100644
--- a/chrome/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -2,22 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window/custom_frame_view.h"
+#include "views/window/custom_frame_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
-#if defined(OS_WIN)
 #include "base/win_util.h"
 #include "chrome/common/win_util.h"
-#endif
-#include "chrome/views/window/client_view.h"
-#if defined(OS_LINUX)
-#include "chrome/views/window/hit_test.h"
-#endif
-#include "chrome/views/window/window_delegate.h"
 #include "grit/theme_resources.h"
+#include "views/window/client_view.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 
@@ -691,12 +686,7 @@ void CustomFrameView::InitClass() {
     active_resources_ = new ActiveWindowResources;
     inactive_resources_ = new InactiveWindowResources;
 
-#if defined(OS_WIN)
     title_font_ = new ChromeFont(win_util::GetWindowTitleFont());
-#elif defined(OS_LINUX)
-    // TODO: need to resolve what font this is.
-    title_font_ = new ChromeFont();
-#endif
 
     initialized = true;
   }
diff --git a/chrome/views/window/custom_frame_view.h b/views/window/custom_frame_view.h
index 1170355..f071692 100644
--- a/chrome/views/window/custom_frame_view.h
+++ b/views/window/custom_frame_view.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
-#define CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
+#ifndef VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
+#define VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
 
-#include "chrome/views/controls/button/image_button.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
-#include "chrome/views/window/window_resources.h"
+#include "views/controls/button/image_button.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
+#include "views/window/window_resources.h"
 
 namespace gfx{
 class Size;
@@ -119,4 +119,4 @@ class CustomFrameView : public NonClientFrameView,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
+#endif  // #ifndef VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
diff --git a/chrome/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 0357da4..b7989ac 100644
--- a/chrome/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.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/views/window/dialog_client_view.h"
+#include "views/window/dialog_client_view.h"
 
 #include <windows.h>
 #include <uxtheme.h>
@@ -14,10 +14,10 @@
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/window/dialog_delegate.h"
-#include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
+#include "views/controls/button/native_button.h"
+#include "views/window/dialog_delegate.h"
+#include "views/window/window.h"
 
 namespace views {
 
diff --git a/chrome/views/window/dialog_client_view.h b/views/window/dialog_client_view.h
index 0a88e19..347b61c 100644
--- a/chrome/views/window/dialog_client_view.h
+++ b/views/window/dialog_client_view.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
-#define CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
+#ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
+#define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 
 #include "app/gfx/chrome_font.h"
-#include "chrome/views/focus/focus_manager.h"
-#include "chrome/views/controls/button/button.h"
-#include "chrome/views/window/client_view.h"
+#include "views/focus/focus_manager.h"
+#include "views/controls/button/button.h"
+#include "views/window/client_view.h"
 
 namespace views {
 
@@ -120,4 +120,4 @@ class DialogClientView : public ClientView,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
+#endif  // #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
diff --git a/chrome/views/window/dialog_delegate.cc b/views/window/dialog_delegate.cc
index bc4f1fd8..4ae9a91 100644
--- a/chrome/views/window/dialog_delegate.cc
+++ b/views/window/dialog_delegate.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 "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/views/controls/button/native_button.h"
-#include "chrome/views/window/window.h"
+#include "views/controls/button/native_button.h"
+#include "views/window/window.h"
 
 namespace views {
 
diff --git a/chrome/views/window/dialog_delegate.h b/views/window/dialog_delegate.h
index a38100c..4418e61f 100644
--- a/chrome/views/window/dialog_delegate.h
+++ b/views/window/dialog_delegate.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
-#define CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
+#ifndef VIEWS_WINDOW_DIALOG_DELEGATE_H_
+#define VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
 #include "app/message_box_flags.h"
-#include "chrome/views/window/dialog_client_view.h"
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/dialog_client_view.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 
@@ -110,4 +110,4 @@ class DialogDelegate : public WindowDelegate {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_
+#endif  // VIEWS_WINDOW_DIALOG_DELEGATE_H_
diff --git a/chrome/views/window/native_frame_view.cc b/views/window/native_frame_view.cc
index 4446f30..05a8dcb 100644
--- a/chrome/views/window/native_frame_view.cc
+++ b/views/window/native_frame_view.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window/native_frame_view.h"
+#include "views/window/native_frame_view.h"
 
-#include "chrome/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 namespace views {
 
diff --git a/chrome/views/window/native_frame_view.h b/views/window/native_frame_view.h
index 336d7c4..e2efa9d 100644
--- a/chrome/views/window/native_frame_view.h
+++ b/views/window/native_frame_view.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
-#define CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
+#ifndef VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
+#define VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
 
-#include "chrome/views/window/non_client_view.h"
+#include "views/window/non_client_view.h"
 
 namespace views {
 
@@ -36,4 +36,4 @@ class NativeFrameView : public NonClientFrameView {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
+#endif  // #ifndef VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
diff --git a/chrome/views/window/non_client_view.cc b/views/window/non_client_view.cc
index 8a8fb71..9a06cfc 100644
--- a/chrome/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -2,17 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window/non_client_view.h"
+#include "views/window/non_client_view.h"
 
-#if defined(OS_WIN)
 #include "chrome/common/win_util.h"
-#endif
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/widget/widget.h"
-#if defined(OS_LINUX)
-#include "chrome/views/window/hit_test.h"
-#endif
-#include "chrome/views/window/window.h"
+#include "views/widget/root_view.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 namespace views {
 
@@ -32,11 +27,7 @@ static const int kClientViewIndex = 1;
 NonClientView::NonClientView(Window* frame)
     : frame_(frame),
       client_view_(NULL),
-#if defined(OS_WIN)
       use_native_frame_(win_util::ShouldUseVistaFrame()) {
-#else
-      use_native_frame_(false) {
-#endif
 }
 
 NonClientView::~NonClientView() {
diff --git a/chrome/views/window/non_client_view.h b/views/window/non_client_view.h
index e82ec77..d93f423 100644
--- a/chrome/views/window/non_client_view.h
+++ b/views/window/non_client_view.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
-#define CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
+#ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_
+#define VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 
 #include "base/task.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/client_view.h"
+#include "views/view.h"
+#include "views/window/client_view.h"
 
 namespace gfx {
 class Path;
@@ -224,4 +224,4 @@ class NonClientView : public View {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
+#endif  // #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_
diff --git a/chrome/views/window/window.h b/views/window/window.h
index 819f31c..17a2ff5 100644
--- a/chrome/views/window/window.h
+++ b/views/window/window.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_WINDOW_H_
-#define CHROME_VIEWS_WINDOW_WINDOW_H_
+#ifndef VIEWS_WINDOW_WINDOW_H_
+#define VIEWS_WINDOW_WINDOW_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -132,4 +132,4 @@ class Window {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WINDOW_WINDOW_H_
+#endif  // #ifndef VIEWS_WINDOW_WINDOW_H_
diff --git a/chrome/views/window/window_delegate.cc b/views/window/window_delegate.cc
index 917836f..7b5f251 100644
--- a/chrome/views/window/window_delegate.cc
+++ b/views/window/window_delegate.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/views/window/window_delegate.h"
+#include "views/window/window_delegate.h"
 
 // TODO(beng): hrmp. Fix this in http://crbug.com/4406
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/window.h"
+#include "views/window/client_view.h"
+#include "views/window/window.h"
 #include "skia/include/SkBitmap.h"
 
 namespace views {
diff --git a/chrome/views/window/window_delegate.h b/views/window/window_delegate.h
index 8e9a556..af8285c 100644
--- a/chrome/views/window/window_delegate.h
+++ b/views/window/window_delegate.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_VIEWS_WINDOW_WINDOW_DELEGATE_H_
-#define CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_
+#ifndef VIEWS_WINDOW_WINDOW_DELEGATE_H_
+#define VIEWS_WINDOW_WINDOW_DELEGATE_H_
 
 #include <string>
 
@@ -148,7 +148,6 @@ class WindowDelegate {
   void ReleaseWindow();
 
  private:
-  friend class WindowGtk;
   friend class WindowWin;
   // This is a little unusual. We use a scoped_ptr here because it's
   // initialized to NULL automatically. We do this because we want to allow
@@ -160,4 +159,4 @@ class WindowDelegate {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_
+#endif  // VIEWS_WINDOW_WINDOW_DELEGATE_H_
diff --git a/chrome/views/window/window_resources.h b/views/window/window_resources.h
index 9db078e..e79476e 100644
--- a/chrome/views/window/window_resources.h
+++ b/views/window/window_resources.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_VIEWS_WINDOW_WINDOW_RESOURCES_H_
-#define CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_
+#ifndef VIEWS_WINDOW_WINDOW_RESOURCES_H_
+#define VIEWS_WINDOW_WINDOW_RESOURCES_H_
 
 class SkBitmap;
 
@@ -27,4 +27,4 @@ class WindowResources {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_
+#endif  // VIEWS_WINDOW_WINDOW_RESOURCES_H_
diff --git a/chrome/views/window/window_win.cc b/views/window/window_win.cc
index 73be950..f41ef18 100644
--- a/chrome/views/window/window_win.cc
+++ b/views/window/window_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/views/window/window_win.h"
+#include "views/window/window_win.h"
 
 #include <shellapi.h>
 
@@ -15,13 +15,13 @@
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/win_util.h"
-#include "chrome/views/widget/root_view.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/custom_frame_view.h"
-#include "chrome/views/window/native_frame_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window_delegate.h"
 #include "grit/generated_resources.h"
+#include "views/widget/root_view.h"
+#include "views/window/client_view.h"
+#include "views/window/custom_frame_view.h"
+#include "views/window/native_frame_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window_delegate.h"
 
 namespace {
 
diff --git a/chrome/views/window/window_win.h b/views/window/window_win.h
index 749ae94..76d5196 100644
--- a/chrome/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_WINDOW_WINDOW_WIN_H__
-#define CHROME_VIEWS_WINDOW_WINDOW_WIN_H__
+#ifndef VIEWS_WINDOW_WINDOW_WIN_H_
+#define VIEWS_WINDOW_WINDOW_WIN_H_
 
-#include "chrome/views/widget/widget_win.h"
-#include "chrome/views/window/client_view.h"
-#include "chrome/views/window/non_client_view.h"
-#include "chrome/views/window/window.h"
+#include "views/widget/widget_win.h"
+#include "views/window/client_view.h"
+#include "views/window/non_client_view.h"
+#include "views/window/window.h"
 
 namespace gfx {
 class Point;
@@ -304,4 +304,4 @@ class WindowWin : public WidgetWin,
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_WINDOW_WINDOW_WIN_H__
+#endif  // VIEWS_WINDOW_WINDOW_WIN_H_