Mojo: Move public C system header files to mojo/public/c/system/.

(macros.h is a bit strange, since it contains C++ macros as well. We may
want to split this file.)

R=darin@chromium.org

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

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

52 files changed, 81 insertions, 83 deletions

diff --git a/mojo/apps/js/main.cc b/mojo/apps/js/main.cc
index 26dc5a3..1cae436 100644
--- a/mojo/apps/js/main.cc
+++ b/mojo/apps/js/main.cc
@@ -5,9 +5,9 @@
 #include "base/message_loop/message_loop.h"
 #include "gin/public/isolate_holder.h"
 #include "mojo/apps/js/mojo_runner_delegate.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/system/core_cpp.h"
-#include "mojo/public/system/macros.h"
 
 #if defined(WIN32)
 #if !defined(CDECL)
diff --git a/mojo/apps/js/mojo_runner_delegate.h b/mojo/apps/js/mojo_runner_delegate.h
index 04f7449..71ee4af 100644
--- a/mojo/apps/js/mojo_runner_delegate.h
+++ b/mojo/apps/js/mojo_runner_delegate.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "gin/modules/module_runner_delegate.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 
 namespace mojo {
 namespace apps {
diff --git a/mojo/bindings/js/waiting_callback.h b/mojo/bindings/js/waiting_callback.h
index a7f5a49..bc17d19 100644
--- a/mojo/bindings/js/waiting_callback.h
+++ b/mojo/bindings/js/waiting_callback.h
@@ -8,7 +8,7 @@
 #include "gin/handle.h"
 #include "gin/runner.h"
 #include "gin/wrappable.h"
-#include "mojo/public/system/async_waiter.h"
+#include "mojo/public/c/system/async_waiter.h"
 
 namespace mojo {
 namespace js {
diff --git a/mojo/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
index 0a8eeab..be663fd 100644
--- a/mojo/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_unittest.cc
@@ -15,7 +15,7 @@
 #include "mojo/common/test/multiprocess_test_helper.h"
 #include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/embedder/test_embedder.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/environment/default_async_waiter_impl.h b/mojo/environment/default_async_waiter_impl.h
index cf2f7c2..266a70f6 100644
--- a/mojo/environment/default_async_waiter_impl.h
+++ b/mojo/environment/default_async_waiter_impl.h
@@ -6,7 +6,7 @@
 #define MOJO_ENVIRONMENT_DEFAULT_ASYNC_WAITER_IMPL_H_
 
 #include "mojo/environment/mojo_environment_impl_export.h"
-#include "mojo/public/system/async_waiter.h"
+#include "mojo/public/c/system/async_waiter.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
index 237f6aa..0f8c9a9 100644
--- a/mojo/examples/aura_demo/aura_demo.cc
+++ b/mojo/examples/aura_demo/aura_demo.cc
@@ -11,11 +11,11 @@
 #include "mojo/examples/aura_demo/demo_screen.h"
 #include "mojo/examples/aura_demo/window_tree_host_mojo.h"
 #include "mojo/public/bindings/allocation_scope.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
index 68e9350..5120f5e 100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -10,11 +10,11 @@
 #include "mojo/examples/compositor_app/compositor_host.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/services/native_viewport/geometry_conversions.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/gfx/rect.h"
diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc
index a641c0f..0817e4c 100644
--- a/mojo/examples/launcher/launcher.cc
+++ b/mojo/examples/launcher/launcher.cc
@@ -17,11 +17,11 @@
 #include "mojo/examples/launcher/launcher.mojom.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_activation_client.h"
diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc
index d1c018d..0445932 100644
--- a/mojo/examples/pepper_container_app/pepper_container_app.cc
+++ b/mojo/examples/pepper_container_app/pepper_container_app.cc
@@ -13,11 +13,11 @@
 #include "mojo/examples/pepper_container_app/type_converters.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc
index 6c078e1..a6cc649 100644
--- a/mojo/examples/sample_app/sample_app.cc
+++ b/mojo/examples/sample_app/sample_app.cc
@@ -8,12 +8,12 @@
 #include "mojo/examples/sample_app/gles2_client_impl.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/public/utility/run_loop.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 
diff --git a/mojo/examples/view_manager/view_manager.cc b/mojo/examples/view_manager/view_manager.cc
index 9568bdf..938d4a5 100644
--- a/mojo/examples/view_manager/view_manager.cc
+++ b/mojo/examples/view_manager/view_manager.cc
@@ -12,10 +12,10 @@
 #include "mojo/examples/view_manager/view_manager.mojom.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/services/native_viewport/geometry_conversions.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/events/event_constants.h"
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 9b52a52..d9b57db 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -15,13 +15,13 @@
         ],
       },
       'sources': [
-        'public/system/async_waiter.h',
-        'public/system/core.h',
+        'public/c/system/async_waiter.h',
+        'public/c/system/core.h',
+        'public/c/system/macros.h',
+        'public/c/system/system_export.h',
         'public/system/core_cpp.h',
         'public/system/core_private.cc',
         'public/system/core_private.h',
-        'public/system/macros.h',
-        'public/system/system_export.h',
       ],
       'conditions': [
         ['OS=="mac"', {
diff --git a/mojo/public/bindings/allocation_scope.h b/mojo/public/bindings/allocation_scope.h
index e4ae560..8df95c0 100644
--- a/mojo/public/bindings/allocation_scope.h
+++ b/mojo/public/bindings/allocation_scope.h
@@ -6,7 +6,7 @@
 #define MOJO_PUBLIC_BINDINGS_ALLOCATION_SCOPE_H_
 
 #include "mojo/public/bindings/lib/scratch_buffer.h"
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/public/bindings/lib/buffer.cc b/mojo/public/bindings/lib/buffer.cc
index 0f1ce86..30368a7 100644
--- a/mojo/public/bindings/lib/buffer.cc
+++ b/mojo/public/bindings/lib/buffer.cc
@@ -6,8 +6,8 @@
 
 #include <assert.h>
 
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/environment/buffer_tls.h"
-#include "mojo/public/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/public/bindings/lib/fixed_buffer.h b/mojo/public/bindings/lib/fixed_buffer.h
index 900c84e..41ab86d 100644
--- a/mojo/public/bindings/lib/fixed_buffer.h
+++ b/mojo/public/bindings/lib/fixed_buffer.h
@@ -6,7 +6,7 @@
 #define MOJO_PUBLIC_BINDINGS_LIB_FIXED_BUFFER_H_
 
 #include "mojo/public/bindings/buffer.h"
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/lib/message_queue.h b/mojo/public/bindings/lib/message_queue.h
index fe88db0..3b59c2c 100644
--- a/mojo/public/bindings/lib/message_queue.h
+++ b/mojo/public/bindings/lib/message_queue.h
@@ -7,7 +7,7 @@
 
 #include <queue>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 class Message;
diff --git a/mojo/public/bindings/lib/scratch_buffer.h b/mojo/public/bindings/lib/scratch_buffer.h
index 2ab933a9..bc40591 100644
--- a/mojo/public/bindings/lib/scratch_buffer.h
+++ b/mojo/public/bindings/lib/scratch_buffer.h
@@ -8,7 +8,7 @@
 #include <deque>
 
 #include "mojo/public/bindings/buffer.h"
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/remote_ptr.h b/mojo/public/bindings/remote_ptr.h
index cce720c..5775dd7 100644
--- a/mojo/public/bindings/remote_ptr.h
+++ b/mojo/public/bindings/remote_ptr.h
@@ -9,7 +9,7 @@
 
 #include "mojo/public/bindings/interface.h"
 #include "mojo/public/bindings/lib/router.h"
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/public/bindings/tests/connector_unittest.cc b/mojo/public/bindings/tests/connector_unittest.cc
index b08a17f..3911759 100644
--- a/mojo/public/bindings/tests/connector_unittest.cc
+++ b/mojo/public/bindings/tests/connector_unittest.cc
@@ -8,8 +8,8 @@
 #include "mojo/public/bindings/lib/connector.h"
 #include "mojo/public/bindings/lib/message_builder.h"
 #include "mojo/public/bindings/lib/message_queue.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/environment/environment.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/public/bindings/tests/router_unittest.cc b/mojo/public/bindings/tests/router_unittest.cc
index 92f5fa7..dee9dd9 100644
--- a/mojo/public/bindings/tests/router_unittest.cc
+++ b/mojo/public/bindings/tests/router_unittest.cc
@@ -8,8 +8,8 @@
 #include "mojo/public/bindings/lib/message_builder.h"
 #include "mojo/public/bindings/lib/message_queue.h"
 #include "mojo/public/bindings/lib/router.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/environment/environment.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/public/system/async_waiter.h b/mojo/public/c/system/async_waiter.h
index 6726b46..ab999a3 100644
--- a/mojo/public/system/async_waiter.h
+++ b/mojo/public/c/system/async_waiter.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_PUBLIC_SYSTEM_ASYNC_WAITER_H_
-#define MOJO_PUBLIC_SYSTEM_ASYNC_WAITER_H_
+#ifndef MOJO_PUBLIC_C_SYSTEM_ASYNC_WAITER_H_
+#define MOJO_PUBLIC_C_SYSTEM_ASYNC_WAITER_H_
 
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,4 +37,4 @@ struct MojoAsyncWaiter {
 }  // extern "C"
 #endif
 
-#endif  // MOJO_PUBLIC_SYSTEM_ASYNC_WAITER_H_
+#endif  // MOJO_PUBLIC_C_SYSTEM_ASYNC_WAITER_H_
diff --git a/mojo/public/system/core.h b/mojo/public/c/system/core.h
index 6e155b1..206689f 100644
--- a/mojo/public/system/core.h
+++ b/mojo/public/c/system/core.h
@@ -1,16 +1,16 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef MOJO_PUBLIC_SYSTEM_CORE_H_
-#define MOJO_PUBLIC_SYSTEM_CORE_H_
+#ifndef MOJO_PUBLIC_C_SYSTEM_CORE_H_
+#define MOJO_PUBLIC_C_SYSTEM_CORE_H_
 
 // Note: This header should be compilable as C.
 
 #include <stdint.h>
 
-#include "mojo/public/system/macros.h"
-#include "mojo/public/system/system_export.h"
+#include "mojo/public/c/system/macros.h"
+#include "mojo/public/c/system/system_export.h"
 
 // Types/constants -------------------------------------------------------------
 
@@ -826,4 +826,4 @@ MOJO_SYSTEM_EXPORT MojoResult MojoUnmapBuffer(void* buffer);  // In.
 }  // extern "C"
 #endif
 
-#endif  // MOJO_PUBLIC_SYSTEM_CORE_H_
+#endif  // MOJO_PUBLIC_C_SYSTEM_CORE_H_
diff --git a/mojo/public/system/macros.h b/mojo/public/c/system/macros.h
index b31469f..d89ca02 100644
--- a/mojo/public/system/macros.h
+++ b/mojo/public/c/system/macros.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef MOJO_PUBLIC_SYSTEM_MACROS_H_
-#define MOJO_PUBLIC_SYSTEM_MACROS_H_
+#ifndef MOJO_PUBLIC_C_SYSTEM_MACROS_H_
+#define MOJO_PUBLIC_C_SYSTEM_MACROS_H_
 
 #include <stddef.h>
 
@@ -80,4 +80,4 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
 
 #endif  // __cplusplus
 
-#endif  // MOJO_PUBLIC_SYSTEM_MACROS_H_
+#endif  // MOJO_PUBLIC_C_SYSTEM_MACROS_H_
diff --git a/mojo/public/system/system_export.h b/mojo/public/c/system/system_export.h
index 6b563ff..3bd0260 100644
--- a/mojo/public/system/system_export.h
+++ b/mojo/public/c/system/system_export.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef MOJO_PUBLIC_SYSTEM_SYSTEM_EXPORT_H_
-#define MOJO_PUBLIC_SYSTEM_SYSTEM_EXPORT_H_
+#ifndef MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_
+#define MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_
 
 #if defined(WIN32)
 
@@ -23,4 +23,4 @@
 
 #endif  // defined(WIN32)
 
-#endif  // MOJO_PUBLIC_SYSTEM_SYSTEM_EXPORT_H_
+#endif  // MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_
diff --git a/mojo/public/environment/default_async_waiter.h b/mojo/public/environment/default_async_waiter.h
index 97cef12..d1cf779 100644
--- a/mojo/public/environment/default_async_waiter.h
+++ b/mojo/public/environment/default_async_waiter.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
 #define MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
 
-#include "mojo/public/system/async_waiter.h"
+#include "mojo/public/c/system/async_waiter.h"
 
 namespace mojo {
 
diff --git a/mojo/public/environment/environment.h b/mojo/public/environment/environment.h
index ce93726..094aa63 100644
--- a/mojo/public/environment/environment.h
+++ b/mojo/public/environment/environment.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_
 #define MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/public/environment/tests/async_waiter_unittest.cc b/mojo/public/environment/tests/async_waiter_unittest.cc
index 614f132..b8fa97c 100644
--- a/mojo/public/environment/tests/async_waiter_unittest.cc
+++ b/mojo/public/environment/tests/async_waiter_unittest.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/environment/default_async_waiter.h"
-
 #include <string>
 
+#include "mojo/public/c/system/macros.h"
+#include "mojo/public/environment/default_async_waiter.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/system/core_cpp.h"
-#include "mojo/public/system/macros.h"
 #include "mojo/public/tests/test_utils.h"
 #include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/public/gles2/gles2.h b/mojo/public/gles2/gles2.h
index 8effd31..f945859 100644
--- a/mojo/public/gles2/gles2.h
+++ b/mojo/public/gles2/gles2.h
@@ -10,10 +10,10 @@
 #include <stdint.h>
 #include <GLES2/gl2.h>
 
+#include "mojo/public/c/system/async_waiter.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/public/gles2/gles2_export.h"
 #include "mojo/public/gles2/gles2_types.h"
-#include "mojo/public/system/async_waiter.h"
-#include "mojo/public/system/core.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/mojo/public/gles2/gles2_private.h b/mojo/public/gles2/gles2_private.h
index 8465cae..7c951bb 100644
--- a/mojo/public/gles2/gles2_private.h
+++ b/mojo/public/gles2/gles2_private.h
@@ -7,9 +7,9 @@
 
 #include <stdint.h>
 
+#include "mojo/public/c/system/async_waiter.h"
 #include "mojo/public/gles2/gles2_export.h"
 #include "mojo/public/gles2/gles2_types.h"
-#include "mojo/public/system/async_waiter.h"
 #include "mojo/public/system/core_cpp.h"
 
 namespace mojo {
diff --git a/mojo/public/system/core_cpp.h b/mojo/public/system/core_cpp.h
index 535ad19..9cd3eb6 100644
--- a/mojo/public/system/core_cpp.h
+++ b/mojo/public/system/core_cpp.h
@@ -10,9 +10,9 @@
 
 #include <limits>
 
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/macros.h"
-#include "mojo/public/system/system_export.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/macros.h"
+#include "mojo/public/c/system/system_export.h"
 
 namespace mojo {
 
diff --git a/mojo/public/system/core_private.h b/mojo/public/system/core_private.h
index fa88a3b..057bfca 100644
--- a/mojo/public/system/core_private.h
+++ b/mojo/public/system/core_private.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_SYSTEM_CORE_PRIVATE_H_
 #define MOJO_PUBLIC_SYSTEM_CORE_PRIVATE_H_
 
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 
 namespace mojo {
 
diff --git a/mojo/public/tests/system/core_cpp_unittest.cc b/mojo/public/tests/system/core_cpp_unittest.cc
index 9344fd3..64f91aa 100644
--- a/mojo/public/tests/system/core_cpp_unittest.cc
+++ b/mojo/public/tests/system/core_cpp_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <map>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/public/tests/system/core_perftest.cc b/mojo/public/tests/system/core_perftest.cc
index 6874375..53ac6b8 100644
--- a/mojo/public/tests/system/core_perftest.cc
+++ b/mojo/public/tests/system/core_perftest.cc
@@ -4,14 +4,14 @@
 
 // This tests the performance of the C API.
 
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/tests/test_support.h"
 #include "mojo/public/tests/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/public/tests/system/core_unittest.cc b/mojo/public/tests/system/core_unittest.cc
index 1ce5faa..c9acd00 100644
--- a/mojo/public/tests/system/core_unittest.cc
+++ b/mojo/public/tests/system/core_unittest.cc
@@ -4,7 +4,7 @@
 
 // This file tests the C API.
 
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 
 #include <string.h>
 
diff --git a/mojo/public/tests/system/core_unittest_pure_c.c b/mojo/public/tests/system/core_unittest_pure_c.c
index 69ab94a..7293ff2 100644
--- a/mojo/public/tests/system/core_unittest_pure_c.c
+++ b/mojo/public/tests/system/core_unittest_pure_c.c
@@ -11,9 +11,9 @@
 
 // Include all the header files that are meant to be compilable as C. Start with
 // core.h, since it's the most important one.
-#include "mojo/public/system/core.h"
-#include "mojo/public/system/async_waiter.h"
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/c/system/async_waiter.h"
+#include "mojo/public/c/system/macros.h"
 
 // The joys of the C preprocessor....
 #define STRINGIFY(x) #x
diff --git a/mojo/public/tests/system/macros_unittest.cc b/mojo/public/tests/system/macros_unittest.cc
index 295703f..1a4125e 100644
--- a/mojo/public/tests/system/macros_unittest.cc
+++ b/mojo/public/tests/system/macros_unittest.cc
@@ -8,13 +8,12 @@
 // TODO(vtl): Fix no-compile tests (which are all disabled; crbug.com/105388)
 // and write some "negative" tests.
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "mojo/public/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/public/utility/lib/thread_local.h b/mojo/public/utility/lib/thread_local.h
index 10cc625..176f7d4 100644
--- a/mojo/public/utility/lib/thread_local.h
+++ b/mojo/public/utility/lib/thread_local.h
@@ -9,7 +9,7 @@
 #include <pthread.h>
 #endif
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/utility/mutex.h b/mojo/public/utility/mutex.h
index 3267759..445647a 100644
--- a/mojo/public/utility/mutex.h
+++ b/mojo/public/utility/mutex.h
@@ -11,7 +11,7 @@
 
 #include <pthread.h>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/public/utility/tests/mutex_unittest.cc b/mojo/public/utility/tests/mutex_unittest.cc
index 7a9f8d4..171dba8 100644
--- a/mojo/public/utility/tests/mutex_unittest.cc
+++ b/mojo/public/utility/tests/mutex_unittest.cc
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 #include "mojo/public/utility/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/public/utility/tests/thread_unittest.cc b/mojo/public/utility/tests/thread_unittest.cc
index 3309c0c..0f1a75f 100644
--- a/mojo/public/utility/tests/thread_unittest.cc
+++ b/mojo/public/utility/tests/thread_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/public/utility/thread.h"
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/public/utility/thread.h b/mojo/public/utility/thread.h
index 055849e..a1ebc6c 100644
--- a/mojo/public/utility/thread.h
+++ b/mojo/public/utility/thread.h
@@ -12,7 +12,7 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mojo/public/system/macros.h"
+#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 
diff --git a/mojo/system/channel.h b/mojo/system/channel.h
index 83be20a..4af6daa 100644
--- a/mojo/system/channel.h
+++ b/mojo/system/channel.h
@@ -16,7 +16,7 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/embedder/scoped_platform_handle.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/raw_channel.h"
diff --git a/mojo/system/core_test_base.h b/mojo/system/core_test_base.h
index 58b2045..beb985b 100644
--- a/mojo/system/core_test_base.h
+++ b/mojo/system/core_test_base.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/system/data_pipe.h b/mojo/system/data_pipe.h
index ce4ad2d..8d6fcaf 100644
--- a/mojo/system/data_pipe.h
+++ b/mojo/system/data_pipe.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
index 966b6da..c6ef752 100644
--- a/mojo/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 // TODO(vtl): We need this since we can't forward declare
 // |RawSharedBuffer::Mapping|. Maybe fix this.
 #include "mojo/system/raw_shared_buffer.h"
diff --git a/mojo/system/local_message_pipe_endpoint.h b/mojo/system/local_message_pipe_endpoint.h
index bae0786..9e200f1 100644
--- a/mojo/system/local_message_pipe_endpoint.h
+++ b/mojo/system/local_message_pipe_endpoint.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/message_in_transit_queue.h"
 #include "mojo/system/message_pipe_endpoint.h"
 #include "mojo/system/system_impl_export.h"
diff --git a/mojo/system/message_pipe.h b/mojo/system/message_pipe.h
index 6815dcb..de42c44 100644
--- a/mojo/system/message_pipe.h
+++ b/mojo/system/message_pipe.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe_endpoint.h"
diff --git a/mojo/system/message_pipe_endpoint.h b/mojo/system/message_pipe_endpoint.h
index 2cd9c17..b7b9589 100644
--- a/mojo/system/message_pipe_endpoint.h
+++ b/mojo/system/message_pipe_endpoint.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/system_impl_export.h"
diff --git a/mojo/system/proxy_message_pipe_endpoint.h b/mojo/system/proxy_message_pipe_endpoint.h
index c1ed3c0..7d62b9b 100644
--- a/mojo/system/proxy_message_pipe_endpoint.h
+++ b/mojo/system/proxy_message_pipe_endpoint.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_in_transit_queue.h"
 #include "mojo/system/message_pipe_endpoint.h"
diff --git a/mojo/system/waiter.h b/mojo/system/waiter.h
index 2de581b..dd5b59d 100644
--- a/mojo/system/waiter.h
+++ b/mojo/system/waiter.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
diff --git a/mojo/system/waiter_list.h b/mojo/system/waiter_list.h
index a14804b..1d35b94 100644
--- a/mojo/system/waiter_list.h
+++ b/mojo/system/waiter_list.h
@@ -8,7 +8,7 @@
 #include <list>
 
 #include "base/basictypes.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
diff --git a/mojo/system/waiter_test_utils.h b/mojo/system/waiter_test_utils.h
index b1a7a33..00475ef 100644
--- a/mojo/system/waiter_test_utils.h
+++ b/mojo/system/waiter_test_utils.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/public/system/core.h"
+#include "mojo/public/c/system/core.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/waiter.h"