Revert "Move mojo edk into mojo/edk"

This reverts commit ee7ff197a98da4636f33bd713de784948b487bd4.

Causing widespread checkdeps failures.

ERROR in src\content\browser\webui\web_ui_mojo_browsertest.cc
  Illegal include: "mojo/edk/test/test_utils.h" Because of no rule applying.

TBR=jamesr@chromium.org

Review URL: https://codereview.chromium.org/623883002

Cr-Commit-Position: refs/heads/master@{#297966}

199 files changed, 813 insertions, 820 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 4fdba5e..ad1530d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -172,10 +172,10 @@ static_library("browser") {
       "//content/app/resources",
       "//media",
       "//media/cast:net",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/public/cpp/bindings",
       "//mojo/public/js/bindings",
+      "//mojo/system",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index bac985e..c03e0e0 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -89,7 +89,7 @@ static_library("ui") {
       "//device/bluetooth",
       "//device/nfc",
       "//media",
-      "//mojo/edk/system",
+      "//mojo/system",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ef17904..14353e2 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -181,7 +181,7 @@ source_set("test_support_unit") {
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
   ]
 }
diff --git a/chrome/test/DEPS b/chrome/test/DEPS
index 2e14c50..1c79004 100644
--- a/chrome/test/DEPS
+++ b/chrome/test/DEPS
@@ -18,7 +18,7 @@ include_rules = [
   "+gin/public",
   "+grit",  # For generated headers. TODO(thestig): Remove.
   "+media/base",
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
   "+sandbox/win/tests",
   "+win8/test",
 ]
diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc
index 639bcff..860c723 100644
--- a/chrome/test/base/run_all_unittests.cc
+++ b/chrome/test/base/run_all_unittests.cc
@@ -6,7 +6,7 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "chrome/test/base/chrome_unit_test_suite.h"
 #include "content/public/test/unittest_test_suite.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 int main(int argc, char **argv) {
   content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv));
