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

mojo/edk/platform/scoped_platform_handle.h

 // 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.
 
 #ifndef MOJO_EDK_PLATFORM_SCOPED_PLATFORM_HANDLE_H_
 #define MOJO_EDK_PLATFORM_SCOPED_PLATFORM_HANDLE_H_
 
+#include <mojo/macros.h>
+
 #include "mojo/edk/platform/platform_handle.h"
-#include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace platform {
 
 // Scoper for |PlatformHandle|s, which are just file descriptors.
 class ScopedPlatformHandle {
  public:
   ScopedPlatformHandle() {}
   explicit ScopedPlatformHandle(PlatformHandle handle) : handle_(handle) {}
@@ skipping 36 matching lines @@
  private:
   PlatformHandle handle_;
 
   MOJO_MOVE_ONLY_TYPE(ScopedPlatformHandle);
 };
 
 }  // namespace platform
 }  // namespace mojo
 
 #endif  // MOJO_EDK_PLATFORM_SCOPED_PLATFORM_HANDLE_H_