43 files changed, 109 insertions, 116 deletions
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 9e06c04..84bfe88 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -248,32 +248,6 @@
       'sources': [
         'public/bindings/js/constants.cc',
         'public/bindings/js/constants.h',
-        'public/bindings/lib/array.cc',
-        'public/bindings/lib/array_internal.h',
-        'public/bindings/lib/array_internal.cc',
-        'public/bindings/lib/bindings_internal.h',
-        'public/bindings/lib/bindings_serialization.cc',
-        'public/bindings/lib/bindings_serialization.h',
-        'public/bindings/lib/buffer.cc',
-        'public/bindings/lib/callback_internal.h',
-        'public/bindings/lib/connector.cc',
-        'public/bindings/lib/connector.h',
-        'public/bindings/lib/fixed_buffer.cc',
-        'public/bindings/lib/fixed_buffer.h',
-        'public/bindings/lib/interface.cc',
-        'public/bindings/lib/message.cc',
-        'public/bindings/lib/message_builder.cc',
-        'public/bindings/lib/message_builder.h',
-        'public/bindings/lib/message_internal.h',
-        'public/bindings/lib/message_queue.cc',
-        'public/bindings/lib/message_queue.h',
-        'public/bindings/lib/router.cc',
-        'public/bindings/lib/router.h',
-        'public/bindings/lib/scratch_buffer.cc',
-        'public/bindings/lib/scratch_buffer.h',
-        'public/bindings/lib/shared_data.h',
-        'public/bindings/lib/shared_ptr.h',
-        'public/bindings/lib/sync_dispatcher.cc',
         'public/cpp/bindings/allocation_scope.h',
         'public/cpp/bindings/array.h',
         'public/cpp/bindings/buffer.h',
@@ -285,6 +259,32 @@
         'public/cpp/bindings/remote_ptr.h',
         'public/cpp/bindings/sync_dispatcher.h',
         'public/cpp/bindings/type_converter.h',
+        'public/cpp/bindings/lib/array.cc',
+        'public/cpp/bindings/lib/array_internal.h',
+        'public/cpp/bindings/lib/array_internal.cc',
+        'public/cpp/bindings/lib/bindings_internal.h',
+        'public/cpp/bindings/lib/bindings_serialization.cc',
+        'public/cpp/bindings/lib/bindings_serialization.h',
+        'public/cpp/bindings/lib/buffer.cc',
+        'public/cpp/bindings/lib/callback_internal.h',
+        'public/cpp/bindings/lib/connector.cc',
+        'public/cpp/bindings/lib/connector.h',
+        'public/cpp/bindings/lib/fixed_buffer.cc',
+        'public/cpp/bindings/lib/fixed_buffer.h',
+        'public/cpp/bindings/lib/interface.cc',
+        'public/cpp/bindings/lib/message.cc',
+        'public/cpp/bindings/lib/message_builder.cc',
+        'public/cpp/bindings/lib/message_builder.h',
+        'public/cpp/bindings/lib/message_internal.h',
+        'public/cpp/bindings/lib/message_queue.cc',
+        'public/cpp/bindings/lib/message_queue.h',
+        'public/cpp/bindings/lib/router.cc',
+        'public/cpp/bindings/lib/router.h',
+        'public/cpp/bindings/lib/scratch_buffer.cc',
+        'public/cpp/bindings/lib/scratch_buffer.h',
+        'public/cpp/bindings/lib/shared_data.h',
+        'public/cpp/bindings/lib/shared_ptr.h',
+        'public/cpp/bindings/lib/sync_dispatcher.cc',
       ],
     },
     {
diff --git a/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl b/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
index 6839207..d298cc3 100644
--- a/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
@@ -8,7 +8,7 @@
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 {%- for import in imports %}
 #include "{{import.module.path}}-internal.h"
 {%- endfor %}
diff --git a/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl b/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
index 1c530c4..33bd46b 100644
--- a/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
@@ -9,8 +9,8 @@
 
 #include "{{module.path}}.h"
 
-#include "mojo/public/bindings/lib/bindings_serialization.h"
-#include "mojo/public/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
+#include "mojo/public/cpp/bindings/lib/message_builder.h"
 
 namespace {{namespace}} {
 namespace internal {
diff --git a/mojo/public/bindings/tests/array_unittest.cc b/mojo/public/bindings/tests/array_unittest.cc
index 2cc300a..72033ea 100644
--- a/mojo/public/bindings/tests/array_unittest.cc
+++ b/mojo/public/bindings/tests/array_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/bindings/lib/fixed_buffer.h"
-#include "mojo/public/bindings/lib/scratch_buffer.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
+#include "mojo/public/cpp/bindings/lib/scratch_buffer.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/public/bindings/tests/buffer_unittest.cc b/mojo/public/bindings/tests/buffer_unittest.cc
index bc0e3a8..49753e1 100644
--- a/mojo/public/bindings/tests/buffer_unittest.cc
+++ b/mojo/public/bindings/tests/buffer_unittest.cc
@@ -4,10 +4,10 @@
 
 #include <limits>
 
-#include "mojo/public/bindings/lib/bindings_serialization.h"
-#include "mojo/public/bindings/lib/fixed_buffer.h"
-#include "mojo/public/bindings/lib/scratch_buffer.h"
 #include "mojo/public/cpp/bindings/buffer.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
+#include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
+#include "mojo/public/cpp/bindings/lib/scratch_buffer.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/public/bindings/tests/connector_unittest.cc b/mojo/public/bindings/tests/connector_unittest.cc
index 94eb951..bd856c7 100644
--- a/mojo/public/bindings/tests/connector_unittest.cc
+++ b/mojo/public/bindings/tests/connector_unittest.cc
@@ -5,9 +5,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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/cpp/bindings/lib/connector.h"
+#include "mojo/public/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/message_queue.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
diff --git a/mojo/public/bindings/tests/router_unittest.cc b/mojo/public/bindings/tests/router_unittest.cc
index b86ede6..4b2d0dc 100644
--- a/mojo/public/bindings/tests/router_unittest.cc
+++ b/mojo/public/bindings/tests/router_unittest.cc
@@ -5,9 +5,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/message_queue.h"
+#include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
diff --git a/mojo/public/cpp/bindings/DEPS b/mojo/public/cpp/bindings/DEPS
deleted file mode 100644
index ba2a571..0000000
--- a/mojo/public/cpp/bindings/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  # TODO(vtl): Temporary, until we move lib here.
-  "+mojo/public/bindings/lib",
-]
diff --git a/mojo/public/cpp/bindings/allocation_scope.h b/mojo/public/cpp/bindings/allocation_scope.h
index e372457..110c9b3 100644
--- a/mojo/public/cpp/bindings/allocation_scope.h
+++ b/mojo/public/cpp/bindings/allocation_scope.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_ALLOCATION_SCOPE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ALLOCATION_SCOPE_H_
 
-#include "mojo/public/bindings/lib/scratch_buffer.h"
+#include "mojo/public/cpp/bindings/lib/scratch_buffer.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
diff --git a/mojo/public/cpp/bindings/array.h b/mojo/public/cpp/bindings/array.h
index 601eedc..72aa56d 100644
--- a/mojo/public/cpp/bindings/array.h
+++ b/mojo/public/cpp/bindings/array.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "mojo/public/bindings/lib/array_internal.h"
+#include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
diff --git a/mojo/public/cpp/bindings/callback.h b/mojo/public/cpp/bindings/callback.h
index 766c9c3..4192f89 100644
--- a/mojo/public/cpp/bindings/callback.h
+++ b/mojo/public/cpp/bindings/callback.h
@@ -11,8 +11,8 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 
-#include "mojo/public/bindings/lib/callback_internal.h"
-#include "mojo/public/bindings/lib/shared_ptr.h"
+#include "mojo/public/cpp/bindings/lib/callback_internal.h"
+#include "mojo/public/cpp/bindings/lib/shared_ptr.h"
 
 namespace mojo {
 
diff --git a/mojo/public/cpp/bindings/callback.h.pump b/mojo/public/cpp/bindings/callback.h.pump
index 998324f..5452abb 100644
--- a/mojo/public/cpp/bindings/callback.h.pump
+++ b/mojo/public/cpp/bindings/callback.h.pump
@@ -14,8 +14,8 @@ $var MAX_ARITY = 7
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 
-#include "mojo/public/bindings/lib/callback_internal.h"
-#include "mojo/public/bindings/lib/shared_ptr.h"
+#include "mojo/public/cpp/bindings/lib/callback_internal.h"
+#include "mojo/public/cpp/bindings/lib/shared_ptr.h"
 
 namespace mojo {
 
diff --git a/mojo/public/bindings/lib/DEPS b/mojo/public/cpp/bindings/lib/DEPS
index fe8a2b3..b809b58 100644
--- a/mojo/public/bindings/lib/DEPS
+++ b/mojo/public/cpp/bindings/lib/DEPS
@@ -1,8 +1,5 @@
 include_rules = [
-  "-mojo",
   "+mojo/public/cpp/bindings",
   "+mojo/public/cpp/environment",
   "+mojo/public/cpp/system",
-  # TODO(vtl): Temporary, until lib is moved.
-  "+mojo/public/bindings/lib",
 ]
diff --git a/mojo/public/bindings/lib/TODO b/mojo/public/cpp/bindings/lib/TODO
index 318edcf..318edcf 100644
--- a/mojo/public/bindings/lib/TODO
+++ b/mojo/public/cpp/bindings/lib/TODO
diff --git a/mojo/public/bindings/lib/array.cc b/mojo/public/cpp/bindings/lib/array.cc
index 6745adc..6745adc 100644
--- a/mojo/public/bindings/lib/array.cc
+++ b/mojo/public/cpp/bindings/lib/array.cc
diff --git a/mojo/public/bindings/lib/array_internal.cc b/mojo/public/cpp/bindings/lib/array_internal.cc
index a10fe23..efdda8c 100644
--- a/mojo/public/bindings/lib/array_internal.cc
+++ b/mojo/public/cpp/bindings/lib/array_internal.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/public/bindings/lib/array_internal.h"
+#include "mojo/public/cpp/bindings/lib/array_internal.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/lib/array_internal.h b/mojo/public/cpp/bindings/lib/array_internal.h
index 1ca84d0..978dca3 100644
--- a/mojo/public/bindings/lib/array_internal.h
+++ b/mojo/public/cpp/bindings/lib/array_internal.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_PUBLIC_BINDINGS_LIB_ARRAY_INTERNAL_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_ARRAY_INTERNAL_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_
 
 #include <new>
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
-#include "mojo/public/bindings/lib/bindings_serialization.h"
 #include "mojo/public/cpp/bindings/buffer.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
 #include "mojo/public/cpp/bindings/passable.h"
 #include "mojo/public/cpp/system/core.h"
 
@@ -369,4 +369,4 @@ template <> struct ArrayTraits<MessagePipeHandle, false> {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_ARRAY_INTERNAL_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_INTERNAL_H_
diff --git a/mojo/public/bindings/lib/bindings_internal.h b/mojo/public/cpp/bindings/lib/bindings_internal.h
index 3a167f3..ef6fc47 100644
--- a/mojo/public/bindings/lib/bindings_internal.h
+++ b/mojo/public/cpp/bindings/lib/bindings_internal.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_PUBLIC_BINDINGS_LIB_BINDINGS_INTERNAL_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_BINDINGS_INTERNAL_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
 
 #include "mojo/public/cpp/system/core.h"
 
@@ -138,4 +138,4 @@ template <typename T> class ObjectTraits {};
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_BINDINGS_INTERNAL_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
diff --git a/mojo/public/bindings/lib/bindings_serialization.cc b/mojo/public/cpp/bindings/lib/bindings_serialization.cc
index 31603a4..ff06d95 100644
--- a/mojo/public/bindings/lib/bindings_serialization.cc
+++ b/mojo/public/cpp/bindings/lib/bindings_serialization.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/public/bindings/lib/bindings_serialization.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
 
 #include <assert.h>
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/lib/bindings_serialization.h b/mojo/public/cpp/bindings/lib/bindings_serialization.h
index 1be889c..a860b14 100644
--- a/mojo/public/bindings/lib/bindings_serialization.h
+++ b/mojo/public/cpp/bindings/lib/bindings_serialization.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_PUBLIC_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
 
 #include <vector>
 
@@ -64,4 +64,4 @@ inline bool Decode(T* obj, Message* message) {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
diff --git a/mojo/public/bindings/lib/buffer.cc b/mojo/public/cpp/bindings/lib/buffer.cc
index 4404df8..4404df8 100644
--- a/mojo/public/bindings/lib/buffer.cc
+++ b/mojo/public/cpp/bindings/lib/buffer.cc
diff --git a/mojo/public/bindings/lib/callback_internal.h b/mojo/public/cpp/bindings/lib/callback_internal.h
index 4e7e996..4802e43 100644
--- a/mojo/public/bindings/lib/callback_internal.h
+++ b/mojo/public/cpp/bindings/lib/callback_internal.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_BINDINGS_LIB_CALLBACK_INTERNAL_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_CALLBACK_INTERNAL_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 
 namespace mojo {
 namespace internal {
@@ -52,4 +52,4 @@ typename EnableIf<Callback_ParamTraits<T>::kIsScopedHandle, T>::type
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_CALLBACK_INTERNAL_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_CALLBACK_INTERNAL_H_
diff --git a/mojo/public/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc
index 7a07409..319631c 100644
--- a/mojo/public/bindings/lib/connector.cc
+++ b/mojo/public/cpp/bindings/lib/connector.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/public/bindings/lib/connector.h"
+#include "mojo/public/cpp/bindings/lib/connector.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/mojo/public/bindings/lib/connector.h b/mojo/public/cpp/bindings/lib/connector.h
index 833acf0..21107d5 100644
--- a/mojo/public/bindings/lib/connector.h
+++ b/mojo/public/cpp/bindings/lib/connector.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_BINDINGS_LIB_CONNECTOR_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_CONNECTOR_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_
 
-#include "mojo/public/bindings/lib/message_queue.h"
+#include "mojo/public/cpp/bindings/lib/message_queue.h"
 #include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/cpp/environment/default_async_waiter.h"
 #include "mojo/public/cpp/system/core.h"
@@ -77,4 +77,4 @@ class Connector : public MessageReceiver {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_CONNECTOR_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_CONNECTOR_H_
diff --git a/mojo/public/bindings/lib/fixed_buffer.cc b/mojo/public/cpp/bindings/lib/fixed_buffer.cc
index 09e3094..7e19ae2 100644
--- a/mojo/public/bindings/lib/fixed_buffer.cc
+++ b/mojo/public/cpp/bindings/lib/fixed_buffer.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/public/bindings/lib/fixed_buffer.h"
+#include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 
 #include <algorithm>
 
-#include "mojo/public/bindings/lib/bindings_serialization.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/lib/fixed_buffer.h b/mojo/public/cpp/bindings/lib/fixed_buffer.h
index 76f95f0..f4a9905 100644
--- a/mojo/public/bindings/lib/fixed_buffer.h
+++ b/mojo/public/cpp/bindings/lib/fixed_buffer.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_PUBLIC_BINDINGS_LIB_FIXED_BUFFER_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_FIXED_BUFFER_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_
 
 #include "mojo/public/cpp/bindings/buffer.h"
 #include "mojo/public/cpp/system/macros.h"
@@ -65,4 +65,4 @@ class FixedBuffer : public Buffer {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_FIXED_BUFFER_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_FIXED_BUFFER_H_
diff --git a/mojo/public/bindings/lib/interface.cc b/mojo/public/cpp/bindings/lib/interface.cc
index 3b552be..3b552be 100644
--- a/mojo/public/bindings/lib/interface.cc
+++ b/mojo/public/cpp/bindings/lib/interface.cc
diff --git a/mojo/public/bindings/lib/message.cc b/mojo/public/cpp/bindings/lib/message.cc
index 8ec188e2..8ec188e2 100644
--- a/mojo/public/bindings/lib/message.cc
+++ b/mojo/public/cpp/bindings/lib/message.cc
diff --git a/mojo/public/bindings/lib/message_builder.cc b/mojo/public/cpp/bindings/lib/message_builder.cc
index 5cdd40e..c746644 100644
--- a/mojo/public/bindings/lib/message_builder.cc
+++ b/mojo/public/cpp/bindings/lib/message_builder.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/public/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/message_builder.h"
 
 #include "mojo/public/cpp/bindings/message.h"
 
diff --git a/mojo/public/bindings/lib/message_builder.h b/mojo/public/cpp/bindings/lib/message_builder.h
index 7158d5b..b4988ff9 100644
--- a/mojo/public/bindings/lib/message_builder.h
+++ b/mojo/public/cpp/bindings/lib/message_builder.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_PUBLIC_BINDINGS_LIB_MESSAGE_BUILDER_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_BUILDER_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_
 
 #include <stdint.h>
 
-#include "mojo/public/bindings/lib/fixed_buffer.h"
-#include "mojo/public/bindings/lib/message_internal.h"
+#include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
+#include "mojo/public/cpp/bindings/lib/message_internal.h"
 
 namespace mojo {
 class Message;
@@ -60,4 +60,4 @@ class ResponseMessageBuilder : public MessageWithRequestIDBuilder {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_BUILDER_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_BUILDER_H_
diff --git a/mojo/public/bindings/lib/message_internal.h b/mojo/public/cpp/bindings/lib/message_internal.h
index f238bb2..3c67902 100644
--- a/mojo/public/bindings/lib/message_internal.h
+++ b/mojo/public/cpp/bindings/lib/message_internal.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_BINDINGS_LIB_MESSAGE_INTERNAL_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_INTERNAL_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 
 namespace mojo {
 namespace internal {
@@ -41,4 +41,4 @@ MOJO_COMPILE_ASSERT(sizeof(MessageData) == sizeof(MessageHeader),
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_INTERNAL_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_INTERNAL_H_
diff --git a/mojo/public/bindings/lib/message_queue.cc b/mojo/public/cpp/bindings/lib/message_queue.cc
index ce5e347..1982ccb 100644
--- a/mojo/public/bindings/lib/message_queue.cc
+++ b/mojo/public/cpp/bindings/lib/message_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/public/bindings/lib/message_queue.h"
+#include "mojo/public/cpp/bindings/lib/message_queue.h"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/mojo/public/bindings/lib/message_queue.h b/mojo/public/cpp/bindings/lib/message_queue.h
index d1c535b..4e46b54 100644
--- a/mojo/public/bindings/lib/message_queue.h
+++ b/mojo/public/cpp/bindings/lib/message_queue.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_PUBLIC_BINDINGS_LIB_MESSAGE_QUEUE_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_QUEUE_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_QUEUE_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_QUEUE_H_
 
 #include <queue>
 
@@ -44,4 +44,4 @@ class MessageQueue {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_MESSAGE_QUEUE_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_QUEUE_H_
diff --git a/mojo/public/bindings/lib/router.cc b/mojo/public/cpp/bindings/lib/router.cc
index 90e0541..594addc 100644
--- a/mojo/public/bindings/lib/router.cc
+++ b/mojo/public/cpp/bindings/lib/router.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/public/bindings/lib/router.h"
+#include "mojo/public/cpp/bindings/lib/router.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/public/bindings/lib/router.h b/mojo/public/cpp/bindings/lib/router.h
index edd2ad5..31c05f6 100644
--- a/mojo/public/bindings/lib/router.h
+++ b/mojo/public/cpp/bindings/lib/router.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_PUBLIC_BINDINGS_LIB_ROUTER_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_ROUTER_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_
 
 #include <map>
 
-#include "mojo/public/bindings/lib/connector.h"
-#include "mojo/public/bindings/lib/shared_data.h"
+#include "mojo/public/cpp/bindings/lib/connector.h"
+#include "mojo/public/cpp/bindings/lib/shared_data.h"
 
 namespace mojo {
 namespace internal {
@@ -70,4 +70,4 @@ class Router : public MessageReceiver {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_ROUTER_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_
diff --git a/mojo/public/bindings/lib/scratch_buffer.cc b/mojo/public/cpp/bindings/lib/scratch_buffer.cc
index abfb5fe..cb894e3 100644
--- a/mojo/public/bindings/lib/scratch_buffer.cc
+++ b/mojo/public/cpp/bindings/lib/scratch_buffer.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/public/bindings/lib/scratch_buffer.h"
+#include "mojo/public/cpp/bindings/lib/scratch_buffer.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 
 #include <algorithm>
 
-#include "mojo/public/bindings/lib/bindings_serialization.h"
+#include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
 
 // Scrub memory in debug builds to help catch use-after-free bugs.
 #ifdef NDEBUG
diff --git a/mojo/public/bindings/lib/scratch_buffer.h b/mojo/public/cpp/bindings/lib/scratch_buffer.h
index 310969b..462c6fe 100644
--- a/mojo/public/bindings/lib/scratch_buffer.h
+++ b/mojo/public/cpp/bindings/lib/scratch_buffer.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_PUBLIC_BINDINGS_LIB_SCRATCH_BUFFER_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_SCRATCH_BUFFER_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SCRATCH_BUFFER_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SCRATCH_BUFFER_H_
 
 #include <deque>
 
@@ -51,4 +51,4 @@ class ScratchBuffer : public Buffer {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_SCRATCH_BUFFER_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SCRATCH_BUFFER_H_
diff --git a/mojo/public/bindings/lib/shared_data.h b/mojo/public/cpp/bindings/lib/shared_data.h
index c40b8f9..e396b0d 100644
--- a/mojo/public/bindings/lib/shared_data.h
+++ b/mojo/public/cpp/bindings/lib/shared_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_PUBLIC_BINDINGS_LIB_SHARED_DATA_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_SHARED_DATA_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_
 
 namespace mojo {
 namespace internal {
@@ -78,4 +78,4 @@ class SharedData {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_SHARED_DATA_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_DATA_H_
diff --git a/mojo/public/bindings/lib/shared_ptr.h b/mojo/public/cpp/bindings/lib/shared_ptr.h
index 537b39e..6ae53a5 100644
--- a/mojo/public/bindings/lib/shared_ptr.h
+++ b/mojo/public/cpp/bindings/lib/shared_ptr.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_BINDINGS_LIB_SHARED_PTR_H_
-#define MOJO_PUBLIC_BINDINGS_LIB_SHARED_PTR_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_
 
-#include "mojo/public/bindings/lib/shared_data.h"
+#include "mojo/public/cpp/bindings/lib/shared_data.h"
 
 namespace mojo {
 namespace internal {
@@ -60,4 +60,4 @@ class SharedPtr {
 }  // namespace mojo
 }  // namespace internal
 
-#endif  // MOJO_PUBLIC_BINDINGS_LIB_SHARED_PTR_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SHARED_PTR_H_
diff --git a/mojo/public/bindings/lib/sync_dispatcher.cc b/mojo/public/cpp/bindings/lib/sync_dispatcher.cc
index acb537e..acb537e 100644
--- a/mojo/public/bindings/lib/sync_dispatcher.cc
+++ b/mojo/public/cpp/bindings/lib/sync_dispatcher.cc
diff --git a/mojo/public/cpp/bindings/message.h b/mojo/public/cpp/bindings/message.h
index 8df1ce0..58001c6 100644
--- a/mojo/public/cpp/bindings/message.h
+++ b/mojo/public/cpp/bindings/message.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "mojo/public/bindings/lib/message_internal.h"
+#include "mojo/public/cpp/bindings/lib/message_internal.h"
 
 namespace mojo {
 
diff --git a/mojo/public/cpp/bindings/passable.h b/mojo/public/cpp/bindings/passable.h
index 3d5c2ca..0e109d6 100644
--- a/mojo/public/cpp/bindings/passable.h
+++ b/mojo/public/cpp/bindings/passable.h
@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_PASSABLE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_PASSABLE_H_
 
-#include "mojo/public/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
diff --git a/mojo/public/cpp/bindings/remote_ptr.h b/mojo/public/cpp/bindings/remote_ptr.h
index 9bc629f..63ee719 100644
--- a/mojo/public/cpp/bindings/remote_ptr.h
+++ b/mojo/public/cpp/bindings/remote_ptr.h
@@ -7,8 +7,8 @@
 
 #include <assert.h>
 
-#include "mojo/public/bindings/lib/router.h"
 #include "mojo/public/cpp/bindings/interface.h"
+#include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {