254 files changed, 677 insertions, 677 deletions

diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 5648c81..303d172 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "content/public/app/content_main.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #include "ash/shell/content_client/shell_main_delegate.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 237784d..5ddb6c3 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -12,7 +12,7 @@
 #include "chrome/app/metro_driver_win.h"
 #include "content/public/app/startup_helper_win.h"
 #include "content/public/common/result_codes.h"
-#include "sandbox/win/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_factory.h"
 
 int RunChrome(HINSTANCE instance) {
   bool exit_now = true;
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index a1eaf52..4cb700e 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -42,7 +42,7 @@
 #include "base/win/registry.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "policy/policy_constants.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #include "ui/base/resource/resource_bundle_win.h"
 #endif
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index eadc5fe..bf67478 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -16,7 +16,7 @@ include_rules = [
   "+ppapi/shared_impl/ppp_flash_browser_operations_shared.h",
   "+rlz",
   "+sandbox/linux",
-  "+sandbox/win/src",  # The path doesn't say it, but this is the Windows sandbox.
+  "+sandbox/src",  # The path doesn't say it, but this is the Windows sandbox.
   "+skia/ext",
   "+skia/include",
   "+sync/api",  # Sync API files.
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5cbb1b3..d329e61 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -4347,8 +4347,8 @@
             'test/security_tests/ipc_security_tests.h',
             'test/security_tests/security_tests.cc',
             '../content/common/injection_test_dll.h',
-            '../sandbox/win/tests/validation_tests/commands.cc',
-            '../sandbox/win/tests/validation_tests/commands.h',
+            '../sandbox/tests/validation_tests/commands.cc',
+            '../sandbox/tests/validation_tests/commands.h',
           ],
         },
       ]},  # 'targets'
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index d88605d..87f258a 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+ppapi/proxy",
   "+ppapi/shared_impl",
   "+remoting/client/plugin",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+skia",
   "+webkit/forms",  # Defines some types that are marshalled over IPC.
   "+webkit/glue",
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 976424f..f8f753f 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -40,7 +40,7 @@
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "chrome/common/chrome_sandbox_type_mac.h"
 #endif
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS
index cba9654..d0a3e4fa 100644
--- a/chrome/nacl/DEPS
+++ b/chrome/nacl/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+chrome/app/breakpad_win.h",
   "+content/public/app/startup_helper_win.h",
   "+sandbox/linux/services",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+seccompsandbox",
   "+native_client/src",
 ]
diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc
index 9184d9c..540f5d0 100644
--- a/chrome/nacl/nacl_exe_win_64.cc
+++ b/chrome/nacl/nacl_exe_win_64.cc
@@ -20,7 +20,7 @@
 #include "content/public/app/startup_helper_win.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 extern int NaClMain(const content::MainFunctionParams&);
 
diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc
index 5fd9b22..d2ce5f3 100644
--- a/chrome/nacl/nacl_main_platform_delegate_win.cc
+++ b/chrome/nacl/nacl_main_platform_delegate_win.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "chrome/common/chrome_switches.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 5ac68f1..28cd104 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -9,7 +9,7 @@ include_rules = [
   "+ppapi/c",
   "+ppapi/proxy",
   "+ppapi/shared_impl",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+skia",
   "+webkit/extensions",
   "+webkit/forms",  # Defines some types that are marshalled over IPC.
diff --git a/chrome/service/DEPS b/chrome/service/DEPS
index c1b9790..3f31d56 100644
--- a/chrome/service/DEPS
+++ b/chrome/service/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   # For generated headers.
   "+grit",
-  "+sandbox/win/src/sandbox_types.h",
+  "+sandbox/src/sandbox_types.h",
 ]
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index 27060a6..d73aabc 100644
--- a/chrome/service/service_main.cc
+++ b/chrome/service/service_main.cc
@@ -12,7 +12,7 @@
 
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #elif defined(OS_MACOSX)
 #include "chrome/service/chrome_service_application_mac.h"
 #endif  // defined(OS_WIN)
diff --git a/chrome/test/DEPS b/chrome/test/DEPS
index 5472a7a..cd7cd3f 100644
--- a/chrome/test/DEPS
+++ b/chrome/test/DEPS
@@ -19,8 +19,8 @@ include_rules = [
 
   "+grit",  # For generated headers
   "+media/audio",
-  "+sandbox/win/src",
-  "+sandbox/win/tests",
+  "+sandbox/src",
+  "+sandbox/tests",
   "+webkit/glue",
   "+webkit/plugins",
 ]
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index 8ca9974..cf3a54b 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -20,7 +20,7 @@
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 class ChromeTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
diff --git a/chrome/test/security_tests/security_tests.cc b/chrome/test/security_tests/security_tests.cc
index caa0260..550380f 100644
--- a/chrome/test/security_tests/security_tests.cc
+++ b/chrome/test/security_tests/security_tests.cc
@@ -8,8 +8,8 @@
 #define TEST_INJECTION_DLL
 #include "chrome/test/security_tests/ipc_security_tests.h"
 #include "content/common/injection_test_dll.h"
-#include "sandbox/win/tests/common/controller.h"
-#include "sandbox/win/tests/validation_tests/commands.h"
+#include "sandbox/tests/common/controller.h"
+#include "sandbox/tests/validation_tests/commands.h"
 
 using sandbox::TestOpenKey;
 using sandbox::TestOpenReadFile;