diff --git a/content/DEPS b/content/DEPS
index 647b09c..48823df 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -35,7 +35,7 @@ include_rules = [
   "+mojo/application_manager",
   "+mojo/bindings/js",
   "+mojo/common",
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
   "+mojo/public",
   "+net",
   "+ppapi",
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index f68c6de..61813d5 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -52,9 +52,9 @@ if (is_ios) {
 } else {
   content_app_deps += [
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/interfaces/application",
+    "//mojo/system",
   ]
 }
 
diff --git a/content/app/mojo/mojo_init.cc b/content/app/mojo/mojo_init.cc
index 755b6b1..be427a4 100644
--- a/content/app/mojo/mojo_init.cc
+++ b/content/app/mojo/mojo_init.cc
@@ -5,8 +5,8 @@
 #include "content/app/mojo/mojo_init.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 
 namespace content {
 
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
index d6ebf15..3af7974 100644
--- a/content/browser/mojo/mojo_application_host.cc
+++ b/content/browser/mojo/mojo_application_host.cc
@@ -7,7 +7,7 @@
 #include "content/common/mojo/mojo_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_sender.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace content {
 namespace {
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
index 01d1335..27a43f8 100644
--- a/content/browser/mojo/mojo_application_host.h
+++ b/content/browser/mojo/mojo_application_host.h
@@ -7,8 +7,8 @@
 
 #include "base/process/process_handle.h"
 #include "content/common/mojo/service_registry_impl.h"
-#include "mojo/edk/embedder/channel_init.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/channel_init.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace IPC {
 class Sender;
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index ff9a4e1..065bc7a 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -26,7 +26,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/js/bindings/constants.h"
diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
index 8aee2e8..d745402 100644
--- a/content/child/mojo/mojo_application.h
+++ b/content/child/mojo/mojo_application.h
@@ -7,7 +7,7 @@
 
 #include "content/common/mojo/service_registry_impl.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 
 namespace IPC {
 class Message;
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 3421cf0..5c16e82 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -83,9 +83,9 @@ source_set("common") {
       "//gpu/skia_bindings",
       "//media",
       "//media:shared_memory_support",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/public/interfaces/application",
+      "//mojo/system",
       "//sandbox",
       "//storage/browser",
       "//storage/common",
diff --git a/device/test/DEPS b/device/test/DEPS
index 7a97c8e..a29f20f 100644
--- a/device/test/DEPS
+++ b/device/test/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
   "+net/proxy",
   "+net/url_request",
 ]
diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc
index d8e2928..3b34102 100644
--- a/device/test/run_all_unittests.cc
+++ b/device/test/run_all_unittests.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index a513093..3fd08f9 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -250,10 +250,10 @@ test("unittests") {
     "//extensions/common",
     "//extensions/renderer",
     "//extensions/strings",
-    "//mojo/bindings/js",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
+    "//mojo/bindings/js",
+    "//mojo/system",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/leveldatabase",
diff --git a/extensions/test/DEPS b/extensions/test/DEPS
index 925491d..e9ef362 100644
--- a/extensions/test/DEPS
+++ b/extensions/test/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "+content/public",
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
 ]
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index 122dbfb..9ec7e24 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -13,7 +13,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gl/gl_surface.h"
 
diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn
index 29905bd..27c9cd9 100644
--- a/ipc/mojo/BUILD.gn
+++ b/ipc/mojo/BUILD.gn
@@ -24,7 +24,7 @@ component("mojo") {
     "//ipc",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
 
@@ -42,8 +42,8 @@ test("ipc_mojo_unittests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//url",
   ]
 }
@@ -61,8 +61,8 @@ test("ipc_mojo_perftests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//url",
   ]
 }
diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS
index 039e243..6706a1f 100644
--- a/ipc/mojo/DEPS
+++ b/ipc/mojo/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "+mojo/public",
-  "+mojo/edk/embedder",
-]
+  "+mojo/embedder",
+]
\ No newline at end of file
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index d3a9f79..00f5452 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -10,7 +10,7 @@
 #include "ipc/ipc_listener.h"
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/file_descriptor_set_posix.h"
diff --git a/ipc/mojo/ipc_channel_mojo_readers.cc b/ipc/mojo/ipc_channel_mojo_readers.cc
index 2c231bf..227a946 100644
--- a/ipc/mojo/ipc_channel_mojo_readers.cc
+++ b/ipc/mojo/ipc_channel_mojo_readers.cc
@@ -5,7 +5,7 @@
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 
 #include "ipc/mojo/ipc_channel_mojo.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/file_descriptor_set_posix.h"
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index 39224a0..ac1efd1 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -239,7 +239,7 @@ TEST_F(IPCChannelMojoErrorTest, SendFailWithPendingMessages) {
   CreateChannel(&listener);
   ASSERT_TRUE(ConnectChannel());
 
-  // This matches a value in mojo/edk/system/constants.h
+  // This matches a value in mojo/system/constants.h
   const int kMaxMessageNumBytes = 4 * 1024 * 1024;
   std::string overly_large_data(kMaxMessageNumBytes, '*');
   // This messages are queued as pending.
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc
index 1b50b3f..0082fb8 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -8,7 +8,7 @@
 #include "base/process/process_handle.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h
index 4d9e471..a099af9 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.h
+++ b/ipc/mojo/ipc_mojo_bootstrap.h
@@ -9,7 +9,7 @@
 #include "base/process/process_handle.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc
index 20893d4..81dcd70 100644
--- a/ipc/mojo/ipc_mojo_perftest.cc
+++ b/ipc/mojo/ipc_mojo_perftest.cc
@@ -6,7 +6,7 @@
 #include "ipc/ipc_perftest_support.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
 #include "ipc/mojo/ipc_channel_mojo_host.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 namespace {
 
diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc
index cc5b102..0989bf3 100644
--- a/ipc/mojo/run_all_unittests.cc
+++ b/ipc/mojo/run_all_unittests.cc
@@ -6,7 +6,7 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 04e1686..d291b89 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -77,8 +77,8 @@ test("media_mojo_lib_unittests") {
     "//media",
     "//media/mojo/interfaces",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//testing/gtest",
     ":lib"
   ]
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 2708cfa..45d91fd 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -39,8 +39,6 @@ group("tests") {
     "//mojo/application_manager:mojo_application_manager_unittests",
     "//mojo/apps/js/test:mojo_apps_js_unittests",
     "//mojo/common:mojo_common_unittests",
-    "//mojo/edk/system:mojo_message_pipe_perftests",
-    "//mojo/edk/system:mojo_system_unittests",
     "//mojo/public/c/system/tests:perftests",
     "//mojo/public/cpp/application/tests:mojo_public_application_unittests",
     "//mojo/public/cpp/bindings/tests:mojo_public_bindings_unittests",
@@ -52,6 +50,8 @@ group("tests") {
     "//mojo/services/public/cpp/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/shell:mojo_external_application_tests",
     "//mojo/shell:mojo_shell_tests",
+    "//mojo/system:mojo_message_pipe_perftests",
+    "//mojo/system:mojo_system_unittests",
     "//mojo/tools:message_generator",
   ]
 
diff --git a/mojo/DEPS b/mojo/DEPS
index c37b8de..22cb4c1 100644
--- a/mojo/DEPS
+++ b/mojo/DEPS
@@ -2,6 +2,6 @@ include_rules = [
   "+base",
   "+build",
   "+mojo",
-  "-mojo/edk/system",
+  "-mojo/system",
   "+testing",
 ]
diff --git a/mojo/PRESUBMIT.py b/mojo/PRESUBMIT.py
index a7dc055..7f5b503 100644
--- a/mojo/PRESUBMIT.py
+++ b/mojo/PRESUBMIT.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Presubmit script for mojo
+"""Presubmit script for mojo/embedder.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
diff --git a/mojo/android/javatests/init_library.cc b/mojo/android/javatests/init_library.cc
index c738981..88e4f81 100644
--- a/mojo/android/javatests/init_library.cc
+++ b/mojo/android/javatests/init_library.cc
@@ -9,8 +9,8 @@
 #include "mojo/android/javatests/mojo_test_case.h"
 #include "mojo/android/javatests/validation_test_util.h"
 #include "mojo/android/system/core_impl.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 
 namespace {
 
diff --git a/mojo/application_manager/BUILD.gn b/mojo/application_manager/BUILD.gn
index 22c0edd..c0597dc 100644
--- a/mojo/application_manager/BUILD.gn
+++ b/mojo/application_manager/BUILD.gn
@@ -32,9 +32,9 @@ component("application_manager") {
     "//base/third_party/dynamic_annotations",
     "//net",
     "//url",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/services/public/interfaces/content_handler:content_handler",
+    "//mojo/system",
   ]
 }
 
diff --git a/mojo/apps/js/test/BUILD.gn b/mojo/apps/js/test/BUILD.gn
index 2b09e71..9044010 100644
--- a/mojo/apps/js/test/BUILD.gn
+++ b/mojo/apps/js/test/BUILD.gn
@@ -12,7 +12,7 @@ test("mojo_apps_js_unittests") {
     "//mojo/apps/js",
     "//mojo/common",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
 
diff --git a/mojo/apps/js/test/js_to_cpp_unittest.cc b/mojo/apps/js/test/js_to_cpp_unittest.cc
index 44526a4..76c357b 100644
--- a/mojo/apps/js/test/js_to_cpp_unittest.cc
+++ b/mojo/apps/js/test/js_to_cpp_unittest.cc
@@ -14,7 +14,7 @@
 #include "mojo/apps/js/mojo_runner_delegate.h"
 #include "mojo/apps/js/test/js_to_cpp.mojom.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index a825189..4e9f6f6 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -37,7 +37,7 @@ test("mojo_common_unittests") {
     "//base",
     "//base:message_loop_tests",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/test_support:test_utils",
@@ -49,5 +49,6 @@ test("mojo_common_unittests") {
     "common_type_converters_unittest.cc",
     "handle_watcher_unittest.cc",
     "message_pump_mojo_unittest.cc",
+    "test/multiprocess_test_helper_unittest.cc",
   ]
 }
diff --git a/mojo/common/test/BUILD.gn b/mojo/common/test/BUILD.gn
index ebad97e..9be7ff1 100644
--- a/mojo/common/test/BUILD.gn
+++ b/mojo/common/test/BUILD.gn
@@ -9,8 +9,8 @@ source_set("run_all_unittests") {
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/c/test_support",
+    "//mojo/system",
     "//testing/gtest",
   ]
 
@@ -24,8 +24,8 @@ source_set("run_all_perftests") {
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/c/test_support",
+    "//mojo/system",
   ]
 
   sources = [ "run_all_perftests.cc" ]
@@ -44,3 +44,22 @@ source_set("test_support_impl") {
     "test_support_impl.h",
   ]
 }
+
+# GYP version: mojo/mojo_base.gyp:mojo_common_test_support
+source_set("test_support") {
+  testonly = true
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//testing/gtest",
+    "//mojo/system",
+  ]
+
+  sources = [
+    "multiprocess_test_helper.cc",
+    "multiprocess_test_helper.h",
+    "test_utils.h",
+    "test_utils_posix.cc",
+    "test_utils_win.cc",
+  ]
+}
diff --git a/mojo/common/test/DEPS b/mojo/common/test/DEPS
index 61ef5fec..26b3ad9b 100644
--- a/mojo/common/test/DEPS
+++ b/mojo/common/test/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
 ]
diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/mojo/common/test/multiprocess_test_helper.cc
index 02367d6..7e9df3e 100644
--- a/mojo/edk/test/multiprocess_test_helper.cc
+++ b/mojo/common/test/multiprocess_test_helper.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 "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process/kill.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/edk/test/multiprocess_test_helper.h b/mojo/common/test/multiprocess_test_helper.h
index ea77544..d518b6f 100644
--- a/mojo/edk/test/multiprocess_test_helper.h
+++ b/mojo/common/test/multiprocess_test_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
-#define MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
+#ifndef MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
+#define MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "base/process/process_handle.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace mojo {
@@ -88,4 +88,4 @@ class MultiprocessTestHelper {
 }  // namespace test
 }  // namespace mojo
 
-#endif  // MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
+#endif  // MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
diff --git a/mojo/edk/test/multiprocess_test_helper_unittest.cc b/mojo/common/test/multiprocess_test_helper_unittest.cc
index ec2ba22..0ed10e2 100644
--- a/mojo/edk/test/multiprocess_test_helper_unittest.cc
+++ b/mojo/common/test/multiprocess_test_helper_unittest.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 "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_POSIX)
diff --git a/mojo/common/test/run_all_perftests.cc b/mojo/common/test/run_all_perftests.cc
index e3f41aa..87e39ce 100644
--- a/mojo/common/test/run_all_perftests.cc
+++ b/mojo/common/test/run_all_perftests.cc
@@ -4,7 +4,7 @@
 
 #include "base/test/perf_test_suite.h"
 #include "mojo/common/test/test_support_impl.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 #include "mojo/public/tests/test_support_private.h"
 
 int main(int argc, char** argv) {
diff --git a/mojo/common/test/run_all_unittests.cc b/mojo/common/test/run_all_unittests.cc
index 48c054e..814a259 100644
--- a/mojo/common/test/run_all_unittests.cc
+++ b/mojo/common/test/run_all_unittests.cc
@@ -6,7 +6,7 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "mojo/common/test/test_support_impl.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 #include "mojo/public/tests/test_support_private.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/edk/test/test_utils.h b/mojo/common/test/test_utils.h
index 9287457..711dfe4 100644
--- a/mojo/edk/test/test_utils.h
+++ b/mojo/common/test/test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_TEST_TEST_UTILS_H_
-#define MOJO_EDK_TEST_TEST_UTILS_H_
+#ifndef MOJO_COMMON_TEST_TEST_UTILS_H_
+#define MOJO_COMMON_TEST_TEST_UTILS_H_
 
 #include <stddef.h>
 #include <stdio.h>
@@ -12,8 +12,8 @@
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace mojo {
 namespace test {
@@ -54,4 +54,4 @@ base::FilePath GetFilePathForJSResource(const std::string& path);
 }  // namespace test
 }  // namespace mojo
 
-#endif  // MOJO_EDK_TEST_TEST_UTILS_H_
+#endif  // MOJO_COMMON_TEST_TEST_UTILS_H_
diff --git a/mojo/edk/test/test_utils_posix.cc b/mojo/common/test/test_utils_posix.cc
index 6491baf..0072d0a 100644
--- a/mojo/edk/test/test_utils_posix.cc
+++ b/mojo/common/test/test_utils_posix.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 "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/mojo/edk/test/test_utils_win.cc b/mojo/common/test/test_utils_win.cc
index 42613a6..71efced 100644
--- a/mojo/edk/test/test_utils_win.cc
+++ b/mojo/common/test/test_utils_win.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 "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 
-#include <windows.h>
 #include <fcntl.h>
 #include <io.h>
 #include <string.h>
+#include <windows.h>
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
diff --git a/mojo/edk/DEPS b/mojo/edk/DEPS
deleted file mode 100644
index 5fe1410..0000000
--- a/mojo/edk/DEPS
+++ /dev/null
@@ -1,5 +0,0 @@
-include_rules = [
-  "-mojo",
-  "+mojo/edk",
-  "+mojo/public",
-]
diff --git a/mojo/edk/embedder/DEPS b/mojo/edk/embedder/DEPS
deleted file mode 100644
index c3a0d22..0000000
--- a/mojo/edk/embedder/DEPS
+++ /dev/null
@@ -1,11 +0,0 @@
-include_rules = [
-  "+mojo/edk/system/system_impl_export.h",
-]
-
-specific_include_rules = {
-  # Implementation files may freely access mojo/edk/system, but we don't want to
-  # leak implementation details through the headers.
-  ".*\.cc": [
-    "+mojo/edk/system",
-  ]
-}
diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
deleted file mode 100644
index 6a6f312..0000000
--- a/mojo/edk/test/BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# GYP version: mojo/mojo_base.gyp:mojo_common_test_support
-source_set("test_support") {
-  testonly = true
-  sources = [
-    "multiprocess_test_helper.cc",
-    "multiprocess_test_helper.h",
-    "test_utils.h",
-    "test_utils_posix.cc",
-    "test_utils_win.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//mojo/edk/system",
-    "//testing/gtest",
-  ]
-}
diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/embedder/BUILD.gn
index 9c2f39fd..540cd83 100644
--- a/mojo/edk/embedder/BUILD.gn
+++ b/mojo/embedder/BUILD.gn
@@ -5,7 +5,7 @@
 source_set("embedder") {
   # This isn't really a standalone target, it must be linked into the
   # mojo_system_impl component.
-  visibility = [ "//mojo/edk/system" ]
+  visibility = [ "//mojo/system" ]
 
   deps = [ "//base", ]
 
@@ -14,7 +14,7 @@ source_set("embedder") {
     "MOJO_SYSTEM_IMPLEMENTATION",
   ]
 
-  configs += [ "//mojo/edk/system:system_config" ]
+  configs += [ "//mojo/system:system_config" ]
 
   sources = [
     "channel_init.cc",
@@ -53,13 +53,13 @@ source_set("embedder") {
 
 source_set("embedder_unittests") {
   testonly = true
-  visibility = [ "//mojo/edk/system:mojo_system_unittests" ]
+  visibility = [ "//mojo/system:mojo_system_unittests" ]
   testonly = true
 
   deps = [
     "//base",
-    "//mojo/edk/test:test_support",
-    "//mojo/edk/system",
+    "//mojo/common/test:test_support",
+    "//mojo/system",
     "//testing/gtest",
   ]
 
diff --git a/mojo/embedder/DEPS b/mojo/embedder/DEPS
new file mode 100644
index 0000000..1c627b7
--- /dev/null
+++ b/mojo/embedder/DEPS
@@ -0,0 +1,11 @@
+include_rules = [
+  "+mojo/system/system_impl_export.h",
+]
+
+specific_include_rules = {
+  # Implementation files may freely access mojo/system, but we don't want to
+  # leak implementation details through the headers.
+  ".*\.cc": [
+    "+mojo/system",
+  ]
+}
diff --git a/mojo/edk/system/PRESUBMIT.py b/mojo/embedder/PRESUBMIT.py
index 2827571..97f67c0 100644
--- a/mojo/edk/system/PRESUBMIT.py
+++ b/mojo/embedder/PRESUBMIT.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Presubmit script for mojo/edk/system.
+"""Presubmit script for mojo/embedder.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
diff --git a/mojo/edk/embedder/README.md b/mojo/embedder/README.md
index f976fcb..5510e99 100644
--- a/mojo/edk/embedder/README.md
+++ b/mojo/embedder/README.md
@@ -4,7 +4,7 @@ Mojo Embedder API
 The Mojo Embedder API is an unstable, internal API to the Mojo system
 implementation. It should be used by code running on top of the system-level
 APIs to set up the Mojo environment (instead of directly instantiating things
-from src/mojo/edk/system).
+from src/mojo/system).
 
 Example uses: Mojo shell, to set up the Mojo environment for Mojo apps; Chromium
 code, to set up the Mojo IPC system for use between processes. Note that most
diff --git a/mojo/edk/embedder/channel_init.cc b/mojo/embedder/channel_init.cc
index 9ea984b..4c15c83 100644
--- a/mojo/edk/embedder/channel_init.cc
+++ b/mojo/embedder/channel_init.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 "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/channel_init.h b/mojo/embedder/channel_init.h
index 797cc6d..26a6452 100644
--- a/mojo/edk/embedder/channel_init.h
+++ b/mojo/embedder/channel_init.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
-#define MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#ifndef MOJO_EMBEDDER_CHANNEL_INIT_H_
+#define MOJO_EMBEDDER_CHANNEL_INIT_H_
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -60,4 +60,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelInit {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#endif  // MOJO_EMBEDDER_CHANNEL_INIT_H_
diff --git a/mojo/edk/embedder/embedder.cc b/mojo/embedder/embedder.cc
index c41c4f7..ca9bcd7 100644
--- a/mojo/edk/embedder/embedder.cc
+++ b/mojo/embedder/embedder.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/entrypoints.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/raw_channel.h"
+#include "mojo/embedder/platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/core.h"
+#include "mojo/system/entrypoints.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/raw_channel.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/embedder.h b/mojo/embedder/embedder.h
index ce949d0..e1d9c60 100644
--- a/mojo/edk/embedder/embedder.h
+++ b/mojo/embedder/embedder.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_EMBEDDER_H_
-#define MOJO_EDK_EMBEDDER_EMBEDDER_H_
+#ifndef MOJO_EMBEDDER_EMBEDDER_H_
+#define MOJO_EMBEDDER_EMBEDDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -122,4 +122,4 @@ MOJO_SYSTEM_IMPL_EXPORT MojoResult
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_EMBEDDER_H_
+#endif  // MOJO_EMBEDDER_EMBEDDER_H_
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
index 551ea272..d41df96 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_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 "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include <string.h>
 
@@ -13,11 +13,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/test_embedder.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/test_embedder.h"
 #include "mojo/public/c/system/core.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/embedder/platform_channel_pair.cc b/mojo/embedder/platform_channel_pair.cc
index 4e88bc9..783ced8 100644
--- a/mojo/edk/embedder/platform_channel_pair.cc
+++ b/mojo/embedder/platform_channel_pair.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 "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include "base/logging.h"
 
diff --git a/mojo/edk/embedder/platform_channel_pair.h b/mojo/embedder/platform_channel_pair.h
index d77c100..126bd3d 100644
--- a/mojo/edk/embedder/platform_channel_pair.h
+++ b/mojo/embedder/platform_channel_pair.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#define MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class CommandLine;
@@ -91,4 +91,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
diff --git a/mojo/edk/embedder/platform_channel_pair_posix.cc b/mojo/embedder/platform_channel_pair_posix.cc
index f9886b5..6185765 100644
--- a/mojo/edk/embedder/platform_channel_pair_posix.cc
+++ b/mojo/embedder/platform_channel_pair_posix.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 "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include "base/posix/global_descriptors.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc b/mojo/embedder/platform_channel_pair_posix_unittest.cc
index 355e573..b3f9682 100644
--- a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
+++ b/mojo/embedder/platform_channel_pair_posix_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 "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <errno.h>
 #include <poll.h>
@@ -21,11 +21,11 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "mojo/edk/embedder/platform_channel_utils_posix.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/platform_channel_utils_posix.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/embedder/platform_channel_pair_win.cc b/mojo/embedder/platform_channel_pair_win.cc
index 1cafc4f..a9130b4 100644
--- a/mojo/edk/embedder/platform_channel_pair_win.cc
+++ b/mojo/embedder/platform_channel_pair_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <windows.h>
 
@@ -14,7 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/platform_channel_utils_posix.cc b/mojo/embedder/platform_channel_utils_posix.cc
index 61b573b..f501081 100644
--- a/mojo/edk/embedder/platform_channel_utils_posix.cc
+++ b/mojo/embedder/platform_channel_utils_posix.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 "mojo/edk/embedder/platform_channel_utils_posix.h"
+#include "mojo/embedder/platform_channel_utils_posix.h"
 
 #include <sys/socket.h>
 #include <sys/uio.h>
diff --git a/mojo/edk/embedder/platform_channel_utils_posix.h b/mojo/embedder/platform_channel_utils_posix.h
index 87176fb..094fe15 100644
--- a/mojo/edk/embedder/platform_channel_utils_posix.h
+++ b/mojo/embedder/platform_channel_utils_posix.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#define MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
 
 #include <stddef.h>
 #include <sys/types.h>  // For |ssize_t|.
@@ -11,8 +11,8 @@
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 struct iovec;  // Declared in <sys/uio.h>.
 
@@ -73,4 +73,4 @@ MOJO_SYSTEM_IMPL_EXPORT ssize_t
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_UTILS_POSIX_H_
diff --git a/mojo/edk/embedder/platform_handle.cc b/mojo/embedder/platform_handle.cc
index 4675714..6cce5e8 100644
--- a/mojo/edk/embedder/platform_handle.cc
+++ b/mojo/embedder/platform_handle.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 "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 #include "build/build_config.h"
 #if defined(OS_POSIX)
diff --git a/mojo/edk/embedder/platform_handle.h b/mojo/embedder/platform_handle.h
index 346301a..39da4a9 100644
--- a/mojo/edk/embedder/platform_handle.h
+++ b/mojo/embedder/platform_handle.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_HANDLE_H_
+#define MOJO_EMBEDDER_PLATFORM_HANDLE_H_
 
 #include "build/build_config.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/system_impl_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -44,4 +44,4 @@ struct MOJO_SYSTEM_IMPL_EXPORT PlatformHandle {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_HANDLE_H_
diff --git a/mojo/edk/embedder/platform_handle_utils.h b/mojo/embedder/platform_handle_utils.h
index f594e21..9b28df2 100644
--- a/mojo/edk/embedder/platform_handle_utils.h
+++ b/mojo/embedder/platform_handle_utils.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
+#define MOJO_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
 
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -31,4 +31,4 @@ MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_HANDLE_UTILS_H_
diff --git a/mojo/edk/embedder/platform_handle_utils_posix.cc b/mojo/embedder/platform_handle_utils_posix.cc
index b3be93f..b6d93bb 100644
--- a/mojo/edk/embedder/platform_handle_utils_posix.cc
+++ b/mojo/embedder/platform_handle_utils_posix.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 "mojo/edk/embedder/platform_handle_utils.h"
+#include "mojo/embedder/platform_handle_utils.h"
 
 #include <unistd.h>
 
diff --git a/mojo/edk/embedder/platform_handle_utils_win.cc b/mojo/embedder/platform_handle_utils_win.cc
index 12745d0..446250f 100644
--- a/mojo/edk/embedder/platform_handle_utils_win.cc
+++ b/mojo/embedder/platform_handle_utils_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/platform_handle_utils.h"
+#include "mojo/embedder/platform_handle_utils.h"
 
 #include <windows.h>
 
diff --git a/mojo/edk/embedder/platform_handle_vector.h b/mojo/embedder/platform_handle_vector.h
index 96356b7..db53419 100644
--- a/mojo/edk/embedder/platform_handle_vector.h
+++ b/mojo/embedder/platform_handle_vector.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
+#define MOJO_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_utils.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_utils.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -32,4 +32,4 @@ typedef scoped_ptr<PlatformHandleVector, PlatformHandleVectorDeleter>
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
diff --git a/mojo/edk/embedder/platform_shared_buffer.h b/mojo/embedder/platform_shared_buffer.h
index 07f8b90..f8f422e 100644
--- a/mojo/edk/embedder/platform_shared_buffer.h
+++ b/mojo/embedder/platform_shared_buffer.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
+#define MOJO_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -99,4 +99,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformSharedBufferMapping {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
diff --git a/mojo/edk/embedder/platform_support.h b/mojo/embedder/platform_support.h
index 4556ee3..8b52fdc 100644
--- a/mojo/edk/embedder/platform_support.h
+++ b/mojo/embedder/platform_support.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_SUPPORT_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_SUPPORT_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_SUPPORT_H_
+#define MOJO_EMBEDDER_PLATFORM_SUPPORT_H_
 
 #include <stddef.h>
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -37,4 +37,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformSupport {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_SUPPORT_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_SUPPORT_H_
diff --git a/mojo/edk/embedder/scoped_platform_handle.h b/mojo/embedder/scoped_platform_handle.h
index 2919b04..be2fa79 100644
--- a/mojo/edk/embedder/scoped_platform_handle.h
+++ b/mojo/embedder/scoped_platform_handle.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
-#define MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#ifndef MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#define MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
 
 #include "base/compiler_specific.h"
 #include "base/move.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -56,4 +56,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#endif  // MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.cc b/mojo/embedder/simple_platform_shared_buffer.cc
index 866250c..8fbe782 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer.cc
+++ b/mojo/embedder/simple_platform_shared_buffer.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 "mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_shared_buffer.h"
 
 #include "base/logging.h"
-#include "mojo/edk/embedder/platform_handle_utils.h"
+#include "mojo/embedder/platform_handle_utils.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.h b/mojo/embedder/simple_platform_shared_buffer.h
index 110637e..abe1ace 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer.h
+++ b/mojo/embedder/simple_platform_shared_buffer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SHARED_BUFFER_H_
-#define MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SHARED_BUFFER_H_
+#ifndef MOJO_SYSTEM_SIMPLE_PLATFORM_SHARED_BUFFER_H_
+#define MOJO_SYSTEM_SIMPLE_PLATFORM_SHARED_BUFFER_H_
 
 #include <stddef.h>
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -99,4 +99,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SimplePlatformSharedBufferMapping
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SHARED_BUFFER_H_
+#endif  // MOJO_SYSTEM_SIMPLE_PLATFORM_SHARED_BUFFER_H_
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc b/mojo/embedder/simple_platform_shared_buffer_posix.cc
index ebb55ee..89898a8 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc
+++ b/mojo/embedder/simple_platform_shared_buffer_posix.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 "mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_shared_buffer.h"
 
 #include <stdint.h>
 #include <stdio.h>     // For |fileno()|.
@@ -21,7 +21,7 @@
 #include "base/posix/eintr_wrapper.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 // We assume that |size_t| and |off_t| (type for |ftruncate()|) fits in a
 // |uint64_t|.
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc b/mojo/embedder/simple_platform_shared_buffer_unittest.cc
index 45d27b9..50287f8 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc
+++ b/mojo/embedder/simple_platform_shared_buffer_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 "mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_shared_buffer.h"
 
 #include <limits>
 
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_win.cc b/mojo/embedder/simple_platform_shared_buffer_win.cc
index fd3de83..73a4d6f 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_win.cc
+++ b/mojo/embedder/simple_platform_shared_buffer_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_shared_buffer.h"
 
 #include <windows.h>
 
@@ -10,8 +10,8 @@
 
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/simple_platform_support.cc b/mojo/embedder/simple_platform_support.cc
index c59cfb3..1c7f82b 100644
--- a/mojo/edk/embedder/simple_platform_support.cc
+++ b/mojo/embedder/simple_platform_support.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 "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/simple_platform_support.h"
 
-#include "mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_shared_buffer.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/edk/embedder/simple_platform_support.h b/mojo/embedder/simple_platform_support.h
index fc5371de..07396af 100644
--- a/mojo/edk/embedder/simple_platform_support.h
+++ b/mojo/embedder/simple_platform_support.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
-#define MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
+#ifndef MOJO_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
+#define MOJO_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_support.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -34,4 +34,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SimplePlatformSupport : public PlatformSupport {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
+#endif  // MOJO_EMBEDDER_SIMPLE_PLATFORM_SUPPORT_H_
diff --git a/mojo/edk/embedder/test_embedder.cc b/mojo/embedder/test_embedder.cc
index 95d3be6..6d93fef 100644
--- a/mojo/edk/embedder/test_embedder.cc
+++ b/mojo/embedder/test_embedder.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 "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/entrypoints.h"
-#include "mojo/edk/system/handle_table.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/core.h"
+#include "mojo/system/entrypoints.h"
+#include "mojo/system/handle_table.h"
 
 namespace mojo {
 
diff --git a/mojo/edk/embedder/test_embedder.h b/mojo/embedder/test_embedder.h
index b6203b4..48f6326 100644
--- a/mojo/edk/embedder/test_embedder.h
+++ b/mojo/embedder/test_embedder.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_TEST_EMBEDDER_H_
-#define MOJO_EDK_EMBEDDER_TEST_EMBEDDER_H_
+#ifndef MOJO_EMBEDDER_TEST_EMBEDDER_H_
+#define MOJO_EMBEDDER_TEST_EMBEDDER_H_
 
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
@@ -26,4 +26,4 @@ MOJO_SYSTEM_IMPL_EXPORT bool Shutdown();
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_TEST_EMBEDDER_H_
+#endif  // MOJO_EMBEDDER_EMBEDDER_H_
diff --git a/mojo/go/BUILD.gn b/mojo/go/BUILD.gn
index e190379..87a169a0 100644
--- a/mojo/go/BUILD.gn
+++ b/mojo/go/BUILD.gn
@@ -19,6 +19,6 @@ go_test_binary("system_test") {
     "c_embedder/c_embedder.h",
   ]
   deps = [
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
diff --git a/mojo/go/c_embedder/c_embedder.cc b/mojo/go/c_embedder/c_embedder.cc
index 7d6a2e0..00104dc 100644
--- a/mojo/go/c_embedder/c_embedder.cc
+++ b/mojo/go/c_embedder/c_embedder.cc
@@ -5,8 +5,8 @@
 #include "mojo/go/c_embedder/c_embedder.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/mojo/go/system/impl/core_impl.go b/mojo/go/system/impl/core_impl.go
index 9341a06e..6db0e54 100644
--- a/mojo/go/system/impl/core_impl.go
+++ b/mojo/go/system/impl/core_impl.go
@@ -2,26 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package impl
+package impl;
 
 /*
 #include "mojo/public/platform/native/system_thunks.h"
 */
 import "C"
-import "mojo/public/go/mojo/edk/system"
+import "mojo/public/go/mojo/system"
+
 
 type CoreImpl struct {
 }
 
 func (c CoreImpl) GetTimeTicksNow() int64 {
-	return (int64)(C.MojoGetTimeTicksNow())
+	return (int64)(C.MojoGetTimeTicksNow());
 }
 
-var lazyInstance *CoreImpl = nil
+var lazyInstance *CoreImpl = nil;
 
 func GetCore() system.Core {
 	if lazyInstance == nil {
-		lazyInstance = new(CoreImpl)
+		lazyInstance = new(CoreImpl);
 	}
-	return lazyInstance
+	return lazyInstance;
 }
diff --git a/mojo/go/tests/system_test.go b/mojo/go/tests/system_test.go
index 549d01d..de3b380 100644
--- a/mojo/go/tests/system_test.go
+++ b/mojo/go/tests/system_test.go
@@ -6,18 +6,18 @@ package tests
 
 import "mojo/go/system/embedder"
 import "mojo/go/system/impl"
-import "mojo/public/go/mojo/edk/system"
+import "mojo/public/go/mojo/system"
 import "testing"
 
 func Init() {
-	embedder.InitializeMojoEmbedder()
+	embedder.InitializeMojoEmbedder();
 }
 
 func TestGetTimeTicksNow(t *testing.T) {
-	Init()
-	var c system.Core = impl.GetCore()
-	x := c.GetTimeTicksNow()
-	if x < 10 {
-		t.Error("Invalid GetTimeTicksNow return value")
+	Init();
+	var c system.Core = impl.GetCore();
+	x := c.GetTimeTicksNow();
+	if (x < 10) {
+		t.Error("Invalid GetTimeTicksNow return value");
 	}
 }
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index fbc3730..03d7948 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -87,7 +87,7 @@
       ],
     },
     {
-      # GN version: //mojo/edk/system
+      # GN version: //mojo/system
       'target_name': 'mojo_system_impl',
       'type': '<(component)',
       'dependencies': [
@@ -100,93 +100,93 @@
         'MOJO_USE_SYSTEM_IMPL',
       ],
       'sources': [
-        'edk/embedder/channel_init.cc',
-        'edk/embedder/channel_init.h',
-        'edk/embedder/embedder.cc',
-        'edk/embedder/embedder.h',
-        'edk/embedder/platform_channel_pair.cc',
-        'edk/embedder/platform_channel_pair.h',
-        'edk/embedder/platform_channel_pair_posix.cc',
-        'edk/embedder/platform_channel_pair_win.cc',
-        'edk/embedder/platform_channel_utils_posix.cc',
-        'edk/embedder/platform_channel_utils_posix.h',
-        'edk/embedder/platform_handle.cc',
-        'edk/embedder/platform_handle.h',
-        'edk/embedder/platform_handle_utils.h',
-        'edk/embedder/platform_handle_utils_posix.cc',
-        'edk/embedder/platform_handle_utils_win.cc',
-        'edk/embedder/platform_handle_vector.h',
-        'edk/embedder/platform_shared_buffer.h',
-        'edk/embedder/platform_support.h',
-        'edk/embedder/scoped_platform_handle.h',
-        'edk/embedder/simple_platform_shared_buffer.cc',
-        'edk/embedder/simple_platform_shared_buffer.h',
-        'edk/embedder/simple_platform_shared_buffer_posix.cc',
-        'edk/embedder/simple_platform_shared_buffer_win.cc',
-        'edk/embedder/simple_platform_support.cc',
-        'edk/embedder/simple_platform_support.h',
-        'edk/system/channel.cc',
-        'edk/system/channel.h',
-        'edk/system/channel_endpoint.cc',
-        'edk/system/channel_endpoint.h',
-        'edk/system/constants.h',
-        'edk/system/core.cc',
-        'edk/system/core.h',
-        'edk/system/data_pipe.cc',
-        'edk/system/data_pipe.h',
-        'edk/system/data_pipe_consumer_dispatcher.cc',
-        'edk/system/data_pipe_consumer_dispatcher.h',
-        'edk/system/data_pipe_producer_dispatcher.cc',
-        'edk/system/data_pipe_producer_dispatcher.h',
-        'edk/system/dispatcher.cc',
-        'edk/system/dispatcher.h',
-        'edk/system/entrypoints.cc',
-        'edk/system/handle_signals_state.h',
-        'edk/system/handle_table.cc',
-        'edk/system/handle_table.h',
-        'edk/system/local_data_pipe.cc',
-        'edk/system/local_data_pipe.h',
-        'edk/system/local_message_pipe_endpoint.cc',
-        'edk/system/local_message_pipe_endpoint.h',
-        'edk/system/mapping_table.cc',
-        'edk/system/mapping_table.h',
-        'edk/system/memory.cc',
-        'edk/system/memory.h',
-        'edk/system/message_in_transit.cc',
-        'edk/system/message_in_transit.h',
-        'edk/system/message_in_transit_queue.cc',
-        'edk/system/message_in_transit_queue.h',
-        'edk/system/message_pipe.cc',
-        'edk/system/message_pipe.h',
-        'edk/system/message_pipe_dispatcher.cc',
-        'edk/system/message_pipe_dispatcher.h',
-        'edk/system/message_pipe_endpoint.cc',
-        'edk/system/message_pipe_endpoint.h',
-        'edk/system/options_validation.h',
-        'edk/system/platform_handle_dispatcher.cc',
-        'edk/system/platform_handle_dispatcher.h',
-        'edk/system/proxy_message_pipe_endpoint.cc',
-        'edk/system/proxy_message_pipe_endpoint.h',
-        'edk/system/raw_channel.cc',
-        'edk/system/raw_channel.h',
-        'edk/system/raw_channel_posix.cc',
-        'edk/system/raw_channel_win.cc',
-        'edk/system/shared_buffer_dispatcher.cc',
-        'edk/system/shared_buffer_dispatcher.h',
-        'edk/system/simple_dispatcher.cc',
-        'edk/system/simple_dispatcher.h',
-        'edk/system/transport_data.cc',
-        'edk/system/transport_data.h',
-        'edk/system/waiter.cc',
-        'edk/system/waiter.h',
-        'edk/system/waiter_list.cc',
-        'edk/system/waiter_list.h',
+        'embedder/channel_init.cc',
+        'embedder/channel_init.h',
+        'embedder/embedder.cc',
+        'embedder/embedder.h',
+        'embedder/platform_channel_pair.cc',
+        'embedder/platform_channel_pair.h',
+        'embedder/platform_channel_pair_posix.cc',
+        'embedder/platform_channel_pair_win.cc',
+        'embedder/platform_channel_utils_posix.cc',
+        'embedder/platform_channel_utils_posix.h',
+        'embedder/platform_handle.cc',
+        'embedder/platform_handle.h',
+        'embedder/platform_handle_utils.h',
+        'embedder/platform_handle_utils_posix.cc',
+        'embedder/platform_handle_utils_win.cc',
+        'embedder/platform_handle_vector.h',
+        'embedder/platform_shared_buffer.h',
+        'embedder/platform_support.h',
+        'embedder/scoped_platform_handle.h',
+        'embedder/simple_platform_shared_buffer.cc',
+        'embedder/simple_platform_shared_buffer.h',
+        'embedder/simple_platform_shared_buffer_posix.cc',
+        'embedder/simple_platform_shared_buffer_win.cc',
+        'embedder/simple_platform_support.cc',
+        'embedder/simple_platform_support.h',
+        'system/channel.cc',
+        'system/channel.h',
+        'system/channel_endpoint.cc',
+        'system/channel_endpoint.h',
+        'system/constants.h',
+        'system/core.cc',
+        'system/core.h',
+        'system/data_pipe.cc',
+        'system/data_pipe.h',
+        'system/data_pipe_consumer_dispatcher.cc',
+        'system/data_pipe_consumer_dispatcher.h',
+        'system/data_pipe_producer_dispatcher.cc',
+        'system/data_pipe_producer_dispatcher.h',
+        'system/dispatcher.cc',
+        'system/dispatcher.h',
+        'system/entrypoints.cc',
+        'system/handle_signals_state.h',
+        'system/handle_table.cc',
+        'system/handle_table.h',
+        'system/local_data_pipe.cc',
+        'system/local_data_pipe.h',
+        'system/local_message_pipe_endpoint.cc',
+        'system/local_message_pipe_endpoint.h',
+        'system/mapping_table.cc',
+        'system/mapping_table.h',
+        'system/memory.cc',
+        'system/memory.h',
+        'system/message_in_transit.cc',
+        'system/message_in_transit.h',
+        'system/message_in_transit_queue.cc',
+        'system/message_in_transit_queue.h',
+        'system/message_pipe.cc',
+        'system/message_pipe.h',
+        'system/message_pipe_dispatcher.cc',
+        'system/message_pipe_dispatcher.h',
+        'system/message_pipe_endpoint.cc',
+        'system/message_pipe_endpoint.h',
+        'system/options_validation.h',
+        'system/platform_handle_dispatcher.cc',
+        'system/platform_handle_dispatcher.h',
+        'system/proxy_message_pipe_endpoint.cc',
+        'system/proxy_message_pipe_endpoint.h',
+        'system/raw_channel.cc',
+        'system/raw_channel.h',
+        'system/raw_channel_posix.cc',
+        'system/raw_channel_win.cc',
+        'system/shared_buffer_dispatcher.cc',
+        'system/shared_buffer_dispatcher.h',
+        'system/simple_dispatcher.cc',
+        'system/simple_dispatcher.h',
+        'system/transport_data.cc',
+        'system/transport_data.h',
+        'system/waiter.cc',
+        'system/waiter.h',
+        'system/waiter_list.cc',
+        'system/waiter_list.h',
         # Test-only code:
         # TODO(vtl): It's a little unfortunate that these end up in the same
         # component as non-test-only code. In the static build, this code should
         # hopefully be dead-stripped.
-        'edk/embedder/test_embedder.cc',
-        'edk/embedder/test_embedder.h',
+        'embedder/test_embedder.cc',
+        'embedder/test_embedder.h',
       ],
       'all_dependent_settings': {
         # Ensures that dependent projects import the core functions on Windows.
@@ -194,7 +194,7 @@
       }
     },
     {
-      # GN version: //mojo/edk/system:mojo_system_unittests
+      # GN version: //mojo/system:mojo_system_unittests
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
@@ -204,47 +204,47 @@
         'mojo_system_impl',
       ],
       'sources': [
-        'edk/embedder/embedder_unittest.cc',
-        'edk/embedder/platform_channel_pair_posix_unittest.cc',
-        'edk/embedder/simple_platform_shared_buffer_unittest.cc',
-        'edk/system/channel_unittest.cc',
-        'edk/system/core_unittest.cc',
-        'edk/system/core_test_base.cc',
-        'edk/system/core_test_base.h',
-        'edk/system/data_pipe_unittest.cc',
-        'edk/system/dispatcher_unittest.cc',
-        'edk/system/local_data_pipe_unittest.cc',
-        'edk/system/memory_unittest.cc',
-        'edk/system/message_pipe_dispatcher_unittest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/message_pipe_unittest.cc',
-        'edk/system/multiprocess_message_pipe_unittest.cc',
-        'edk/system/options_validation_unittest.cc',
-        'edk/system/platform_handle_dispatcher_unittest.cc',
-        'edk/system/raw_channel_unittest.cc',
-        'edk/system/remote_message_pipe_unittest.cc',
-        'edk/system/run_all_unittests.cc',
-        'edk/system/shared_buffer_dispatcher_unittest.cc',
-        'edk/system/simple_dispatcher_unittest.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
-        'edk/system/waiter_list_unittest.cc',
-        'edk/system/waiter_test_utils.cc',
-        'edk/system/waiter_test_utils.h',
-        'edk/system/waiter_unittest.cc',
+        'embedder/embedder_unittest.cc',
+        'embedder/platform_channel_pair_posix_unittest.cc',
+        'embedder/simple_platform_shared_buffer_unittest.cc',
+        'system/channel_unittest.cc',
+        'system/core_unittest.cc',
+        'system/core_test_base.cc',
+        'system/core_test_base.h',
+        'system/data_pipe_unittest.cc',
+        'system/dispatcher_unittest.cc',
+        'system/local_data_pipe_unittest.cc',
+        'system/memory_unittest.cc',
+        'system/message_pipe_dispatcher_unittest.cc',
+        'system/message_pipe_test_utils.h',
+        'system/message_pipe_test_utils.cc',
+        'system/message_pipe_unittest.cc',
+        'system/multiprocess_message_pipe_unittest.cc',
+        'system/options_validation_unittest.cc',
+        'system/platform_handle_dispatcher_unittest.cc',
+        'system/raw_channel_unittest.cc',
+        'system/remote_message_pipe_unittest.cc',
+        'system/run_all_unittests.cc',
+        'system/shared_buffer_dispatcher_unittest.cc',
+        'system/simple_dispatcher_unittest.cc',
+        'system/test_utils.cc',
+        'system/test_utils.h',
+        'system/waiter_list_unittest.cc',
+        'system/waiter_test_utils.cc',
+        'system/waiter_test_utils.h',
+        'system/waiter_unittest.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/embedder/embedder_unittest.cc',
-            'edk/system/multiprocess_message_pipe_unittest.cc',
+            'embedder/embedder_unittest.cc',
+            'system/multiprocess_message_pipe_unittest.cc',
           ],
         }],
       ],
     },
     {
-      # GN version: //mojo/edk/system:mojo_message_pipe_perftests
+      # GN version: //mojo/system:mojo_message_pipe_perftests
       'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
@@ -257,11 +257,11 @@
         'mojo_system_impl',
       ],
       'sources': [
-        'edk/system/message_pipe_perftest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
+        'system/message_pipe_perftest.cc',
+        'system/message_pipe_test_utils.h',
+        'system/message_pipe_test_utils.cc',
+        'system/test_utils.cc',
+        'system/test_utils.h',
       ],
     },
     {
@@ -307,7 +307,7 @@
       ],
     },
     {
-      # GN version: //mojo/edk/test:test_support
+      # GN version: //mojo/common/test:test_support
       'target_name': 'mojo_common_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -317,16 +317,16 @@
         'mojo_system_impl',
       ],
       'sources': [
-        'edk/test/multiprocess_test_helper.cc',
-        'edk/test/multiprocess_test_helper.h',
-        'edk/test/test_utils.h',
-        'edk/test/test_utils_posix.cc',
-        'edk/test/test_utils_win.cc',
+        'common/test/multiprocess_test_helper.cc',
+        'common/test/multiprocess_test_helper.h',
+        'common/test/test_utils.h',
+        'common/test/test_utils_posix.cc',
+        'common/test/test_utils_win.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/test/multiprocess_test_helper.cc',
+            'common/test/multiprocess_test_helper.cc',
           ],
         }],
       ],
