Change the canonical way to include the C bindings headers to <mojo/bindings/*.h>.

mojo/public/c/include/mojo/bindings/internal/type_descriptor.h

 // Copyright 2016 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.
 
 // This file contains structs used for constructing type descriptors for
 // generated mojom types. A type descriptor for a mojom struct is a table
 // describing the byte-offsets of all the pointers and handles in the struct,
 // and has references to the type descriptorss that further describe the
 // pointers. The table is used for doing all computations for the struct --
 // determining serialized size, encoding and decoding recursively, etc. A type
 // descriptor is generated for each struct, union, array and map. Mojom maps are
 // just mojom structs with two mojom arrays. We denote it as a separate type,
 // but it is described the same way as a mojom struct.
 //
 // The user is not expected to construct type descriptors -- a bindings
 // generator will do this when it generates bindings for a mojom file.
 //
 // A type descriptor for a mojom struct is a |MojomTypeDescriptorStruct|
 // containing an array of entries of types of |MojomTypeDescriptorStructEntry|.
 // Similarly, unions are described with |MojomTypeDescriptorUnion| with entries
 // of |MojomTypeDescriptorUnionEntry|. Arrays are described with
 // |MojomTypeDescriptorArray|.
 
-#ifndef MOJO_PUBLIC_C_BINDINGS_LIB_TYPE_DESCRIPTOR_H_
-#define MOJO_PUBLIC_C_BINDINGS_LIB_TYPE_DESCRIPTOR_H_
+#ifndef MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_INTERNAL_TYPE_DESCRIPTOR_H_
+#define MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_INTERNAL_TYPE_DESCRIPTOR_H_
 
+#include <mojo/bindings/buffer.h>
+#include <mojo/bindings/internal/util.h>
+#include <mojo/bindings/validation.h>
 #include <mojo/macros.h>
 #include <mojo/system/handle.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/public/c/bindings/buffer.h"
-#include "mojo/public/c/bindings/lib/util.h"
-#include "mojo/public/c/bindings/validation.h"
-
 MOJO_BEGIN_EXTERN_C
 
 // This enum is used in a type descriptor entry for the |elem_type| field, and
 // indicates which type the accompanying |elem_descriptor| is describing (if it
 // is describing a reference type), or to indicate that it's a handle type.
 // Values that correspond to an |elem_descriptor|'s pointer type:
 // - If MOJOM_TYPE_DESCRIPTOR_TYPE_STRUCT_PTR, then |elem_descriptor| points to
 //   a |MojomTypeDescriptorStruct|.
 // - If MOJOM_TYPE_DESCRIPTOR_TYPE_MAP_PTR, then |elem_descriptor| points to
 //   a |MojomTypeDescriptorStruct|.
@@ skipping 162 matching lines @@
 // new union before dispatching a call to MojomUnion_DeepCopy. Returns false if
 // the copy failed due to insufficient space in the buffer.
 bool MojomType_DispatchDeepCopy(struct MojomBuffer* buffer,
                                 enum MojomTypeDescriptorType in_elem_type,
                                 const void* in_type_desc,
                                 const void* in_data,
                                 void* out_data);
 
 MOJO_END_EXTERN_C
 
-#endif  // MOJO_PUBLIC_C_BINDINGS_LIB_TYPE_DESCRIPTOR_H_
+#endif  // MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_INTERNAL_TYPE_DESCRIPTOR_H_