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

mojo/edk/system/data_pipe_impl.h

 // Copyright 2015 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_EDK_SYSTEM_DATA_PIPE_IMPL_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_
 
+#include <mojo/macros.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/data_pipe.h"
-#include "mojo/public/c/system/macros.h"
 #include "mojo/public/c/system/result.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
 class MessageInTransit;
 
 // Base class/interface for classes that "implement" |DataPipe| for various
 // situations (local versus remote). The methods, other than the constructor,
@@ skipping 171 matching lines @@
 struct MOJO_ALIGNAS(8) SerializedDataPipeConsumerDispatcher {
   // Only validated (and thus canonicalized) options should be serialized.
   // However, the deserializer must revalidate (as with everything received).
   MojoCreateDataPipeOptions validated_options;
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_