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

mojo/public/c/lib/bindings/union.c

 // 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.
 
-#include "mojo/public/c/bindings/union.h"
+#include <mojo/bindings/union.h>
 
 #include <assert.h>
+#include <mojo/bindings/internal/type_descriptor.h>
 #include <string.h>
 
-#include "mojo/public/c/bindings/lib/type_descriptor.h"
-
 #define UNION_TAG_UNKNOWN ((uint32_t)0xFFFFFFFF)
 
 size_t MojomUnion_ComputeSerializedSize(
     const struct MojomTypeDescriptorUnion* in_type_desc,
     const struct MojomUnionLayout* in_union_data) {
   assert(in_type_desc);
   assert(in_union_data);
 
   for (size_t i = 0; i < in_type_desc->num_entries; i++) {
     const struct MojomTypeDescriptorUnionEntry* entry =
@@ skipping 129 matching lines @@
         buffer, entry->elem_type, entry->elem_descriptor,
         &(in_union_data->data), &(out_union_data->data));
   }
   // We reach here if we don't recognize the tag. If it's the UNKNOWN tag, it's
   // not a failure. If it's an unrecognized tag (erroneous or because this union
   // is from a future-version), we don't know how to copy it, so the copy is a
   // failure.
   return in_union_data->tag < in_type_desc->num_fields ||
          in_union_data->tag == UNION_TAG_UNKNOWN;
 }