Make header include guards great again

i.e. #ifndef VM_WHATEVER -> #ifndef RUNTIME_VM_WHATEVER

This lets us remove a hack from the PRESUBMIT.py script that existed
for reasons that are no longer valid, and sets us up to add some
presubmit checks for the GN build.

R=asiva@google.com, rmacnak@google.com

Review URL: https://codereview.chromium.org/2450713004 .

runtime/PRESUBMIT.py

@@ -6,37 +6,23 @@ import os
 import cpplint
 import re
 
-
-class PathHackException(Exception):
-  def __init__(self, error_msg):
-    self.error_msg = error_msg
-
-  def __str__(self):
-    return repr(self.error_msg)
-
-def AddSvnPathIfNeeded(runtime_path):
-  # Add the .svn into the runtime directory if needed for git or svn 1.7.
-  fake_svn_path = os.path.join(runtime_path, '.svn')
-  if os.path.exists(fake_svn_path):
-    return None
-  open(fake_svn_path, 'w').close()
-  return lambda: os.remove(fake_svn_path)
-
-
-def TrySvnPathHack(parent_path):
-  orig_path = os.path.join(parent_path, '.svn')
-  renamed_path = os.path.join(parent_path, '.svn_orig')
-  if os.path.exists(renamed_path):
-    error_msg = '".svn_orig" exists in presubmit parent directory('
-    error_msg += parent_path
-    error_msg += '). Consider renaming it manually to ".svn".'
-    raise PathHackException(error_msg)
-  if os.path.exists(orig_path):
-    # Make the parent SVN directory non-discoverable by cpplint to get
-    # the correct header guard checks. This is needed if using all Dart
-    # checkout.
-    os.rename(orig_path, renamed_path)
-    return lambda: os.rename(renamed_path, orig_path)
+# memcpy does not handle overlapping memory regions. Even though this
+# is well documented it seems to be used in error quite often. To avoid
+# problems we disallow the direct use of memcpy.  The exceptions are in
+# third-party code and in platform/globals.h which uses it to implement
+# bit_cast and bit_copy.
+def CheckMemcpy(filename):
+  if filename.endswith(os.path.join('platform', 'globals.h')) or \
+     filename.find('third_party') != -1:
+    return 0
+  fh = open(filename, 'r')
+  content = fh.read()
+  match = re.search('\\bmemcpy\\b', content)
+  if match:
+    line_number = content[0:match.start()].count('\n') + 1
+    print "%s:%d: use of memcpy is forbidden" % (filename, line_number)
+    return 1
+  return 0
 
 
 def RunLint(input_api, output_api):
@@ -44,39 +30,13 @@ def RunLint(input_api, output_api):
   cpplint._cpplint_state.ResetErrorCounts()
   memcpy_match_count = 0
   # Find all .cc and .h files in the change list.
-  for svn_file in input_api.AffectedTextFiles():
-    filename = svn_file.AbsoluteLocalPath()
+  for git_file in input_api.AffectedTextFiles():
+    filename = git_file.AbsoluteLocalPath()
     if filename.endswith('.cc') or filename.endswith('.h'):
-      cleanup_parent = None
-      cleanup_runtime = None
-      try:
-        runtime_path = input_api.PresubmitLocalPath()
-        parent_path = os.path.dirname(runtime_path)
-        if filename.endswith('.h'):
-          cleanup_runtime = AddSvnPathIfNeeded(runtime_path)
-          cleanup_parent = TrySvnPathHack(parent_path)
-      except PathHackException, exception:
-        return [output_api.PresubmitError(str(exception))]
       # Run cpplint on the file.
       cpplint.ProcessFile(filename, 1)
-      if cleanup_parent is not None:
-        cleanup_parent()
-      if cleanup_runtime is not None:
-        cleanup_runtime()
-      # memcpy does not handle overlapping memory regions. Even though this
-      # is well documented it seems to be used in error quite often. To avoid
-      # problems we disallow the direct use of memcpy.  The exceptions are in
-      # third-party code and in platform/globals.h which uses it to implement
-      # bit_cast and bit_copy.
-      if not filename.endswith(os.path.join('platform', 'globals.h')) and \
-         filename.find('third_party') == -1:
-        fh = open(filename, 'r')
-        content = fh.read()
-        match = re.search('\\bmemcpy\\b', content)
-        if match:
-          line_number = content[0:match.start()].count('\n') + 1
-          print "%s:%d: use of memcpy is forbidden" % (filename, line_number)
-          memcpy_match_count += 1
+      # Check for memcpy use.
+      memcpy_match_count += CheckMemcpy(filename)
 
   # Report a presubmit error if any of the files had an error.
   if cpplint._cpplint_state.error_count > 0 or memcpy_match_count > 0:

runtime/bin/builtin.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_BUILTIN_H_
-#define BIN_BUILTIN_H_
+#ifndef RUNTIME_BIN_BUILTIN_H_
+#define RUNTIME_BIN_BUILTIN_H_
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -103,4 +103,4 @@ class Builtin {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_BUILTIN_H_
+#endif  // RUNTIME_BIN_BUILTIN_H_

runtime/bin/crypto.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_CRYPTO_H_
-#define BIN_CRYPTO_H_
+#ifndef RUNTIME_BIN_CRYPTO_H_
+#define RUNTIME_BIN_CRYPTO_H_
 
 #include "bin/builtin.h"
 #include "bin/utils.h"
@@ -23,5 +23,5 @@ class Crypto {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_CRYPTO_H_
+#endif  // RUNTIME_BIN_CRYPTO_H_
 

runtime/bin/dartutils.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_DARTUTILS_H_
-#define BIN_DARTUTILS_H_
+#ifndef RUNTIME_BIN_DARTUTILS_H_
+#define RUNTIME_BIN_DARTUTILS_H_
 
 #include "bin/isolate_data.h"
 #include "include/dart_api.h"
@@ -686,4 +686,4 @@ class ScopedMemBuffer {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_DARTUTILS_H_
+#endif  // RUNTIME_BIN_DARTUTILS_H_

runtime/bin/directory.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_DIRECTORY_H_
-#define BIN_DIRECTORY_H_
+#ifndef RUNTIME_BIN_DIRECTORY_H_
+#define RUNTIME_BIN_DIRECTORY_H_
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ -300,4 +300,4 @@ class Directory {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_DIRECTORY_H_
+#endif  // RUNTIME_BIN_DIRECTORY_H_

runtime/bin/embedded_dart_io.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EMBEDDED_DART_IO_H_
-#define BIN_EMBEDDED_DART_IO_H_
+#ifndef RUNTIME_BIN_EMBEDDED_DART_IO_H_
+#define RUNTIME_BIN_EMBEDDED_DART_IO_H_
 
 namespace dart {
 namespace bin {
@@ -30,4 +30,4 @@ bool ShouldCaptureStderr();
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EMBEDDED_DART_IO_H_
+#endif  // RUNTIME_BIN_EMBEDDED_DART_IO_H_

runtime/bin/eventhandler.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_H_
-#define BIN_EVENTHANDLER_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_H_
+#define RUNTIME_BIN_EVENTHANDLER_H_
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ -669,4 +669,4 @@ class EventHandler {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_H_

runtime/bin/eventhandler_android.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_ANDROID_H_
-#define BIN_EVENTHANDLER_ANDROID_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_ANDROID_H_
+#define RUNTIME_BIN_EVENTHANDLER_ANDROID_H_
 
-#if !defined(BIN_EVENTHANDLER_H_)
+#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_android.h directly;
 #error use eventhandler.h instead.
 #endif
@@ -101,4 +101,4 @@ class EventHandlerImplementation {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_ANDROID_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_ANDROID_H_

runtime/bin/eventhandler_fuchsia.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_FUCHSIA_H_
-#define BIN_EVENTHANDLER_FUCHSIA_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_FUCHSIA_H_
+#define RUNTIME_BIN_EVENTHANDLER_FUCHSIA_H_
 
-#if !defined(BIN_EVENTHANDLER_H_)
+#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_fuchsia.h directly; use eventhandler.h instead.
 #endif
 
@@ -116,4 +116,4 @@ class EventHandlerImplementation {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_FUCHSIA_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_FUCHSIA_H_

runtime/bin/eventhandler_linux.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_LINUX_H_
-#define BIN_EVENTHANDLER_LINUX_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_LINUX_H_
+#define RUNTIME_BIN_EVENTHANDLER_LINUX_H_
 
-#if !defined(BIN_EVENTHANDLER_H_)
+#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_linux.h directly; use eventhandler.h instead.
 #endif
 
@@ -100,4 +100,4 @@ class EventHandlerImplementation {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_LINUX_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_LINUX_H_

runtime/bin/eventhandler_macos.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_MACOS_H_
-#define BIN_EVENTHANDLER_MACOS_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_MACOS_H_
+#define RUNTIME_BIN_EVENTHANDLER_MACOS_H_
 
-#if !defined(BIN_EVENTHANDLER_H_)
+#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_macos.h directly; use eventhandler.h instead.
 #endif
 
@@ -115,4 +115,4 @@ class EventHandlerImplementation {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_MACOS_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_MACOS_H_

runtime/bin/eventhandler_win.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EVENTHANDLER_WIN_H_
-#define BIN_EVENTHANDLER_WIN_H_
+#ifndef RUNTIME_BIN_EVENTHANDLER_WIN_H_
+#define RUNTIME_BIN_EVENTHANDLER_WIN_H_
 
-#if !defined(BIN_EVENTHANDLER_H_)
+#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_win.h directly; use eventhandler.h instead.
 #endif
 
@@ -553,4 +553,4 @@ class EventHandlerImplementation {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EVENTHANDLER_WIN_H_
+#endif  // RUNTIME_BIN_EVENTHANDLER_WIN_H_

runtime/bin/extensions.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_EXTENSIONS_H_
-#define BIN_EXTENSIONS_H_
+#ifndef RUNTIME_BIN_EXTENSIONS_H_
+#define RUNTIME_BIN_EXTENSIONS_H_
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
@@ -41,4 +41,4 @@ class Extensions {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_EXTENSIONS_H_
+#endif  // RUNTIME_BIN_EXTENSIONS_H_

runtime/bin/fdutils.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_FDUTILS_H_
-#define BIN_FDUTILS_H_
+#ifndef RUNTIME_BIN_FDUTILS_H_
+#define RUNTIME_BIN_FDUTILS_H_
 
 #include "bin/builtin.h"
 #include "platform/globals.h"
@@ -47,4 +47,4 @@ class FDUtils {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_FDUTILS_H_
+#endif  // RUNTIME_BIN_FDUTILS_H_

runtime/bin/file.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_FILE_H_
-#define BIN_FILE_H_
+#ifndef RUNTIME_BIN_FILE_H_
+#define RUNTIME_BIN_FILE_H_
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -243,4 +243,4 @@ class File : public ReferenceCounted<File> {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_FILE_H_
+#endif  // RUNTIME_BIN_FILE_H_

runtime/bin/file_system_watcher.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_FILE_SYSTEM_WATCHER_H_
-#define BIN_FILE_SYSTEM_WATCHER_H_
+#ifndef RUNTIME_BIN_FILE_SYSTEM_WATCHER_H_
+#define RUNTIME_BIN_FILE_SYSTEM_WATCHER_H_
 
 #if defined(DART_IO_DISABLED)
 #error "file_system_watcher.h can only be included on builds with IO enabled"
@@ -57,5 +57,5 @@ class FileSystemWatcher {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_FILE_SYSTEM_WATCHER_H_
+#endif  // RUNTIME_BIN_FILE_SYSTEM_WATCHER_H_
 

runtime/bin/filter.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_FILTER_H_
-#define BIN_FILTER_H_
+#ifndef RUNTIME_BIN_FILTER_H_
+#define RUNTIME_BIN_FILTER_H_
 
 #if defined(DART_IO_DISABLED)
 #error "filter.h can only be included on builds with IO enabled"
@@ -113,4 +113,4 @@ class ZLibInflateFilter : public Filter {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_FILTER_H_
+#endif  // RUNTIME_BIN_FILTER_H_

runtime/bin/io_buffer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_IO_BUFFER_H_
-#define BIN_IO_BUFFER_H_
+#ifndef RUNTIME_BIN_IO_BUFFER_H_
+#define RUNTIME_BIN_IO_BUFFER_H_
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
@@ -41,4 +41,4 @@ class IOBuffer {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_IO_BUFFER_H_
+#endif  // RUNTIME_BIN_IO_BUFFER_H_

runtime/bin/io_natives.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_IO_NATIVES_H_
-#define BIN_IO_NATIVES_H_
+#ifndef RUNTIME_BIN_IO_NATIVES_H_
+#define RUNTIME_BIN_IO_NATIVES_H_
 
 #include "include/dart_api.h"
 
@@ -19,4 +19,4 @@ const uint8_t* IONativeSymbol(Dart_NativeFunction nf);
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_IO_NATIVES_H_
+#endif  // RUNTIME_BIN_IO_NATIVES_H_

runtime/bin/io_service.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_IO_SERVICE_H_
-#define BIN_IO_SERVICE_H_
+#ifndef RUNTIME_BIN_IO_SERVICE_H_
+#define RUNTIME_BIN_IO_SERVICE_H_
 
 #if defined(DART_IO_DISABLED) || defined(DART_IO_SECURE_SOCKET_DISABLED)
 #error "io_service.h can only be included on builds with IO and SSL enabled"
@@ -77,4 +77,4 @@ IO_SERVICE_REQUEST_LIST(DECLARE_REQUEST)
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_IO_SERVICE_H_
+#endif  // RUNTIME_BIN_IO_SERVICE_H_

runtime/bin/io_service_no_ssl.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_IO_SERVICE_NO_SSL_H_
-#define BIN_IO_SERVICE_NO_SSL_H_
+#ifndef RUNTIME_BIN_IO_SERVICE_NO_SSL_H_
+#define RUNTIME_BIN_IO_SERVICE_NO_SSL_H_
 
 #if defined(DART_IO_DISABLED) || !defined(DART_IO_SECURE_SOCKET_DISABLED)
 #error "io_service_no_ssl.h can only be included on builds with IO enabled"
@@ -78,4 +78,4 @@ IO_SERVICE_REQUEST_LIST(DECLARE_REQUEST)
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_IO_SERVICE_NO_SSL_H_
+#endif  // RUNTIME_BIN_IO_SERVICE_NO_SSL_H_

runtime/bin/isolate_data.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_ISOLATE_DATA_H_
-#define BIN_ISOLATE_DATA_H_
+#ifndef RUNTIME_BIN_ISOLATE_DATA_H_
+#define RUNTIME_BIN_ISOLATE_DATA_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
@@ -97,4 +97,4 @@ class IsolateData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_ISOLATE_DATA_H_
+#endif  // RUNTIME_BIN_ISOLATE_DATA_H_

runtime/bin/loader.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_LOADER_H_
-#define BIN_LOADER_H_
+#ifndef RUNTIME_BIN_LOADER_H_
+#define RUNTIME_BIN_LOADER_H_
 
 #include "bin/isolate_data.h"
 #include "include/dart_api.h"
@@ -146,4 +146,4 @@ class Loader {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_LOADER_H_
+#endif  // RUNTIME_BIN_LOADER_H_

runtime/bin/lockers.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_LOCKERS_H_
-#define BIN_LOCKERS_H_
+#ifndef RUNTIME_BIN_LOCKERS_H_
+#define RUNTIME_BIN_LOCKERS_H_
 
 #include "bin/thread.h"
 #include "platform/assert.h"
@@ -61,4 +61,4 @@ class MonitorLocker {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_LOCKERS_H_
+#endif  // RUNTIME_BIN_LOCKERS_H_

runtime/bin/log.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_LOG_H_
-#define BIN_LOG_H_
+#ifndef RUNTIME_BIN_LOG_H_
+#define RUNTIME_BIN_LOG_H_
 
 #include <stdarg.h>
 
@@ -41,4 +41,4 @@ class Log {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_LOG_H_
+#endif  // RUNTIME_BIN_LOG_H_

runtime/bin/platform.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_PLATFORM_H_
-#define BIN_PLATFORM_H_
+#ifndef RUNTIME_BIN_PLATFORM_H_
+#define RUNTIME_BIN_PLATFORM_H_
 
 #include "bin/builtin.h"
 #include "platform/globals.h"
@@ -107,4 +107,4 @@ class Platform {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_PLATFORM_H_
+#endif  // RUNTIME_BIN_PLATFORM_H_

runtime/bin/process.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_PROCESS_H_
-#define BIN_PROCESS_H_
+#ifndef RUNTIME_BIN_PROCESS_H_
+#define RUNTIME_BIN_PROCESS_H_
 
 #include "bin/builtin.h"
 #include "bin/io_buffer.h"
@@ -294,4 +294,4 @@ class BufferListBase {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_PROCESS_H_
+#endif  // RUNTIME_BIN_PROCESS_H_

runtime/bin/reference_counting.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_REFERENCE_COUNTING_H_
-#define BIN_REFERENCE_COUNTING_H_
+#ifndef RUNTIME_BIN_REFERENCE_COUNTING_H_
+#define RUNTIME_BIN_REFERENCE_COUNTING_H_
 
 #include "vm/atomic.h"
 
@@ -156,4 +156,4 @@ class RetainedPointer {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_REFERENCE_COUNTING_H_
+#endif  // RUNTIME_BIN_REFERENCE_COUNTING_H_

runtime/bin/secure_socket.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SECURE_SOCKET_H_
-#define BIN_SECURE_SOCKET_H_
+#ifndef RUNTIME_BIN_SECURE_SOCKET_H_
+#define RUNTIME_BIN_SECURE_SOCKET_H_
 
 #if defined(DART_IO_DISABLED) || defined(DART_IO_SECURE_SOCKET_DISABLED)
 #error "secure_socket.h can only be included on builds with SSL enabled"
@@ -24,4 +24,4 @@
 #error Unknown target os.
 #endif
 
-#endif  // BIN_SECURE_SOCKET_H_
+#endif  // RUNTIME_BIN_SECURE_SOCKET_H_

runtime/bin/secure_socket_boringssl.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SECURE_SOCKET_BORINGSSL_H_
-#define BIN_SECURE_SOCKET_BORINGSSL_H_
+#ifndef RUNTIME_BIN_SECURE_SOCKET_BORINGSSL_H_
+#define RUNTIME_BIN_SECURE_SOCKET_BORINGSSL_H_
 
-#if !defined(BIN_SECURE_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SECURE_SOCKET_H_)
 #error Do not include secure_socket_boringssl.h directly. Use secure_socket.h.
 #endif
 
@@ -162,4 +162,4 @@ class SSLFilter : public ReferenceCounted<SSLFilter> {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_SECURE_SOCKET_BORINGSSL_H_
+#endif  // RUNTIME_BIN_SECURE_SOCKET_BORINGSSL_H_

runtime/bin/secure_socket_ios.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SECURE_SOCKET_IOS_H_
-#define BIN_SECURE_SOCKET_IOS_H_
+#ifndef RUNTIME_BIN_SECURE_SOCKET_IOS_H_
+#define RUNTIME_BIN_SECURE_SOCKET_IOS_H_
 
-#if !defined(BIN_SECURE_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SECURE_SOCKET_H_)
 #error Do not include secure_socket_macos.h directly. Use secure_socket.h.
 #endif
 
@@ -237,4 +237,4 @@ class SSLFilter : public ReferenceCounted<SSLFilter> {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_SECURE_SOCKET_IOS_H_
+#endif  // RUNTIME_BIN_SECURE_SOCKET_IOS_H_

runtime/bin/secure_socket_macos.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SECURE_SOCKET_MACOS_H_
-#define BIN_SECURE_SOCKET_MACOS_H_
+#ifndef RUNTIME_BIN_SECURE_SOCKET_MACOS_H_
+#define RUNTIME_BIN_SECURE_SOCKET_MACOS_H_
 
-#if !defined(BIN_SECURE_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SECURE_SOCKET_H_)
 #error Do not include secure_socket_macos.h directly. Use secure_socket.h.
 #endif
 
@@ -278,4 +278,4 @@ class SSLFilter : public ReferenceCounted<SSLFilter> {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_SECURE_SOCKET_MACOS_H_
+#endif  // RUNTIME_BIN_SECURE_SOCKET_MACOS_H_

runtime/bin/socket.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_H_
-#define BIN_SOCKET_H_
+#ifndef RUNTIME_BIN_SOCKET_H_
+#define RUNTIME_BIN_SOCKET_H_
 
 #if defined(DART_IO_DISABLED)
 #error "socket.h can only be included on builds with IO enabled"
@@ -475,4 +475,4 @@ class ListeningSocketRegistry {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_SOCKET_H_
+#endif  // RUNTIME_BIN_SOCKET_H_

runtime/bin/socket_android.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_ANDROID_H_
-#define BIN_SOCKET_ANDROID_H_
+#ifndef RUNTIME_BIN_SOCKET_ANDROID_H_
+#define RUNTIME_BIN_SOCKET_ANDROID_H_
 
-#if !defined(BIN_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SOCKET_H_)
 #error Do not include socket_android.h directly. Use socket.h.
 #endif
 
@@ -13,4 +13,4 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
-#endif  // BIN_SOCKET_ANDROID_H_
+#endif  // RUNTIME_BIN_SOCKET_ANDROID_H_

runtime/bin/socket_fuchsia.h

@@ -2,11 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_FUCHSIA_H_
-#define BIN_SOCKET_FUCHSIA_H_
+#ifndef RUNTIME_BIN_SOCKET_FUCHSIA_H_
+#define RUNTIME_BIN_SOCKET_FUCHSIA_H_
 
-#if !defined(BIN_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SOCKET_H_)
 #error Do not include socket_fuchsia.h directly. Use socket.h.
 #endif
 
-#endif  // BIN_SOCKET_FUCHSIA_H_
+#endif  // RUNTIME_BIN_SOCKET_FUCHSIA_H_

runtime/bin/socket_linux.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_LINUX_H_
-#define BIN_SOCKET_LINUX_H_
+#ifndef RUNTIME_BIN_SOCKET_LINUX_H_
+#define RUNTIME_BIN_SOCKET_LINUX_H_
 
-#if !defined(BIN_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SOCKET_H_)
 #error Do not include socket_linux.h directly. Use socket.h.
 #endif
 
@@ -13,4 +13,4 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
-#endif  // BIN_SOCKET_LINUX_H_
+#endif  // RUNTIME_BIN_SOCKET_LINUX_H_

runtime/bin/socket_macos.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_MACOS_H_
-#define BIN_SOCKET_MACOS_H_
+#ifndef RUNTIME_BIN_SOCKET_MACOS_H_
+#define RUNTIME_BIN_SOCKET_MACOS_H_
 
-#if !defined(BIN_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SOCKET_H_)
 #error Do not include socket_macos.h directly. Use socket.h.
 #endif
 
@@ -13,4 +13,4 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
-#endif  // BIN_SOCKET_MACOS_H_
+#endif  // RUNTIME_BIN_SOCKET_MACOS_H_

runtime/bin/socket_win.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_SOCKET_WIN_H_
-#define BIN_SOCKET_WIN_H_
+#ifndef RUNTIME_BIN_SOCKET_WIN_H_
+#define RUNTIME_BIN_SOCKET_WIN_H_
 
-#if !defined(BIN_SOCKET_H_)
+#if !defined(RUNTIME_BIN_SOCKET_H_)
 #error Do not include socket_win.h directly. Use socket.h.
 #endif
 
@@ -14,4 +14,4 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
-#endif  // BIN_SOCKET_WIN_H_
+#endif  // RUNTIME_BIN_SOCKET_WIN_H_

runtime/bin/stdio.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_STDIO_H_
-#define BIN_STDIO_H_
+#ifndef RUNTIME_BIN_STDIO_H_
+#define RUNTIME_BIN_STDIO_H_
 
 #if defined(DART_IO_DISABLED)
 #error "stdio.h can only be included on builds with IO enabled"
@@ -45,4 +45,4 @@ class Stdout {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_STDIO_H_
+#endif  // RUNTIME_BIN_STDIO_H_

runtime/bin/thread.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_H_
-#define BIN_THREAD_H_
+#ifndef RUNTIME_BIN_THREAD_H_
+#define RUNTIME_BIN_THREAD_H_
 
 #include "platform/globals.h"
 
@@ -114,4 +114,4 @@ class Monitor {
 }  // namespace dart
 
 
-#endif  // BIN_THREAD_H_
+#endif  // RUNTIME_BIN_THREAD_H_

runtime/bin/thread_android.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_ANDROID_H_
-#define BIN_THREAD_ANDROID_H_
+#ifndef RUNTIME_BIN_THREAD_ANDROID_H_
+#define RUNTIME_BIN_THREAD_ANDROID_H_
 
-#if !defined(BIN_THREAD_H_)
+#if !defined(RUNTIME_BIN_THREAD_H_)
 #error Do not include thread_android.h directly; use thread.h instead.
 #endif
 
@@ -74,4 +74,4 @@ class MonitorData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_THREAD_ANDROID_H_
+#endif  // RUNTIME_BIN_THREAD_ANDROID_H_

runtime/bin/thread_fuchsia.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_FUCHSIA_H_
-#define BIN_THREAD_FUCHSIA_H_
+#ifndef RUNTIME_BIN_THREAD_FUCHSIA_H_
+#define RUNTIME_BIN_THREAD_FUCHSIA_H_
 
-#if !defined(BIN_THREAD_H_)
+#if !defined(RUNTIME_BIN_THREAD_H_)
 #error Do not include thread_fuchsia.h directly; use thread.h instead.
 #endif
 
@@ -74,4 +74,4 @@ class MonitorData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_THREAD_FUCHSIA_H_
+#endif  // RUNTIME_BIN_THREAD_FUCHSIA_H_

runtime/bin/thread_linux.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_LINUX_H_
-#define BIN_THREAD_LINUX_H_
+#ifndef RUNTIME_BIN_THREAD_LINUX_H_
+#define RUNTIME_BIN_THREAD_LINUX_H_
 
-#if !defined(BIN_THREAD_H_)
+#if !defined(RUNTIME_BIN_THREAD_H_)
 #error Do not include thread_linux.h directly; use thread.h instead.
 #endif
 
@@ -74,4 +74,4 @@ class MonitorData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_THREAD_LINUX_H_
+#endif  // RUNTIME_BIN_THREAD_LINUX_H_

runtime/bin/thread_macos.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_MACOS_H_
-#define BIN_THREAD_MACOS_H_
+#ifndef RUNTIME_BIN_THREAD_MACOS_H_
+#define RUNTIME_BIN_THREAD_MACOS_H_
 
-#if !defined(BIN_THREAD_H_)
+#if !defined(RUNTIME_BIN_THREAD_H_)
 #error Do not include thread_macos.h directly; use thread.h instead.
 #endif
 
@@ -74,4 +74,4 @@ class MonitorData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_THREAD_MACOS_H_
+#endif  // RUNTIME_BIN_THREAD_MACOS_H_

runtime/bin/thread_win.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_THREAD_WIN_H_
-#define BIN_THREAD_WIN_H_
+#ifndef RUNTIME_BIN_THREAD_WIN_H_
+#define RUNTIME_BIN_THREAD_WIN_H_
 
-#if !defined(BIN_THREAD_H_)
+#if !defined(RUNTIME_BIN_THREAD_H_)
 #error Do not include thread_win.h directly; use thread.h instead.
 #endif
 
@@ -119,4 +119,4 @@ class MonitorData {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_THREAD_WIN_H_
+#endif  // RUNTIME_BIN_THREAD_WIN_H_

runtime/bin/utils.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_UTILS_H_
-#define BIN_UTILS_H_
+#ifndef RUNTIME_BIN_UTILS_H_
+#define RUNTIME_BIN_UTILS_H_
 
 #include <stdlib.h>
 #include <string.h>
@@ -123,4 +123,4 @@ class TimerUtils {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_UTILS_H_
+#endif  // RUNTIME_BIN_UTILS_H_

runtime/bin/utils_win.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_UTILS_WIN_H_
-#define BIN_UTILS_WIN_H_
+#ifndef RUNTIME_BIN_UTILS_WIN_H_
+#define RUNTIME_BIN_UTILS_WIN_H_
 
 #include "platform/globals.h"
 
@@ -95,4 +95,4 @@ class Utf8ToWideScope {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_UTILS_WIN_H_
+#endif  // RUNTIME_BIN_UTILS_WIN_H_

runtime/bin/vmservice_dartium.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_VMSERVICE_DARTIUM_H_
-#define BIN_VMSERVICE_DARTIUM_H_
+#ifndef RUNTIME_BIN_VMSERVICE_DARTIUM_H_
+#define RUNTIME_BIN_VMSERVICE_DARTIUM_H_
 
 /* In order to avoid conflicts / issues with blink, no headers are included */
 
@@ -38,4 +38,4 @@ class VmServiceServer {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_VMSERVICE_DARTIUM_H_
+#endif  // RUNTIME_BIN_VMSERVICE_DARTIUM_H_

runtime/bin/vmservice_impl.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef BIN_VMSERVICE_IMPL_H_
-#define BIN_VMSERVICE_IMPL_H_
+#ifndef RUNTIME_BIN_VMSERVICE_IMPL_H_
+#define RUNTIME_BIN_VMSERVICE_IMPL_H_
 
 #include "include/dart_api.h"
 
@@ -59,4 +59,4 @@ class VmService {
 }  // namespace bin
 }  // namespace dart
 
-#endif  // BIN_VMSERVICE_IMPL_H_
+#endif  // RUNTIME_BIN_VMSERVICE_IMPL_H_

runtime/include/dart_api.h

@@ -4,8 +4,8 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
-#ifndef INCLUDE_DART_API_H_
-#define INCLUDE_DART_API_H_
+#ifndef RUNTIME_INCLUDE_DART_API_H_
+#define RUNTIME_INCLUDE_DART_API_H_
 
 /** \mainpage Dart Embedding API Reference
  *

runtime/include/dart_mirrors_api.h

@@ -4,8 +4,8 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
-#ifndef INCLUDE_DART_MIRRORS_API_H_
-#define INCLUDE_DART_MIRRORS_API_H_
+#ifndef RUNTIME_INCLUDE_DART_MIRRORS_API_H_
+#define RUNTIME_INCLUDE_DART_MIRRORS_API_H_
 
 #include "include/dart_api.h"
 

runtime/include/dart_native_api.h

@@ -4,8 +4,8 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
-#ifndef INCLUDE_DART_NATIVE_API_H_
-#define INCLUDE_DART_NATIVE_API_H_
+#ifndef RUNTIME_INCLUDE_DART_NATIVE_API_H_
+#define RUNTIME_INCLUDE_DART_NATIVE_API_H_
 
 #include "include/dart_api.h"
 

runtime/include/dart_tools_api.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef INCLUDE_DART_TOOLS_API_H_
-#define INCLUDE_DART_TOOLS_API_H_
+#ifndef RUNTIME_INCLUDE_DART_TOOLS_API_H_
+#define RUNTIME_INCLUDE_DART_TOOLS_API_H_
 
 #include "include/dart_api.h"
 
@@ -1087,4 +1087,4 @@ DART_EXPORT void Dart_SetEmbedderTimelineCallbacks(
     Dart_EmbedderTimelineStartRecording start_recording,
     Dart_EmbedderTimelineStopRecording stop_recording);
 
-#endif  // INCLUDE_DART_TOOLS_API_H_
+#endif  // RUNTIME_INCLUDE_DART_TOOLS_API_H_

runtime/lib/invocation_mirror.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef LIB_INVOCATION_MIRROR_H_
-#define LIB_INVOCATION_MIRROR_H_
+#ifndef RUNTIME_LIB_INVOCATION_MIRROR_H_
+#define RUNTIME_LIB_INVOCATION_MIRROR_H_
 
 #include "vm/allocation.h"
 
@@ -47,4 +47,4 @@ class InvocationMirror : public AllStatic {
 
 }  // namespace dart
 
-#endif  // LIB_INVOCATION_MIRROR_H_
+#endif  // RUNTIME_LIB_INVOCATION_MIRROR_H_

runtime/lib/mirrors.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef LIB_MIRRORS_H_
-#define LIB_MIRRORS_H_
+#ifndef RUNTIME_LIB_MIRRORS_H_
+#define RUNTIME_LIB_MIRRORS_H_
 
 #include "vm/allocation.h"
 
@@ -32,4 +32,4 @@ class Mirrors : public AllStatic {
 
 }  // namespace dart
 
-#endif  // LIB_MIRRORS_H_
+#endif  // RUNTIME_LIB_MIRRORS_H_

runtime/lib/stacktrace.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef LIB_STACKTRACE_H_
-#define LIB_STACKTRACE_H_
+#ifndef RUNTIME_LIB_STACKTRACE_H_
+#define RUNTIME_LIB_STACKTRACE_H_
 
 namespace dart {
 
@@ -18,4 +18,4 @@ const Stacktrace& GetCurrentStacktrace(int skip_frames);
 
 }  // namespace dart
 
-#endif  // LIB_STACKTRACE_H_
+#endif  // RUNTIME_LIB_STACKTRACE_H_

runtime/platform/address_sanitizer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_ADDRESS_SANITIZER_H_
-#define PLATFORM_ADDRESS_SANITIZER_H_
+#ifndef RUNTIME_PLATFORM_ADDRESS_SANITIZER_H_
+#define RUNTIME_PLATFORM_ADDRESS_SANITIZER_H_
 
 #include "platform/globals.h"
 
@@ -20,4 +20,4 @@ extern "C" void __asan_unpoison_memory_region(void *, size_t);
 #define ASAN_UNPOISON(ptr, len) do {} while (false && (ptr) == 0 && (len) == 0)
 #endif  // defined(__has_feature)
 
-#endif  // PLATFORM_ADDRESS_SANITIZER_H_
+#endif  // RUNTIME_PLATFORM_ADDRESS_SANITIZER_H_

runtime/platform/assert.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_ASSERT_H_
-#define PLATFORM_ASSERT_H_
+#ifndef RUNTIME_PLATFORM_ASSERT_H_
+#define RUNTIME_PLATFORM_ASSERT_H_
 
 // TODO(5411406): include sstream for now, once we have a Utils::toString()
 // implemented for all the primitive types we can replace the usage of
@@ -379,4 +379,4 @@ struct CompileAssert {
 
 #endif  // defined(TESTING)
 
-#endif  // PLATFORM_ASSERT_H_
+#endif  // RUNTIME_PLATFORM_ASSERT_H_

runtime/platform/c99_support_win.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_C99_SUPPORT_WIN_H_
-#define PLATFORM_C99_SUPPORT_WIN_H_
+#ifndef RUNTIME_PLATFORM_C99_SUPPORT_WIN_H_
+#define RUNTIME_PLATFORM_C99_SUPPORT_WIN_H_
 
 #if defined(_MSC_VER) && (_MSC_VER < 1800)
 
@@ -79,4 +79,4 @@ static inline double round(double x) {
 
 #endif
 
-#endif  // PLATFORM_C99_SUPPORT_WIN_H_
+#endif  // RUNTIME_PLATFORM_C99_SUPPORT_WIN_H_

runtime/platform/floating_point.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_FLOATING_POINT_H_
-#define PLATFORM_FLOATING_POINT_H_
+#ifndef RUNTIME_PLATFORM_FLOATING_POINT_H_
+#define RUNTIME_PLATFORM_FLOATING_POINT_H_
 
 inline double fmod_ieee(double x, double y) { return fmod(x, y); }
 inline double atan2_ieee(double y, double x) { return atan2(y, x); }
 
-#endif  // PLATFORM_FLOATING_POINT_H_
+#endif  // RUNTIME_PLATFORM_FLOATING_POINT_H_

runtime/platform/floating_point_win.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_FLOATING_POINT_WIN_H_
-#define PLATFORM_FLOATING_POINT_WIN_H_
+#ifndef RUNTIME_PLATFORM_FLOATING_POINT_WIN_H_
+#define RUNTIME_PLATFORM_FLOATING_POINT_WIN_H_
 
 double atan2_ieee(double x, double y);
 double fmod_ieee(double x, double y);
 
-#endif  // PLATFORM_FLOATING_POINT_WIN_H_
+#endif  // RUNTIME_PLATFORM_FLOATING_POINT_WIN_H_

runtime/platform/globals.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_GLOBALS_H_
-#define PLATFORM_GLOBALS_H_
+#ifndef RUNTIME_PLATFORM_GLOBALS_H_
+#define RUNTIME_PLATFORM_GLOBALS_H_
 
 // __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
 // enable platform independent printf format specifiers.
@@ -713,4 +713,4 @@ static inline T ReadUnaligned(const T* ptr) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_GLOBALS_H_
+#endif  // RUNTIME_PLATFORM_GLOBALS_H_

runtime/platform/hashmap.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_HASHMAP_H_
-#define PLATFORM_HASHMAP_H_
+#ifndef RUNTIME_PLATFORM_HASHMAP_H_
+#define RUNTIME_PLATFORM_HASHMAP_H_
 
 #include "platform/globals.h"
 
@@ -105,4 +105,4 @@ class HashMap {
 
 }  // namespace dart
 
-#endif  // PLATFORM_HASHMAP_H_
+#endif  // RUNTIME_PLATFORM_HASHMAP_H_

runtime/platform/inttypes_support_win.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_INTTYPES_SUPPORT_WIN_H_
-#define PLATFORM_INTTYPES_SUPPORT_WIN_H_
+#ifndef RUNTIME_PLATFORM_INTTYPES_SUPPORT_WIN_H_
+#define RUNTIME_PLATFORM_INTTYPES_SUPPORT_WIN_H_
 
 typedef signed __int8 int8_t;
 typedef signed __int16 int16_t;
@@ -24,4 +24,4 @@ typedef unsigned __int64 uint64_t;
 #define PRIu64 "I64u"
 #define PRIx64 "I64x"
 
-#endif  // PLATFORM_INTTYPES_SUPPORT_WIN_H_
+#endif  // RUNTIME_PLATFORM_INTTYPES_SUPPORT_WIN_H_

runtime/platform/math.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_MATH_H_
-#define PLATFORM_MATH_H_
+#ifndef RUNTIME_PLATFORM_MATH_H_
+#define RUNTIME_PLATFORM_MATH_H_
 
 // We must take these math functions from the C++ header file as long as we
 // are using the STL. Otherwise the Android build will break due to confusion
@@ -20,4 +20,4 @@
 #include <math.h>
 #endif
 
-#endif  // PLATFORM_MATH_H_
+#endif  // RUNTIME_PLATFORM_MATH_H_

runtime/platform/memory_sanitizer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_MEMORY_SANITIZER_H_
-#define PLATFORM_MEMORY_SANITIZER_H_
+#ifndef RUNTIME_PLATFORM_MEMORY_SANITIZER_H_
+#define RUNTIME_PLATFORM_MEMORY_SANITIZER_H_
 
 #include "platform/globals.h"
 
@@ -23,4 +23,4 @@ extern "C" void __msan_unpoison(void *, size_t);
 #define NO_SANITIZE_MEMORY
 #endif  // defined(__has_feature)
 
-#endif  // PLATFORM_MEMORY_SANITIZER_H_
+#endif  // RUNTIME_PLATFORM_MEMORY_SANITIZER_H_

runtime/platform/signal_blocker.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_SIGNAL_BLOCKER_H_
-#define PLATFORM_SIGNAL_BLOCKER_H_
+#ifndef RUNTIME_PLATFORM_SIGNAL_BLOCKER_H_
+#define RUNTIME_PLATFORM_SIGNAL_BLOCKER_H_
 
 #include "platform/globals.h"
 #include "platform/assert.h"
@@ -105,4 +105,4 @@ class ThreadSignalBlocker {
 
 }  // namespace dart
 
-#endif  // PLATFORM_SIGNAL_BLOCKER_H_
+#endif  // RUNTIME_PLATFORM_SIGNAL_BLOCKER_H_

runtime/platform/text_buffer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_TEXT_BUFFER_H_
-#define PLATFORM_TEXT_BUFFER_H_
+#ifndef RUNTIME_PLATFORM_TEXT_BUFFER_H_
+#define RUNTIME_PLATFORM_TEXT_BUFFER_H_
 
 #include "vm/allocation.h"
 #include "vm/globals.h"
@@ -45,4 +45,4 @@ class TextBuffer : ValueObject {
 
 }  // namespace dart
 
-#endif  // PLATFORM_TEXT_BUFFER_H_
+#endif  // RUNTIME_PLATFORM_TEXT_BUFFER_H_

runtime/platform/utils.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_H_
-#define PLATFORM_UTILS_H_
+#ifndef RUNTIME_PLATFORM_UTILS_H_
+#define RUNTIME_PLATFORM_UTILS_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ -227,4 +227,4 @@ class Utils {
 #error Unknown target os.
 #endif
 
-#endif  // PLATFORM_UTILS_H_
+#endif  // RUNTIME_PLATFORM_UTILS_H_

runtime/platform/utils_android.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_ANDROID_H_
-#define PLATFORM_UTILS_ANDROID_H_
+#ifndef RUNTIME_PLATFORM_UTILS_ANDROID_H_
+#define RUNTIME_PLATFORM_UTILS_ANDROID_H_
 
 #include <endian.h>  // NOLINT
 
@@ -69,4 +69,4 @@ inline char* Utils::StrError(int err, char* buffer, size_t bufsize) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_UTILS_ANDROID_H_
+#endif  // RUNTIME_PLATFORM_UTILS_ANDROID_H_

runtime/platform/utils_fuchsia.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_FUCHSIA_H_
-#define PLATFORM_UTILS_FUCHSIA_H_
+#ifndef RUNTIME_PLATFORM_UTILS_FUCHSIA_H_
+#define RUNTIME_PLATFORM_UTILS_FUCHSIA_H_
 
 #include <endian.h>
 
@@ -70,4 +70,4 @@ inline char* Utils::StrError(int err, char* buffer, size_t bufsize) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_UTILS_FUCHSIA_H_
+#endif  // RUNTIME_PLATFORM_UTILS_FUCHSIA_H_

runtime/platform/utils_linux.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_LINUX_H_
-#define PLATFORM_UTILS_LINUX_H_
+#ifndef RUNTIME_PLATFORM_UTILS_LINUX_H_
+#define RUNTIME_PLATFORM_UTILS_LINUX_H_
 
 #include <endian.h>  // NOLINT
 
@@ -77,4 +77,4 @@ inline char* Utils::StrError(int err, char* buffer, size_t bufsize) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_UTILS_LINUX_H_
+#endif  // RUNTIME_PLATFORM_UTILS_LINUX_H_

runtime/platform/utils_macos.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_MACOS_H_
-#define PLATFORM_UTILS_MACOS_H_
+#ifndef RUNTIME_PLATFORM_UTILS_MACOS_H_
+#define RUNTIME_PLATFORM_UTILS_MACOS_H_
 
 #include <libkern/OSByteOrder.h>  // NOLINT
 
@@ -69,4 +69,4 @@ inline char* Utils::StrError(int err, char* buffer, size_t bufsize) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_UTILS_MACOS_H_
+#endif  // RUNTIME_PLATFORM_UTILS_MACOS_H_

runtime/platform/utils_win.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef PLATFORM_UTILS_WIN_H_
-#define PLATFORM_UTILS_WIN_H_
+#ifndef RUNTIME_PLATFORM_UTILS_WIN_H_
+#define RUNTIME_PLATFORM_UTILS_WIN_H_
 
 #include <intrin.h>
 #include <stdlib.h>
@@ -67,4 +67,4 @@ inline uint64_t Utils::HostToLittleEndian64(uint64_t value) {
 
 }  // namespace dart
 
-#endif  // PLATFORM_UTILS_WIN_H_
+#endif  // RUNTIME_PLATFORM_UTILS_WIN_H_

runtime/vm/allocation.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ALLOCATION_H_
-#define VM_ALLOCATION_H_
+#ifndef RUNTIME_VM_ALLOCATION_H_
+#define RUNTIME_VM_ALLOCATION_H_
 
 #include "platform/assert.h"
 #include "vm/base_isolate.h"
@@ -124,4 +124,4 @@ class NoSafepointScope : public ValueObject {
 
 }  // namespace dart
 
-#endif  // VM_ALLOCATION_H_
+#endif  // RUNTIME_VM_ALLOCATION_H_

runtime/vm/aot_optimizer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_AOT_OPTIMIZER_H_
-#define VM_AOT_OPTIMIZER_H_
+#ifndef RUNTIME_VM_AOT_OPTIMIZER_H_
+#define RUNTIME_VM_AOT_OPTIMIZER_H_
 
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph.h"
@@ -145,4 +145,4 @@ class AotOptimizer : public FlowGraphVisitor {
 
 }  // namespace dart
 
-#endif  // VM_AOT_OPTIMIZER_H_
+#endif  // RUNTIME_VM_AOT_OPTIMIZER_H_

runtime/vm/assembler.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_H_
-#define VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
+#define RUNTIME_VM_ASSEMBLER_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
@@ -348,4 +348,4 @@ enum RestorePP {
 #error Unknown architecture.
 #endif
 
-#endif  // VM_ASSEMBLER_H_
+#endif  // RUNTIME_VM_ASSEMBLER_H_

runtime/vm/assembler_arm.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_ARM_H_
-#define VM_ASSEMBLER_ARM_H_
+#ifndef RUNTIME_VM_ASSEMBLER_ARM_H_
+#define RUNTIME_VM_ASSEMBLER_ARM_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_arm.h directly; use assembler.h instead.
 #endif
 
@@ -1178,4 +1178,4 @@ class Assembler : public ValueObject {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_ARM_H_
+#endif  // RUNTIME_VM_ASSEMBLER_ARM_H_

runtime/vm/assembler_arm64.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_ARM64_H_
-#define VM_ASSEMBLER_ARM64_H_
+#ifndef RUNTIME_VM_ASSEMBLER_ARM64_H_
+#define RUNTIME_VM_ASSEMBLER_ARM64_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_arm64.h directly; use assembler.h instead.
 #endif
 
@@ -1959,4 +1959,4 @@ class Assembler : public ValueObject {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_ARM64_H_
+#endif  // RUNTIME_VM_ASSEMBLER_ARM64_H_

runtime/vm/assembler_dbc.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_DBC_H_
-#define VM_ASSEMBLER_DBC_H_
+#ifndef RUNTIME_VM_ASSEMBLER_DBC_H_
+#define RUNTIME_VM_ASSEMBLER_DBC_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_dbc.h directly; use assembler.h instead.
 #endif
 
@@ -196,4 +196,4 @@ class Assembler : public ValueObject {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_DBC_H_
+#endif  // RUNTIME_VM_ASSEMBLER_DBC_H_

runtime/vm/assembler_ia32.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_IA32_H_
-#define VM_ASSEMBLER_IA32_H_
+#ifndef RUNTIME_VM_ASSEMBLER_IA32_H_
+#define RUNTIME_VM_ASSEMBLER_IA32_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_ia32.h directly; use assembler.h instead.
 #endif
 
@@ -1025,4 +1025,4 @@ inline void Assembler::EmitOperandSizeOverride() {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_IA32_H_
+#endif  // RUNTIME_VM_ASSEMBLER_IA32_H_

runtime/vm/assembler_mips.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_MIPS_H_
-#define VM_ASSEMBLER_MIPS_H_
+#ifndef RUNTIME_VM_ASSEMBLER_MIPS_H_
+#define RUNTIME_VM_ASSEMBLER_MIPS_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_mips.h directly; use assembler.h instead.
 #endif
 
@@ -1764,4 +1764,4 @@ class Assembler : public ValueObject {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_MIPS_H_
+#endif  // RUNTIME_VM_ASSEMBLER_MIPS_H_

runtime/vm/assembler_x64.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ASSEMBLER_X64_H_
-#define VM_ASSEMBLER_X64_H_
+#ifndef RUNTIME_VM_ASSEMBLER_X64_H_
+#define RUNTIME_VM_ASSEMBLER_X64_H_
 
-#ifndef VM_ASSEMBLER_H_
+#ifndef RUNTIME_VM_ASSEMBLER_H_
 #error Do not include assembler_x64.h directly; use assembler.h instead.
 #endif
 
@@ -1175,4 +1175,4 @@ inline void Assembler::EmitOperandSizeOverride() {
 
 }  // namespace dart
 
-#endif  // VM_ASSEMBLER_X64_H_
+#endif  // RUNTIME_VM_ASSEMBLER_X64_H_

runtime/vm/ast.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_AST_H_
-#define VM_AST_H_
+#ifndef RUNTIME_VM_AST_H_
+#define RUNTIME_VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
@@ -2026,4 +2026,4 @@ class InlinedFinallyNode : public AstNode {
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
-#endif  // VM_AST_H_
+#endif  // RUNTIME_VM_AST_H_

runtime/vm/ast_printer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_AST_PRINTER_H_
-#define VM_AST_PRINTER_H_
+#ifndef RUNTIME_VM_AST_PRINTER_H_
+#define RUNTIME_VM_AST_PRINTER_H_
 
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ -52,4 +52,4 @@ class AstPrinter : public AstNodeVisitor {
 
 }  // namespace dart
 
-#endif  // VM_AST_PRINTER_H_
+#endif  // RUNTIME_VM_AST_PRINTER_H_

runtime/vm/ast_transformer.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_AST_TRANSFORMER_H_
-#define VM_AST_TRANSFORMER_H_
+#ifndef RUNTIME_VM_AST_TRANSFORMER_H_
+#define RUNTIME_VM_AST_TRANSFORMER_H_
 
 #include "platform/assert.h"
 #include "vm/ast.h"
@@ -77,4 +77,4 @@ class AwaitTransformer : public AstNodeVisitor {
 
 }  // namespace dart
 
-#endif  // VM_AST_TRANSFORMER_H_
+#endif  // RUNTIME_VM_AST_TRANSFORMER_H_

runtime/vm/atomic.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_H_
-#define VM_ATOMIC_H_
+#ifndef RUNTIME_VM_ATOMIC_H_
+#define RUNTIME_VM_ATOMIC_H_
 
 #include "platform/globals.h"
 
@@ -86,4 +86,4 @@ class AtomicOperations : public AllStatic {
 #error Unknown target os.
 #endif
 
-#endif  // VM_ATOMIC_H_
+#endif  // RUNTIME_VM_ATOMIC_H_

runtime/vm/atomic_android.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_ANDROID_H_
-#define VM_ATOMIC_ANDROID_H_
+#ifndef RUNTIME_VM_ATOMIC_ANDROID_H_
+#define RUNTIME_VM_ATOMIC_ANDROID_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_android.h directly. Use atomic.h instead.
 #endif
 
@@ -68,4 +68,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_ANDROID_H_
+#endif  // RUNTIME_VM_ATOMIC_ANDROID_H_

runtime/vm/atomic_fuchsia.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_FUCHSIA_H_
-#define VM_ATOMIC_FUCHSIA_H_
+#ifndef RUNTIME_VM_ATOMIC_FUCHSIA_H_
+#define RUNTIME_VM_ATOMIC_FUCHSIA_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_fuchsia.h directly. Use atomic.h instead.
 #endif
 
@@ -67,4 +67,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_FUCHSIA_H_
+#endif  // RUNTIME_VM_ATOMIC_FUCHSIA_H_

runtime/vm/atomic_linux.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_LINUX_H_
-#define VM_ATOMIC_LINUX_H_
+#ifndef RUNTIME_VM_ATOMIC_LINUX_H_
+#define RUNTIME_VM_ATOMIC_LINUX_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_linux.h directly. Use atomic.h instead.
 #endif
 
@@ -73,4 +73,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_LINUX_H_
+#endif  // RUNTIME_VM_ATOMIC_LINUX_H_

runtime/vm/atomic_macos.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_MACOS_H_
-#define VM_ATOMIC_MACOS_H_
+#ifndef RUNTIME_VM_ATOMIC_MACOS_H_
+#define RUNTIME_VM_ATOMIC_MACOS_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_macos.h directly. Use atomic.h instead.
 #endif
 
@@ -68,4 +68,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_MACOS_H_
+#endif  // RUNTIME_VM_ATOMIC_MACOS_H_

runtime/vm/atomic_simulator.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_SIMULATOR_H_
-#define VM_ATOMIC_SIMULATOR_H_
+#ifndef RUNTIME_VM_ATOMIC_SIMULATOR_H_
+#define RUNTIME_VM_ATOMIC_SIMULATOR_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_simulator.h directly. Use atomic.h instead.
 #endif
 
@@ -29,4 +29,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_SIMULATOR_H_
+#endif  // RUNTIME_VM_ATOMIC_SIMULATOR_H_

runtime/vm/atomic_win.h

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_ATOMIC_WIN_H_
-#define VM_ATOMIC_WIN_H_
+#ifndef RUNTIME_VM_ATOMIC_WIN_H_
+#define RUNTIME_VM_ATOMIC_WIN_H_
 
-#if !defined VM_ATOMIC_H_
+#if !defined RUNTIME_VM_ATOMIC_H_
 #error Do not include atomic_win.h directly. Use atomic.h instead.
 #endif
 
@@ -137,4 +137,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // VM_ATOMIC_WIN_H_
+#endif  // RUNTIME_VM_ATOMIC_WIN_H_

runtime/vm/base_isolate.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BASE_ISOLATE_H_
-#define VM_BASE_ISOLATE_H_
+#ifndef RUNTIME_VM_BASE_ISOLATE_H_
+#define RUNTIME_VM_BASE_ISOLATE_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
@@ -47,4 +47,4 @@ class BaseIsolate {
 
 }  // namespace dart
 
-#endif  // VM_BASE_ISOLATE_H_
+#endif  // RUNTIME_VM_BASE_ISOLATE_H_

runtime/vm/become.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BECOME_H_
-#define VM_BECOME_H_
+#ifndef RUNTIME_VM_BECOME_H_
+#define RUNTIME_VM_BECOME_H_
 
 #include "vm/allocation.h"
 #include "vm/raw_object.h"
@@ -92,4 +92,4 @@ class Become : public AllStatic {
 
 }  // namespace dart
 
-#endif  // VM_BECOME_H_
+#endif  // RUNTIME_VM_BECOME_H_

runtime/vm/benchmark_test.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BENCHMARK_TEST_H_
-#define VM_BENCHMARK_TEST_H_
+#ifndef RUNTIME_VM_BENCHMARK_TEST_H_
+#define RUNTIME_VM_BENCHMARK_TEST_H_
 
 #include "include/dart_api.h"
 
@@ -128,4 +128,4 @@ class BenchmarkIsolateScope {
 
 }  // namespace dart
 
-#endif  // VM_BENCHMARK_TEST_H_
+#endif  // RUNTIME_VM_BENCHMARK_TEST_H_

runtime/vm/bit_set.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BIT_SET_H_
-#define VM_BIT_SET_H_
+#ifndef RUNTIME_VM_BIT_SET_H_
+#define RUNTIME_VM_BIT_SET_H_
 
 #include "platform/utils.h"
 #include "vm/globals.h"
@@ -100,4 +100,4 @@ class BitSet {
 
 }  // namespace dart
 
-#endif  // VM_BIT_SET_H_
+#endif  // RUNTIME_VM_BIT_SET_H_

runtime/vm/bit_vector.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BIT_VECTOR_H_
-#define VM_BIT_VECTOR_H_
+#ifndef RUNTIME_VM_BIT_VECTOR_H_
+#define RUNTIME_VM_BIT_VECTOR_H_
 
 #include "vm/allocation.h"
 #include "vm/isolate.h"
@@ -118,4 +118,4 @@ class BitVector : public ZoneAllocated {
 
 }  // namespace dart
 
-#endif  // VM_BIT_VECTOR_H_
+#endif  // RUNTIME_VM_BIT_VECTOR_H_

runtime/vm/bitfield.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BITFIELD_H_
-#define VM_BITFIELD_H_
+#ifndef RUNTIME_VM_BITFIELD_H_
+#define RUNTIME_VM_BITFIELD_H_
 
 namespace dart {
 
@@ -67,4 +67,4 @@ class BitField {
 
 }  // namespace dart
 
-#endif  // VM_BITFIELD_H_
+#endif  // RUNTIME_VM_BITFIELD_H_

runtime/vm/bitmap.h

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef VM_BITMAP_H_
-#define VM_BITMAP_H_
+#ifndef RUNTIME_VM_BITMAP_H_
+#define RUNTIME_VM_BITMAP_H_
 
 #include "vm/allocation.h"
 #include "vm/isolate.h"
@@ -77,4 +77,4 @@ class BitmapBuilder : public ZoneAllocated {
 
 }  // namespace dart
 
-#endif  // VM_BITMAP_H_
+#endif  // RUNTIME_VM_BITMAP_H_