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

mojo/edk/system/connection_manager_messages.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_CONNECTION_MANAGER_MESSAGES_H_
 #define MOJO_EDK_SYSTEM_CONNECTION_MANAGER_MESSAGES_H_
 
+#include <mojo/macros.h>
 #include <string.h>
 
 #include "mojo/edk/system/process_identifier.h"
-#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 // Align as 8 bytes to force 32/64-bit architectures to match size.
 struct MOJO_ALIGNAS(8) ConnectionManagerAckSuccessConnectData {
   // Set to the process identifier of the process that the receiver of this ack
   // ack should connect to.
   ProcessIdentifier peer_process_identifier;
 
   // Whether the receiver of this ack is the first party in the connection. This
   // is typically used to decide whether the receiver should initiate the
   // message (or data) pipe (i.e., allocate endpoint IDs, etc.).
   bool is_first;
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CONNECTION_MANAGER_MESSAGES_H_