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

mojo/public/c/include/mojo/bindings/union.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.
 
-#ifndef MOJO_PUBLIC_C_BINDINGS_UNION_H_
-#define MOJO_PUBLIC_C_BINDINGS_UNION_H_
+#ifndef MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_UNION_H_
+#define MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_UNION_H_
 
+#include <mojo/bindings/buffer.h>
+#include <mojo/bindings/internal/type_descriptor.h>
+#include <mojo/bindings/internal/util.h>
 #include <mojo/macros.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/public/c/bindings/buffer.h"
-#include "mojo/public/c/bindings/lib/type_descriptor.h"
-#include "mojo/public/c/bindings/lib/util.h"
-
 MOJO_BEGIN_EXTERN_C
 
 struct MojomUnionLayout {
   // |num_bytes|, the number of bytes used in this union, includes the size of
   // the |num_bytes| and |tag| fields, along with data.
   uint32_t size;
   uint32_t tag;
   union {
     // To be used when the data is a pointer.
     union MojomPointer pointer;
@@ skipping 83 matching lines @@
 // |in_type_desc|: Describes the pointer and handle fields of the mojom union.
 // |in_union_data|: The unencoded mojom union to be copied.
 // |out_union_data|: Where |in_union_data| should be copied to.
 bool MojomUnion_DeepCopy(struct MojomBuffer* buffer,
                          const struct MojomTypeDescriptorUnion* in_type_desc,
                          const struct MojomUnionLayout* in_union_data,
                          struct MojomUnionLayout* out_union_data);
 
 MOJO_END_EXTERN_C
 
-#endif  // MOJO_PUBLIC_C_BINDINGS_UNION_H_
+#endif  // MOJO_PUBLIC_C_INCLUDE_MOJO_BINDINGS_UNION_H_