diff --git a/chrome/test/security_tests/security_tests.gyp b/chrome/test/security_tests/security_tests.gyp
index 2f0b0d7..c0a21f2 100644
--- a/chrome/test/security_tests/security_tests.gyp
+++ b/chrome/test/security_tests/security_tests.gyp
@@ -11,8 +11,8 @@
       'target_name': 'security_tests',
       'type': 'shared_library',
       'sources': [
-        '../../../sandbox/win/tests/validation_tests/commands.cc',
-        '../../../sandbox/win/tests/validation_tests/commands.h',
+        '../../../sandbox/tests/validation_tests/commands.cc',
+        '../../../sandbox/tests/validation_tests/commands.h',
         '../injection_test_dll.h',
         'ipc_security_tests.cc',
         'ipc_security_tests.h',
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index ec79019..8544a17 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -318,7 +318,7 @@ BOOL LowIntegrityToken::Impersonate() {
     return ok;
   }
 
-  // TODO(stoyan): sandbox/win/src/restricted_token_utils.cc has
+  // TODO(stoyan): sandbox/src/restricted_token_utils.cc has
   // SetTokenIntegrityLevel function already.
   base::win::ScopedHandle impersonation_token(impersonation_token_handle);
   PSID integrity_sid = NULL;
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index d333c13..151f267 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -63,7 +63,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "net/base/net_util.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 8094ca4..884eb11 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -37,7 +37,7 @@
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/win/dpi.h"
diff --git a/content/app/startup_helper_win.cc b/content/app/startup_helper_win.cc
index 9ead36d..aaba83c 100644
--- a/content/app/startup_helper_win.cc
+++ b/content/app/startup_helper_win.cc
@@ -10,8 +10,8 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/dep.h"
-#include "sandbox/win/src/sandbox_factory.h"
+#include "sandbox/src/dep.h"
+#include "sandbox/src/sandbox_factory.h"
 
 namespace {
 
diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc
index 424c55e..5f2dfbe 100644
--- a/content/common/handle_enumerator_win.cc
+++ b/content/common/handle_enumerator_win.cc
@@ -15,7 +15,7 @@
 #include "base/win/windows_version.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
-#include "sandbox/win/src/handle_table.h"
+#include "sandbox/src/handle_table.h"
 
 namespace {
 
diff --git a/content/common/sandbox_init_win.cc b/content/common/sandbox_init_win.cc
index a0eedcb..e2fe0b2 100644
--- a/content/common/sandbox_init_win.cc
+++ b/content/common/sandbox_init_win.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "content/common/sandbox_policy.h"
 #include "content/public/common/content_switches.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace content {
 
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc
index 2878f2c..9c4efa1 100644
--- a/content/common/sandbox_policy.cc
+++ b/content/common/sandbox_policy.cc
@@ -25,9 +25,9 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/sandbox_init.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/win_utils.h"
 #include "ui/gl/gl_switches.h"
 
 static sandbox::BrokerServices* g_broker_services = NULL;
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 40d759c..6ab3247 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -30,7 +30,7 @@
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(USE_X11)
diff --git a/content/plugin/DEPS b/content/plugin/DEPS
index b8d10ee..6a3fdfa 100644
--- a/content/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "-chrome",
   "+content/public/plugin",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+skia/ext",
   "+third_party/npapi",
   "+webkit/glue",
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 67321cd..204fbe7 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -23,7 +23,7 @@
 
 #if defined(OS_WIN)
 #include "content/common/injection_test_dll.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"
 #include "ipc/ipc_descriptors.h"
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 4550e906..7f79f48 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -14,7 +14,7 @@
 #include "ppapi/proxy/proxy_module.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(OS_LINUX)
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 5fa3b87..c5d6e37 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -34,7 +34,7 @@
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
 #endif
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 200133d..724cec9 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -13,7 +13,7 @@
 #include "content/common/injection_test_dll.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_thread.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #include "skia/ext/skia_sandbox_support_win.h"
 #include "unicode/timezone.h"
 
diff --git a/content/shell/shell_main.cc b/content/shell/shell_main.cc
index 62d6ea9..7e4eaf7 100644
--- a/content/shell/shell_main.cc
+++ b/content/shell/shell_main.cc
@@ -5,7 +5,7 @@
 #include "content/public/app/content_main.h"
 
 #include "content/shell/shell_main_delegate.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
diff --git a/content/test/browser_test_base.cc b/content/test/browser_test_base.cc
index a2f1b9a..8383be9 100644
--- a/content/test/browser_test_base.cc
+++ b/content/test/browser_test_base.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/public/common/main_function_params.h"
-#include "sandbox/win/src/dep.h"
+#include "sandbox/src/dep.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 2194cde..1e28b1d 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -16,7 +16,7 @@
 
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
diff --git a/content/test/test_launcher.cc b/content/test/test_launcher.cc
index 62b1b4f..8c767cf 100644
--- a/content/test/test_launcher.cc
+++ b/content/test/test_launcher.cc
@@ -32,9 +32,9 @@
 #if defined(OS_WIN)
 #include "base/base_switches.h"
 #include "content/common/sandbox_policy.h"
-#include "sandbox/win/src/dep.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/dep.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_types.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
diff --git a/content/utility/DEPS b/content/utility/DEPS
index 7a77d69..bdee969 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+content/public/utility",
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+webkit/glue",
 ]
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index 711b7bc..dd7c571 100644
--- a/content/utility/utility_main.cc
+++ b/content/utility/utility_main.cc
@@ -13,7 +13,7 @@
 #include "content/utility/utility_thread_impl.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 // Mainline routine for running as the utility process.
diff --git a/content/worker/DEPS b/content/worker/DEPS
index ccf9e2b..ba093bb 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+sandbox/win/src",
+  "+sandbox/src",
   "+webkit/appcache",
   "+webkit/glue",
 ]
diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc
index ff6a820..31b4c57 100644
--- a/content/worker/worker_main.cc
+++ b/content/worker/worker_main.cc
@@ -15,7 +15,7 @@
 #include "content/worker/worker_thread.h"
 
 #if defined(OS_WIN)
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 #endif
 
 // Mainline routine for running as the worker process.
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 1d87d11..cd42434 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -9,7 +9,7 @@
   'conditions': [
     [ 'OS=="win"', {
       'includes': [
-        'win/sandbox_win.gypi',
+        'sandbox_win.gypi',
       ],
     }],
     [ 'OS=="linux"', {
diff --git a/sandbox/win/sandbox_poc/main_ui_window.cc b/sandbox/sandbox_poc/main_ui_window.cc
index 4d7c13a..ef4d550 100644
--- a/sandbox/win/sandbox_poc/main_ui_window.cc
+++ b/sandbox/sandbox_poc/main_ui_window.cc
@@ -12,12 +12,12 @@
 #include <algorithm>
 #include <sstream>
 
-#include "sandbox/win/sandbox_poc/main_ui_window.h"
+#include "sandbox/sandbox_poc/main_ui_window.h"
 #include "base/logging.h"
-#include "sandbox/win/sandbox_poc/resource.h"
-#include "sandbox/win/src/acl.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/sandbox_poc/resource.h"
+#include "sandbox/src/acl.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/win_utils.h"
 
 HWND MainUIWindow::list_view_ = NULL;
 
diff --git a/sandbox/win/sandbox_poc/main_ui_window.h b/sandbox/sandbox_poc/main_ui_window.h
index c70189a..c70189a 100644
--- a/sandbox/win/sandbox_poc/main_ui_window.h
+++ b/sandbox/sandbox_poc/main_ui_window.h
diff --git a/sandbox/win/sandbox_poc/pocdll/exports.h b/sandbox/sandbox_poc/pocdll/exports.h
index 66a07d6..66a07d6 100644
--- a/sandbox/win/sandbox_poc/pocdll/exports.h
+++ b/sandbox/sandbox_poc/pocdll/exports.h
diff --git a/sandbox/win/sandbox_poc/pocdll/fs.cc b/sandbox/sandbox_poc/pocdll/fs.cc
index 5fab41b..42c1006 100644
--- a/sandbox/win/sandbox_poc/pocdll/fs.cc
+++ b/sandbox/sandbox_poc/pocdll/fs.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify the security of the file system.
 
diff --git a/sandbox/win/sandbox_poc/pocdll/handles.cc b/sandbox/sandbox_poc/pocdll/handles.cc
index 0568484f..05a57b7 100644
--- a/sandbox/win/sandbox_poc/pocdll/handles.cc
+++ b/sandbox/sandbox_poc/pocdll/handles.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 "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
-#include "sandbox/win/tools/finder/ntundoc.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
+#include "sandbox/tools/finder/ntundoc.h"
 
 // This file contains the tests used to verify the security of handles in
 // the process
diff --git a/sandbox/win/sandbox_poc/pocdll/invasive.cc b/sandbox/sandbox_poc/pocdll/invasive.cc
index df36612..1bac7c1 100644
--- a/sandbox/win/sandbox_poc/pocdll/invasive.cc
+++ b/sandbox/sandbox_poc/pocdll/invasive.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include <malloc.h>
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify if it's possible to DOS or crash
 // the machine. All tests that can impact the stability of the machine should
diff --git a/sandbox/win/sandbox_poc/pocdll/network.cc b/sandbox/sandbox_poc/pocdll/network.cc
index 56ab5ae..09e9f33 100644
--- a/sandbox/win/sandbox_poc/pocdll/network.cc
+++ b/sandbox/sandbox_poc/pocdll/network.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify the security of the network.
 
diff --git a/sandbox/win/sandbox_poc/pocdll/pocdll.cc b/sandbox/sandbox_poc/pocdll/pocdll.cc
index e058f58..3387064 100644
--- a/sandbox/win/sandbox_poc/pocdll/pocdll.cc
+++ b/sandbox/sandbox_poc/pocdll/pocdll.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 BOOL APIENTRY DllMain(HMODULE module,
                       DWORD reason_for_call,
diff --git a/sandbox/win/sandbox_poc/pocdll/pocdll.vcproj b/sandbox/sandbox_poc/pocdll/pocdll.vcproj
index 8e4e31f..8e4e31f 100644
--- a/sandbox/win/sandbox_poc/pocdll/pocdll.vcproj
+++ b/sandbox/sandbox_poc/pocdll/pocdll.vcproj
diff --git a/sandbox/win/sandbox_poc/pocdll/processes_and_threads.cc b/sandbox/sandbox_poc/pocdll/processes_and_threads.cc
index 0a7503c..1bef005 100644
--- a/sandbox/win/sandbox_poc/pocdll/processes_and_threads.cc
+++ b/sandbox/sandbox_poc/pocdll/processes_and_threads.cc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 #include <Tlhelp32.h>
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify the security of threads and
 // processes.
diff --git a/sandbox/win/sandbox_poc/pocdll/registry.cc b/sandbox/sandbox_poc/pocdll/registry.cc
index 7394ec4..f5b249d 100644
--- a/sandbox/win/sandbox_poc/pocdll/registry.cc
+++ b/sandbox/sandbox_poc/pocdll/registry.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify the security of the registry.
 
diff --git a/sandbox/win/sandbox_poc/pocdll/spyware.cc b/sandbox/sandbox_poc/pocdll/spyware.cc
index a77fe0a..b9bf64a 100644
--- a/sandbox/win/sandbox_poc/pocdll/spyware.cc
+++ b/sandbox/sandbox_poc/pocdll/spyware.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include <string>
-#include "sandbox/win/sandbox_poc/pocdll/exports.h"
-#include "sandbox/win/sandbox_poc/pocdll/utils.h"
+#include "sandbox/sandbox_poc/pocdll/exports.h"
+#include "sandbox/sandbox_poc/pocdll/utils.h"
 
 // This file contains the tests used to verify the security of the system by
 // using some spying techniques.
diff --git a/sandbox/win/sandbox_poc/pocdll/utils.h b/sandbox/sandbox_poc/pocdll/utils.h
index ae42861..ae42861 100644
--- a/sandbox/win/sandbox_poc/pocdll/utils.h
+++ b/sandbox/sandbox_poc/pocdll/utils.h
diff --git a/sandbox/win/sandbox_poc/resource.h b/sandbox/sandbox_poc/resource.h
index 87ff920..87ff920 100644
--- a/sandbox/win/sandbox_poc/resource.h
+++ b/sandbox/sandbox_poc/resource.h
diff --git a/sandbox/win/sandbox_poc/sandbox.cc b/sandbox/sandbox_poc/sandbox.cc
index 31cf308..4dc0882 100644
--- a/sandbox/win/sandbox_poc/sandbox.cc
+++ b/sandbox/sandbox_poc/sandbox.cc
@@ -5,11 +5,11 @@
 #include <windows.h>
 #include <tchar.h>
 #include <shellapi.h>
-#include "sandbox/win/sandbox_poc/sandbox.h"
+#include "sandbox/sandbox_poc/sandbox.h"
 #include "base/logging.h"
-#include "sandbox/win/sandbox_poc/main_ui_window.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
+#include "sandbox/sandbox_poc/main_ui_window.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
 
 // Prototype allowed for functions to be called in the POC
 typedef void(__cdecl *lpfnInit)(HANDLE);
diff --git a/sandbox/win/sandbox_poc/sandbox.h b/sandbox/sandbox_poc/sandbox.h
index 65c09a1..15531ad 100644
--- a/sandbox/win/sandbox_poc/sandbox.h
+++ b/sandbox/sandbox_poc/sandbox.h
@@ -5,6 +5,6 @@
 #ifndef SANDBOX_SANDBOX_POC_SANDBOX_H__
 #define SANDBOX_SANDBOX_POC_SANDBOX_H__
 
-#include "sandbox/win/sandbox_poc/resource.h"
+#include "sandbox/sandbox_poc/resource.h"
 
 #endif  // SANDBOX_SANDBOX_POC_SANDBOX_H__
diff --git a/sandbox/win/sandbox_poc/sandbox.ico b/sandbox/sandbox_poc/sandbox.ico
index 916fa12..916fa12 100644
--- a/sandbox/win/sandbox_poc/sandbox.ico
+++ b/sandbox/sandbox_poc/sandbox.ico
diff --git a/sandbox/win/sandbox_poc/sandbox.rc b/sandbox/sandbox_poc/sandbox.rc
index 978c96f..978c96f 100644
--- a/sandbox/win/sandbox_poc/sandbox.rc
+++ b/sandbox/sandbox_poc/sandbox.rc
diff --git a/sandbox/win/sandbox_poc/sandbox_poc.vcproj b/sandbox/sandbox_poc/sandbox_poc.vcproj
index 5fde1cd..5fde1cd 100644
--- a/sandbox/win/sandbox_poc/sandbox_poc.vcproj
+++ b/sandbox/sandbox_poc/sandbox_poc.vcproj
diff --git a/sandbox/win/sandbox_standalone.sln b/sandbox/sandbox_standalone.sln
index 529d20e..529d20e 100644
--- a/sandbox/win/sandbox_standalone.sln
+++ b/sandbox/sandbox_standalone.sln
diff --git a/sandbox/win/sandbox_win.gypi b/sandbox/sandbox_win.gypi
index 3a6ecc7..86506c1 100644
--- a/sandbox/win/sandbox_win.gypi
+++ b/sandbox/sandbox_win.gypi
@@ -166,7 +166,7 @@
         'src/Wow64.h',
       ],
       'include_dirs': [
-        '../..',
+        '..',
       ],
       'copies': [
         {
@@ -180,7 +180,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
-          '../..',
+          '..',
         ],
       },
     },
@@ -209,12 +209,12 @@
         'src/Wow64_64.cc',
       ],
       'include_dirs': [
-        '../..',
+        '..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
-          '../..',
+          '..',
         ],
       },
       'defines': [
@@ -335,7 +335,7 @@
         'POCDLL_EXPORTS',
       ],
       'include_dirs': [
-        '../..',
+        '..',
       ],
     },
   ],