@@ -351,12 +351,12 @@
         'common/common_type_converters_unittest.cc',
         'common/handle_watcher_unittest.cc',
         'common/message_pump_mojo_unittest.cc',
-        'edk/test/multiprocess_test_helper_unittest.cc',
+        'common/test/multiprocess_test_helper_unittest.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/test/multiprocess_test_helper_unittest.cc',
+            'common/test/multiprocess_test_helper_unittest.cc',
           ],
         }],
       ],
diff --git a/mojo/nacl/monacl_shell.cc b/mojo/nacl/monacl_shell.cc
index 7922d9a..1711863 100644
--- a/mojo/nacl/monacl_shell.cc
+++ b/mojo/nacl/monacl_shell.cc
@@ -4,8 +4,8 @@
 
 #include <iostream>
 
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 #include "mojo/nacl/monacl_sel_main.h"
 
 
diff --git a/mojo/public/c/system/BUILD.gn b/mojo/public/c/system/BUILD.gn
index b47b3da9..028bc3c 100644
--- a/mojo/public/c/system/BUILD.gn
+++ b/mojo/public/c/system/BUILD.gn
@@ -19,9 +19,9 @@ source_set("system") {
   ]
 }
 
-# In an is_component_build build, everything can link against //mojo/edk/system
+# In an is_component_build build, everything can link against //mojo/system
 # because it is built as a shared library. However, in a static build,
