Change the canonical way to include the C macros.h to <mojo/macros.h>.

mojo/edk/system/shared_buffer_dispatcher.cc

 // 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.
 
 #include "mojo/edk/system/shared_buffer_dispatcher.h"
 
+#include <mojo/macros.h>
+
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/platform/platform_shared_buffer.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/system/options_validation.h"
-#include "mojo/public/c/system/macros.h"
 
 using mojo::platform::PlatformSharedBuffer;
 using mojo::platform::PlatformSharedBufferMapping;
 using mojo::platform::ScopedPlatformHandle;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 
 namespace {
@@ skipping 311 matching lines @@
   platform_handles->push_back(std::move(platform_handle));
   *actual_size = sizeof(SerializedSharedBufferDispatcher);
 
   shared_buffer_ = nullptr;
 
   return true;
 }
 
 }  // namespace system
 }  // namespace mojo