diff --git a/sandbox/win/src/Wow64.cc b/sandbox/src/Wow64.cc
index 39108e5..5098647 100644
--- a/sandbox/win/src/Wow64.cc
+++ b/sandbox/src/Wow64.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 "sandbox/win/src/wow64.h"
+#include "sandbox/src/wow64.h"
 
 #include <sstream>
 
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/target_process.h"
+#include "sandbox/src/target_process.h"
 
 namespace {
 
diff --git a/sandbox/win/src/Wow64.h b/sandbox/src/Wow64.h
index e9bbd53..472297e 100644
--- a/sandbox/win/src/Wow64.h
+++ b/sandbox/src/Wow64.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/Wow64_64.cc b/sandbox/src/Wow64_64.cc
index f03831b..5218077 100644
--- a/sandbox/win/src/Wow64_64.cc
+++ b/sandbox/src/Wow64_64.cc
@@ -4,7 +4,7 @@
 
 // Wow64 implementation for native 64-bit Windows (in other words, never WOW).
 
-#include "sandbox/win/src/wow64.h"
+#include "sandbox/src/wow64.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/acl.cc b/sandbox/src/acl.cc
index 70d2a8d..4869bb0 100644
--- a/sandbox/win/src/acl.cc
+++ b/sandbox/src/acl.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 "sandbox/win/src/acl.h"
+#include "sandbox/src/acl.h"
 
 #include <aclapi.h>
 #include <sddl.h>
diff --git a/sandbox/win/src/acl.h b/sandbox/src/acl.h
index 25d5cdb..d452011 100644
--- a/sandbox/win/src/acl.h
+++ b/sandbox/src/acl.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/sid.h"
+#include "sandbox/src/sid.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/broker_services.cc b/sandbox/src/broker_services.cc
index 80837b3..7f46abe 100644
--- a/sandbox/win/src/broker_services.cc
+++ b/sandbox/src/broker_services.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/broker_services.h"
+#include "sandbox/src/broker_services.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/target_process.h"
-#include "sandbox/win/src/win2k_threadpool.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/sandbox_policy_base.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/target_process.h"
+#include "sandbox/src/win2k_threadpool.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/broker_services.h b/sandbox/src/broker_services.h
index 0455dca..1d9c730 100644
--- a/sandbox/win/src/broker_services.h
+++ b/sandbox/src/broker_services.h
@@ -10,12 +10,12 @@
 #include <set>
 #include "base/basictypes.h"
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/job.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sharedmem_ipc_server.h"
-#include "sandbox/win/src/win2k_threadpool.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/job.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sharedmem_ipc_server.h"
+#include "sandbox/src/win2k_threadpool.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/crosscall_client.h b/sandbox/src/crosscall_client.h
index 2715f96..e92c1d1 100644
--- a/sandbox/win/src/crosscall_client.h
+++ b/sandbox/src/crosscall_client.h
@@ -5,8 +5,8 @@
 #ifndef SANDBOX_SRC_CROSSCALL_CLIENT_H_
 #define SANDBOX_SRC_CROSSCALL_CLIENT_H_
 
-#include "sandbox/win/src/crosscall_params.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/crosscall_params.h"
+#include "sandbox/src/sandbox.h"
 
 // This header defines the CrossCall(..) family of templated functions
 // Their purpose is to simulate the syntax of regular call but to generate
diff --git a/sandbox/win/src/crosscall_params.h b/sandbox/src/crosscall_params.h
index c5298ba..e4c047b 100644
--- a/sandbox/win/src/crosscall_params.h
+++ b/sandbox/src/crosscall_params.h
@@ -11,8 +11,8 @@
 #include <memory>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/internal_types.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/internal_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace {
 
diff --git a/sandbox/win/src/crosscall_server.cc b/sandbox/src/crosscall_server.cc
index 0140580..f40b677 100644
--- a/sandbox/win/src/crosscall_server.cc
+++ b/sandbox/src/crosscall_server.cc
@@ -5,9 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/crosscall_params.h"
-#include "sandbox/win/src/crosscall_client.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/crosscall_params.h"
+#include "sandbox/src/crosscall_client.h"
 #include "base/logging.h"
 
 // This code performs the ipc message validation. Potential security flaws
diff --git a/sandbox/win/src/crosscall_server.h b/sandbox/src/crosscall_server.h
index 2a39507..59445f6 100644
--- a/sandbox/win/src/crosscall_server.h
+++ b/sandbox/src/crosscall_server.h
@@ -9,7 +9,7 @@
 #include <vector>
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "sandbox/win/src/crosscall_params.h"
+#include "sandbox/src/crosscall_params.h"
 
 // This is the IPC server interface for CrossCall: The  IPC for the Sandbox
 // On the server, CrossCall needs two things:
diff --git a/sandbox/win/src/dep.cc b/sandbox/src/dep.cc
index 0c42050..4995601 100644
--- a/sandbox/win/src/dep.cc
+++ b/sandbox/src/dep.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 "sandbox/win/src/dep.h"
+#include "sandbox/src/dep.h"
 
 #include <windows.h>
 
diff --git a/sandbox/win/src/dep.h b/sandbox/src/dep.h
index 9016285..9016285 100644
--- a/sandbox/win/src/dep.h
+++ b/sandbox/src/dep.h
diff --git a/sandbox/win/src/dep_test.cc b/sandbox/src/dep_test.cc
index 2817caa..91d4e67 100644
--- a/sandbox/win/src/dep_test.cc
+++ b/sandbox/src/dep_test.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 "sandbox/win/src/dep.h"
+#include "sandbox/src/dep.h"
 
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/eat_resolver.cc b/sandbox/src/eat_resolver.cc
index 8e81820..f057006 100644
--- a/sandbox/win/src/eat_resolver.cc
+++ b/sandbox/src/eat_resolver.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 "sandbox/win/src/eat_resolver.h"
+#include "sandbox/src/eat_resolver.h"
 
 #include "base/win/pe_image.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/eat_resolver.h b/sandbox/src/eat_resolver.h
index 5e4b6e8..0d5b3e0 100644
--- a/sandbox/win/src/eat_resolver.h
+++ b/sandbox/src/eat_resolver.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_EAT_RESOLVER_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/resolver.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/resolver.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/file_policy_test.cc b/sandbox/src/file_policy_test.cc
index ef33101..df1e903 100644
--- a/sandbox/win/src/file_policy_test.cc
+++ b/sandbox/src/file_policy_test.cc
@@ -9,13 +9,13 @@
 #include <winioctl.h>
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/win_utils.h"
-#include "sandbox/win/tests/common/controller.h"
-#include "sandbox/win/tests/common/test_utils.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/win_utils.h"
+#include "sandbox/tests/common/controller.h"
+#include "sandbox/tests/common/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define BINDNTDLL(name) \
diff --git a/sandbox/win/src/filesystem_dispatcher.cc b/sandbox/src/filesystem_dispatcher.cc
index 22240ff..71a6f02 100644
--- a/sandbox/win/src/filesystem_dispatcher.cc
+++ b/sandbox/src/filesystem_dispatcher.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/filesystem_dispatcher.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/filesystem_interception.h"
-#include "sandbox/win/src/filesystem_policy.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/filesystem_dispatcher.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/filesystem_interception.h"
+#include "sandbox/src/filesystem_policy.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/filesystem_dispatcher.h b/sandbox/src/filesystem_dispatcher.h
index b0d9a7a..d828715 100644
--- a/sandbox/win/src/filesystem_dispatcher.h
+++ b/sandbox/src/filesystem_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_FILESYSTEM_DISPATCHER_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/filesystem_interception.cc b/sandbox/src/filesystem_interception.cc
index 33688f0..cdc10ff 100644
--- a/sandbox/win/src/filesystem_interception.cc
+++ b/sandbox/src/filesystem_interception.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 "sandbox/win/src/filesystem_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/filesystem_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/filesystem_interception.h b/sandbox/src/filesystem_interception.h
index 2fafb44..d8d9e58 100644
--- a/sandbox/win/src/filesystem_interception.h
+++ b/sandbox/src/filesystem_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_FILESYSTEM_INTERCEPTION_H__
 #define SANDBOX_SRC_FILESYSTEM_INTERCEPTION_H__
diff --git a/sandbox/win/src/filesystem_policy.cc b/sandbox/src/filesystem_policy.cc
index b3eddab..385f4ae 100644
--- a/sandbox/win/src/filesystem_policy.cc
+++ b/sandbox/src/filesystem_policy.cc
@@ -4,16 +4,16 @@
 
 #include <string>
 
-#include "sandbox/win/src/filesystem_policy.h"
+#include "sandbox/src/filesystem_policy.h"
 
 #include "base/logging.h"
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/filesystem_policy.h b/sandbox/src/filesystem_policy.h
index bcedb63..5010a9f 100644
--- a/sandbox/win/src/filesystem_policy.h
+++ b/sandbox/src/filesystem_policy.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_closer.cc b/sandbox/src/handle_closer.cc
index fc72835..d79f2c1 100644
--- a/sandbox/win/src/handle_closer.cc
+++ b/sandbox/src/handle_closer.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 "sandbox/win/src/handle_closer.h"
+#include "sandbox/src/handle_closer.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/internal_types.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/process_thread_interception.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/internal_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/process_thread_interception.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/handle_closer.h b/sandbox/src/handle_closer.h
index b43e50f..f680169 100644
--- a/sandbox/win/src/handle_closer.h
+++ b/sandbox/src/handle_closer.h
@@ -10,9 +10,9 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/target_process.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/target_process.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/src/handle_closer_agent.cc
index be262e8..2b5ac97 100644
--- a/sandbox/win/src/handle_closer_agent.cc
+++ b/sandbox/src/handle_closer_agent.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 "sandbox/win/src/handle_closer_agent.h"
+#include "sandbox/src/handle_closer_agent.h"
 
 #include "base/logging.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/handle_closer_agent.h b/sandbox/src/handle_closer_agent.h
index 602f327..c74987c 100644
--- a/sandbox/win/src/handle_closer_agent.h
+++ b/sandbox/src/handle_closer_agent.h
@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "sandbox/win/src/handle_closer.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/handle_closer.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_closer_test.cc b/sandbox/src/handle_closer_test.cc
index b35ff5e..81b6db2 100644
--- a/sandbox/win/src/handle_closer_test.cc
+++ b/sandbox/src/handle_closer_test.cc
@@ -4,11 +4,11 @@
 
 #include "base/stringprintf.h"
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/handle_closer_agent.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/target_services.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/handle_closer_agent.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/target_services.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/sandbox/win/src/handle_dispatcher.cc b/sandbox/src/handle_dispatcher.cc
index 26b8fc3..7a18cee 100644
--- a/sandbox/win/src/handle_dispatcher.cc
+++ b/sandbox/src/handle_dispatcher.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/handle_dispatcher.h"
+#include "sandbox/src/handle_dispatcher.h"
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/handle_interception.h"
-#include "sandbox/win/src/handle_policy.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sandbox_utils.h"
+#include "sandbox/src/handle_interception.h"
+#include "sandbox/src/handle_policy.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sandbox_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_dispatcher.h b/sandbox/src/handle_dispatcher.h
index a3dc6cf..c1abc28 100644
--- a/sandbox/win/src/handle_dispatcher.h
+++ b/sandbox/src/handle_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_HANDLE_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_interception.cc b/sandbox/src/handle_interception.cc
index af0bebc..0f7b9f8 100644
--- a/sandbox/win/src/handle_interception.cc
+++ b/sandbox/src/handle_interception.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 "sandbox/win/src/handle_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/handle_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_interception.h b/sandbox/src/handle_interception.h
index 6f60811..543c7ba 100644
--- a/sandbox/win/src/handle_interception.h
+++ b/sandbox/src/handle_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_HANDLE_INTERCEPTION_H_
 #define SANDBOX_SRC_HANDLE_INTERCEPTION_H_
diff --git a/sandbox/win/src/handle_policy.cc b/sandbox/src/handle_policy.cc
index eeeea7b..355dda8 100644
--- a/sandbox/win/src/handle_policy.cc
+++ b/sandbox/src/handle_policy.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 "sandbox/win/src/handle_policy.h"
+#include "sandbox/src/handle_policy.h"
 
 #include <string>
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/broker_services.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sandbox_utils.h"
+#include "sandbox/src/broker_services.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sandbox_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_policy.h b/sandbox/src/handle_policy.h
index d91a039..c3b7156 100644
--- a/sandbox/win/src/handle_policy.h
+++ b/sandbox/src/handle_policy.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/handle_policy_test.cc b/sandbox/src/handle_policy_test.cc
index 65efbc85..05eb39b 100644
--- a/sandbox/win/src/handle_policy_test.cc
+++ b/sandbox/src/handle_policy_test.cc
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "base/stringprintf.h"
-#include "sandbox/win/src/handle_policy.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/win_utils.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/handle_policy.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/win_utils.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/handle_table.cc b/sandbox/src/handle_table.cc
index a497f74..c7fcf0a 100644
--- a/sandbox/win/src/handle_table.cc
+++ b/sandbox/src/handle_table.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 "sandbox/win/src/handle_table.h"
+#include "sandbox/src/handle_table.h"
 
 #include <algorithm>
 #include <cstdlib>
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/handle_table.h b/sandbox/src/handle_table.h
index acdc88d..e2b2615 100644
--- a/sandbox/win/src/handle_table.h
+++ b/sandbox/src/handle_table.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/integrity_level_test.cc b/sandbox/src/integrity_level_test.cc
index 67ea9de..c6e0b64 100644
--- a/sandbox/win/src/integrity_level_test.cc
+++ b/sandbox/src/integrity_level_test.cc
@@ -7,10 +7,10 @@
 
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/interception.cc b/sandbox/src/interception.cc
index 929b621..a850c6e 100644
--- a/sandbox/win/src/interception.cc
+++ b/sandbox/src/interception.cc
@@ -7,20 +7,20 @@
 
 #include <set>
 
-#include "sandbox/win/src/interception.h"
+#include "sandbox/src/interception.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/interception_internal.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/service_resolver.h"
-#include "sandbox/win/src/target_interceptions.h"
-#include "sandbox/win/src/target_process.h"
-#include "sandbox/win/src/wow64.h"
+#include "sandbox/src/interception_internal.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/service_resolver.h"
+#include "sandbox/src/target_interceptions.h"
+#include "sandbox/src/target_process.h"
+#include "sandbox/src/wow64.h"
 
 namespace {
 
diff --git a/sandbox/win/src/interception.h b/sandbox/src/interception.h
index 02fc592..c02b0ff 100644
--- a/sandbox/win/src/interception.h
+++ b/sandbox/src/interception.h
@@ -14,7 +14,7 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/interception_agent.cc b/sandbox/src/interception_agent.cc
index b2a66c4..b40364f 100644
--- a/sandbox/win/src/interception_agent.cc
+++ b/sandbox/src/interception_agent.cc
@@ -5,13 +5,13 @@
 // For information about interceptions as a whole see
 // http://dev.chromium.org/developers/design-documents/sandbox .
 
-#include "sandbox/win/src/interception_agent.h"
+#include "sandbox/src/interception_agent.h"
 
-#include "sandbox/win/src/interception_internal.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/eat_resolver.h"
-#include "sandbox/win/src/sidestep_resolver.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/interception_internal.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/eat_resolver.h"
+#include "sandbox/src/sidestep_resolver.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace {
 
diff --git a/sandbox/win/src/interception_agent.h b/sandbox/src/interception_agent.h
index 2762c61..10679dd 100644
--- a/sandbox/win/src/interception_agent.h
+++ b/sandbox/src/interception_agent.h
@@ -10,8 +10,8 @@
 #define SANDBOX_SRC_INTERCEPTION_AGENT_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/interception_internal.h b/sandbox/src/interception_internal.h
index 810478a..f3c401c 100644
--- a/sandbox/win/src/interception_internal.h
+++ b/sandbox/src/interception_internal.h
@@ -9,7 +9,7 @@
 #ifndef SANDBOX_SRC_INTERCEPTION_INTERNAL_H_
 #define SANDBOX_SRC_INTERCEPTION_INTERNAL_H_
 
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/interception_unittest.cc b/sandbox/src/interception_unittest.cc
index cc76767..a0dd98d 100644
--- a/sandbox/win/src/interception_unittest.cc
+++ b/sandbox/src/interception_unittest.cc
@@ -9,10 +9,10 @@
 #include <windows.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/interception_internal.h"
-#include "sandbox/win/src/target_process.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/interception_internal.h"
+#include "sandbox/src/target_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/interceptors.h b/sandbox/src/interceptors.h
index 43126d0..67b0900 100644
--- a/sandbox/win/src/interceptors.h
+++ b/sandbox/src/interceptors.h
@@ -6,7 +6,7 @@
 #define SANDBOX_SRC_INTERCEPTORS_H_
 
 #if defined(_WIN64)
-#include "sandbox/win/src/interceptors_64.h"
+#include "sandbox/src/interceptors_64.h"
 #endif
 
 namespace sandbox {
diff --git a/sandbox/win/src/interceptors_64.cc b/sandbox/src/interceptors_64.cc
index 30843fd..c068010 100644
--- a/sandbox/win/src/interceptors_64.cc
+++ b/sandbox/src/interceptors_64.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/interceptors_64.h"
-
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/filesystem_interception.h"
-#include "sandbox/win/src/named_pipe_interception.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/process_thread_interception.h"
-#include "sandbox/win/src/registry_interception.h"
-#include "sandbox/win/src/sandbox_nt_types.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sync_interception.h"
-#include "sandbox/win/src/target_interceptions.h"
+#include "sandbox/src/interceptors_64.h"
+
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/filesystem_interception.h"
+#include "sandbox/src/named_pipe_interception.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/process_thread_interception.h"
+#include "sandbox/src/registry_interception.h"
+#include "sandbox/src/sandbox_nt_types.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sync_interception.h"
+#include "sandbox/src/target_interceptions.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/interceptors_64.h b/sandbox/src/interceptors_64.h
index 87c1c50..50355a0 100644
--- a/sandbox/win/src/interceptors_64.h
+++ b/sandbox/src/interceptors_64.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_INTERCEPTORS_64_H_
 #define SANDBOX_SRC_INTERCEPTORS_64_H_
diff --git a/sandbox/win/src/internal_types.h b/sandbox/src/internal_types.h
index db969aa..db969aa 100644
--- a/sandbox/win/src/internal_types.h
+++ b/sandbox/src/internal_types.h
diff --git a/sandbox/win/src/ipc_ping_test.cc b/sandbox/src/ipc_ping_test.cc
index 64e3de6..410fd6a 100644
--- a/sandbox/win/src/ipc_ping_test.cc
+++ b/sandbox/src/ipc_ping_test.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/target_services.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/target_services.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/ipc_tags.h b/sandbox/src/ipc_tags.h
index 4e3a806..4e3a806 100644
--- a/sandbox/win/src/ipc_tags.h
+++ b/sandbox/src/ipc_tags.h
diff --git a/sandbox/win/src/ipc_unittest.cc b/sandbox/src/ipc_unittest.cc
index daca7bb..e1fb7c1 100644
--- a/sandbox/win/src/ipc_unittest.cc
+++ b/sandbox/src/ipc_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sharedmem_ipc_server.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/sharedmem_ipc_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/job.cc b/sandbox/src/job.cc
index 060ffa52..8ed3a77 100644
--- a/sandbox/win/src/job.cc
+++ b/sandbox/src/job.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 "sandbox/win/src/job.h"
+#include "sandbox/src/job.h"
 
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/restricted_token.h"
+#include "sandbox/src/restricted_token.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/job.h b/sandbox/src/job.h
index 487722f..a3f6738 100644
--- a/sandbox/win/src/job.h
+++ b/sandbox/src/job.h
@@ -6,7 +6,7 @@
 #define SANDBOX_SRC_JOB_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/restricted_token_utils.h"
+#include "sandbox/src/restricted_token_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/job_unittest.cc b/sandbox/src/job_unittest.cc
index 8d84b78..f386f1f 100644
--- a/sandbox/win/src/job_unittest.cc
+++ b/sandbox/src/job_unittest.cc
@@ -5,7 +5,7 @@
 // This file contains unit tests for the job object.
 
 #include "base/win/scoped_process_information.h"
-#include "sandbox/win/src/job.h"
+#include "sandbox/src/job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/named_pipe_dispatcher.cc b/sandbox/src/named_pipe_dispatcher.cc
index aae1096..0569784 100644
--- a/sandbox/win/src/named_pipe_dispatcher.cc
+++ b/sandbox/src/named_pipe_dispatcher.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/named_pipe_dispatcher.h"
+#include "sandbox/src/named_pipe_dispatcher.h"
 
 #include "base/basictypes.h"
 
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/named_pipe_interception.h"
-#include "sandbox/win/src/named_pipe_policy.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/named_pipe_interception.h"
+#include "sandbox/src/named_pipe_policy.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox.h"
 
 
 namespace sandbox {
diff --git a/sandbox/win/src/named_pipe_dispatcher.h b/sandbox/src/named_pipe_dispatcher.h
index 0d03b2e..87a68b6 100644
--- a/sandbox/win/src/named_pipe_dispatcher.h
+++ b/sandbox/src/named_pipe_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_NAMED_PIPE_DISPATCHER_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/named_pipe_interception.cc b/sandbox/src/named_pipe_interception.cc
index f437b1c..4599441 100644
--- a/sandbox/win/src/named_pipe_interception.cc
+++ b/sandbox/src/named_pipe_interception.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 "sandbox/win/src/named_pipe_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/named_pipe_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/named_pipe_interception.h b/sandbox/src/named_pipe_interception.h
index fdbee19..5e2b334 100644
--- a/sandbox/win/src/named_pipe_interception.h
+++ b/sandbox/src/named_pipe_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_NAMED_PIPE_INTERCEPTION_H__
 #define SANDBOX_SRC_NAMED_PIPE_INTERCEPTION_H__
diff --git a/sandbox/win/src/named_pipe_policy.cc b/sandbox/src/named_pipe_policy.cc
index 470e823..00182cf 100644
--- a/sandbox/win/src/named_pipe_policy.cc
+++ b/sandbox/src/named_pipe_policy.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 "sandbox/win/src/named_pipe_policy.h"
+#include "sandbox/src/named_pipe_policy.h"
 
 #include <string>
 
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace {
 
diff --git a/sandbox/win/src/named_pipe_policy.h b/sandbox/src/named_pipe_policy.h
index 1ba07b8..2b6b09d 100644
--- a/sandbox/win/src/named_pipe_policy.h
+++ b/sandbox/src/named_pipe_policy.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/named_pipe_policy_test.cc b/sandbox/src/named_pipe_policy_test.cc
index b89a191..11ddbc3 100644
--- a/sandbox/win/src/named_pipe_policy_test.cc
+++ b/sandbox/src/named_pipe_policy_test.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/nt_internals.h b/sandbox/src/nt_internals.h
index fe4fcd6..fe4fcd6 100644
--- a/sandbox/win/src/nt_internals.h
+++ b/sandbox/src/nt_internals.h
diff --git a/sandbox/win/src/policy_broker.cc b/sandbox/src/policy_broker.cc
index 210eb47..61c64c6 100644
--- a/sandbox/win/src/policy_broker.cc
+++ b/sandbox/src/policy_broker.cc
@@ -4,20 +4,20 @@
 
 #include <map>
 
-#include "sandbox/win/src/policy_broker.h"
+#include "sandbox/src/policy_broker.h"
 
 #include "base/logging.h"
 #include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/process_thread_interception.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_types.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/target_process.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/process_thread_interception.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_nt_types.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/target_process.h"
 
 // This code executes on the broker side, as a callback from the policy on the
 // target side (the child).
diff --git a/sandbox/win/src/policy_broker.h b/sandbox/src/policy_broker.h
index 1c5cc26..fd2602a 100644
--- a/sandbox/win/src/policy_broker.h
+++ b/sandbox/src/policy_broker.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_SRC_POLICY_BROKER_H_
 #define SANDBOX_SRC_POLICY_BROKER_H_
 
-#include "sandbox/win/src/interception.h"
+#include "sandbox/src/interception.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/policy_engine_opcodes.cc b/sandbox/src/policy_engine_opcodes.cc
index e8a39ed..8d9ceef 100644
--- a/sandbox/win/src/policy_engine_opcodes.cc
+++ b/sandbox/src/policy_engine_opcodes.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 "sandbox/win/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_engine_opcodes.h"
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/sandbox_nt_types.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_nt_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace {
 const unsigned short kMaxUniStrSize = 0xfffc;
diff --git a/sandbox/win/src/policy_engine_opcodes.h b/sandbox/src/policy_engine_opcodes.h
index f74ce31..6821413 100644
--- a/sandbox/win/src/policy_engine_opcodes.h
+++ b/sandbox/src/policy_engine_opcodes.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_SRC_POLICY_ENGINE_OPCODES_H__
 #define SANDBOX_SRC_POLICY_ENGINE_OPCODES_H__
 
-#include "sandbox/win/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_params.h"
 #include "base/basictypes.h"
 
 // The low-level policy is implemented using the concept of policy 'opcodes'.
diff --git a/sandbox/win/src/policy_engine_params.h b/sandbox/src/policy_engine_params.h
index a1566f3..ecf454f 100644
--- a/sandbox/win/src/policy_engine_params.h
+++ b/sandbox/src/policy_engine_params.h
@@ -6,9 +6,9 @@
 #define SANDBOX_SRC_POLICY_ENGINE_PARAMS_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/internal_types.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/internal_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 // This header defines the classes that allow the low level policy to select
 // the input parameters. In order to better make sense of this header is
diff --git a/sandbox/win/src/policy_engine_processor.cc b/sandbox/src/policy_engine_processor.cc
index a35eabf..d0455d0 100644
--- a/sandbox/win/src/policy_engine_processor.cc
+++ b/sandbox/src/policy_engine_processor.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 "sandbox/win/src/policy_engine_processor.h"
+#include "sandbox/src/policy_engine_processor.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/policy_engine_processor.h b/sandbox/src/policy_engine_processor.h
index 85c999e..3327e36 100644
--- a/sandbox/win/src/policy_engine_processor.h
+++ b/sandbox/src/policy_engine_processor.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_POLICY_ENGINE_PROCESSOR_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_opcodes.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/policy_engine_unittest.cc b/sandbox/src/policy_engine_unittest.cc
index e6c3435..f988ccc 100644
--- a/sandbox/win/src/policy_engine_unittest.cc
+++ b/sandbox/src/policy_engine_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/policy_engine_processor.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_processor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define POLPARAMS_BEGIN(x) sandbox::ParameterSet x[] = {
diff --git a/sandbox/win/src/policy_low_level.cc b/sandbox/src/policy_low_level.cc
index 8431bc0..401f2e1 100644
--- a/sandbox/win/src/policy_low_level.cc
+++ b/sandbox/src/policy_low_level.cc
@@ -5,7 +5,7 @@
 #include <string>
 #include <map>
 
-#include "sandbox/win/src/policy_low_level.h"
+#include "sandbox/src/policy_low_level.h"
 #include "base/basictypes.h"
 
 namespace {
diff --git a/sandbox/win/src/policy_low_level.h b/sandbox/src/policy_low_level.h
index 025a133..5bf6a46 100644
--- a/sandbox/win/src/policy_low_level.h
+++ b/sandbox/src/policy_low_level.h
@@ -8,9 +8,9 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_opcodes.h"
 
 // Low level policy classes.
 // Built on top of the PolicyOpcode and OpcodeFatory, the low level policy
diff --git a/sandbox/win/src/policy_low_level_unittest.cc b/sandbox/src/policy_low_level_unittest.cc
index 4a2cf4b..20d1777 100644
--- a/sandbox/win/src/policy_low_level_unittest.cc
+++ b/sandbox/src/policy_low_level_unittest.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 "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/policy_engine_processor.h"
-#include "sandbox/win/src/policy_low_level.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_processor.h"
+#include "sandbox/src/policy_low_level.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define POLPARAMS_BEGIN(x) sandbox::ParameterSet x[] = {
diff --git a/sandbox/win/src/policy_opcodes_unittest.cc b/sandbox/src/policy_opcodes_unittest.cc
index e1a7ad6..37ccd80 100644
--- a/sandbox/win/src/policy_opcodes_unittest.cc
+++ b/sandbox/src/policy_opcodes_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sandbox_nt_types.h"
-#include "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sandbox_nt_types.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_opcodes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
diff --git a/sandbox/win/src/policy_params.h b/sandbox/src/policy_params.h
index 686d08f..e1fb3fc 100644
--- a/sandbox/win/src/policy_params.h
+++ b/sandbox/src/policy_params.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_SRC_POLICY_PARAMS_H__
 #define SANDBOX_SRC_POLICY_PARAMS_H__
 
-#include "sandbox/win/src/policy_engine_params.h"
+#include "sandbox/src/policy_engine_params.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/policy_target.cc b/sandbox/src/policy_target.cc
index 84b7203..aa69892 100644
--- a/sandbox/win/src/policy_target.cc
+++ b/sandbox/src/policy_target.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 "sandbox/win/src/policy_target.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_processor.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/policy_target.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_processor.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/policy_target.h b/sandbox/src/policy_target.h
index 8a2b437..4a77b47 100644
--- a/sandbox/win/src/policy_target.h
+++ b/sandbox/src/policy_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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_POLICY_TARGET_H__
 #define SANDBOX_SRC_POLICY_TARGET_H__
diff --git a/sandbox/win/src/policy_target_test.cc b/sandbox/src/policy_target_test.cc
index ee28260..aef7548 100644
--- a/sandbox/win/src/policy_target_test.cc
+++ b/sandbox/src/policy_target_test.cc
@@ -4,11 +4,11 @@
 
 #include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/target_services.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/target_services.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/process_policy_test.cc b/sandbox/src/process_policy_test.cc
index 5e78a8a..783446e 100644
--- a/sandbox/win/src/process_policy_test.cc
+++ b/sandbox/src/process_policy_test.cc
@@ -8,10 +8,10 @@
 #include "base/sys_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/sandbox/win/src/process_thread_dispatcher.cc b/sandbox/src/process_thread_dispatcher.cc
index 2df203a..cc137a5 100644
--- a/sandbox/win/src/process_thread_dispatcher.cc
+++ b/sandbox/src/process_thread_dispatcher.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/process_thread_dispatcher.h"
+#include "sandbox/src/process_thread_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/process_thread_interception.h"
-#include "sandbox/win/src/process_thread_policy.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/process_thread_interception.h"
+#include "sandbox/src/process_thread_policy.h"
+#include "sandbox/src/sandbox.h"
 
 namespace {
 
diff --git a/sandbox/win/src/process_thread_dispatcher.h b/sandbox/src/process_thread_dispatcher.h
index 1cc5743..45fad03 100644
--- a/sandbox/win/src/process_thread_dispatcher.h
+++ b/sandbox/src/process_thread_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_PROCESS_THREAD_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/process_thread_interception.cc b/sandbox/src/process_thread_interception.cc
index cb1017b..e847908 100644
--- a/sandbox/win/src/process_thread_interception.cc
+++ b/sandbox/src/process_thread_interception.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 "sandbox/win/src/process_thread_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/process_thread_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/process_thread_interception.h b/sandbox/src/process_thread_interception.h
index 7d2d533..37c2c14 100644
--- a/sandbox/win/src/process_thread_interception.h
+++ b/sandbox/src/process_thread_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_PROCESS_THREAD_INTERCEPTION_H__
 #define SANDBOX_SRC_PROCESS_THREAD_INTERCEPTION_H__
diff --git a/sandbox/win/src/process_thread_policy.cc b/sandbox/src/process_thread_policy.cc
index 9493b9e..ca00916 100644
--- a/sandbox/win/src/process_thread_policy.cc
+++ b/sandbox/src/process_thread_policy.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 "sandbox/win/src/process_thread_policy.h"
+#include "sandbox/src/process_thread_policy.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/process_thread_policy.h b/sandbox/src/process_thread_policy.h
index c35c52b5..78323cc 100644
--- a/sandbox/win/src/process_thread_policy.h
+++ b/sandbox/src/process_thread_policy.h
@@ -7,11 +7,11 @@
 
 #include <string>
 
-#include "sandbox/win/src/policy_low_level.h"
+#include "sandbox/src/policy_low_level.h"
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/registry_dispatcher.cc b/sandbox/src/registry_dispatcher.cc
index f4dc5f5..f86c76a 100644
--- a/sandbox/win/src/registry_dispatcher.cc
+++ b/sandbox/src/registry_dispatcher.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 "sandbox/win/src/registry_dispatcher.h"
+#include "sandbox/src/registry_dispatcher.h"
 
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/registry_interception.h"
-#include "sandbox/win/src/registry_policy.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/registry_interception.h"
+#include "sandbox/src/registry_policy.h"
 
 namespace {
 
diff --git a/sandbox/win/src/registry_dispatcher.h b/sandbox/src/registry_dispatcher.h
index 782a070..6d1390d 100644
--- a/sandbox/win/src/registry_dispatcher.h
+++ b/sandbox/src/registry_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_REGISTRY_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/registry_interception.cc b/sandbox/src/registry_interception.cc
index 936d4ac..3cabf47 100644
--- a/sandbox/win/src/registry_interception.cc
+++ b/sandbox/src/registry_interception.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 "sandbox/win/src/registry_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/registry_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/registry_interception.h b/sandbox/src/registry_interception.h
index c3cbde0..7036c49 100644
--- a/sandbox/win/src/registry_interception.h
+++ b/sandbox/src/registry_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_REGISTRY_INTERCEPTION_H__
 #define SANDBOX_SRC_REGISTRY_INTERCEPTION_H__
diff --git a/sandbox/win/src/registry_policy.cc b/sandbox/src/registry_policy.cc
index 55f3bcd..497636f 100644
--- a/sandbox/win/src/registry_policy.cc
+++ b/sandbox/src/registry_policy.cc
@@ -4,15 +4,15 @@
 
 #include <string>
 
-#include "sandbox/win/src/registry_policy.h"
+#include "sandbox/src/registry_policy.h"
 
 #include "base/logging.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/src/registry_policy.h b/sandbox/src/registry_policy.h
index 8badde2..da41d1c 100644
--- a/sandbox/win/src/registry_policy.h
+++ b/sandbox/src/registry_policy.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/registry_policy_test.cc b/sandbox/src/registry_policy_test.cc
index d8ee34b..cdc1577 100644
--- a/sandbox/win/src/registry_policy_test.cc
+++ b/sandbox/src/registry_policy_test.cc
@@ -5,13 +5,13 @@
 #include <shlobj.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/src/registry_policy.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/win_utils.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/registry_policy.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/win_utils.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace {
 
diff --git a/sandbox/win/src/resolver.cc b/sandbox/src/resolver.cc
index 6616fa5..295bfb2 100644
--- a/sandbox/win/src/resolver.cc
+++ b/sandbox/src/resolver.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 "sandbox/win/src/resolver.h"
+#include "sandbox/src/resolver.h"
 
 #include "base/win/pe_image.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/resolver.h b/sandbox/src/resolver.h
index 85f1e91..7ec0bf5 100644
--- a/sandbox/win/src/resolver.h
+++ b/sandbox/src/resolver.h
@@ -7,7 +7,7 @@
 // http://dev.chromium.org/developers/design-documents/sandbox .
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/nt_internals.h"
 
 #ifndef SANDBOX_SRC_RESOLVER_H__
 #define SANDBOX_SRC_RESOLVER_H__
diff --git a/sandbox/win/src/resolver_32.cc b/sandbox/src/resolver_32.cc
index e5d7be3..ae5c168 100644
--- a/sandbox/win/src/resolver_32.cc
+++ b/sandbox/src/resolver_32.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 "sandbox/win/src/resolver.h"
+#include "sandbox/src/resolver.h"
 
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace {
 
diff --git a/sandbox/win/src/resolver_64.cc b/sandbox/src/resolver_64.cc
index ca58b20..96d039b 100644
--- a/sandbox/win/src/resolver_64.cc
+++ b/sandbox/src/resolver_64.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 "sandbox/win/src/resolver.h"
+#include "sandbox/src/resolver.h"
 
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace {
 
diff --git a/sandbox/win/src/restricted_token.cc b/sandbox/src/restricted_token.cc
index 8a096a1..bac8816 100644
--- a/sandbox/win/src/restricted_token.cc
+++ b/sandbox/src/restricted_token.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 "sandbox/win/src/restricted_token.h"
+#include "sandbox/src/restricted_token.h"
 
 #include <vector>
 
 #include "base/logging.h"
-#include "sandbox/win/src/acl.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/acl.h"
+#include "sandbox/src/win_utils.h"
 
 
 namespace sandbox {
diff --git a/sandbox/win/src/restricted_token.h b/sandbox/src/restricted_token.h
index 4327856..88bd70f 100644
--- a/sandbox/win/src/restricted_token.h
+++ b/sandbox/src/restricted_token.h
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/src/security_level.h"
-#include "sandbox/win/src/sid.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/src/security_level.h"
+#include "sandbox/src/sid.h"
 
 // Flags present in the Group SID list. These 2 flags are new in Windows Vista
 #ifndef SE_GROUP_INTEGRITY
diff --git a/sandbox/win/src/restricted_token_unittest.cc b/sandbox/src/restricted_token_unittest.cc
index df35f1c..310b73f 100644
--- a/sandbox/win/src/restricted_token_unittest.cc
+++ b/sandbox/src/restricted_token_unittest.cc
@@ -8,8 +8,8 @@
 #include <atlbase.h>
 #include <atlsecurity.h>
 #include <vector>
-#include "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/sid.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/sid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/restricted_token_utils.cc b/sandbox/src/restricted_token_utils.cc
index 5f1a246..df30b40 100644
--- a/sandbox/win/src/restricted_token_utils.cc
+++ b/sandbox/src/restricted_token_utils.cc
@@ -6,16 +6,16 @@
 #include <sddl.h>
 #include <vector>
 
-#include "sandbox/win/src/restricted_token_utils.h"
+#include "sandbox/src/restricted_token_utils.h"
 
 #include "base/logging.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/job.h"
-#include "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/security_level.h"
-#include "sandbox/win/src/sid.h"
+#include "sandbox/src/job.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/security_level.h"
+#include "sandbox/src/sid.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/restricted_token_utils.h b/sandbox/src/restricted_token_utils.h
index f2a280a..0aade8b 100644
--- a/sandbox/win/src/restricted_token_utils.h
+++ b/sandbox/src/restricted_token_utils.h
@@ -8,8 +8,8 @@
 #include <accctrl.h>
 #include <windows.h>
 
-#include "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/security_level.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/security_level.h"
 
 // Contains the utility functions to be able to create restricted tokens based
 // on a security profiles.
diff --git a/sandbox/win/src/sandbox.cc b/sandbox/src/sandbox.cc
index 3344ba4..f70c702 100644
--- a/sandbox/win/src/sandbox.cc
+++ b/sandbox/src/sandbox.cc
@@ -4,10 +4,10 @@
 
 #include <stdio.h>
 #include <windows.h>
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/broker_services.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/broker_services.h"
+#include "sandbox/src/target_services.h"
 
 #if defined(_WIN64) && !defined(NACL_WIN64)
 // We allow building this code for Win64 as part of NaCl to enable development
diff --git a/sandbox/win/src/sandbox.h b/sandbox/src/sandbox.h
index ee4b7b0..18c05ce 100644
--- a/sandbox/win/src/sandbox.h
+++ b/sandbox/src/sandbox.h
@@ -22,8 +22,8 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_types.h"
 
 // sandbox: Google User-Land Application Sandbox
 namespace sandbox {
diff --git a/sandbox/win/src/sandbox.vcproj b/sandbox/src/sandbox.vcproj
index f206e01..f206e01 100644
--- a/sandbox/win/src/sandbox.vcproj
+++ b/sandbox/src/sandbox.vcproj
diff --git a/sandbox/win/src/sandbox_factory.h b/sandbox/src/sandbox_factory.h
index 7a0280f..b52bcb6 100644
--- a/sandbox/win/src/sandbox_factory.h
+++ b/sandbox/src/sandbox_factory.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_SRC_SANDBOX_FACTORY_H__
 #define SANDBOX_SRC_SANDBOX_FACTORY_H__
 
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 
 // SandboxFactory is a set of static methods to get access to the broker
 // or target services object. Only one of the two methods (GetBrokerServices,
diff --git a/sandbox/win/src/sandbox_nt_types.h b/sandbox/src/sandbox_nt_types.h
index 1303ac2..d0d24f8 100644
--- a/sandbox/win/src/sandbox_nt_types.h
+++ b/sandbox/src/sandbox_nt_types.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_SRC_SANDBOX_NT_TYPES_H__
 #define SANDBOX_SRC_SANDBOX_NT_TYPES_H__
 
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/src/sandbox_nt_util.cc
index 4c937bd..daa361a 100644
--- a/sandbox/win/src/sandbox_nt_util.cc
+++ b/sandbox/src/sandbox_nt_util.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 "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 #include "base/win/pe_image.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sandbox_nt_util.h b/sandbox/src/sandbox_nt_util.h
index 06538cd..7a82302 100644
--- a/sandbox/win/src/sandbox_nt_util.h
+++ b/sandbox/src/sandbox_nt_util.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_SANDBOX_NT_UTIL_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_nt_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_nt_types.h"
 
 // Placement new and delete to be used from ntdll interception code.
 void* __cdecl operator new(size_t size, sandbox::AllocationType type,
diff --git a/sandbox/win/src/sandbox_policy.h b/sandbox/src/sandbox_policy.h
index 566351a4..288adc45 100644
--- a/sandbox/win/src/sandbox_policy.h
+++ b/sandbox/src/sandbox_policy.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/security_level.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/security_level.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sandbox_policy_base.cc b/sandbox/src/sandbox_policy_base.cc
index 63e77d5..4438641 100644
--- a/sandbox/win/src/sandbox_policy_base.cc
+++ b/sandbox/src/sandbox_policy_base.cc
@@ -2,32 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/logging.h"
-#include "sandbox/win/src/filesystem_dispatcher.h"
-#include "sandbox/win/src/filesystem_policy.h"
-#include "sandbox/win/src/handle_dispatcher.h"
-#include "sandbox/win/src/handle_policy.h"
-#include "sandbox/win/src/job.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/named_pipe_dispatcher.h"
-#include "sandbox/win/src/named_pipe_policy.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_engine_processor.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/process_thread_dispatcher.h"
-#include "sandbox/win/src/process_thread_policy.h"
-#include "sandbox/win/src/registry_dispatcher.h"
-#include "sandbox/win/src/registry_policy.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sync_dispatcher.h"
-#include "sandbox/win/src/sync_policy.h"
-#include "sandbox/win/src/target_process.h"
-#include "sandbox/win/src/window.h"
+#include "sandbox/src/filesystem_dispatcher.h"
+#include "sandbox/src/filesystem_policy.h"
+#include "sandbox/src/handle_dispatcher.h"
+#include "sandbox/src/handle_policy.h"
+#include "sandbox/src/job.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/named_pipe_dispatcher.h"
+#include "sandbox/src/named_pipe_policy.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_engine_processor.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/process_thread_dispatcher.h"
+#include "sandbox/src/process_thread_policy.h"
+#include "sandbox/src/registry_dispatcher.h"
+#include "sandbox/src/registry_policy.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sync_dispatcher.h"
+#include "sandbox/src/sync_policy.h"
+#include "sandbox/src/target_process.h"
+#include "sandbox/src/window.h"
 
 namespace {
 // The standard windows size for one memory page.
diff --git a/sandbox/win/src/sandbox_policy_base.h b/sandbox/src/sandbox_policy_base.h
index 8fdfe91..b3ea805 100644
--- a/sandbox/win/src/sandbox_policy_base.h
+++ b/sandbox/src/sandbox_policy_base.h
@@ -13,13 +13,13 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/handle_closer.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_engine_params.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/handle_closer.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_engine_params.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/win_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sandbox_types.h b/sandbox/src/sandbox_types.h
index ce9b767..ce9b767 100644
--- a/sandbox/win/src/sandbox_types.h
+++ b/sandbox/src/sandbox_types.h
diff --git a/sandbox/win/src/sandbox_utils.cc b/sandbox/src/sandbox_utils.cc
index 509c7c8..3bfa696 100644
--- a/sandbox/win/src/sandbox_utils.cc
+++ b/sandbox/src/sandbox_utils.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 "sandbox/win/src/sandbox_utils.h"
+#include "sandbox/src/sandbox_utils.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/internal_types.h"
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/internal_types.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sandbox_utils.h b/sandbox/src/sandbox_utils.h
index 8329698..314330f 100644
--- a/sandbox/win/src/sandbox_utils.h
+++ b/sandbox/src/sandbox_utils.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/security_level.h b/sandbox/src/security_level.h
index 467f96f..467f96f 100644
--- a/sandbox/win/src/security_level.h
+++ b/sandbox/src/security_level.h
diff --git a/sandbox/win/src/service_resolver.cc b/sandbox/src/service_resolver.cc
index bae698c..79579a0 100644
--- a/sandbox/win/src/service_resolver.cc
+++ b/sandbox/src/service_resolver.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 "sandbox/win/src/service_resolver.h"
+#include "sandbox/src/service_resolver.h"
 
 #include "base/logging.h"
 #include "base/win/pe_image.h"
diff --git a/sandbox/win/src/service_resolver.h b/sandbox/src/service_resolver.h
index 3eb9e08..99eadb6 100644
--- a/sandbox/win/src/service_resolver.h
+++ b/sandbox/src/service_resolver.h
@@ -5,8 +5,8 @@
 #ifndef SANDBOX_SRC_SERVICE_RESOLVER_H__
 #define SANDBOX_SRC_SERVICE_RESOLVER_H__
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/resolver.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/resolver.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/service_resolver_32.cc b/sandbox/src/service_resolver_32.cc
index d4d2048..2f5597b 100644
--- a/sandbox/win/src/service_resolver_32.cc
+++ b/sandbox/src/service_resolver_32.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 "sandbox/win/src/service_resolver.h"
+#include "sandbox/src/service_resolver.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 #pragma pack(push, 1)
diff --git a/sandbox/win/src/service_resolver_64.cc b/sandbox/src/service_resolver_64.cc
index b69d4d8..01e3b1a 100644
--- a/sandbox/win/src/service_resolver_64.cc
+++ b/sandbox/src/service_resolver_64.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 "sandbox/win/src/service_resolver.h"
+#include "sandbox/src/service_resolver.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/win_utils.h"
 
 namespace {
 #pragma pack(push, 1)
diff --git a/sandbox/win/src/service_resolver_unittest.cc b/sandbox/src/service_resolver_unittest.cc
index 8c44202..fc85c86 100644
--- a/sandbox/win/src/service_resolver_unittest.cc
+++ b/sandbox/src/service_resolver_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/resolver.h"
-#include "sandbox/win/src/sandbox_utils.h"
-#include "sandbox/win/src/service_resolver.h"
+#include "sandbox/src/resolver.h"
+#include "sandbox/src/sandbox_utils.h"
+#include "sandbox/src/service_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/sandbox/win/src/shared_handles.cc b/sandbox/src/shared_handles.cc
index 423b67b..d07f057 100644
--- a/sandbox/win/src/shared_handles.cc
+++ b/sandbox/src/shared_handles.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 "sandbox/win/src/shared_handles.h"
+#include "sandbox/src/shared_handles.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/shared_handles.h b/sandbox/src/shared_handles.h
index 2c76bfb..2c76bfb 100644
--- a/sandbox/win/src/shared_handles.h
+++ b/sandbox/src/shared_handles.h
diff --git a/sandbox/win/src/sharedmem_ipc_client.cc b/sandbox/src/sharedmem_ipc_client.cc
index a9eb01f..30c03b9 100644
--- a/sandbox/win/src/sharedmem_ipc_client.cc
+++ b/sandbox/src/sharedmem_ipc_client.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include <string.h>
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/crosscall_params.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/crosscall_params.h"
 #include "base/logging.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/sharedmem_ipc_client.h b/sandbox/src/sharedmem_ipc_client.h
index a0c5f2f..90d0022 100644
--- a/sandbox/win/src/sharedmem_ipc_client.h
+++ b/sandbox/src/sharedmem_ipc_client.h
@@ -5,8 +5,8 @@
 #ifndef SANDBOX_SRC_SHAREDMEM_IPC_CLIENT_H__
 #define SANDBOX_SRC_SHAREDMEM_IPC_CLIENT_H__
 
-#include "sandbox/win/src/crosscall_params.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/crosscall_params.h"
+#include "sandbox/src/sandbox.h"
 
 // IPC transport implementation that uses shared memory.
 // This is the client side
diff --git a/sandbox/win/src/sharedmem_ipc_server.cc b/sandbox/src/sharedmem_ipc_server.cc
index e2a30c72..ba90d1b 100644
--- a/sandbox/win/src/sharedmem_ipc_server.cc
+++ b/sandbox/src/sharedmem_ipc_server.cc
@@ -5,12 +5,12 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/sharedmem_ipc_server.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/crosscall_params.h"
-#include "sandbox/win/src/crosscall_server.h"
+#include "sandbox/src/sharedmem_ipc_server.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/crosscall_params.h"
+#include "sandbox/src/crosscall_server.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sharedmem_ipc_server.h b/sandbox/src/sharedmem_ipc_server.h
index 94d6959..7e10174 100644
--- a/sandbox/win/src/sharedmem_ipc_server.h
+++ b/sandbox/src/sharedmem_ipc_server.h
@@ -9,9 +9,9 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "sandbox/win/src/crosscall_params.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
+#include "sandbox/src/crosscall_params.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
 
 // IPC transport implementation that uses shared memory.
 // This is the server side
diff --git a/sandbox/win/src/sid.cc b/sandbox/src/sid.cc
index 261605d..6ed9963 100644
--- a/sandbox/win/src/sid.cc
+++ b/sandbox/src/sid.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 "sandbox/win/src/sid.h"
+#include "sandbox/src/sid.h"
 
 #include "base/logging.h"
 
diff --git a/sandbox/win/src/sid.h b/sandbox/src/sid.h
index 4656859..4656859 100644
--- a/sandbox/win/src/sid.h
+++ b/sandbox/src/sid.h
diff --git a/sandbox/win/src/sid_unittest.cc b/sandbox/src/sid_unittest.cc
index 76d61e8..f1ac60a 100644
--- a/sandbox/win/src/sid_unittest.cc
+++ b/sandbox/src/sid_unittest.cc
@@ -8,7 +8,7 @@
 #include <atlbase.h>
 #include <atlsecurity.h>
 
-#include "sandbox/win/src/sid.h"
+#include "sandbox/src/sid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/sidestep/ia32_modrm_map.cpp b/sandbox/src/sidestep/ia32_modrm_map.cpp
index 89bc189..b22ab1d 100644
--- a/sandbox/win/src/sidestep/ia32_modrm_map.cpp
+++ b/sandbox/src/sidestep/ia32_modrm_map.cpp
@@ -6,8 +6,8 @@
 // Based on information in the IA-32 Intel Architecture
 // Software Developer's Manual Volume 2: Instruction Set Reference.
 
-#include "sandbox/win/src/sidestep/mini_disassembler.h"
-#include "sandbox/win/src/sidestep/mini_disassembler_types.h"
+#include "sandbox/src/sidestep/mini_disassembler.h"
+#include "sandbox/src/sidestep/mini_disassembler_types.h"
 
 namespace sidestep {
 
diff --git a/sandbox/win/src/sidestep/ia32_opcode_map.cpp b/sandbox/src/sidestep/ia32_opcode_map.cpp
index b7d8a60..9f37cef 100644
--- a/sandbox/win/src/sidestep/ia32_opcode_map.cpp
+++ b/sandbox/src/sidestep/ia32_opcode_map.cpp
@@ -7,7 +7,7 @@
 // for how to lay out the tables in memory taken from the implementation
 // in the Bastard disassembly environment.
 
-#include "sandbox/win/src/sidestep/mini_disassembler.h"
+#include "sandbox/src/sidestep/mini_disassembler.h"
 
 namespace sidestep {
 
diff --git a/sandbox/win/src/sidestep/mini_disassembler.cpp b/sandbox/src/sidestep/mini_disassembler.cpp
index 1e8e0bd..514522a 100644
--- a/sandbox/win/src/sidestep/mini_disassembler.cpp
+++ b/sandbox/src/sidestep/mini_disassembler.cpp
@@ -8,7 +8,7 @@
 #error The code in this file should not be used on 64-bit Windows.
 #endif
 
-#include "sandbox/win/src/sidestep/mini_disassembler.h"
+#include "sandbox/src/sidestep/mini_disassembler.h"
 
 namespace sidestep {
 
diff --git a/sandbox/win/src/sidestep/mini_disassembler.h b/sandbox/src/sidestep/mini_disassembler.h
index 202c4ec..444df36 100644
--- a/sandbox/win/src/sidestep/mini_disassembler.h
+++ b/sandbox/src/sidestep/mini_disassembler.h
@@ -7,7 +7,7 @@
 #ifndef SANDBOX_SRC_SIDESTEP_MINI_DISASSEMBLER_H__
 #define SANDBOX_SRC_SIDESTEP_MINI_DISASSEMBLER_H__
 
-#include "sandbox/win/src/sidestep/mini_disassembler_types.h"
+#include "sandbox/src/sidestep/mini_disassembler_types.h"
 
 namespace sidestep {
 
diff --git a/sandbox/win/src/sidestep/mini_disassembler_types.h b/sandbox/src/sidestep/mini_disassembler_types.h
index 1c10626..1c10626 100644
--- a/sandbox/win/src/sidestep/mini_disassembler_types.h
+++ b/sandbox/src/sidestep/mini_disassembler_types.h
diff --git a/sandbox/win/src/sidestep/preamble_patcher.h b/sandbox/src/sidestep/preamble_patcher.h
index 18cf7f8..18cf7f8 100644
--- a/sandbox/win/src/sidestep/preamble_patcher.h
+++ b/sandbox/src/sidestep/preamble_patcher.h
diff --git a/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp b/sandbox/src/sidestep/preamble_patcher_with_stub.cpp
index 999d76b..4bdd79c2 100644
--- a/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp
+++ b/sandbox/src/sidestep/preamble_patcher_with_stub.cpp
@@ -4,10 +4,10 @@
 
 // Implementation of PreamblePatcher
 
-#include "sandbox/win/src/sidestep/preamble_patcher.h"
+#include "sandbox/src/sidestep/preamble_patcher.h"
 
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sidestep/mini_disassembler.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sidestep/mini_disassembler.h"
 
 // Definitions of assembly statements we need
 #define ASM_JMP32REL 0xE9
diff --git a/sandbox/win/src/sidestep_resolver.cc b/sandbox/src/sidestep_resolver.cc
index 47c0f56..e22ca6b 100644
--- a/sandbox/win/src/sidestep_resolver.cc
+++ b/sandbox/src/sidestep_resolver.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 "sandbox/win/src/sidestep_resolver.h"
+#include "sandbox/src/sidestep_resolver.h"
 
 #include "base/win/pe_image.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sidestep/preamble_patcher.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sidestep/preamble_patcher.h"
 
 namespace {
 
diff --git a/sandbox/win/src/sidestep_resolver.h b/sandbox/src/sidestep_resolver.h
index 30d8cb3..1e7fdac 100644
--- a/sandbox/win/src/sidestep_resolver.h
+++ b/sandbox/src/sidestep_resolver.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_SIDESTEP_RESOLVER_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/resolver.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/resolver.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_dispatcher.cc b/sandbox/src/sync_dispatcher.cc
index eb1c1e4..025fd96 100644
--- a/sandbox/win/src/sync_dispatcher.cc
+++ b/sandbox/src/sync_dispatcher.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 "sandbox/win/src/sync_dispatcher.h"
+#include "sandbox/src/sync_dispatcher.h"
 
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sync_interception.h"
-#include "sandbox/win/src/sync_policy.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/interception.h"
+#include "sandbox/src/interceptors.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_broker.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sync_interception.h"
+#include "sandbox/src/sync_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_dispatcher.h b/sandbox/src/sync_dispatcher.h
index 13c8b9d3..be9b9a2 100644
--- a/sandbox/win/src/sync_dispatcher.h
+++ b/sandbox/src/sync_dispatcher.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_SYNC_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_policy_base.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_interception.cc b/sandbox/src/sync_interception.cc
index d235723..4832c79 100644
--- a/sandbox/win/src/sync_interception.cc
+++ b/sandbox/src/sync_interception.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 "sandbox/win/src/sync_interception.h"
-
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/policy_target.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/sync_interception.h"
+
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/policy_target.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_interception.h b/sandbox/src/sync_interception.h
index 6c5c46e..4ac23e7 100644
--- a/sandbox/win/src/sync_interception.h
+++ b/sandbox/src/sync_interception.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_SYNC_INTERCEPTION_H__
 #define SANDBOX_SRC_SYNC_INTERCEPTION_H__
diff --git a/sandbox/win/src/sync_policy.cc b/sandbox/src/sync_policy.cc
index 926fc52..364cf73 100644
--- a/sandbox/win/src/sync_policy.cc
+++ b/sandbox/src/sync_policy.cc
@@ -4,14 +4,14 @@
 
 #include <string>
 
-#include "sandbox/win/src/sync_policy.h"
+#include "sandbox/src/sync_policy.h"
 
 #include "base/logging.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/policy_engine_opcodes.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sandbox_utils.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/policy_engine_opcodes.h"
+#include "sandbox/src/policy_params.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sandbox_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_policy.h b/sandbox/src/sync_policy.h
index 2b8b422..6404f79 100644
--- a/sandbox/win/src/sync_policy.h
+++ b/sandbox/src/sync_policy.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_policy.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_policy.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/sync_policy_test.cc b/sandbox/src/sync_policy_test.cc
index 6490175..3c87243 100644
--- a/sandbox/win/src/sync_policy_test.cc
+++ b/sandbox/src/sync_policy_test.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_policy.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/target_interceptions.cc b/sandbox/src/target_interceptions.cc
index e6b0dcf..a1d463b 100644
--- a/sandbox/win/src/target_interceptions.cc
+++ b/sandbox/src/target_interceptions.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 "sandbox/win/src/target_interceptions.h"
+#include "sandbox/src/target_interceptions.h"
 
-#include "sandbox/win/src/interception_agent.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/target_services.h"
+#include "sandbox/src/interception_agent.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_nt_util.h"
+#include "sandbox/src/target_services.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/target_interceptions.h b/sandbox/src/target_interceptions.h
index f4805fe..dd6e12c 100644
--- a/sandbox/win/src/target_interceptions.h
+++ b/sandbox/src/target_interceptions.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.
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/sandbox_types.h"
 
 #ifndef SANDBOX_SRC_TARGET_INTERCEPTIONS_H__
 #define SANDBOX_SRC_TARGET_INTERCEPTIONS_H__
diff --git a/sandbox/win/src/target_process.cc b/sandbox/src/target_process.cc
index 601d80b..88e2751 100644
--- a/sandbox/win/src/target_process.cc
+++ b/sandbox/src/target_process.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 "sandbox/win/src/target_process.h"
+#include "sandbox/src/target_process.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/policy_low_level.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sharedmem_ipc_server.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/policy_low_level.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sharedmem_ipc_server.h"
 
 namespace {
 
diff --git a/sandbox/win/src/target_process.h b/sandbox/src/target_process.h
index 311fa84..6e462c3 100644
--- a/sandbox/win/src/target_process.h
+++ b/sandbox/src/target_process.h
@@ -11,8 +11,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
-#include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/crosscall_server.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/target_services.cc b/sandbox/src/target_services.cc
index 495f108..e13a3d6 100644
--- a/sandbox/win/src/target_services.cc
+++ b/sandbox/src/target_services.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 "sandbox/win/src/target_services.h"
+#include "sandbox/src/target_services.h"
 
 #include <process.h>
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/handle_closer_agent.h"
-#include "sandbox/win/src/handle_interception.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/src/crosscall_client.h"
+#include "sandbox/src/handle_closer_agent.h"
+#include "sandbox/src/handle_interception.h"
+#include "sandbox/src/ipc_tags.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_types.h"
+#include "sandbox/src/sharedmem_ipc_client.h"
+#include "sandbox/src/sandbox_nt_util.h"
 
 namespace {
 
diff --git a/sandbox/win/src/target_services.h b/sandbox/src/target_services.h
index 70f173b..c4bf4f6 100644
--- a/sandbox/win/src/target_services.h
+++ b/sandbox/src/target_services.h
@@ -6,8 +6,8 @@
 #define SANDBOX_SRC_TARGET_SERVICES_H__
 
 #include "base/basictypes.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/win_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/threadpool_unittest.cc b/sandbox/src/threadpool_unittest.cc
index f439810..2c85b57 100644
--- a/sandbox/win/src/threadpool_unittest.cc
+++ b/sandbox/src/threadpool_unittest.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 "sandbox/win/src/win2k_threadpool.h"
+#include "sandbox/src/win2k_threadpool.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 void __stdcall EmptyCallBack(void*, unsigned char) {
diff --git a/sandbox/win/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc
index 620016c..2bce1b8 100644
--- a/sandbox/win/src/unload_dll_test.cc
+++ b/sandbox/src/unload_dll_test.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/target_services.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/target_services.h"
+#include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
diff --git a/sandbox/win/src/win2k_threadpool.cc b/sandbox/src/win2k_threadpool.cc
index 24cbacf..fe2473e 100644
--- a/sandbox/win/src/win2k_threadpool.cc
+++ b/sandbox/src/win2k_threadpool.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 "sandbox/win/src/win2k_threadpool.h"
+#include "sandbox/src/win2k_threadpool.h"
 
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/src/win_utils.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/win2k_threadpool.h b/sandbox/src/win2k_threadpool.h
index 0abb358..8593fa3 100644
--- a/sandbox/win/src/win2k_threadpool.h
+++ b/sandbox/src/win2k_threadpool.h
@@ -7,7 +7,7 @@
 
 #include <list>
 #include <algorithm>
-#include "sandbox/win/src/crosscall_server.h"
+#include "sandbox/src/crosscall_server.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/src/win_utils.cc b/sandbox/src/win_utils.cc
index 8e63ac7..8a43d97 100644
--- a/sandbox/win/src/win_utils.cc
+++ b/sandbox/src/win_utils.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 "sandbox/win/src/win_utils.h"
+#include "sandbox/src/win_utils.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/internal_types.h"
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/internal_types.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace {
 
diff --git a/sandbox/win/src/win_utils.h b/sandbox/src/win_utils.h
index a80bb81..a80bb81 100644
--- a/sandbox/win/src/win_utils.h
+++ b/sandbox/src/win_utils.h
diff --git a/sandbox/win/src/win_utils_unittest.cc b/sandbox/src/win_utils_unittest.cc
index 7265316..0f445ef 100644
--- a/sandbox/win/src/win_utils_unittest.cc
+++ b/sandbox/src/win_utils_unittest.cc
@@ -5,8 +5,8 @@
 #include <windows.h>
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/win_utils.h"
-#include "sandbox/win/tests/common/test_utils.h"
+#include "sandbox/src/win_utils.h"
+#include "sandbox/tests/common/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(WinUtils, IsReparsePoint) {
diff --git a/sandbox/win/src/window.cc b/sandbox/src/window.cc
index 445cb17..507ae57 100644
--- a/sandbox/win/src/window.cc
+++ b/sandbox/src/window.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 "sandbox/win/src/window.h"
+#include "sandbox/src/window.h"
 
 #include <aclapi.h>
 
diff --git a/sandbox/win/src/window.h b/sandbox/src/window.h
index e8233e7..f65b463 100644
--- a/sandbox/win/src/window.h
+++ b/sandbox/src/window.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 #include <string>
 
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/tests/common/controller.cc b/sandbox/tests/common/controller.cc
index 3d50848..6c73c2d 100644
--- a/sandbox/win/tests/common/controller.cc
+++ b/sandbox/tests/common/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 "sandbox/win/tests/common/controller.h"
+#include "sandbox/tests/common/controller.h"
 
 #include <string>
 
@@ -10,8 +10,8 @@
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/win/windows_version.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_utils.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_utils.h"
 
 namespace {
 
diff --git a/sandbox/win/tests/common/controller.h b/sandbox/tests/common/controller.h
index 42a6671..5c2a471 100644
--- a/sandbox/win/tests/common/controller.h
+++ b/sandbox/tests/common/controller.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/win/scoped_handle.h"
-#include "sandbox/win/src/sandbox.h"
+#include "sandbox/src/sandbox.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/tests/common/test_utils.cc b/sandbox/tests/common/test_utils.cc
index cdd86de..929c322 100644
--- a/sandbox/win/tests/common/test_utils.cc
+++ b/sandbox/tests/common/test_utils.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 "sandbox/win/tests/common/test_utils.h"
+#include "sandbox/tests/common/test_utils.h"
 
 #include <winioctl.h>
 
diff --git a/sandbox/win/tests/common/test_utils.h b/sandbox/tests/common/test_utils.h
index 9e17660..9e17660 100644
--- a/sandbox/win/tests/common/test_utils.h
+++ b/sandbox/tests/common/test_utils.h
diff --git a/sandbox/win/tests/integration_tests/integration_tests.cc b/sandbox/tests/integration_tests/integration_tests.cc
index 1996430..5096abb 100644
--- a/sandbox/win/tests/integration_tests/integration_tests.cc
+++ b/sandbox/tests/integration_tests/integration_tests.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/tests/common/controller.h"
 
 int wmain(int argc, wchar_t **argv) {
   if (argc >= 2) {
diff --git a/sandbox/win/tests/integration_tests/integration_tests_test.cc b/sandbox/tests/integration_tests/integration_tests_test.cc
index 1f54c64..b610681 100644
--- a/sandbox/win/tests/integration_tests/integration_tests_test.cc
+++ b/sandbox/tests/integration_tests/integration_tests_test.cc
@@ -5,10 +5,10 @@
 // Some tests for the framework itself.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/target_services.h"
-#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/src/sandbox.h"
+#include "sandbox/src/target_services.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/tests/integration_tests/sbox_integration_tests.vcproj b/sandbox/tests/integration_tests/sbox_integration_tests.vcproj
index 53816e7..53816e7 100644
--- a/sandbox/win/tests/integration_tests/sbox_integration_tests.vcproj
+++ b/sandbox/tests/integration_tests/sbox_integration_tests.vcproj
diff --git a/sandbox/win/tests/unit_tests/sbox_unittests.vcproj b/sandbox/tests/unit_tests/sbox_unittests.vcproj
index a2df792..a2df792 100644
--- a/sandbox/win/tests/unit_tests/sbox_unittests.vcproj
+++ b/sandbox/tests/unit_tests/sbox_unittests.vcproj
diff --git a/sandbox/win/tests/unit_tests/unit_tests.cc b/sandbox/tests/unit_tests/unit_tests.cc
index a9623db..a9623db 100644
--- a/sandbox/win/tests/unit_tests/unit_tests.cc
+++ b/sandbox/tests/unit_tests/unit_tests.cc
diff --git a/sandbox/win/tests/validation_tests/commands.cc b/sandbox/tests/validation_tests/commands.cc
index dcdd433..d99451f 100644
--- a/sandbox/win/tests/validation_tests/commands.cc
+++ b/sandbox/tests/validation_tests/commands.cc
@@ -5,9 +5,9 @@
 #include <windows.h>
 #include <string>
 
-#include "sandbox/win/tests/validation_tests/commands.h"
+#include "sandbox/tests/validation_tests/commands.h"
 
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/tests/common/controller.h"
 
 namespace {
 
diff --git a/sandbox/win/tests/validation_tests/commands.h b/sandbox/tests/validation_tests/commands.h
index 9b797a5..9b797a5 100644
--- a/sandbox/win/tests/validation_tests/commands.h
+++ b/sandbox/tests/validation_tests/commands.h
diff --git a/sandbox/win/tests/validation_tests/sbox_validation_tests.vcproj b/sandbox/tests/validation_tests/sbox_validation_tests.vcproj
index 9b7b599..9b7b599 100644
--- a/sandbox/win/tests/validation_tests/sbox_validation_tests.vcproj
+++ b/sandbox/tests/validation_tests/sbox_validation_tests.vcproj
diff --git a/sandbox/win/tests/validation_tests/suite.cc b/sandbox/tests/validation_tests/suite.cc
index 95209b7..3147f70 100644
--- a/sandbox/win/tests/validation_tests/suite.cc
+++ b/sandbox/tests/validation_tests/suite.cc
@@ -10,7 +10,7 @@
 
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/tests/common/controller.h"
 
 #pragma comment(lib, "shlwapi.lib")
 
diff --git a/sandbox/win/tests/validation_tests/unit_tests.cc b/sandbox/tests/validation_tests/unit_tests.cc
index 56be2ce..490f7ec 100644
--- a/sandbox/win/tests/validation_tests/unit_tests.cc
+++ b/sandbox/tests/validation_tests/unit_tests.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/win/tests/common/controller.h"
+#include "sandbox/tests/common/controller.h"
 
 int wmain(int argc, wchar_t **argv) {
   if (argc >= 2) {
diff --git a/sandbox/win/tools/finder/finder.cc b/sandbox/tools/finder/finder.cc
index 9b82962..26fc1b9 100644
--- a/sandbox/win/tools/finder/finder.cc
+++ b/sandbox/tools/finder/finder.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 "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/finder.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/finder.h"
 
 Finder::Finder() {
   file_output_ = NULL;
diff --git a/sandbox/win/tools/finder/finder.h b/sandbox/tools/finder/finder.h
index 23255ce..0686b1d 100644
--- a/sandbox/win/tools/finder/finder.h
+++ b/sandbox/tools/finder/finder.h
@@ -5,8 +5,8 @@
 #ifndef SANDBOX_TOOLS_FINDER_FINDER_H__
 #define SANDBOX_TOOLS_FINDER_FINDER_H__
 
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/ntundoc.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/ntundoc.h"
 
 // Type of stats that we calculate during the Scan operation
 enum Stats {
diff --git a/sandbox/win/tools/finder/finder.vcproj b/sandbox/tools/finder/finder.vcproj
index 787c847..787c847 100644
--- a/sandbox/win/tools/finder/finder.vcproj
+++ b/sandbox/tools/finder/finder.vcproj
diff --git a/sandbox/win/tools/finder/finder_fs.cc b/sandbox/tools/finder/finder_fs.cc
index ddcc4be..7375b86 100644
--- a/sandbox/win/tools/finder/finder_fs.cc
+++ b/sandbox/tools/finder/finder_fs.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 "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/finder.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/finder.h"
 
 DWORD Finder::ParseFileSystem(ATL::CString directory) {
   WIN32_FIND_DATA find_data;
diff --git a/sandbox/win/tools/finder/finder_kernel.cc b/sandbox/tools/finder/finder_kernel.cc
index 430a4c0..66ab454 100644
--- a/sandbox/win/tools/finder/finder_kernel.cc
+++ b/sandbox/tools/finder/finder_kernel.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 "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/finder.h"
-#include "sandbox/win/tools/finder/ntundoc.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/finder.h"
+#include "sandbox/tools/finder/ntundoc.h"
 
 #define BUFFER_SIZE 0x800
 #define CHECKPTR(x) if (!x) return ::GetLastError()
diff --git a/sandbox/win/tools/finder/finder_registry.cc b/sandbox/tools/finder/finder_registry.cc
index a84e413..4b18625 100644
--- a/sandbox/win/tools/finder/finder_registry.cc
+++ b/sandbox/tools/finder/finder_registry.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 "sandbox/win/src/restricted_token.h"
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/finder.h"
+#include "sandbox/src/restricted_token.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/finder.h"
 
 DWORD Finder::ParseRegistry(HKEY key, ATL::CString print_name) {
   DWORD index = 0;
diff --git a/sandbox/win/tools/finder/main.cc b/sandbox/tools/finder/main.cc
index 7cadbef..6ffbec3 100644
--- a/sandbox/win/tools/finder/main.cc
+++ b/sandbox/tools/finder/main.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sandbox/win/src/restricted_token_utils.h"
-#include "sandbox/win/tools/finder/finder.h"
+#include "sandbox/src/restricted_token_utils.h"
+#include "sandbox/tools/finder/finder.h"
 
 #define PARAM_IS(y) (argc > i) && (_wcsicmp(argv[i], y) == 0)
 
diff --git a/sandbox/win/tools/finder/ntundoc.h b/sandbox/tools/finder/ntundoc.h
index dc8c3a5..dc8c3a5 100644
--- a/sandbox/win/tools/finder/ntundoc.h
+++ b/sandbox/tools/finder/ntundoc.h
diff --git a/sandbox/win/tools/launcher/launcher.cc b/sandbox/tools/launcher/launcher.cc
index efcc4a4..8f913b3 100644
--- a/sandbox/win/tools/launcher/launcher.cc
+++ b/sandbox/tools/launcher/launcher.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 "sandbox/win/src/restricted_token_utils.h"
+#include "sandbox/src/restricted_token_utils.h"
 
 // launcher.exe is an application used to launch another application with a
 // restricted token. This is to be used for testing only.
diff --git a/sandbox/win/tools/launcher/launcher.vcproj b/sandbox/tools/launcher/launcher.vcproj
index 71ed011..71ed011 100644
--- a/sandbox/win/tools/launcher/launcher.vcproj
+++ b/sandbox/tools/launcher/launcher.vcproj
diff --git a/sandbox/win/wow_helper.sln b/sandbox/wow_helper.sln
index 26d0da2..26d0da2 100644
--- a/sandbox/win/wow_helper.sln
+++ b/sandbox/wow_helper.sln
diff --git a/sandbox/win/wow_helper/service64_resolver.cc b/sandbox/wow_helper/service64_resolver.cc
index fe8a210..d54e0b0 100644
--- a/sandbox/win/wow_helper/service64_resolver.cc
+++ b/sandbox/wow_helper/service64_resolver.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 "sandbox/win/wow_helper/service64_resolver.h"
+#include "sandbox/wow_helper/service64_resolver.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/wow_helper/target_code.h"
+#include "sandbox/wow_helper/target_code.h"
 
 namespace {
 #pragma pack(push, 1)
diff --git a/sandbox/win/wow_helper/service64_resolver.h b/sandbox/wow_helper/service64_resolver.h
index abd7efd..f782172 100644
--- a/sandbox/win/wow_helper/service64_resolver.h
+++ b/sandbox/wow_helper/service64_resolver.h
@@ -5,8 +5,8 @@
 #ifndef SANDBOX_WOW_HELPER_SERVICE64_RESOLVER_H__
 #define SANDBOX_WOW_HELPER_SERVICE64_RESOLVER_H__
 
-#include "sandbox/win/src/nt_internals.h"
-#include "sandbox/win/src/resolver.h"
+#include "sandbox/src/nt_internals.h"
+#include "sandbox/src/resolver.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/wow_helper/target_code.cc b/sandbox/wow_helper/target_code.cc
index 8da27cc5..1f93988 100644
--- a/sandbox/win/wow_helper/target_code.cc
+++ b/sandbox/wow_helper/target_code.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 "sandbox/win/wow_helper/target_code.h"
+#include "sandbox/wow_helper/target_code.h"
 
 namespace sandbox {
 
diff --git a/sandbox/win/wow_helper/target_code.h b/sandbox/wow_helper/target_code.h
index c198a85..56db6fe 100644
--- a/sandbox/win/wow_helper/target_code.h
+++ b/sandbox/wow_helper/target_code.h
@@ -5,7 +5,7 @@
 #ifndef SANDBOX_WOW_HELPER_TARGET_CODE_H__
 #define SANDBOX_WOW_HELPER_TARGET_CODE_H__
 
-#include "sandbox/win/src/nt_internals.h"
+#include "sandbox/src/nt_internals.h"
 
 namespace sandbox {
 
@@ -13,7 +13,7 @@ extern "C" {
 
 // Holds the information needed for the interception of NtMapViewOfSection.
 // Changes of this structure must be synchronized with changes of PatchInfo32
-// on sandbox/win/src/wow64.cc.
+// on sandbox/src/wow64.cc.
 struct PatchInfo {
   HANDLE dll_load;  // Event to signal the broker.
   HANDLE continue_load;  // Event to wait for the broker.
diff --git a/sandbox/win/wow_helper/wow_helper.cc b/sandbox/wow_helper/wow_helper.cc
index 9d5a5ea..6c272e4 100644
--- a/sandbox/win/wow_helper/wow_helper.cc
+++ b/sandbox/wow_helper/wow_helper.cc
@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include "sandbox/win/wow_helper/service64_resolver.h"
-#include "sandbox/win/wow_helper/target_code.h"
+#include "sandbox/wow_helper/service64_resolver.h"
+#include "sandbox/wow_helper/target_code.h"
 
 namespace {
 
diff --git a/sandbox/win/wow_helper/wow_helper.exe b/sandbox/wow_helper/wow_helper.exe
index f9bfb4b..f9bfb4b 100755
--- a/sandbox/win/wow_helper/wow_helper.exe
+++ b/sandbox/wow_helper/wow_helper.exe
diff --git a/sandbox/win/wow_helper/wow_helper.pdb b/sandbox/wow_helper/wow_helper.pdb
index 9cb67d0..9cb67d0 100644
--- a/sandbox/win/wow_helper/wow_helper.pdb
+++ b/sandbox/wow_helper/wow_helper.pdb
diff --git a/sandbox/win/wow_helper/wow_helper.vcproj b/sandbox/wow_helper/wow_helper.vcproj
index 5482fbd..5482fbd 100644
--- a/sandbox/win/wow_helper/wow_helper.vcproj
+++ b/sandbox/wow_helper/wow_helper.vcproj
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index bb2b059..fc4e1b9 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "content/public/app/content_main.h"
-#include "sandbox/win/src/sandbox_types.h"
+#include "sandbox/src/sandbox_types.h"
 #include "ui/views/examples/content_client/examples_main_delegate.h"
 
 #if defined(OS_WIN)