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

mojo/edk/system/memory.h

 // Copyright 2013 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_MEMORY_H_
 #define MOJO_EDK_SYSTEM_MEMORY_H_
 
+#include <mojo/macros.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>  // For |memcpy()|.
 
 #include <memory>
 #include <type_traits>
 
-#include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 namespace internal {
 
 // Yields |(const) char| if |T| is |(const) void|, else |T|:
 template <typename T>
 struct VoidToChar {
@@ skipping 383 matching lines @@
 
   TypeNoConst storage_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerPartialReader);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MEMORY_H_