-# //mojo/edk/system is linked into an executable (e.g., mojo_shell), and must be
+# //mojo/system is linked into an executable (e.g., mojo_shell), and must be
 # injected into other shared libraries (i.e., Mojo Apps) that need the mojo
 # system API.
 #
@@ -34,7 +34,7 @@ source_set("system") {
 group("for_shared_library") {
   public_deps = [ ":system" ]
   if (is_component_build) {
-    deps = [ "//mojo/edk/system" ]
+    deps = [ "//mojo/system" ]
   } else {
     deps = [ "//mojo/public/platform/native:system_thunks" ]
   }
@@ -43,6 +43,6 @@ group("for_shared_library") {
 group("for_component") {
   public_deps = [ ":system" ]
   if (is_component_build) {
-    deps = [ "//mojo/edk/system" ]
+    deps = [ "//mojo/system" ]
   }
 }
diff --git a/mojo/public/js/bindings/tests/BUILD.gn b/mojo/public/js/bindings/tests/BUILD.gn
index c85e68f..e2fc48f 100644
--- a/mojo/public/js/bindings/tests/BUILD.gn
+++ b/mojo/public/js/bindings/tests/BUILD.gn
@@ -6,12 +6,12 @@
 test("mojo_js_unittests") {
   deps = [
     "//gin:gin_test",
+    "//mojo/common/test:test_support",
+    "//mojo/public/cpp/environment:standalone",
     "//mojo/bindings/js",
+    "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/test:test_support",
-    "//mojo/public/cpp/environment:standalone",
     "//mojo/public/cpp/utility",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
 
   sources = [ "run_js_tests.cc" ]
diff --git a/mojo/python/BUILD.gn b/mojo/python/BUILD.gn
index 7b07f4f..95eab04 100644
--- a/mojo/python/BUILD.gn
+++ b/mojo/python/BUILD.gn
@@ -19,7 +19,7 @@ python_binary_module("embedder") {
     "system/mojo/embedder.pyx",
   ]
   deps = [
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
   datadeps = [
     "//mojo/public/python:system",
diff --git a/mojo/python/system/mojo/embedder.pyx b/mojo/python/system/mojo/embedder.pyx
index c409999..06ac22f 100644
--- a/mojo/python/system/mojo/embedder.pyx
+++ b/mojo/python/system/mojo/embedder.pyx
@@ -15,17 +15,17 @@ cdef extern from "base/memory/scoped_ptr.h":
   cdef cppclass scoped_ptr[T]:
     scoped_ptr(T*)
 
-cdef extern from "mojo/edk/embedder/platform_support.h" \
+cdef extern from "mojo/embedder/platform_support.h" \
     namespace "mojo::embedder" nogil:
   cdef cppclass PlatformSupport:
     pass
 
-cdef extern from "mojo/edk/embedder/simple_platform_support.h" \
+cdef extern from "mojo/embedder/simple_platform_support.h" \
     namespace "mojo::embedder" nogil:
   cdef cppclass SimplePlatformSupport(PlatformSupport):
     SimplePlatformSupport()
 
-cdef extern from "mojo/edk/embedder/embedder.h" nogil:
+cdef extern from "mojo/embedder/embedder.h" nogil:
   cdef void InitCEmbedder "mojo::embedder::Init"(
       scoped_ptr[PlatformSupport] platform_support)
 
diff --git a/mojo/services/clipboard/BUILD.gn b/mojo/services/clipboard/BUILD.gn
index 5c3b78e..f7029411 100644
--- a/mojo/services/clipboard/BUILD.gn
+++ b/mojo/services/clipboard/BUILD.gn
@@ -31,10 +31,10 @@ test("mojo_clipboard_unittests") {
     "//mojo/application_manager",
     "//mojo/common",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/services/public/interfaces/clipboard:clipboard",
     "//mojo/shell:test_support",
+    "//mojo/system",
     "//testing/gtest",
   ]
 
diff --git a/mojo/services/view_manager/BUILD.gn b/mojo/services/view_manager/BUILD.gn
index ddb76e2..b9ca037 100644
--- a/mojo/services/view_manager/BUILD.gn
+++ b/mojo/services/view_manager/BUILD.gn
@@ -68,14 +68,14 @@ test("mojo_view_manager_unittests") {
     "//base/test:test_support",
     "//mojo/application",
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/public/cpp/geometry",
     "//mojo/services/public/cpp/input_events",
+    "//mojo/services/public/cpp/geometry",
     "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/cpp/view_manager/lib:run_unittests",
     "//mojo/shell:test_support",
+    "//mojo/system",
     "//testing/gtest",
     "//ui/gfx/geometry",
   ]
diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn
index b439775..3a08deb 100644
--- a/mojo/services/window_manager/BUILD.gn
+++ b/mojo/services/window_manager/BUILD.gn
@@ -63,12 +63,12 @@ test("mojo_core_window_manager_unittests") {
   deps = [
     "//base/test:test_support",
     "//mojo/application_manager",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/interfaces/view_manager",
     "//mojo/services/public/interfaces/window_manager",
     "//mojo/shell:test_support",
+    "//mojo/system",
     "//testing/gtest",
     "//ui/gl",
   ]
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index f405bc9..becbf15 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -34,11 +34,11 @@ source_set("lib") {
     "//mojo/application",
     "//mojo/application_manager",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/gles2",
     "//mojo/public/interfaces/application",
     "//mojo/services/public/interfaces/network",
     "//mojo/spy",
+    "//mojo/system",
   ]
 
   sources = [
@@ -133,10 +133,10 @@ test("mojo_shell_tests") {
     "//net:test_support",
     "//url",
     "//mojo/application_manager",
+    "//mojo/services/test_service:bindings",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/services/test_service:bindings",
+    "//mojo/system",
   ]
 
   datadeps = [
@@ -171,7 +171,7 @@ source_set("test_support") {
 
   deps = [
     ":lib",
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
 
@@ -187,8 +187,8 @@ test("mojo_external_application_tests") {
     "//url",
     "//mojo/application_manager",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
   ]
 
   sources = [
diff --git a/mojo/shell/DEPS b/mojo/shell/DEPS
index 1370103..56b6b65 100644
--- a/mojo/shell/DEPS
+++ b/mojo/shell/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+gpu",
-  "+mojo/edk/embedder",
+  "+mojo/embedder",
   "+net",
   "+ui/gfx/switches.h",
   "+ui/gl",
diff --git a/mojo/shell/app_child_process.cc b/mojo/shell/app_child_process.cc
index 7bf5420..c288ee3 100644
--- a/mojo/shell/app_child_process.cc
+++ b/mojo/shell/app_child_process.cc
@@ -19,8 +19,8 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/common/message_pump_mojo.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/app_child_process.mojom.h"
 
diff --git a/mojo/shell/app_child_process_host.cc b/mojo/shell/app_child_process_host.cc
index 8da4772..0740608 100644
--- a/mojo/shell/app_child_process_host.cc
+++ b/mojo/shell/app_child_process_host.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/task_runners.h"
diff --git a/mojo/shell/child_process.cc b/mojo/shell/child_process.cc
index 79b9940..24728af 100644
--- a/mojo/shell/child_process.cc
+++ b/mojo/shell/child_process.cc
@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/app_child_process.h"
 #include "mojo/shell/switches.h"
 #include "mojo/shell/test_child_process.h"
diff --git a/mojo/shell/child_process.h b/mojo/shell/child_process.h
index 81780a3..d794a4e 100644
--- a/mojo/shell/child_process.h
+++ b/mojo/shell/child_process.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace base {
 class CommandLine;
diff --git a/mojo/shell/child_process_host.h b/mojo/shell/child_process_host.h
index 6e94b96..d3c7669 100644
--- a/mojo/shell/child_process_host.h
+++ b/mojo/shell/child_process_host.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "base/process/process_handle.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/shell/child_process.h"  // For |ChildProcess::Type|.
 
 namespace mojo {
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index e1c8d53..7925450 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -19,8 +19,8 @@
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/application_manager/background_shell_application_loader.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
diff --git a/mojo/shell/external_application_listener_posix.cc b/mojo/shell/external_application_listener_posix.cc
index 42afa25..c4f28ff 100644
--- a/mojo/shell/external_application_listener_posix.cc
+++ b/mojo/shell/external_application_listener_posix.cc
@@ -16,7 +16,7 @@
 #include "base/threading/thread_checker.h"
 #include "base/tracked_objects.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/shell/external_application_registrar.mojom.h"
 #include "mojo/shell/incoming_connection_listener_posix.h"
diff --git a/mojo/shell/external_application_listener_posix.h b/mojo/shell/external_application_listener_posix.h
index 788a4ff..9a7eedc 100644
--- a/mojo/shell/external_application_listener_posix.h
+++ b/mojo/shell/external_application_listener_posix.h
@@ -15,7 +15,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_checker.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/shell/external_application_registrar.mojom.h"
 #include "mojo/shell/incoming_connection_listener_posix.h"
diff --git a/mojo/shell/external_application_registrar_connection.cc b/mojo/shell/external_application_registrar_connection.cc
index 57498a9..8afe0c1 100644
--- a/mojo/shell/external_application_registrar_connection.cc
+++ b/mojo/shell/external_application_registrar_connection.cc
@@ -8,7 +8,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
diff --git a/mojo/shell/external_application_registrar_connection.h b/mojo/shell/external_application_registrar_connection.h
index 327d19b..38b66fc 100644
--- a/mojo/shell/external_application_registrar_connection.h
+++ b/mojo/shell/external_application_registrar_connection.h
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
diff --git a/mojo/shell/external_application_test_main.cc b/mojo/shell/external_application_test_main.cc
index 859f52b..bdad551 100644
--- a/mojo/shell/external_application_test_main.cc
+++ b/mojo/shell/external_application_test_main.cc
@@ -6,8 +6,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 int main(int argc, char** argv) {
diff --git a/mojo/shell/incoming_connection_listener_unittest.cc b/mojo/shell/incoming_connection_listener_unittest.cc
index 5488c98..5a99a25 100644
--- a/mojo/shell/incoming_connection_listener_unittest.cc
+++ b/mojo/shell/incoming_connection_listener_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/edk/embedder/channel_init.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/channel_init.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/external_application_registrar_connection.h"
 #include "mojo/shell/incoming_connection_listener_posix.h"
 #include "net/base/net_errors.h"
diff --git a/mojo/edk/system/BUILD.gn b/mojo/system/BUILD.gn
index 549af7d..4bee025 100644
--- a/mojo/edk/system/BUILD.gn
+++ b/mojo/system/BUILD.gn
@@ -15,7 +15,7 @@ component("system") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/edk/embedder",
+    "//mojo/embedder",
   ]
 
   defines = [
@@ -90,24 +90,23 @@ test("mojo_system_unittests") {
   deps = [
     ":system",
     "//base",
-    "//mojo/edk/embedder:embedder_unittests",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
+    "//mojo/embedder:embedder_unittests",
     "//testing/gtest",
   ]
 
   sources = [
-    "../test/multiprocess_test_helper_unittest.cc",
     "channel_unittest.cc",
+    "core_unittest.cc",
     "core_test_base.cc",
     "core_test_base.h",
-    "core_unittest.cc",
     "data_pipe_unittest.cc",
     "dispatcher_unittest.cc",
     "local_data_pipe_unittest.cc",
     "memory_unittest.cc",
     "message_pipe_dispatcher_unittest.cc",
-    "message_pipe_test_utils.cc",
     "message_pipe_test_utils.h",
+    "message_pipe_test_utils.cc",
     "message_pipe_unittest.cc",
     "multiprocess_message_pipe_unittest.cc",
     "options_validation_unittest.cc",
@@ -133,7 +132,7 @@ test("mojo_message_pipe_perftests") {
     "//base",
     "//base/test:test_support",
     "//base/test:test_support_perf",
-    "//mojo/edk/test:test_support",
+    "//mojo/common/test:test_support",
     "//testing/gtest",
   ]
 
diff --git a/mojo/edk/embedder/PRESUBMIT.py b/mojo/system/PRESUBMIT.py
index 9cd39bc..36cc56a 100644
--- a/mojo/edk/embedder/PRESUBMIT.py
+++ b/mojo/system/PRESUBMIT.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Presubmit script for mojo/edk/embedder.
+"""Presubmit script for mojo/system.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
diff --git a/mojo/edk/system/channel.cc b/mojo/system/channel.cc
index 79b6e92..6c927ba 100644
--- a/mojo/edk/system/channel.cc
+++ b/mojo/system/channel.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 "mojo/edk/system/channel.h"
+#include "mojo/system/channel.h"
 
 #include <algorithm>
 
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/channel.h b/mojo/system/channel.h
index bd66ca4..0be9999 100644
--- a/mojo/edk/system/channel.h
+++ b/mojo/system/channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CHANNEL_H_
-#define MOJO_EDK_SYSTEM_CHANNEL_H_
+#ifndef MOJO_SYSTEM_CHANNEL_H_
+#define MOJO_SYSTEM_CHANNEL_H_
 
 #include <stdint.h>
 
@@ -15,13 +15,13 @@
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -190,4 +190,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CHANNEL_H_
+#endif  // MOJO_SYSTEM_CHANNEL_H_
diff --git a/mojo/edk/system/channel_endpoint.cc b/mojo/system/channel_endpoint.cc
index 40cb184..dbd3fdb 100644
--- a/mojo/edk/system/channel_endpoint.cc
+++ b/mojo/system/channel_endpoint.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 "mojo/edk/system/channel_endpoint.h"
+#include "mojo/system/channel_endpoint.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/channel_endpoint.h b/mojo/system/channel_endpoint.h
index 0ba7aaf..d11c16c 100644
--- a/mojo/edk/system/channel_endpoint.h
+++ b/mojo/system/channel_endpoint.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
-#define MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
+#ifndef MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
+#define MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_in_transit_queue.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_in_transit_queue.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -207,4 +207,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelEndpoint
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
+#endif  // MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/system/channel_unittest.cc
index 237c05c..a99663e 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/mojo/system/channel_unittest.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 "mojo/edk/system/channel.h"
+#include "mojo/system/channel.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/constants.h b/mojo/system/constants.h
index 23f35d8..b92eef1 100644
--- a/mojo/edk/system/constants.h
+++ b/mojo/system/constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CONSTANTS_H_
-#define MOJO_EDK_SYSTEM_CONSTANTS_H_
+#ifndef MOJO_SYSTEM_CONSTANTS_H_
+#define MOJO_SYSTEM_CONSTANTS_H_
 
 #include <stddef.h>
 
@@ -45,4 +45,4 @@ const size_t kMaxSharedMemoryNumBytes = 1024 * 1024 * 1024;  // 1 GB.
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CONSTANTS_H_
+#endif  // MOJO_SYSTEM_CONSTANTS_H_
diff --git a/mojo/edk/system/core.cc b/mojo/system/core.cc
index c67a626..db9d70f 100644
--- a/mojo/edk/system/core.cc
+++ b/mojo/system/core.cc
@@ -2,27 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/core.h"
+#include "mojo/system/core.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
-#include "mojo/edk/system/data_pipe_producer_dispatcher.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/local_data_pipe.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/shared_buffer_dispatcher.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/embedder/platform_support.h"
 #include "mojo/public/c/system/macros.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/data_pipe_consumer_dispatcher.h"
+#include "mojo/system/data_pipe_producer_dispatcher.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/local_data_pipe.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/core.h b/mojo/system/core.h
index 5a3c27b..d074da3 100644
--- a/mojo/edk/system/core.h
+++ b/mojo/system/core.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CORE_H_
-#define MOJO_EDK_SYSTEM_CORE_H_
+#ifndef MOJO_SYSTEM_CORE_H_
+#define MOJO_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
@@ -11,14 +11,14 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/system/handle_table.h"
-#include "mojo/edk/system/mapping_table.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/handle_table.h"
+#include "mojo/system/mapping_table.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -153,4 +153,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Core {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CORE_H_
+#endif  // MOJO_SYSTEM_CORE_H_
diff --git a/mojo/edk/system/core_test_base.cc b/mojo/system/core_test_base.cc
index 0f2c7cc..0518135 100644
--- a/mojo/edk/system/core_test_base.cc
+++ b/mojo/system/core_test_base.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 "mojo/edk/system/core_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/core.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/core_test_base.h b/mojo/system/core_test_base.h
index 409f7e1..e1b52bc 100644
--- a/mojo/edk/system/core_test_base.h
+++ b/mojo/system/core_test_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
-#define MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
+#ifndef MOJO_SYSTEM_CORE_TEST_BASE_H_
+#define MOJO_SYSTEM_CORE_TEST_BASE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -102,4 +102,4 @@ class CoreTestBase_MockHandleInfo {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
+#endif  // MOJO_SYSTEM_CORE_TEST_BASE_H_
diff --git a/mojo/edk/system/core_unittest.cc b/mojo/system/core_unittest.cc
index 9adde19..f229883 100644
--- a/mojo/edk/system/core_unittest.cc
+++ b/mojo/system/core_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 "mojo/edk/system/core.h"
+#include "mojo/system/core.h"
 
 #include <stdint.h>
 
@@ -10,7 +10,7 @@
 
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/core_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/data_pipe.cc b/mojo/system/data_pipe.cc
index 3aca67a..767657d 100644
--- a/mojo/edk/system/data_pipe.cc
+++ b/mojo/system/data_pipe.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 "mojo/edk/system/data_pipe.h"
+#include "mojo/system/data_pipe.h"
 
 #include <string.h>
 
@@ -11,10 +11,10 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/options_validation.h"
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/options_validation.h"
+#include "mojo/system/waiter_list.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/data_pipe.h b/mojo/system/data_pipe.h
index 64b18e2..aa054df 100644
--- a/mojo/edk/system/data_pipe.h
+++ b/mojo/system/data_pipe.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DATA_PIPE_H_
-#define MOJO_EDK_SYSTEM_DATA_PIPE_H_
+#ifndef MOJO_SYSTEM_DATA_PIPE_H_
+#define MOJO_SYSTEM_DATA_PIPE_H_
 
 #include <stdint.h>
 
@@ -11,11 +11,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -213,4 +213,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipe
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DATA_PIPE_H_
+#endif  // MOJO_SYSTEM_DATA_PIPE_H_
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.cc b/mojo/system/data_pipe_consumer_dispatcher.cc
index 2b3f514..fe083e0 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.cc
+++ b/mojo/system/data_pipe_consumer_dispatcher.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 "mojo/edk/system/data_pipe_consumer_dispatcher.h"
+#include "mojo/system/data_pipe_consumer_dispatcher.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/system/data_pipe_consumer_dispatcher.h
index 59c1239..64e5bb3c 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.h
+++ b/mojo/system/data_pipe_consumer_dispatcher.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#define MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -64,4 +64,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipeConsumerDispatcher : public Dispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_DATA_PIPE_CONSUMER_DISPATCHER_H_
diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.cc b/mojo/system/data_pipe_producer_dispatcher.cc
index 0a82c9a..b7e7db3 100644
--- a/mojo/edk/system/data_pipe_producer_dispatcher.cc
+++ b/mojo/system/data_pipe_producer_dispatcher.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 "mojo/edk/system/data_pipe_producer_dispatcher.h"
+#include "mojo/system/data_pipe_producer_dispatcher.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.h b/mojo/system/data_pipe_producer_dispatcher.h
index a53357a..91ba94b 100644
--- a/mojo/edk/system/data_pipe_producer_dispatcher.h
+++ b/mojo/system/data_pipe_producer_dispatcher.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
+#define MOJO_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -65,4 +65,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipeProducerDispatcher : public Dispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_DATA_PIPE_PRODUCER_DISPATCHER_H_
diff --git a/mojo/edk/system/data_pipe_unittest.cc b/mojo/system/data_pipe_unittest.cc
index 8d2e4eb..bbdafe9 100644
--- a/mojo/edk/system/data_pipe_unittest.cc
+++ b/mojo/system/data_pipe_unittest.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 "mojo/edk/system/data_pipe.h"
+#include "mojo/system/data_pipe.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 
-#include "mojo/edk/system/constants.h"
+#include "mojo/system/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/dispatcher.cc b/mojo/system/dispatcher.cc
index 5607125..214e291 100644
--- a/mojo/edk/system/dispatcher.cc
+++ b/mojo/system/dispatcher.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 "mojo/edk/system/dispatcher.h"
+#include "mojo/system/dispatcher.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/shared_buffer_dispatcher.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/dispatcher.h b/mojo/system/dispatcher.h
index 3e2230a..9c5c338 100644
--- a/mojo/edk/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_DISPATCHER_H_
+#define MOJO_SYSTEM_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -14,15 +14,15 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -402,4 +402,4 @@ class MOJO_SYSTEM_IMPL_EXPORT DispatcherTransport {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_DISPATCHER_H_
diff --git a/mojo/edk/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
index d9d526d..209ada4 100644
--- a/mojo/edk/system/dispatcher_unittest.cc
+++ b/mojo/system/dispatcher_unittest.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 "mojo/edk/system/dispatcher.h"
+#include "mojo/system/dispatcher.h"
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/entrypoints.cc b/mojo/system/entrypoints.cc
index 7ec5bb4..9b5d3bf 100644
--- a/mojo/edk/system/entrypoints.cc
+++ b/mojo/system/entrypoints.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 "mojo/edk/system/entrypoints.h"
+#include "mojo/system/entrypoints.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/core.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/message_pipe.h"
+#include "mojo/system/core.h"
 
 static mojo::system::Core* g_core = nullptr;
 
diff --git a/mojo/edk/system/entrypoints.h b/mojo/system/entrypoints.h
index 46c41b4..65a0363 100644
--- a/mojo/edk/system/entrypoints.h
+++ b/mojo/system/entrypoints.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_ENTRYPOINTS_H_
-#define MOJO_EDK_SYSTEM_ENTRYPOINTS_H_
+#ifndef MOJO_SYSTEM_ENTRYPOINTS_H
+#define MOJO_SYSTEM_ENTRYPOINTS_H
 
 namespace mojo {
 namespace system {
@@ -21,4 +21,4 @@ Core* GetCore();
 }  // namepace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_ENTRYPOINTS_H_
+#endif  // MOJO_SYSTEM_ENTRYPOINTS_H
diff --git a/mojo/edk/system/handle_signals_state.h b/mojo/system/handle_signals_state.h
index 3391ea0..f442cf5 100644
--- a/mojo/edk/system/handle_signals_state.h
+++ b/mojo/system/handle_signals_state.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_
-#define MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#ifndef MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#define MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_
 
 #include "base/macros.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -47,4 +47,4 @@ static_assert(sizeof(HandleSignalsState) == sizeof(MojoHandleSignalsState),
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_HANDLE_SIGNALS_STATE_H_
+#endif  // MOJO_SYSTEM_HANDLE_SIGNALS_STATE_H_
diff --git a/mojo/edk/system/handle_table.cc b/mojo/system/handle_table.cc
index 9c01230..8cfa267 100644
--- a/mojo/edk/system/handle_table.cc
+++ b/mojo/system/handle_table.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 "mojo/edk/system/handle_table.h"
+#include "mojo/system/handle_table.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/dispatcher.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/dispatcher.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/handle_table.h b/mojo/system/handle_table.h
index 9385643..8afb18b 100644
--- a/mojo/edk/system/handle_table.h
+++ b/mojo/system/handle_table.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
-#define MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
+#ifndef MOJO_SYSTEM_HANDLE_TABLE_H_
+#define MOJO_SYSTEM_HANDLE_TABLE_H_
 
 #include <utility>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -141,4 +141,4 @@ class MOJO_SYSTEM_IMPL_EXPORT HandleTable {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
+#endif  // MOJO_SYSTEM_HANDLE_TABLE_H_
diff --git a/mojo/edk/system/local_data_pipe.cc b/mojo/system/local_data_pipe.cc
index 8ee696c..79e293f 100644
--- a/mojo/edk/system/local_data_pipe.cc
+++ b/mojo/system/local_data_pipe.cc
@@ -8,14 +8,14 @@
 // saved by the limit on capacity -- the maximum size of the buffer, checked in
 // |DataPipe::ValidateOptions()|, is currently sufficiently small.)
 
-#include "mojo/edk/system/local_data_pipe.h"
+#include "mojo/system/local_data_pipe.h"
 
 #include <string.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
-#include "mojo/edk/system/constants.h"
+#include "mojo/system/constants.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/local_data_pipe.h b/mojo/system/local_data_pipe.h
index 8d3b75b..2eedca3 100644
--- a/mojo/edk/system/local_data_pipe.h
+++ b/mojo/system/local_data_pipe.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_LOCAL_DATA_PIPE_H_
-#define MOJO_EDK_SYSTEM_LOCAL_DATA_PIPE_H_
+#ifndef MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
+#define MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
 
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -89,4 +89,4 @@ class MOJO_SYSTEM_IMPL_EXPORT LocalDataPipe : public DataPipe {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_LOCAL_DATA_PIPE_H_
+#endif  // MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
diff --git a/mojo/edk/system/local_data_pipe_unittest.cc b/mojo/system/local_data_pipe_unittest.cc
index 979b4d2..adcd556 100644
--- a/mojo/edk/system/local_data_pipe_unittest.cc
+++ b/mojo/system/local_data_pipe_unittest.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 "mojo/edk/system/local_data_pipe.h"
+#include "mojo/system/local_data_pipe.h"
 
 #include <string.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/local_message_pipe_endpoint.cc b/mojo/system/local_message_pipe_endpoint.cc
index 124241e..24b7e7c 100644
--- a/mojo/edk/system/local_message_pipe_endpoint.cc
+++ b/mojo/system/local_message_pipe_endpoint.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 "mojo/edk/system/local_message_pipe_endpoint.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
 
 #include <string.h>
 
 #include "base/logging.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/message_in_transit.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/message_in_transit.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/local_message_pipe_endpoint.h b/mojo/system/local_message_pipe_endpoint.h
index ccff26d..da38ba2 100644
--- a/mojo/edk/system/local_message_pipe_endpoint.h
+++ b/mojo/system/local_message_pipe_endpoint.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
-#define MOJO_EDK_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
+#ifndef MOJO_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
+#define MOJO_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/message_in_transit_queue.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/system_impl_export.h"
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/message_in_transit_queue.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/system_impl_export.h"
+#include "mojo/system/waiter_list.h"
 
 namespace mojo {
 namespace system {
@@ -61,4 +61,4 @@ class MOJO_SYSTEM_IMPL_EXPORT LocalMessagePipeEndpoint
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
+#endif  // MOJO_SYSTEM_LOCAL_MESSAGE_PIPE_ENDPOINT_H_
diff --git a/mojo/edk/system/mapping_table.cc b/mojo/system/mapping_table.cc
index 0a28a1d..7aeb04d 100644
--- a/mojo/edk/system/mapping_table.cc
+++ b/mojo/system/mapping_table.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 "mojo/edk/system/mapping_table.h"
+#include "mojo/system/mapping_table.h"
 
 #include "base/logging.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/system/constants.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/system/constants.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/mapping_table.h b/mojo/system/mapping_table.h
index d2812d8..5581e1e 100644
--- a/mojo/edk/system/mapping_table.h
+++ b/mojo/system/mapping_table.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
-#define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
+#ifndef MOJO_SYSTEM_MAPPING_TABLE_H_
+#define MOJO_SYSTEM_MAPPING_TABLE_H_
 
 #include <stdint.h>
 
@@ -12,8 +12,8 @@
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -59,4 +59,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MappingTable {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
+#endif  // MOJO_SYSTEM_MAPPING_TABLE_H_
diff --git a/mojo/edk/system/memory.cc b/mojo/system/memory.cc
index 606c08f..2df2ff2 100644
--- a/mojo/edk/system/memory.cc
+++ b/mojo/system/memory.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 "mojo/edk/system/memory.h"
+#include "mojo/system/memory.h"
 
 #include <limits>
 
diff --git a/mojo/edk/system/memory.h b/mojo/system/memory.h
index 7b5b724..acbbb54 100644
--- a/mojo/edk/system/memory.h
+++ b/mojo/system/memory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MEMORY_H_
-#define MOJO_EDK_SYSTEM_MEMORY_H_
+#ifndef MOJO_SYSTEM_MEMORY_H_
+#define MOJO_SYSTEM_MEMORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -11,8 +11,8 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/macros.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -374,4 +374,4 @@ class UserPointerReaderWriter {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MEMORY_H_
+#endif  // MOJO_SYSTEM_MEMORY_H_
diff --git a/mojo/edk/system/memory_unittest.cc b/mojo/system/memory_unittest.cc
index 46515c0..74bcf11 100644
--- a/mojo/edk/system/memory_unittest.cc
+++ b/mojo/system/memory_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 "mojo/edk/system/memory.h"
+#include "mojo/system/memory.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/mojo/edk/system/message_in_transit.cc b/mojo/system/message_in_transit.cc
index f1fb91d..911623c 100644
--- a/mojo/edk/system/message_in_transit.cc
+++ b/mojo/system/message_in_transit.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 "mojo/edk/system/message_in_transit.h"
+#include "mojo/system/message_in_transit.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/message_in_transit.h b/mojo/system/message_in_transit.h
index 7714fa7..9101f365 100644
--- a/mojo/edk/system/message_in_transit.h
+++ b/mojo/system/message_in_transit.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#ifndef MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#define MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,9 +13,9 @@
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -264,4 +264,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
+#endif  // MOJO_SYSTEM_MESSAGE_IN_TRANSIT_H_
diff --git a/mojo/edk/system/message_in_transit_queue.cc b/mojo/system/message_in_transit_queue.cc
index ab5195e..1ad5ecf 100644
--- a/mojo/edk/system/message_in_transit_queue.cc
+++ b/mojo/system/message_in_transit_queue.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 "mojo/edk/system/message_in_transit_queue.h"
+#include "mojo/system/message_in_transit_queue.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
diff --git a/mojo/edk/system/message_in_transit_queue.h b/mojo/system/message_in_transit_queue.h
index d81bd2b..a32f424 100644
--- a/mojo/edk/system/message_in_transit_queue.h
+++ b/mojo/system/message_in_transit_queue.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#ifndef MOJO_SYSTEM_MESSAGE_QUEUE_H_
+#define MOJO_SYSTEM_MESSAGE_QUEUE_H_
 
 #include <deque>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -58,4 +58,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransitQueue {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#endif  // MOJO_SYSTEM_MESSAGE_QUEUE_H_
diff --git a/mojo/edk/system/message_pipe.cc b/mojo/system/message_pipe.cc
index 55f1285..17cb5c07 100644
--- a/mojo/edk/system/message_pipe.cc
+++ b/mojo/system/message_pipe.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/message_pipe.h"
+#include "mojo/system/message_pipe.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/local_message_pipe_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/proxy_message_pipe_endpoint.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/message_pipe.h b/mojo/system/message_pipe.h
index e1d9f63..5375302 100644
--- a/mojo/edk/system/message_pipe.h
+++ b/mojo/system/message_pipe.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_H_
 
 #include <stdint.h>
 
@@ -13,14 +13,14 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -129,4 +129,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessagePipe
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_H_
diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/mojo/system/message_pipe_dispatcher.cc
index 5da6f7f..abe0ecb 100644
--- a/mojo/edk/system/message_pipe_dispatcher.cc
+++ b/mojo/system/message_pipe_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 "mojo/edk/system/message_pipe_dispatcher.h"
+#include "mojo/system/message_pipe_dispatcher.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/local_message_pipe_endpoint.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/options_validation.h"
-#include "mojo/edk/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/options_validation.h"
+#include "mojo/system/proxy_message_pipe_endpoint.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/message_pipe_dispatcher.h b/mojo/system/message_pipe_dispatcher.h
index de789ba..ac3d5f9 100644
--- a/mojo/edk/system/message_pipe_dispatcher.h
+++ b/mojo/system/message_pipe_dispatcher.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -132,4 +132,4 @@ class MessagePipeDispatcherTransport : public DispatcherTransport {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
diff --git a/mojo/edk/system/message_pipe_dispatcher_unittest.cc b/mojo/system/message_pipe_dispatcher_unittest.cc
index 96ca436..f0eb1eb4 100644
--- a/mojo/edk/system/message_pipe_dispatcher_unittest.cc
+++ b/mojo/system/message_pipe_dispatcher_unittest.cc
@@ -7,7 +7,7 @@
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
-#include "mojo/edk/system/message_pipe_dispatcher.h"
+#include "mojo/system/message_pipe_dispatcher.h"
 
 #include <string.h>
 
@@ -19,10 +19,10 @@
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
+#include "mojo/system/waiter_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/message_pipe_endpoint.cc b/mojo/system/message_pipe_endpoint.cc
index df623d4..1d960a9 100644
--- a/mojo/edk/system/message_pipe_endpoint.cc
+++ b/mojo/system/message_pipe_endpoint.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 "mojo/edk/system/message_pipe_endpoint.h"
+#include "mojo/system/message_pipe_endpoint.h"
 
 #include "base/logging.h"
 
diff --git a/mojo/edk/system/message_pipe_endpoint.h b/mojo/system/message_pipe_endpoint.h
index 7bc0a0d..c8a01fa 100644
--- a/mojo/edk/system/message_pipe_endpoint.h
+++ b/mojo/system/message_pipe_endpoint.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
 
 #include <stdint.h>
 
@@ -12,12 +12,12 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -86,4 +86,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessagePipeEndpoint {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
diff --git a/mojo/edk/system/message_pipe_perftest.cc b/mojo/system/message_pipe_perftest.cc
index 9861e0b..7a8584a 100644
--- a/mojo/edk/system/message_pipe_perftest.cc
+++ b/mojo/system/message_pipe_perftest.cc
@@ -17,15 +17,15 @@
 #include "base/strings/stringprintf.h"
 #include "base/test/perf_time_logger.h"
 #include "base/time/time.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/local_message_pipe_endpoint.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/message_pipe_test_utils.h"
-#include "mojo/edk/system/proxy_message_pipe_endpoint.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/message_pipe_test_utils.h"
+#include "mojo/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/message_pipe_test_utils.cc b/mojo/system/message_pipe_test_utils.cc
index c773bf5..3c0a8cc 100644
--- a/mojo/edk/system/message_pipe_test_utils.cc
+++ b/mojo/system/message_pipe_test_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 "mojo/edk/system/message_pipe_test_utils.h"
+#include "mojo/system/message_pipe_test_utils.h"
 
 #include "base/bind.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/message_pipe_test_utils.h b/mojo/system/message_pipe_test_utils.h
index 9e6a4b7..1d1f861 100644
--- a/mojo/edk/system/message_pipe_test_utils.h
+++ b/mojo/system/message_pipe_test_utils.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
 
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/test_utils.h"
 
 namespace mojo {
 namespace system {
@@ -70,4 +70,4 @@ class MultiprocessMessagePipeTestBase : public testing::Test {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_TEST_HELPER_H_
diff --git a/mojo/edk/system/message_pipe_unittest.cc b/mojo/system/message_pipe_unittest.cc
index dbffb4c..318a824 100644
--- a/mojo/edk/system/message_pipe_unittest.cc
+++ b/mojo/system/message_pipe_unittest.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 "mojo/edk/system/message_pipe.h"
+#include "mojo/system/message_pipe.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/time/time.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/waiter.h"
+#include "mojo/system/waiter_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/mojo/system/multiprocess_message_pipe_unittest.cc
index 2f22d67..3d40f33 100644
--- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc
+++ b/mojo/system/multiprocess_message_pipe_unittest.cc
@@ -18,17 +18,17 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"  // TODO(vtl): Remove this.
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/message_pipe_test_utils.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/shared_buffer_dispatcher.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/message_pipe_test_utils.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/options_validation.h b/mojo/system/options_validation.h
index 4772508..25be7c0 100644
--- a/mojo/edk/system/options_validation.h
+++ b/mojo/system/options_validation.h
@@ -8,8 +8,8 @@
 // but any |flags| specified must be known to the system (otherwise, an error of
 // |MOJO_RESULT_UNIMPLEMENTED| should be returned).
 
-#ifndef MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
-#define MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#ifndef MOJO_SYSTEM_OPTIONS_VALIDATION_H_
+#define MOJO_SYSTEM_OPTIONS_VALIDATION_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -18,10 +18,10 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -100,4 +100,4 @@ class UserOptionsReader {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#endif  // MOJO_SYSTEM_OPTIONS_VALIDATION_H_
diff --git a/mojo/edk/system/options_validation_unittest.cc b/mojo/system/options_validation_unittest.cc
index f410f24..c845ffe 100644
--- a/mojo/edk/system/options_validation_unittest.cc
+++ b/mojo/system/options_validation_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 "mojo/edk/system/options_validation.h"
+#include "mojo/system/options_validation.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/mojo/edk/system/platform_handle_dispatcher.cc b/mojo/system/platform_handle_dispatcher.cc
index a6072cf..8ee46e3 100644
--- a/mojo/edk/system/platform_handle_dispatcher.cc
+++ b/mojo/system/platform_handle_dispatcher.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 "mojo/edk/system/platform_handle_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
 
 #include <algorithm>
 
diff --git a/mojo/edk/system/platform_handle_dispatcher.h b/mojo/system/platform_handle_dispatcher.h
index eb5eb5d..d86a48e 100644
--- a/mojo/edk/system/platform_handle_dispatcher.h
+++ b/mojo/system/platform_handle_dispatcher.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#define MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/simple_dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/simple_dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -58,4 +58,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformHandleDispatcher
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
diff --git a/mojo/edk/system/platform_handle_dispatcher_unittest.cc b/mojo/system/platform_handle_dispatcher_unittest.cc
index 1d784a6..7a68e45 100644
--- a/mojo/edk/system/platform_handle_dispatcher_unittest.cc
+++ b/mojo/system/platform_handle_dispatcher_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 "mojo/edk/system/platform_handle_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
 
 #include <stdio.h>
 
@@ -11,7 +11,7 @@
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/proxy_message_pipe_endpoint.cc b/mojo/system/proxy_message_pipe_endpoint.cc
index 85437bb..935955c 100644
--- a/mojo/edk/system/proxy_message_pipe_endpoint.cc
+++ b/mojo/system/proxy_message_pipe_endpoint.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 "mojo/edk/system/proxy_message_pipe_endpoint.h"
+#include "mojo/system/proxy_message_pipe_endpoint.h"
 
 #include <string.h>
 
 #include "base/logging.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/local_message_pipe_endpoint.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/local_message_pipe_endpoint.h"
+#include "mojo/system/message_pipe_dispatcher.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/proxy_message_pipe_endpoint.h b/mojo/system/proxy_message_pipe_endpoint.h
index c884240..936e2ae 100644
--- a/mojo/edk/system/proxy_message_pipe_endpoint.h
+++ b/mojo/system/proxy_message_pipe_endpoint.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
-#define MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
+#ifndef MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
+#define MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_endpoint.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_endpoint.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -50,4 +50,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ProxyMessagePipeEndpoint
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
+#endif  // MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
diff --git a/mojo/edk/system/raw_channel.cc b/mojo/system/raw_channel.cc
index 0bfe104..6533af9 100644
--- a/mojo/edk/system/raw_channel.cc
+++ b/mojo/system/raw_channel.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 "mojo/edk/system/raw_channel.h"
+#include "mojo/system/raw_channel.h"
 
 #include <string.h>
 
@@ -13,8 +13,8 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/raw_channel.h b/mojo/system/raw_channel.h
index 1a077ef..c40f43c 100644
--- a/mojo/edk/system/raw_channel.h
+++ b/mojo/system/raw_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_RAW_CHANNEL_H_
-#define MOJO_EDK_SYSTEM_RAW_CHANNEL_H_
+#ifndef MOJO_SYSTEM_RAW_CHANNEL_H_
+#define MOJO_SYSTEM_RAW_CHANNEL_H_
 
 #include <deque>
 #include <vector>
@@ -12,11 +12,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class MessageLoopForIO;
@@ -328,4 +328,4 @@ class MOJO_SYSTEM_IMPL_EXPORT RawChannel {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_RAW_CHANNEL_H_
+#endif  // MOJO_SYSTEM_RAW_CHANNEL_H_
diff --git a/mojo/edk/system/raw_channel_posix.cc b/mojo/system/raw_channel_posix.cc
index 05a01aa..f6601c9 100644
--- a/mojo/edk/system/raw_channel_posix.cc
+++ b/mojo/system/raw_channel_posix.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 "mojo/edk/system/raw_channel.h"
+#include "mojo/system/raw_channel.h"
 
 #include <errno.h>
 #include <sys/uio.h>
@@ -19,10 +19,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_channel_utils_posix.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/embedder/platform_channel_utils_posix.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/raw_channel_unittest.cc b/mojo/system/raw_channel_unittest.cc
index 7531cf3..c198257 100644
--- a/mojo/edk/system/raw_channel_unittest.cc
+++ b/mojo/system/raw_channel_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 "mojo/edk/system/raw_channel.h"
+#include "mojo/system/raw_channel.h"
 
 #include <stdint.h>
 
@@ -22,12 +22,12 @@
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/raw_channel_win.cc b/mojo/system/raw_channel_win.cc
index 208d595..72cec16 100644
--- a/mojo/edk/system/raw_channel_win.cc
+++ b/mojo/system/raw_channel_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/raw_channel.h"
+#include "mojo/system/raw_channel.h"
 
 #include <windows.h>
 
@@ -17,7 +17,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/win/windows_version.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc
index c84a65f..21acd24 100644
--- a/mojo/edk/system/remote_message_pipe_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -20,20 +20,20 @@
 #include "base/test/test_io_thread.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "build/build_config.h"              // TODO(vtl): Remove this.
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/shared_buffer_dispatcher.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/run_all_unittests.cc b/mojo/system/run_all_unittests.cc
index 2855e96..2855e96 100644
--- a/mojo/edk/system/run_all_unittests.cc
+++ b/mojo/system/run_all_unittests.cc
diff --git a/mojo/edk/system/shared_buffer_dispatcher.cc b/mojo/system/shared_buffer_dispatcher.cc
index 7e345d9..6229f08 100644
--- a/mojo/edk/system/shared_buffer_dispatcher.cc
+++ b/mojo/system/shared_buffer_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 "mojo/edk/system/shared_buffer_dispatcher.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/options_validation.h"
+#include "mojo/embedder/platform_support.h"
 #include "mojo/public/c/system/macros.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/options_validation.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/shared_buffer_dispatcher.h b/mojo/system/shared_buffer_dispatcher.h
index 3e5ade0..8c2e7f1 100644
--- a/mojo/edk/system/shared_buffer_dispatcher.h
+++ b/mojo/system/shared_buffer_dispatcher.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
+#define MOJO_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
 
 #include "base/macros.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/simple_dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/simple_dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -100,4 +100,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SharedBufferDispatcher : public SimpleDispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_SHARED_BUFFER_DISPATCHER_H_
diff --git a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/mojo/system/shared_buffer_dispatcher_unittest.cc
index d46ffe3..397040b 100644
--- a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
+++ b/mojo/system/shared_buffer_dispatcher_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/shared_buffer_dispatcher.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/dispatcher.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/dispatcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/simple_dispatcher.cc b/mojo/system/simple_dispatcher.cc
index 3eb7a4f..19c302c 100644
--- a/mojo/edk/system/simple_dispatcher.cc
+++ b/mojo/system/simple_dispatcher.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 "mojo/edk/system/simple_dispatcher.h"
+#include "mojo/system/simple_dispatcher.h"
 
 #include "base/logging.h"
 
diff --git a/mojo/edk/system/simple_dispatcher.h b/mojo/system/simple_dispatcher.h
index 400e302..f26f24c 100644
--- a/mojo/edk/system/simple_dispatcher.h
+++ b/mojo/system/simple_dispatcher.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
-#define MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
+#ifndef MOJO_SYSTEM_SIMPLE_DISPATCHER_H_
+#define MOJO_SYSTEM_SIMPLE_DISPATCHER_H_
 
 #include <list>
 
 #include "base/macros.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
+#include "mojo/system/waiter_list.h"
 
 namespace mojo {
 namespace system {
@@ -50,4 +50,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SimpleDispatcher : public Dispatcher {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_SIMPLE_DISPATCHER_H_
+#endif  // MOJO_SYSTEM_SIMPLE_DISPATCHER_H_
diff --git a/mojo/edk/system/simple_dispatcher_unittest.cc b/mojo/system/simple_dispatcher_unittest.cc
index d2b7eaa..fb4fc7e 100644
--- a/mojo/edk/system/simple_dispatcher_unittest.cc
+++ b/mojo/system/simple_dispatcher_unittest.cc
@@ -7,7 +7,7 @@
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
-#include "mojo/edk/system/simple_dispatcher.h"
+#include "mojo/system/simple_dispatcher.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ -16,9 +16,9 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/time/time.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
+#include "mojo/system/waiter_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/system_impl_export.h b/mojo/system/system_impl_export.h
index 5bbf005..a35eacf 100644
--- a/mojo/edk/system/system_impl_export.h
+++ b/mojo/system/system_impl_export.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_SYSTEM_IMPL_EXPORT_H_
-#define MOJO_EDK_SYSTEM_SYSTEM_IMPL_EXPORT_H_
+#ifndef MOJO_SYSTEM_SYSTEM_IMPL_EXPORT_H_
+#define MOJO_SYSTEM_SYSTEM_IMPL_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define MOJO_SYSTEM_IMPL_EXPORT
 #endif
 
-#endif  // MOJO_EDK_SYSTEM_SYSTEM_IMPL_EXPORT_H_
+#endif  // MOJO_SYSTEM_SYSTEM_IMPL_EXPORT_H_
diff --git a/mojo/edk/system/test_utils.cc b/mojo/system/test_utils.cc
index 3217c00..d0e425a 100644
--- a/mojo/edk/system/test_utils.cc
+++ b/mojo/system/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 "mojo/edk/system/test_utils.h"
+#include "mojo/system/test_utils.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
diff --git a/mojo/edk/system/test_utils.h b/mojo/system/test_utils.h
index 3ab1907..80c2930 100644
--- a/mojo/edk/system/test_utils.h
+++ b/mojo/system/test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_TEST_UTILS_H_
+#define MOJO_SYSTEM_TEST_UTILS_H_
 
 #include <stdint.h>
 
@@ -58,4 +58,4 @@ class Stopwatch {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_TEST_UTILS_H_
diff --git a/mojo/edk/system/transport_data.cc b/mojo/system/transport_data.cc
index 774b744..96ba61c 100644
--- a/mojo/edk/system/transport_data.cc
+++ b/mojo/system/transport_data.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/transport_data.h"
+#include "mojo/system/transport_data.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/message_in_transit.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/message_in_transit.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/transport_data.h b/mojo/system/transport_data.h
index 395bc73..b74623c 100644
--- a/mojo/edk/system/transport_data.h
+++ b/mojo/system/transport_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
-#define MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
+#ifndef MOJO_SYSTEM_TRANSPORT_DATA_H_
+#define MOJO_SYSTEM_TRANSPORT_DATA_H_
 
 #include <stdint.h>
 
@@ -13,10 +13,10 @@
 #include "base/memory/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -189,4 +189,4 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
+#endif  // MOJO_SYSTEM_TRANSPORT_DATA_H_
diff --git a/mojo/edk/system/waiter.cc b/mojo/system/waiter.cc
index 6dcd713..70e6c29 100644
--- a/mojo/edk/system/waiter.cc
+++ b/mojo/system/waiter.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 "mojo/edk/system/waiter.h"
+#include "mojo/system/waiter.h"
 
 #include <limits>
 
diff --git a/mojo/edk/system/waiter.h b/mojo/system/waiter.h
index 03ada16..af85e9c 100644
--- a/mojo/edk/system/waiter.h
+++ b/mojo/system/waiter.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_WAITER_H_
-#define MOJO_EDK_SYSTEM_WAITER_H_
+#ifndef MOJO_SYSTEM_WAITER_H_
+#define MOJO_SYSTEM_WAITER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -78,4 +78,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Waiter {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_H_
+#endif  // MOJO_SYSTEM_WAITER_H_
diff --git a/mojo/edk/system/waiter_list.cc b/mojo/system/waiter_list.cc
index 42dfe15..6ee9010 100644
--- a/mojo/edk/system/waiter_list.cc
+++ b/mojo/system/waiter_list.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 "mojo/edk/system/waiter_list.h"
+#include "mojo/system/waiter_list.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/waiter_list.h b/mojo/system/waiter_list.h
index 6bbc799..39ac7b0 100644
--- a/mojo/edk/system/waiter_list.h
+++ b/mojo/system/waiter_list.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_WAITER_LIST_H_
-#define MOJO_EDK_SYSTEM_WAITER_LIST_H_
+#ifndef MOJO_SYSTEM_WAITER_LIST_H_
+#define MOJO_SYSTEM_WAITER_LIST_H_
 
 #include <stdint.h>
 
 #include <list>
 
 #include "base/macros.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -55,4 +55,4 @@ class MOJO_SYSTEM_IMPL_EXPORT WaiterList {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_LIST_H_
+#endif  // MOJO_SYSTEM_WAITER_LIST_H_
diff --git a/mojo/edk/system/waiter_list_unittest.cc b/mojo/system/waiter_list_unittest.cc
index 129df71..647fb64 100644
--- a/mojo/edk/system/waiter_list_unittest.cc
+++ b/mojo/system/waiter_list_unittest.cc
@@ -7,14 +7,14 @@
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/waiter_list.h"
 
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/time/time.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
+#include "mojo/system/waiter_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/edk/system/waiter_test_utils.cc b/mojo/system/waiter_test_utils.cc
index 06a4033..5c2946a 100644
--- a/mojo/edk/system/waiter_test_utils.cc
+++ b/mojo/system/waiter_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 "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/waiter_test_utils.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/edk/system/waiter_test_utils.h b/mojo/system/waiter_test_utils.h
index 25e5344..8de4c9d 100644
--- a/mojo/edk/system/waiter_test_utils.h
+++ b/mojo/system/waiter_test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_WAITER_TEST_UTILS_H_
+#define MOJO_SYSTEM_WAITER_TEST_UTILS_H_
 
 #include <stdint.h>
 
@@ -11,10 +11,10 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
@@ -102,4 +102,4 @@ class WaiterThread : public base::SimpleThread {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_WAITER_TEST_UTILS_H_
diff --git a/mojo/edk/system/waiter_unittest.cc b/mojo/system/waiter_unittest.cc
index bbbc5b8..95993b2 100644
--- a/mojo/edk/system/waiter_unittest.cc
+++ b/mojo/system/waiter_unittest.cc
@@ -7,7 +7,7 @@
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/waiter.h"
 
 #include <stdint.h>
 
@@ -16,7 +16,7 @@
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/test_utils.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/tools/BUILD.gn b/mojo/tools/BUILD.gn
index de38e6c..7879505 100644
--- a/mojo/tools/BUILD.gn
+++ b/mojo/tools/BUILD.gn
@@ -14,9 +14,9 @@ executable("message_generator") {
   deps = [
     "//base",
     "//mojo/common",
-    "//mojo/edk/system",
-    "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
+    "//mojo/environment:chromium",
+    "//mojo/system",
     "//testing/gtest",
   ]
 }
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index ddcbdb5..3aadef2 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -38,11 +38,11 @@ component("keyboard") {
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
     "//content/public/common",
-    "//mojo/bindings/js",
-    "//mojo/edk/system",
-    "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/environment:chromium",
+    "//mojo/bindings/js",
+    "//mojo/system",
     "//url",
     "//ui/aura",
     "//ui/base",