From 4f5337a2b64dc2486bde7b6b2c52ad6b1fedeaa0 Mon Sep 17 00:00:00 2001
From: erikcorry <erikcorry@chromium.org>
Date: Mon, 1 Jun 2015 15:46:54 -0700
Subject: [PATCH] Cosmetic changes to tests to make it easier to concatenate
 them.

When compiling on a laptop I like to concatenate the small test files.
This makes a big difference to compile times. These changes make that
easier.

R=ulan@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#28742}
---
 src/accessors.cc                                   |  3 ++-
 src/allocation-site-scopes.cc                      |  3 ++-
 src/allocation-tracker.cc                          |  3 ++-
 src/allocation.cc                                  |  3 ++-
 src/api.cc                                         |  3 ++-
 src/arguments.cc                                   |  3 ++-
 src/arm/assembler-arm.cc                           |  3 ++-
 src/arm/builtins-arm.cc                            |  3 ++-
 src/arm/code-stubs-arm.cc                          |  3 ++-
 src/arm/codegen-arm.cc                             |  3 ++-
 src/arm/constants-arm.cc                           |  3 ++-
 src/arm/cpu-arm.cc                                 |  3 ++-
 src/arm/debug-arm.cc                               |  3 ++-
 src/arm/deoptimizer-arm.cc                         |  3 ++-
 src/arm/disasm-arm.cc                              |  4 ++--
 src/arm/frames-arm.cc                              |  3 ++-
 src/arm/full-codegen-arm.cc                        |  3 ++-
 src/arm/interface-descriptors-arm.cc               |  4 ++--
 src/arm/lithium-arm.cc                             |  3 ++-
 src/arm/lithium-codegen-arm.cc                     |  3 ++-
 src/arm/lithium-gap-resolver-arm.cc                |  3 ++-
 src/arm/regexp-macro-assembler-arm.cc              |  3 ++-
 src/arm/simulator-arm.cc                           |  3 ++-
 src/arm64/assembler-arm64.cc                       |  3 ++-
 src/arm64/builtins-arm64.cc                        |  3 ++-
 src/arm64/code-stubs-arm64.cc                      |  3 ++-
 src/arm64/codegen-arm64.cc                         |  3 ++-
 src/arm64/cpu-arm64.cc                             |  3 ++-
 src/arm64/debug-arm64.cc                           |  3 ++-
 src/arm64/decoder-arm64.cc                         |  3 ++-
 src/arm64/delayed-masm-arm64.cc                    |  3 ++-
 src/arm64/deoptimizer-arm64.cc                     |  3 ++-
 src/arm64/disasm-arm64.cc                          |  3 ++-
 src/arm64/frames-arm64.cc                          |  3 ++-
 src/arm64/full-codegen-arm64.cc                    |  3 ++-
 src/arm64/instructions-arm64.cc                    |  3 ++-
 src/arm64/instrument-arm64.cc                      |  3 ++-
 src/arm64/interface-descriptors-arm64.cc           |  4 ++--
 src/arm64/lithium-arm64.cc                         |  3 ++-
 src/arm64/lithium-codegen-arm64.cc                 |  4 ++--
 src/arm64/lithium-gap-resolver-arm64.cc            |  3 ++-
 src/arm64/macro-assembler-arm64.cc                 |  3 ++-
 src/arm64/regexp-macro-assembler-arm64.cc          |  3 ++-
 src/arm64/simulator-arm64.cc                       |  3 ++-
 src/arm64/utils-arm64.cc                           |  3 ++-
 src/assembler.cc                                   |  3 ++-
 src/ast-numbering.cc                               |  4 ++--
 src/ast-value-factory.cc                           |  3 ++-
 src/ast.cc                                         |  3 ++-
 src/background-parsing-task.cc                     |  4 ++--
 src/bailout-reason.cc                              |  4 ++--
 src/basic-block-profiler.h                         |  3 ---
 src/bignum-dtoa.cc                                 |  3 ++-
 src/bignum.cc                                      |  3 ++-
 src/bootstrapper.cc                                |  3 ++-
 src/builtins.cc                                    |  3 ++-
 src/cached-powers.cc                               |  3 ++-
 src/char-predicates.cc                             |  4 ++--
 src/code-stubs-hydrogen.cc                         |  3 ++-
 src/code-stubs.cc                                  |  3 ++-
 src/codegen.cc                                     |  3 ++-
 src/compilation-cache.cc                           |  3 ++-
 src/compilation-dependencies.cc                    |  4 ++--
 src/compiler.cc                                    |  3 ++-
 src/contexts.cc                                    |  3 ++-
 src/conversions.cc                                 |  3 ++-
 src/counters.cc                                    |  3 ++-
 src/cpu-profiler.cc                                |  3 ++-
 src/date.cc                                        |  3 ++-
 src/dateparser.cc                                  |  3 ++-
 src/debug.cc                                       |  3 ++-
 src/deoptimizer.cc                                 |  3 ++-
 src/disassembler.cc                                |  3 ++-
 src/diy-fp.cc                                      |  3 ++-
 src/dtoa.cc                                        |  3 ++-
 src/elements-kind.cc                               |  3 ++-
 src/elements.cc                                    |  3 ++-
 src/execution.cc                                   |  3 ++-
 src/extensions/externalize-string-extension.cc     |  3 ++-
 src/extensions/free-buffer-extension.cc            |  3 ++-
 src/extensions/gc-extension.cc                     |  3 ++-
 src/extensions/statistics-extension.cc             |  3 ++-
 src/extensions/trigger-failure-extension.cc        |  3 ++-
 src/factory.cc                                     |  3 ++-
 src/fast-dtoa.cc                                   |  3 ++-
 src/fixed-dtoa.cc                                  |  3 ++-
 src/flags.cc                                       |  3 ++-
 src/frames.cc                                      |  3 ++-
 src/full-codegen.cc                                |  3 ++-
 src/func-name-inferrer.cc                          |  3 ++-
 src/global-handles.cc                              |  3 ++-
 src/handles.cc                                     |  3 ++-
 src/heap-profiler.cc                               |  3 ++-
 src/heap-snapshot-generator.cc                     |  3 ++-
 src/heap/gc-tracer.cc                              |  4 ++--
 src/heap/heap.cc                                   |  4 ++--
 src/heap/identity-map.cc                           |  4 ++--
 src/heap/incremental-marking.cc                    |  4 ++--
 src/heap/mark-compact.cc                           |  4 ++--
 src/heap/objects-visiting.cc                       |  4 ++--
 src/heap/spaces.cc                                 |  4 ++--
 src/heap/store-buffer.cc                           |  4 ++--
 src/hydrogen-bce.cc                                |  3 ++-
 src/hydrogen-bch.cc                                |  3 ++-
 src/hydrogen-canonicalize.cc                       |  3 ++-
 src/hydrogen-check-elimination.cc                  |  3 ++-
 src/hydrogen-dce.cc                                |  3 ++-
 src/hydrogen-dehoist.cc                            |  3 ++-
 src/hydrogen-environment-liveness.cc               |  3 ++-
 src/hydrogen-escape-analysis.cc                    |  3 ++-
 src/hydrogen-gvn.cc                                |  3 ++-
 src/hydrogen-infer-representation.cc               |  3 ++-
 src/hydrogen-infer-types.cc                        |  3 ++-
 src/hydrogen-instructions.cc                       |  3 ++-
 src/hydrogen-load-elimination.cc                   |  3 ++-
 src/hydrogen-mark-deoptimize.cc                    |  3 ++-
 src/hydrogen-mark-unreachable.cc                   |  3 ++-
 src/hydrogen-osr.cc                                |  3 ++-
 src/hydrogen-range-analysis.cc                     |  3 ++-
 src/hydrogen-redundant-phi.cc                      |  3 ++-
 src/hydrogen-removable-simulates.cc                |  3 ++-
 src/hydrogen-representation-changes.cc             |  3 ++-
 src/hydrogen-sce.cc                                |  3 ++-
 src/hydrogen-store-elimination.cc                  |  3 ++-
 src/hydrogen-types.cc                              |  3 ++-
 src/hydrogen-uint32-analysis.cc                    |  3 ++-
 src/hydrogen.cc                                    |  3 ++-
 src/i18n.cc                                        |  3 ++-
 src/ia32/assembler-ia32.cc                         |  3 ++-
 src/ia32/builtins-ia32.cc                          |  4 ++--
 src/ia32/code-stubs-ia32.cc                        |  3 ++-
 src/ia32/codegen-ia32.cc                           |  3 ++-
 src/ia32/cpu-ia32.cc                               |  3 ++-
 src/ia32/debug-ia32.cc                             |  3 ++-
 src/ia32/deoptimizer-ia32.cc                       |  3 ++-
 src/ia32/frames-ia32.cc                            |  3 ++-
 src/ia32/full-codegen-ia32.cc                      |  3 ++-
 src/ia32/interface-descriptors-ia32.cc             |  4 ++--
 src/ia32/lithium-codegen-ia32.cc                   |  3 ++-
 src/ia32/lithium-gap-resolver-ia32.cc              |  3 ++-
 src/ia32/lithium-ia32.cc                           |  3 ++-
 src/ia32/macro-assembler-ia32.cc                   |  3 ++-
 src/ia32/regexp-macro-assembler-ia32.cc            |  3 ++-
 src/ic/access-compiler.cc                          |  4 ++--
 src/ic/arm/access-compiler-arm.cc                  |  4 ++--
 src/ic/arm/handler-compiler-arm.cc                 |  4 ++--
 src/ic/arm/ic-arm.cc                               |  4 ++--
 src/ic/arm/ic-compiler-arm.cc                      |  4 ++--
 src/ic/arm/stub-cache-arm.cc                       |  4 ++--
 src/ic/arm64/access-compiler-arm64.cc              |  4 ++--
 src/ic/arm64/handler-compiler-arm64.cc             |  4 ++--
 src/ic/arm64/ic-arm64.cc                           |  4 ++--
 src/ic/arm64/ic-compiler-arm64.cc                  |  4 ++--
 src/ic/arm64/stub-cache-arm64.cc                   |  4 ++--
 src/ic/call-optimization.cc                        |  4 ++--
 src/ic/handler-compiler.cc                         |  4 ++--
 src/ic/ia32/access-compiler-ia32.cc                |  4 ++--
 src/ic/ia32/handler-compiler-ia32.cc               |  4 ++--
 src/ic/ia32/ic-compiler-ia32.cc                    |  4 ++--
 src/ic/ia32/ic-ia32.cc                             |  4 ++--
 src/ic/ia32/stub-cache-ia32.cc                     |  4 ++--
 src/ic/ic-compiler.cc                              |  4 ++--
 src/ic/ic-state.cc                                 |  4 ++--
 src/ic/ic.cc                                       |  4 ++--
 src/ic/mips/access-compiler-mips.cc                |  4 ++--
 src/ic/mips/handler-compiler-mips.cc               |  4 ++--
 src/ic/mips/ic-compiler-mips.cc                    |  4 ++--
 src/ic/mips/ic-mips.cc                             |  4 ++--
 src/ic/mips/stub-cache-mips.cc                     |  4 ++--
 src/ic/mips64/access-compiler-mips64.cc            |  4 ++--
 src/ic/mips64/handler-compiler-mips64.cc           |  4 ++--
 src/ic/mips64/ic-compiler-mips64.cc                |  4 ++--
 src/ic/mips64/ic-mips64.cc                         |  4 ++--
 src/ic/mips64/stub-cache-mips64.cc                 |  4 ++--
 src/ic/ppc/access-compiler-ppc.cc                  |  4 ++--
 src/ic/ppc/handler-compiler-ppc.cc                 |  4 ++--
 src/ic/ppc/ic-compiler-ppc.cc                      |  4 ++--
 src/ic/ppc/ic-ppc.cc                               |  4 ++--
 src/ic/ppc/stub-cache-ppc.cc                       |  4 ++--
 src/ic/stub-cache.cc                               |  4 ++--
 src/ic/x64/access-compiler-x64.cc                  |  4 ++--
 src/ic/x64/handler-compiler-x64.cc                 |  4 ++--
 src/ic/x64/ic-compiler-x64.cc                      |  4 ++--
 src/ic/x64/ic-x64.cc                               |  4 ++--
 src/ic/x64/stub-cache-x64.cc                       |  4 ++--
 src/ic/x87/access-compiler-x87.cc                  |  4 ++--
 src/ic/x87/handler-compiler-x87.cc                 |  4 ++--
 src/ic/x87/ic-compiler-x87.cc                      |  4 ++--
 src/ic/x87/ic-x87.cc                               |  4 ++--
 src/ic/x87/stub-cache-x87.cc                       |  4 ++--
 src/icu_util.cc                                    |  3 ++-
 src/interface-descriptors.cc                       |  4 ++--
 src/interpreter-irregexp.cc                        |  3 ++-
 src/isolate.cc                                     |  3 ++-
 src/jsregexp.cc                                    |  3 ++-
 src/layout-descriptor.cc                           |  4 ++--
 src/lithium-allocator.cc                           |  3 ++-
 src/lithium-codegen.cc                             |  3 ++-
 src/lithium.cc                                     |  3 ++-
 src/liveedit.cc                                    |  3 ++-
 src/log-utils.cc                                   |  3 ++-
 src/log.cc                                         |  3 ++-
 src/lookup.cc                                      |  3 ++-
 src/messages.cc                                    |  3 ++-
 src/mips/assembler-mips.cc                         |  3 ++-
 src/mips/builtins-mips.cc                          |  3 ++-
 src/mips/code-stubs-mips.cc                        |  3 ++-
 src/mips/codegen-mips.cc                           |  3 ++-
 src/mips/constants-mips.cc                         |  3 ++-
 src/mips/cpu-mips.cc                               |  3 ++-
 src/mips/debug-mips.cc                             |  3 ++-
 src/mips/deoptimizer-mips.cc                       |  3 ++-
 src/mips/disasm-mips.cc                            |  4 ++--
 src/mips/frames-mips.cc                            |  3 ++-
 src/mips/full-codegen-mips.cc                      |  3 ++-
 src/mips/interface-descriptors-mips.cc             |  4 ++--
 src/mips/lithium-codegen-mips.cc                   |  3 ++-
 src/mips/lithium-gap-resolver-mips.cc              |  3 ++-
 src/mips/lithium-mips.cc                           |  3 ++-
 src/mips/macro-assembler-mips.cc                   |  3 ++-
 src/mips/regexp-macro-assembler-mips.cc            |  3 ++-
 src/mips/simulator-mips.cc                         |  3 ++-
 src/mips64/assembler-mips64.cc                     |  3 ++-
 src/mips64/builtins-mips64.cc                      |  3 ++-
 src/mips64/code-stubs-mips64.cc                    |  3 ++-
 src/mips64/codegen-mips64.cc                       |  3 ++-
 src/mips64/constants-mips64.cc                     |  3 ++-
 src/mips64/cpu-mips64.cc                           |  3 ++-
 src/mips64/debug-mips64.cc                         |  3 ++-
 src/mips64/deoptimizer-mips64.cc                   |  3 ++-
 src/mips64/disasm-mips64.cc                        |  4 ++--
 src/mips64/frames-mips64.cc                        |  3 ++-
 src/mips64/full-codegen-mips64.cc                  |  3 ++-
 src/mips64/interface-descriptors-mips64.cc         |  4 ++--
 src/mips64/lithium-codegen-mips64.cc               |  3 ++-
 src/mips64/lithium-gap-resolver-mips64.cc          |  3 ++-
 src/mips64/lithium-mips64.cc                       |  3 ++-
 src/mips64/macro-assembler-mips64.cc               |  3 ++-
 src/mips64/regexp-macro-assembler-mips64.cc        |  3 ++-
 src/mips64/simulator-mips64.cc                     |  3 ++-
 src/modules.cc                                     |  4 ++--
 src/objects-debug.cc                               |  3 ++-
 src/objects-printer.cc                             |  3 ++-
 src/objects.cc                                     |  3 ++-
 src/optimizing-compile-dispatcher.cc               |  4 ++--
 src/parser.cc                                      |  3 ++-
 src/pattern-rewriter.cc                            |  4 ++--
 src/pending-compilation-error-handler.cc           |  4 ++--
 src/ppc/assembler-ppc.cc                           |  4 ++--
 src/ppc/builtins-ppc.cc                            |  4 ++--
 src/ppc/code-stubs-ppc.cc                          |  4 ++--
 src/ppc/codegen-ppc.cc                             |  4 ++--
 src/ppc/constants-ppc.cc                           |  4 ++--
 src/ppc/cpu-ppc.cc                                 |  4 ++--
 src/ppc/debug-ppc.cc                               |  4 ++--
 src/ppc/deoptimizer-ppc.cc                         |  4 ++--
 src/ppc/disasm-ppc.cc                              |  4 ++--
 src/ppc/frames-ppc.cc                              |  4 ++--
 src/ppc/full-codegen-ppc.cc                        |  4 ++--
 src/ppc/interface-descriptors-ppc.cc               |  4 ++--
 src/ppc/lithium-codegen-ppc.cc                     |  4 ++--
 src/ppc/lithium-gap-resolver-ppc.cc                |  4 ++--
 src/ppc/lithium-ppc.cc                             |  4 ++--
 src/ppc/regexp-macro-assembler-ppc.cc              |  4 ++--
 src/ppc/simulator-ppc.cc                           |  4 ++--
 src/preparse-data.cc                               |  3 ++-
 src/prettyprinter.cc                               |  3 ++-
 src/profile-generator.cc                           |  3 ++-
 src/property.cc                                    |  3 ++-
 src/regexp-macro-assembler-irregexp.cc             |  3 ++-
 src/regexp-macro-assembler-tracer.cc               |  3 ++-
 src/regexp-macro-assembler.cc                      |  3 ++-
 src/regexp-stack.cc                                |  3 ++-
 src/rewriter.cc                                    |  3 ++-
 src/runtime-profiler.cc                            |  3 ++-
 src/safepoint-table.cc                             |  4 ++--
 src/sampler.cc                                     |  3 ++-
 src/scanner-character-streams.cc                   |  3 ++-
 src/scanner.cc                                     |  3 ++-
 src/scopeinfo.cc                                   |  3 ++-
 src/scopes.cc                                      |  3 ++-
 src/snapshot/natives-external.cc                   |  3 +--
 src/snapshot/serialize.cc                          |  3 ++-
 src/snapshot/snapshot-common.cc                    |  3 ++-
 src/snapshot/snapshot-empty.cc                     |  3 ++-
 src/snapshot/snapshot-external.cc                  |  3 ++-
 src/snapshot/snapshot-source-sink.cc               |  3 +--
 src/string-builder.cc                              |  4 ++--
 src/string-search.cc                               |  3 ++-
 src/string-stream.cc                               |  3 ++-
 src/strings-storage.cc                             |  4 ++--
 src/strtod.cc                                      |  3 ++-
 src/third_party/fdlibm/fdlibm.cc                   |  4 ++--
 src/token.cc                                       |  3 ++-
 src/transitions.cc                                 |  3 ++-
 src/type-feedback-vector.cc                        |  4 ++--
 src/type-info.cc                                   |  3 ++-
 src/types.cc                                       |  3 ++-
 src/typing.cc                                      |  3 ++-
 src/utils.cc                                       |  3 ++-
 src/v8.cc                                          |  3 ++-
 src/variables.cc                                   |  3 ++-
 src/version.cc                                     |  3 ++-
 src/x64/assembler-x64.cc                           |  3 ++-
 src/x64/builtins-x64.cc                            |  3 ++-
 src/x64/code-stubs-x64.cc                          |  3 ++-
 src/x64/codegen-x64.cc                             |  3 ++-
 src/x64/cpu-x64.cc                                 |  3 ++-
 src/x64/debug-x64.cc                               |  3 ++-
 src/x64/deoptimizer-x64.cc                         |  3 ++-
 src/x64/frames-x64.cc                              |  3 ++-
 src/x64/full-codegen-x64.cc                        |  3 ++-
 src/x64/interface-descriptors-x64.cc               |  4 ++--
 src/x64/lithium-codegen-x64.cc                     |  3 ++-
 src/x64/lithium-gap-resolver-x64.cc                |  3 ++-
 src/x64/lithium-x64.cc                             |  3 ++-
 src/x64/macro-assembler-x64.cc                     |  3 ++-
 src/x64/regexp-macro-assembler-x64.cc              |  3 ++-
 src/x87/assembler-x87.cc                           |  3 ++-
 src/x87/builtins-x87.cc                            |  4 ++--
 src/x87/code-stubs-x87.cc                          |  3 ++-
 src/x87/codegen-x87.cc                             |  3 ++-
 src/x87/cpu-x87.cc                                 |  3 ++-
 src/x87/debug-x87.cc                               |  3 ++-
 src/x87/deoptimizer-x87.cc                         |  3 ++-
 src/x87/frames-x87.cc                              |  3 ++-
 src/x87/full-codegen-x87.cc                        |  3 ++-
 src/x87/interface-descriptors-x87.cc               |  4 ++--
 src/x87/lithium-codegen-x87.cc                     |  3 ++-
 src/x87/lithium-gap-resolver-x87.cc                |  3 ++-
 src/x87/lithium-x87.cc                             |  3 ++-
 src/x87/macro-assembler-x87.cc                     |  3 ++-
 src/x87/regexp-macro-assembler-x87.cc              |  3 ++-
 test/cctest/compiler/test-linkage.cc               |  1 -
 test/cctest/compiler/test-representation-change.cc |  6 +++---
 test/cctest/compiler/test-run-deopt.cc             |  8 +++----
 test/cctest/gay-fixed.cc                           |  3 ++-
 test/cctest/gay-precision.cc                       |  3 ++-
 test/cctest/gay-shortest.cc                        |  3 ++-
 test/cctest/print-extension.cc                     |  3 ++-
 test/cctest/profiler-extension.cc                  |  3 ++-
 test/cctest/test-debug.cc                          |  3 ++-
 test/cctest/test-global-object.cc                  |  4 +---
 test/cctest/test-hydrogen-types.cc                 |  1 -
 test/cctest/test-microtask-delivery.cc             | 25 +++++++++++-----------
 test/cctest/test-reloc-info.cc                     |  3 ++-
 test/cctest/test-spaces.cc                         |  3 ++-
 test/cctest/test-threads.cc                        | 11 +++-------
 test/cctest/test-version.cc                        |  3 ++-
 test/cctest/test-weakmaps.cc                       |  1 -
 test/cctest/test-weaksets.cc                       |  1 -
 test/cctest/trace-extension.cc                     |  3 ++-
 352 files changed, 705 insertions(+), 483 deletions(-)

diff --git a/src/accessors.cc b/src/accessors.cc
index e192007..4527001 100644
--- a/src/accessors.cc
+++ b/src/accessors.cc
@@ -1458,4 +1458,5 @@ Handle<AccessorInfo> Accessors::MakeModuleExport(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/allocation-site-scopes.cc b/src/allocation-site-scopes.cc
index 5b513f6..4c8cda5 100644
--- a/src/allocation-site-scopes.cc
+++ b/src/allocation-site-scopes.cc
@@ -76,4 +76,5 @@ bool AllocationSiteUsageContext::ShouldCreateMemento(Handle<JSObject> object) {
   return false;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/allocation-tracker.cc b/src/allocation-tracker.cc
index 227d969..f8617cf 100644
--- a/src/allocation-tracker.cc
+++ b/src/allocation-tracker.cc
@@ -337,4 +337,5 @@ void AllocationTracker::UnresolvedLocation::HandleWeakScript(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/allocation.cc b/src/allocation.cc
index 8a03a9c..851cd61 100644
--- a/src/allocation.cc
+++ b/src/allocation.cc
@@ -108,4 +108,5 @@ void AlignedFree(void *ptr) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/api.cc b/src/api.cc
index 349c702..6ecdb4d 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -8367,4 +8367,5 @@ void InvokeFunctionCallback(const v8::FunctionCallbackInfo<v8::Value>& info,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arguments.cc b/src/arguments.cc
index d31c479..4b478d7 100644
--- a/src/arguments.cc
+++ b/src/arguments.cc
@@ -102,4 +102,5 @@ double ClobberDoubleRegisters(double x1, double x2, double x3, double x4) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index 6e65677..315eeb1 100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -4117,6 +4117,7 @@ void ConstantPoolBuilder::Populate(Assembler* assm,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
index db53022..eb09bc1 100644
--- a/src/arm/builtins-arm.cc
+++ b/src/arm/builtins-arm.cc
@@ -1813,6 +1813,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index f53079c..e7ba1f3 100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -5361,6 +5361,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index fd1b0ef..a456996 100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -946,6 +946,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/constants-arm.cc b/src/arm/constants-arm.cc
index 3f3c5ed..0749356 100644
--- a/src/arm/constants-arm.cc
+++ b/src/arm/constants-arm.cc
@@ -126,6 +126,7 @@ int Registers::Number(const char* name) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/cpu-arm.cc b/src/arm/cpu-arm.cc
index 4bbfd37..dd2d13c 100644
--- a/src/arm/cpu-arm.cc
+++ b/src/arm/cpu-arm.cc
@@ -77,6 +77,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/debug-arm.cc b/src/arm/debug-arm.cc
index 8b0a1f6..831edaf 100644
--- a/src/arm/debug-arm.cc
+++ b/src/arm/debug-arm.cc
@@ -287,6 +287,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc
index 9359768..867dc30 100644
--- a/src/arm/deoptimizer-arm.cc
+++ b/src/arm/deoptimizer-arm.cc
@@ -360,4 +360,5 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm/disasm-arm.cc b/src/arm/disasm-arm.cc
index 7da2e60..1c1516d 100644
--- a/src/arm/disasm-arm.cc
+++ b/src/arm/disasm-arm.cc
@@ -1904,8 +1904,8 @@ int Decoder::InstructionDecode(byte* instr_ptr) {
 }
 
 
-} }  // namespace v8::internal
-
+}  // namespace internal
+}  // namespace v8
 
 
 //------------------------------------------------------------------------------
diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc
index fde4a17..af33c75 100644
--- a/src/arm/frames-arm.cc
+++ b/src/arm/frames-arm.cc
@@ -41,6 +41,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
index 7a0d9b6..e87ce45 100644
--- a/src/arm/full-codegen-arm.cc
+++ b/src/arm/full-codegen-arm.cc
@@ -5577,6 +5577,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/interface-descriptors-arm.cc b/src/arm/interface-descriptors-arm.cc
index 4c1529d..581ef88 100644
--- a/src/arm/interface-descriptors-arm.cc
+++ b/src/arm/interface-descriptors-arm.cc
@@ -411,7 +411,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
index 59a24b3..d8cc7e5 100644
--- a/src/arm/lithium-arm.cc
+++ b/src/arm/lithium-arm.cc
@@ -2672,4 +2672,5 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
   return MarkAsCall(DefineFixed(result, cp), instr);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index 53d0e60..3c845cb 100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -6018,4 +6018,5 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm/lithium-gap-resolver-arm.cc b/src/arm/lithium-gap-resolver-arm.cc
index 2fceec9..f8e4a7f 100644
--- a/src/arm/lithium-gap-resolver-arm.cc
+++ b/src/arm/lithium-gap-resolver-arm.cc
@@ -299,4 +299,5 @@ void LGapResolver::EmitMove(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm/regexp-macro-assembler-arm.cc b/src/arm/regexp-macro-assembler-arm.cc
index 33f941b..9f4b4af 100644
--- a/src/arm/regexp-macro-assembler-arm.cc
+++ b/src/arm/regexp-macro-assembler-arm.cc
@@ -1193,6 +1193,7 @@ void RegExpMacroAssemblerARM::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc
index 97d6127..1dd0e20 100644
--- a/src/arm/simulator-arm.cc
+++ b/src/arm/simulator-arm.cc
@@ -4151,7 +4151,8 @@ uintptr_t Simulator::PopAddress() {
   return address;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // USE_SIMULATOR
 
diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc
index 3decdb6..d351685 100644
--- a/src/arm64/assembler-arm64.cc
+++ b/src/arm64/assembler-arm64.cc
@@ -3189,6 +3189,7 @@ void PatchingAssembler::PatchAdrFar(int64_t target_offset) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc
index aa747d4..b70500a 100644
--- a/src/arm64/builtins-arm64.cc
+++ b/src/arm64/builtins-arm64.cc
@@ -1835,6 +1835,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc
index 732f8fa..655f388 100644
--- a/src/arm64/code-stubs-arm64.cc
+++ b/src/arm64/code-stubs-arm64.cc
@@ -5829,6 +5829,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/codegen-arm64.cc b/src/arm64/codegen-arm64.cc
index cda6e5b..2d1ef57 100644
--- a/src/arm64/codegen-arm64.cc
+++ b/src/arm64/codegen-arm64.cc
@@ -634,6 +634,7 @@ void MathExpGenerator::EmitMathExp(MacroAssembler* masm,
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/cpu-arm64.cc b/src/arm64/cpu-arm64.cc
index 11ba7c9..8258fbf 100644
--- a/src/arm64/cpu-arm64.cc
+++ b/src/arm64/cpu-arm64.cc
@@ -120,6 +120,7 @@ void CpuFeatures::FlushICache(void* address, size_t length) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/debug-arm64.cc b/src/arm64/debug-arm64.cc
index 404bcb7..59b2d1c 100644
--- a/src/arm64/debug-arm64.cc
+++ b/src/arm64/debug-arm64.cc
@@ -344,6 +344,7 @@ void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
 
 const bool LiveEdit::kFrameDropperSupported = true;
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/decoder-arm64.cc b/src/arm64/decoder-arm64.cc
index 5cca85e..08aab42 100644
--- a/src/arm64/decoder-arm64.cc
+++ b/src/arm64/decoder-arm64.cc
@@ -81,6 +81,7 @@ VISITOR_LIST(DEFINE_VISITOR_CALLERS)
 #undef DEFINE_VISITOR_CALLERS
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/delayed-masm-arm64.cc b/src/arm64/delayed-masm-arm64.cc
index b51e77e..77ad791 100644
--- a/src/arm64/delayed-masm-arm64.cc
+++ b/src/arm64/delayed-masm-arm64.cc
@@ -193,6 +193,7 @@ void DelayedMasm::EmitPending() {
   ResetPending();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/deoptimizer-arm64.cc b/src/arm64/deoptimizer-arm64.cc
index b28d6f1..02a6918 100644
--- a/src/arm64/deoptimizer-arm64.cc
+++ b/src/arm64/deoptimizer-arm64.cc
@@ -361,4 +361,5 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm64/disasm-arm64.cc b/src/arm64/disasm-arm64.cc
index 9a9303e..232dfce 100644
--- a/src/arm64/disasm-arm64.cc
+++ b/src/arm64/disasm-arm64.cc
@@ -1730,7 +1730,8 @@ void PrintDisassembler::ProcessOutput(Instruction* instr) {
           GetOutput());
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 namespace disasm {
diff --git a/src/arm64/frames-arm64.cc b/src/arm64/frames-arm64.cc
index b3633e0..56999f9 100644
--- a/src/arm64/frames-arm64.cc
+++ b/src/arm64/frames-arm64.cc
@@ -37,6 +37,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/full-codegen-arm64.cc b/src/arm64/full-codegen-arm64.cc
index 0e6391f..a2675dd 100644
--- a/src/arm64/full-codegen-arm64.cc
+++ b/src/arm64/full-codegen-arm64.cc
@@ -5541,6 +5541,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/instructions-arm64.cc b/src/arm64/instructions-arm64.cc
index fce7a67..7892684 100644
--- a/src/arm64/instructions-arm64.cc
+++ b/src/arm64/instructions-arm64.cc
@@ -337,6 +337,7 @@ uint64_t InstructionSequence::InlineData() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/instrument-arm64.cc b/src/arm64/instrument-arm64.cc
index da505ff..9bd02f4 100644
--- a/src/arm64/instrument-arm64.cc
+++ b/src/arm64/instrument-arm64.cc
@@ -591,4 +591,5 @@ void Instrument::VisitUnimplemented(Instruction* instr) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm64/interface-descriptors-arm64.cc b/src/arm64/interface-descriptors-arm64.cc
index 96f7d2b..ea85ba0 100644
--- a/src/arm64/interface-descriptors-arm64.cc
+++ b/src/arm64/interface-descriptors-arm64.cc
@@ -462,7 +462,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/lithium-arm64.cc b/src/arm64/lithium-arm64.cc
index 822e736..d81f78b 100644
--- a/src/arm64/lithium-arm64.cc
+++ b/src/arm64/lithium-arm64.cc
@@ -2764,4 +2764,5 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc
index 94f09e0..f51b3ed 100644
--- a/src/arm64/lithium-codegen-arm64.cc
+++ b/src/arm64/lithium-codegen-arm64.cc
@@ -6104,5 +6104,5 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 }
 
 
-
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm64/lithium-gap-resolver-arm64.cc b/src/arm64/lithium-gap-resolver-arm64.cc
index d06a37b..7d01f79 100644
--- a/src/arm64/lithium-gap-resolver-arm64.cc
+++ b/src/arm64/lithium-gap-resolver-arm64.cc
@@ -292,4 +292,5 @@ void LGapResolver::EmitMove(int index) {
   moves_[index].Eliminate();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc
index e15edc9..c7d6797 100644
--- a/src/arm64/macro-assembler-arm64.cc
+++ b/src/arm64/macro-assembler-arm64.cc
@@ -5152,6 +5152,7 @@ InlineSmiCheckInfo::InlineSmiCheckInfo(Address info)
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/regexp-macro-assembler-arm64.cc b/src/arm64/regexp-macro-assembler-arm64.cc
index 4315fd6..801cc13 100644
--- a/src/arm64/regexp-macro-assembler-arm64.cc
+++ b/src/arm64/regexp-macro-assembler-arm64.cc
@@ -1611,6 +1611,7 @@ void RegExpMacroAssemblerARM64::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/simulator-arm64.cc b/src/arm64/simulator-arm64.cc
index 0b1ba1d..da56962 100644
--- a/src/arm64/simulator-arm64.cc
+++ b/src/arm64/simulator-arm64.cc
@@ -3837,6 +3837,7 @@ void Simulator::DoPrintf(Instruction* instr) {
 
 #endif  // USE_SIMULATOR
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/arm64/utils-arm64.cc b/src/arm64/utils-arm64.cc
index aff1918..1cd9785 100644
--- a/src/arm64/utils-arm64.cc
+++ b/src/arm64/utils-arm64.cc
@@ -89,6 +89,7 @@ int MaskToBit(uint64_t mask) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/assembler.cc b/src/assembler.cc
index 1464074..2555bbb 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -1669,4 +1669,5 @@ void Assembler::RecordDebugBreakSlot() {
   EnsureSpace ensure_space(this);
   RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ast-numbering.cc b/src/ast-numbering.cc
index da23aad..fe17ec3 100644
--- a/src/ast-numbering.cc
+++ b/src/ast-numbering.cc
@@ -546,5 +546,5 @@ bool AstNumbering::Renumber(Isolate* isolate, Zone* zone,
   AstNumberingVisitor visitor(isolate, zone);
   return visitor.Renumber(function);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ast-value-factory.cc b/src/ast-value-factory.cc
index 14badac..1174460 100644
--- a/src/ast-value-factory.cc
+++ b/src/ast-value-factory.cc
@@ -378,4 +378,5 @@ bool AstValueFactory::AstRawStringCompare(void* a, void* b) {
   if (rhs->byte_length() != len) return false;
   return memcmp(lhs->raw_data(), rhs->raw_data(), len) == 0;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ast.cc b/src/ast.cc
index 73cd013..1205983 100644
--- a/src/ast.cc
+++ b/src/ast.cc
@@ -1125,4 +1125,5 @@ bool Literal::Match(void* literal1, void* literal2) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/background-parsing-task.cc b/src/background-parsing-task.cc
index dcc5eb4..d7df9b4 100644
--- a/src/background-parsing-task.cc
+++ b/src/background-parsing-task.cc
@@ -71,5 +71,5 @@ void BackgroundParsingTask::Run() {
     delete script_data;
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/bailout-reason.cc b/src/bailout-reason.cc
index 93d43dd..cd01851 100644
--- a/src/bailout-reason.cc
+++ b/src/bailout-reason.cc
@@ -16,5 +16,5 @@ const char* GetBailoutReason(BailoutReason reason) {
 #undef ERROR_MESSAGES_TEXTS
   return error_messages_[reason];
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/basic-block-profiler.h b/src/basic-block-profiler.h
index 99fa3b1..0f7b155 100644
--- a/src/basic-block-profiler.h
+++ b/src/basic-block-profiler.h
@@ -14,9 +14,6 @@
 namespace v8 {
 namespace internal {
 
-class Schedule;
-class Graph;
-
 class BasicBlockProfiler {
  public:
   class Data {
diff --git a/src/bignum-dtoa.cc b/src/bignum-dtoa.cc
index f9a0c95..ace9e37 100644
--- a/src/bignum-dtoa.cc
+++ b/src/bignum-dtoa.cc
@@ -632,4 +632,5 @@ static void FixupMultiply10(int estimated_power, bool is_even,
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/bignum.cc b/src/bignum.cc
index 254cb01..e70987a 100644
--- a/src/bignum.cc
+++ b/src/bignum.cc
@@ -750,4 +750,5 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 3a26e40..a353883 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -3116,4 +3116,5 @@ void Bootstrapper::FreeThreadResources() {
   DCHECK(!IsActive());
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/builtins.cc b/src/builtins.cc
index 4296dc4..26c0b21 100644
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -1666,4 +1666,5 @@ BUILTIN_LIST_DEBUG_A(DEFINE_BUILTIN_ACCESSOR_A)
 #undef DEFINE_BUILTIN_ACCESSOR_A
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/cached-powers.cc b/src/cached-powers.cc
index ccf8882..5bd0884 100644
--- a/src/cached-powers.cc
+++ b/src/cached-powers.cc
@@ -156,4 +156,5 @@ void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent,
   DCHECK(requested_exponent < *found_exponent + kDecimalExponentDistance);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/char-predicates.cc b/src/char-predicates.cc
index ab551d8..6650837 100644
--- a/src/char-predicates.cc
+++ b/src/char-predicates.cc
@@ -38,5 +38,5 @@ bool SupplementaryPlanes::IsIDPart(uc32 c) {
   return false;
 #endif  // V8_I18N_SUPPORT
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index fed12e7..cc65922 100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -2242,4 +2242,5 @@ Handle<Code> KeyedLoadGenericStub::GenerateCode() {
   return DoGenerateCode(this);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index 9262364..5fb6f26 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -1047,4 +1047,5 @@ InternalArrayConstructorStub::InternalArrayConstructorStub(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/codegen.cc b/src/codegen.cc
index 796e39a..fc09fe6 100644
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -253,4 +253,5 @@ bool CodeGenerator::RecordPositions(MacroAssembler* masm,
   return false;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/compilation-cache.cc b/src/compilation-cache.cc
index 7b2d6d5..46d7838 100644
--- a/src/compilation-cache.cc
+++ b/src/compilation-cache.cc
@@ -400,4 +400,5 @@ void CompilationCache::Disable() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/compilation-dependencies.cc b/src/compilation-dependencies.cc
index 9ea6a7a..e20015c 100644
--- a/src/compilation-dependencies.cc
+++ b/src/compilation-dependencies.cc
@@ -117,5 +117,5 @@ void CompilationDependencies::AssumeTransitionStable(
     Insert(DependentCode::kAllocationSiteTransitionChangedGroup, site);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/compiler.cc b/src/compiler.cc
index 0268bbd..ef21f1f 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1573,4 +1573,5 @@ void CompilationInfo::PrintAstForTesting() {
          PrettyPrinter(isolate(), zone()).PrintProgram(function()));
 }
 #endif
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/contexts.cc b/src/contexts.cc
index 76f5225..61b83c2 100644
--- a/src/contexts.cc
+++ b/src/contexts.cc
@@ -503,4 +503,5 @@ bool Context::IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object) {
 }
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/conversions.cc b/src/conversions.cc
index 32de34c..5877473 100644
--- a/src/conversions.cc
+++ b/src/conversions.cc
@@ -560,4 +560,5 @@ bool IsSpecialIndex(UnicodeCache* unicode_cache, String* string) {
   }
   return true;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/counters.cc b/src/counters.cc
index 6972011..2788ff7 100644
--- a/src/counters.cc
+++ b/src/counters.cc
@@ -194,4 +194,5 @@ void Counters::ResetHistograms() {
 #undef HM
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/cpu-profiler.cc b/src/cpu-profiler.cc
index 5d021ec..f48499e 100644
--- a/src/cpu-profiler.cc
+++ b/src/cpu-profiler.cc
@@ -544,4 +544,5 @@ void CpuProfiler::LogBuiltins() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/date.cc b/src/date.cc
index 1f879de..68c7507 100644
--- a/src/date.cc
+++ b/src/date.cc
@@ -359,4 +359,5 @@ DateCache::DST* DateCache::LeastRecentlyUsedDST(DST* skip) {
   return result;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/dateparser.cc b/src/dateparser.cc
index 5db0391..0e5cc8c 100644
--- a/src/dateparser.cc
+++ b/src/dateparser.cc
@@ -187,4 +187,5 @@ int DateParser::ReadMilliseconds(DateToken token) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/debug.cc b/src/debug.cc
index 934f200..eb3b408 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -3369,4 +3369,5 @@ void LockingCommandMessageQueue::Clear() {
   queue_.Clear();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 4440d9f..35f340e 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -3847,4 +3847,5 @@ Deoptimizer::DeoptInfo Deoptimizer::GetDeoptInfo(Code* code, Address pc) {
   }
   return DeoptInfo(SourcePosition::Unknown(), NULL, Deoptimizer::kNoReason);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/disassembler.cc b/src/disassembler.cc
index fbdda54..9ec2f42 100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -295,4 +295,5 @@ int Disassembler::Decode(Isolate* isolate, std::ostream* os, byte* begin,
 
 #endif  // ENABLE_DISASSEMBLER
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/diy-fp.cc b/src/diy-fp.cc
index b705df0..b64f340 100644
--- a/src/diy-fp.cc
+++ b/src/diy-fp.cc
@@ -33,4 +33,5 @@ void DiyFp::Multiply(const DiyFp& other) {
   f_ = result_f;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/dtoa.cc b/src/dtoa.cc
index fc02aca..76993cf 100644
--- a/src/dtoa.cc
+++ b/src/dtoa.cc
@@ -79,4 +79,5 @@ void DoubleToAscii(double v, DtoaMode mode, int requested_digits,
   buffer[*length] = '\0';
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/elements-kind.cc b/src/elements-kind.cc
index 0ebc6dc..200fea6 100644
--- a/src/elements-kind.cc
+++ b/src/elements-kind.cc
@@ -195,4 +195,5 @@ bool IsMoreGeneralElementsKindTransition(ElementsKind from_kind,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/elements.cc b/src/elements.cc
index 9d88626..d204cc5 100644
--- a/src/elements.cc
+++ b/src/elements.cc
@@ -1919,4 +1919,5 @@ MaybeHandle<Object> ArrayConstructInitializeElements(Handle<JSArray> array,
   return array;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/execution.cc b/src/execution.cc
index 04e1472..c72002f 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -692,4 +692,5 @@ Object* StackGuard::HandleInterrupts() {
   return isolate_->heap()->undefined_value();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/extensions/externalize-string-extension.cc b/src/extensions/externalize-string-extension.cc
index 8d38dfa..e45cb67 100644
--- a/src/extensions/externalize-string-extension.cc
+++ b/src/extensions/externalize-string-extension.cc
@@ -122,4 +122,5 @@ void ExternalizeStringExtension::IsOneByte(
   args.GetReturnValue().Set(is_one_byte);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/extensions/free-buffer-extension.cc b/src/extensions/free-buffer-extension.cc
index c880d75..c2510c9 100644
--- a/src/extensions/free-buffer-extension.cc
+++ b/src/extensions/free-buffer-extension.cc
@@ -27,4 +27,5 @@ void FreeBufferExtension::FreeBuffer(
                                           contents.ByteLength());
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/extensions/gc-extension.cc b/src/extensions/gc-extension.cc
index 74b7481..fbe40a6 100644
--- a/src/extensions/gc-extension.cc
+++ b/src/extensions/gc-extension.cc
@@ -23,4 +23,5 @@ void GCExtension::GC(const v8::FunctionCallbackInfo<v8::Value>& args) {
                               : v8::Isolate::kFullGarbageCollection);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/extensions/statistics-extension.cc b/src/extensions/statistics-extension.cc
index d1e110e..d1bb091 100644
--- a/src/extensions/statistics-extension.cc
+++ b/src/extensions/statistics-extension.cc
@@ -129,4 +129,5 @@ void StatisticsExtension::GetCounters(
   args.GetReturnValue().Set(result);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/extensions/trigger-failure-extension.cc b/src/extensions/trigger-failure-extension.cc
index b0aacb4..e4a8d73 100644
--- a/src/extensions/trigger-failure-extension.cc
+++ b/src/extensions/trigger-failure-extension.cc
@@ -53,4 +53,5 @@ void TriggerFailureExtension::TriggerSlowAssertFalse(
   SLOW_DCHECK(false);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/factory.cc b/src/factory.cc
index 79e0142..fe75c6b 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -2470,4 +2470,5 @@ Handle<Object> Factory::ToBoolean(bool value) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/fast-dtoa.cc b/src/fast-dtoa.cc
index d6edddc..ed7223e 100644
--- a/src/fast-dtoa.cc
+++ b/src/fast-dtoa.cc
@@ -712,4 +712,5 @@ bool FastDtoa(double v,
   return result;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/fixed-dtoa.cc b/src/fixed-dtoa.cc
index 7856b13..a33ba17 100644
--- a/src/fixed-dtoa.cc
+++ b/src/fixed-dtoa.cc
@@ -382,4 +382,5 @@ bool FastFixedDtoa(double v,
   return true;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/flags.cc b/src/flags.cc
index 88f06a3..6f28ebb 100644
--- a/src/flags.cc
+++ b/src/flags.cc
@@ -574,4 +574,5 @@ void FlagList::EnforceFlagImplications() {
 
 
 uint32_t FlagList::Hash() { return flag_hash; }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/frames.cc b/src/frames.cc
index 434cdb3..2d4f379 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -1525,4 +1525,5 @@ Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index 95957d6..1ae52c8 100644
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -1648,4 +1648,5 @@ FullCodeGenerator::EnterBlockScopeIfNeeded::~EnterBlockScopeIfNeeded() {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/func-name-inferrer.cc b/src/func-name-inferrer.cc
index b3a64b2..9415b89 100644
--- a/src/func-name-inferrer.cc
+++ b/src/func-name-inferrer.cc
@@ -82,4 +82,5 @@ void FuncNameInferrer::InferFunctionsNames() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/global-handles.cc b/src/global-handles.cc
index b8ef33f..3bb7706 100644
--- a/src/global-handles.cc
+++ b/src/global-handles.cc
@@ -1231,4 +1231,5 @@ void EternalHandles::Create(Isolate* isolate, Object* object, int* index) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/handles.cc b/src/handles.cc
index d9b130f..247956a 100644
--- a/src/handles.cc
+++ b/src/handles.cc
@@ -127,4 +127,5 @@ DeferredHandles* DeferredHandleScope::Detach() {
   return deferred;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap-profiler.cc b/src/heap-profiler.cc
index 0fe5034..3f11be4 100644
--- a/src/heap-profiler.cc
+++ b/src/heap-profiler.cc
@@ -186,4 +186,5 @@ void HeapProfiler::ClearHeapObjectMap() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc
index 4b3f3be..2518353 100644
--- a/src/heap-snapshot-generator.cc
+++ b/src/heap-snapshot-generator.cc
@@ -3182,4 +3182,5 @@ void HeapSnapshotJSONSerializer::SerializeStrings() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/gc-tracer.cc b/src/heap/gc-tracer.cc
index b034750..11c682d 100644
--- a/src/heap/gc-tracer.cc
+++ b/src/heap/gc-tracer.cc
@@ -695,5 +695,5 @@ bool GCTracer::SurvivalEventsRecorded() const {
 
 
 void GCTracer::ResetSurvivalEvents() { survival_events_.reset(); }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 76209c4..0976293 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -6670,5 +6670,5 @@ bool Heap::GetObjectTypeName(size_t index, const char** object_type,
   }
   return false;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/identity-map.cc b/src/heap/identity-map.cc
index 9840d74..a93f607 100644
--- a/src/heap/identity-map.cc
+++ b/src/heap/identity-map.cc
@@ -187,5 +187,5 @@ void IdentityMapBase::Resize() {
   heap_->UnregisterStrongRoots(old_keys);
   heap_->RegisterStrongRoots(keys_, keys_ + size_);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
index d8e07aa..bcb934f 100644
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -1040,5 +1040,5 @@ void IncrementalMarking::IncrementIdleMarkingDelayCounter() {
 void IncrementalMarking::ClearIdleMarkingDelayCounter() {
   idle_marking_delay_counter_ = 0;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index 70285b7..2c5a053 100644
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -4663,5 +4663,5 @@ void SlotsBufferAllocator::DeallocateChain(SlotsBuffer** buffer_address) {
   }
   *buffer_address = NULL;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/objects-visiting.cc b/src/heap/objects-visiting.cc
index e3f7da2..c52c46f 100644
--- a/src/heap/objects-visiting.cc
+++ b/src/heap/objects-visiting.cc
@@ -360,5 +360,5 @@ template Object* VisitWeakList<Context>(Heap* heap, Object* list,
 
 template Object* VisitWeakList<AllocationSite>(Heap* heap, Object* list,
                                                WeakObjectRetainer* retainer);
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index fe388e0..e06455f 100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -3125,5 +3125,5 @@ void Page::Print() {
 }
 
 #endif  // DEBUG
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc
index 52c2333..04f24ba 100644
--- a/src/heap/store-buffer.cc
+++ b/src/heap/store-buffer.cc
@@ -579,5 +579,5 @@ void StoreBuffer::Compact() {
   }
   heap_->isolate()->counters()->store_buffer_compactions()->Increment();
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-bce.cc b/src/hydrogen-bce.cc
index 48c1f77..30c218f 100644
--- a/src/hydrogen-bce.cc
+++ b/src/hydrogen-bce.cc
@@ -473,4 +473,5 @@ void HBoundsCheckEliminationPhase::PostProcessBlock(
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-bch.cc b/src/hydrogen-bch.cc
index 875c18c..a4c0ae4 100644
--- a/src/hydrogen-bch.cc
+++ b/src/hydrogen-bch.cc
@@ -375,4 +375,5 @@ void HBoundsCheckHoistingPhase::HoistRedundantBoundsChecks() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-canonicalize.cc b/src/hydrogen-canonicalize.cc
index c15b8d9..25911eb 100644
--- a/src/hydrogen-canonicalize.cc
+++ b/src/hydrogen-canonicalize.cc
@@ -52,4 +52,5 @@ void HCanonicalizePhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-check-elimination.cc b/src/hydrogen-check-elimination.cc
index cdfedb4..74be2e4 100644
--- a/src/hydrogen-check-elimination.cc
+++ b/src/hydrogen-check-elimination.cc
@@ -909,4 +909,5 @@ void HCheckEliminationPhase::PrintStats() {
   PRINT_STAT(transitions);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-dce.cc b/src/hydrogen-dce.cc
index c653fc1..1d5bb78 100644
--- a/src/hydrogen-dce.cc
+++ b/src/hydrogen-dce.cc
@@ -102,4 +102,5 @@ void HDeadCodeEliminationPhase::RemoveDeadInstructions() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-dehoist.cc b/src/hydrogen-dehoist.cc
index 51dda37..e521c25 100644
--- a/src/hydrogen-dehoist.cc
+++ b/src/hydrogen-dehoist.cc
@@ -67,4 +67,5 @@ void HDehoistIndexComputationsPhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-environment-liveness.cc b/src/hydrogen-environment-liveness.cc
index 8e9018f..7cc4dc0 100644
--- a/src/hydrogen-environment-liveness.cc
+++ b/src/hydrogen-environment-liveness.cc
@@ -228,4 +228,5 @@ bool HEnvironmentLivenessAnalysisPhase::VerifyClosures(
 }
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-escape-analysis.cc b/src/hydrogen-escape-analysis.cc
index e22dd88..3613737 100644
--- a/src/hydrogen-escape-analysis.cc
+++ b/src/hydrogen-escape-analysis.cc
@@ -325,4 +325,5 @@ void HEscapeAnalysisPhase::Run() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-gvn.cc b/src/hydrogen-gvn.cc
index 3836e32..31a2cd6 100644
--- a/src/hydrogen-gvn.cc
+++ b/src/hydrogen-gvn.cc
@@ -894,4 +894,5 @@ void HGlobalValueNumberingPhase::AnalyzeGraph() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-infer-representation.cc b/src/hydrogen-infer-representation.cc
index 3815ba5..6687aef 100644
--- a/src/hydrogen-infer-representation.cc
+++ b/src/hydrogen-infer-representation.cc
@@ -158,4 +158,5 @@ void HInferRepresentationPhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-infer-types.cc b/src/hydrogen-infer-types.cc
index e69b4fa..ea69662 100644
--- a/src/hydrogen-infer-types.cc
+++ b/src/hydrogen-infer-types.cc
@@ -51,4 +51,5 @@ void HInferTypesPhase::InferTypes(int from_inclusive, int to_inclusive) {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index 9f5b49a..5c8e89a 100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -4714,4 +4714,5 @@ std::ostream& operator<<(std::ostream& os, const HObjectAccess& access) {
   return os << "@" << access.offset();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-load-elimination.cc b/src/hydrogen-load-elimination.cc
index c5fd88b..a4536fd 100644
--- a/src/hydrogen-load-elimination.cc
+++ b/src/hydrogen-load-elimination.cc
@@ -508,4 +508,5 @@ void HLoadEliminationPhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-mark-deoptimize.cc b/src/hydrogen-mark-deoptimize.cc
index 47642e4..fe7a886 100644
--- a/src/hydrogen-mark-deoptimize.cc
+++ b/src/hydrogen-mark-deoptimize.cc
@@ -58,4 +58,5 @@ void HComputeChangeUndefinedToNaN::Run() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-mark-unreachable.cc b/src/hydrogen-mark-unreachable.cc
index 05779ca..affe7ce 100644
--- a/src/hydrogen-mark-unreachable.cc
+++ b/src/hydrogen-mark-unreachable.cc
@@ -51,4 +51,5 @@ void HMarkUnreachableBlocksPhase::Run() {
   MarkUnreachableBlocks();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-osr.cc b/src/hydrogen-osr.cc
index 89c28ac..8a4780c 100644
--- a/src/hydrogen-osr.cc
+++ b/src/hydrogen-osr.cc
@@ -99,4 +99,5 @@ void HOsrBuilder::FinishOsrValues() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-range-analysis.cc b/src/hydrogen-range-analysis.cc
index f5c5a9f..c81dc1d 100644
--- a/src/hydrogen-range-analysis.cc
+++ b/src/hydrogen-range-analysis.cc
@@ -287,4 +287,5 @@ void HRangeAnalysisPhase::PropagateMinusZeroChecks(HValue* value) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-redundant-phi.cc b/src/hydrogen-redundant-phi.cc
index 0b9b0aa..1b3c94a 100644
--- a/src/hydrogen-redundant-phi.cc
+++ b/src/hydrogen-redundant-phi.cc
@@ -62,4 +62,5 @@ void HRedundantPhiEliminationPhase::ProcessPhis(const ZoneList<HPhi*>* phis) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-removable-simulates.cc b/src/hydrogen-removable-simulates.cc
index 73d7a8e..eb13cb2 100644
--- a/src/hydrogen-removable-simulates.cc
+++ b/src/hydrogen-removable-simulates.cc
@@ -184,4 +184,5 @@ void HMergeRemovableSimulatesPhase::Run() {
   engine.AnalyzeDominatedBlocks(graph()->blocks()->at(0), state);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-representation-changes.cc b/src/hydrogen-representation-changes.cc
index 33adf5a..4af4e01 100644
--- a/src/hydrogen-representation-changes.cc
+++ b/src/hydrogen-representation-changes.cc
@@ -210,4 +210,5 @@ void HRepresentationChangesPhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-sce.cc b/src/hydrogen-sce.cc
index b7ab9fd..6944f70 100644
--- a/src/hydrogen-sce.cc
+++ b/src/hydrogen-sce.cc
@@ -36,4 +36,5 @@ void HStackCheckEliminationPhase::Run() {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-store-elimination.cc b/src/hydrogen-store-elimination.cc
index ee718e6..f04ec44 100644
--- a/src/hydrogen-store-elimination.cc
+++ b/src/hydrogen-store-elimination.cc
@@ -118,4 +118,5 @@ void HStoreEliminationPhase::ProcessInstr(HInstruction* instr,
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-types.cc b/src/hydrogen-types.cc
index 8813b1f..7c50a1d 100644
--- a/src/hydrogen-types.cc
+++ b/src/hydrogen-types.cc
@@ -70,4 +70,5 @@ std::ostream& operator<<(std::ostream& os, const HType& t) {
   return os;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen-uint32-analysis.cc b/src/hydrogen-uint32-analysis.cc
index 8507584..37f19eb 100644
--- a/src/hydrogen-uint32-analysis.cc
+++ b/src/hydrogen-uint32-analysis.cc
@@ -237,4 +237,5 @@ void HUint32AnalysisPhase::Run() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 809640f..13a686c 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -13153,4 +13153,5 @@ HPhase::~HPhase() {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/i18n.cc b/src/i18n.cc
index 9dfdd63..8d616d9 100644
--- a/src/i18n.cc
+++ b/src/i18n.cc
@@ -947,4 +947,5 @@ void BreakIterator::DeleteBreakIterator(
   DestroyGlobalHandle(data);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ia32/assembler-ia32.cc b/src/ia32/assembler-ia32.cc
index a3c19af..6951fa3 100644
--- a/src/ia32/assembler-ia32.cc
+++ b/src/ia32/assembler-ia32.cc
@@ -2979,6 +2979,7 @@ void LogGeneratedCodeCoverage(const char* file_line) {
 
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc
index e26728a..6cbac53 100644
--- a/src/ia32/builtins-ia32.cc
+++ b/src/ia32/builtins-ia32.cc
@@ -1711,7 +1711,7 @@ void Builtins::Generate_OsrAfterStackCheck(MacroAssembler* masm) {
 }
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
index 72b17d4..b1081ed 100644
--- a/src/ia32/code-stubs-ia32.cc
+++ b/src/ia32/code-stubs-ia32.cc
@@ -5479,6 +5479,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc
index 083f5db..1fc42e0 100644
--- a/src/ia32/codegen-ia32.cc
+++ b/src/ia32/codegen-ia32.cc
@@ -1041,6 +1041,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/cpu-ia32.cc b/src/ia32/cpu-ia32.cc
index 00c2043..0b5c47b 100644
--- a/src/ia32/cpu-ia32.cc
+++ b/src/ia32/cpu-ia32.cc
@@ -39,6 +39,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/debug-ia32.cc b/src/ia32/debug-ia32.cc
index df5c1b2..957a75a 100644
--- a/src/ia32/debug-ia32.cc
+++ b/src/ia32/debug-ia32.cc
@@ -324,6 +324,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/deoptimizer-ia32.cc b/src/ia32/deoptimizer-ia32.cc
index 5fbee32..98182db 100644
--- a/src/ia32/deoptimizer-ia32.cc
+++ b/src/ia32/deoptimizer-ia32.cc
@@ -431,6 +431,7 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/frames-ia32.cc b/src/ia32/frames-ia32.cc
index 18f1960..5f5b0d1 100644
--- a/src/ia32/frames-ia32.cc
+++ b/src/ia32/frames-ia32.cc
@@ -37,6 +37,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
index 573ca70..f9a9d5f 100644
--- a/src/ia32/full-codegen-ia32.cc
+++ b/src/ia32/full-codegen-ia32.cc
@@ -5440,6 +5440,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/interface-descriptors-ia32.cc b/src/ia32/interface-descriptors-ia32.cc
index 3d15d41..1acd05b 100644
--- a/src/ia32/interface-descriptors-ia32.cc
+++ b/src/ia32/interface-descriptors-ia32.cc
@@ -387,7 +387,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
index a7a7c42..30c35b1 100644
--- a/src/ia32/lithium-codegen-ia32.cc
+++ b/src/ia32/lithium-codegen-ia32.cc
@@ -5836,6 +5836,7 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/lithium-gap-resolver-ia32.cc b/src/ia32/lithium-gap-resolver-ia32.cc
index 682503b..099e1f8 100644
--- a/src/ia32/lithium-gap-resolver-ia32.cc
+++ b/src/ia32/lithium-gap-resolver-ia32.cc
@@ -477,6 +477,7 @@ void LGapResolver::EmitSwap(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
index 0186c04..cecfadd 100644
--- a/src/ia32/lithium-ia32.cc
+++ b/src/ia32/lithium-ia32.cc
@@ -2735,6 +2735,7 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index 654f7f5..c445b5e 100644
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -3227,6 +3227,7 @@ void MacroAssembler::TruncatingDiv(Register dividend, int32_t divisor) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ia32/regexp-macro-assembler-ia32.cc b/src/ia32/regexp-macro-assembler-ia32.cc
index 3df8575..36be56e 100644
--- a/src/ia32/regexp-macro-assembler-ia32.cc
+++ b/src/ia32/regexp-macro-assembler-ia32.cc
@@ -1224,6 +1224,7 @@ void RegExpMacroAssemblerIA32::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/access-compiler.cc b/src/ic/access-compiler.cc
index c3bf11c..6fffeda 100644
--- a/src/ic/access-compiler.cc
+++ b/src/ic/access-compiler.cc
@@ -51,5 +51,5 @@ Register* PropertyAccessCompiler::GetCallingConvention(Code::Kind kind) {
   DCHECK(kind == Code::STORE_IC || kind == Code::KEYED_STORE_IC);
   return store_calling_convention();
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/arm/access-compiler-arm.cc b/src/ic/arm/access-compiler-arm.cc
index 4a4d688..73ef096 100644
--- a/src/ic/arm/access-compiler-arm.cc
+++ b/src/ic/arm/access-compiler-arm.cc
@@ -40,7 +40,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc
index 0343193..6af65e2 100644
--- a/src/ic/arm/handler-compiler-arm.cc
+++ b/src/ic/arm/handler-compiler-arm.cc
@@ -788,7 +788,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/ic/arm/ic-arm.cc b/src/ic/arm/ic-arm.cc
index e37244b..3ecdc31 100644
--- a/src/ic/arm/ic-arm.cc
+++ b/src/ic/arm/ic-arm.cc
@@ -865,7 +865,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
     patcher.EmitCondition(eq);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/ic/arm/ic-compiler-arm.cc b/src/ic/arm/ic-compiler-arm.cc
index c5c0b70..e42f2f7 100644
--- a/src/ic/arm/ic-compiler-arm.cc
+++ b/src/ic/arm/ic-compiler-arm.cc
@@ -128,7 +128,7 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/ic/arm/stub-cache-arm.cc b/src/ic/arm/stub-cache-arm.cc
index 16e9a5f..aa247d2 100644
--- a/src/ic/arm/stub-cache-arm.cc
+++ b/src/ic/arm/stub-cache-arm.cc
@@ -175,7 +175,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/ic/arm64/access-compiler-arm64.cc b/src/ic/arm64/access-compiler-arm64.cc
index 58e6099..e77476f 100644
--- a/src/ic/arm64/access-compiler-arm64.cc
+++ b/src/ic/arm64/access-compiler-arm64.cc
@@ -47,7 +47,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/ic/arm64/handler-compiler-arm64.cc b/src/ic/arm64/handler-compiler-arm64.cc
index 516bf64..3986c0e 100644
--- a/src/ic/arm64/handler-compiler-arm64.cc
+++ b/src/ic/arm64/handler-compiler-arm64.cc
@@ -800,7 +800,7 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/arm64/ic-arm64.cc b/src/ic/arm64/ic-arm64.cc
index 5e548dd..e0bf48b 100644
--- a/src/ic/arm64/ic-arm64.cc
+++ b/src/ic/arm64/ic-arm64.cc
@@ -851,7 +851,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
     patcher.tbz(smi_reg, 0, branch_imm);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/ic/arm64/ic-compiler-arm64.cc b/src/ic/arm64/ic-compiler-arm64.cc
index 08ce4cb..f9eab7d 100644
--- a/src/ic/arm64/ic-compiler-arm64.cc
+++ b/src/ic/arm64/ic-compiler-arm64.cc
@@ -132,7 +132,7 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/ic/arm64/stub-cache-arm64.cc b/src/ic/arm64/stub-cache-arm64.cc
index 0068c44..ba5cbdd 100644
--- a/src/ic/arm64/stub-cache-arm64.cc
+++ b/src/ic/arm64/stub-cache-arm64.cc
@@ -157,7 +157,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
   __ IncrementCounter(counters->megamorphic_stub_cache_misses(), 1, extra2,
                       extra3);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM64
diff --git a/src/ic/call-optimization.cc b/src/ic/call-optimization.cc
index 85dc01a..31f5437 100644
--- a/src/ic/call-optimization.cc
+++ b/src/ic/call-optimization.cc
@@ -111,5 +111,5 @@ void CallOptimization::AnalyzePossibleApiFunction(Handle<JSFunction> function) {
 
   is_simple_api_call_ = true;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/handler-compiler.cc b/src/ic/handler-compiler.cc
index c434ce5..4d9d46a 100644
--- a/src/ic/handler-compiler.cc
+++ b/src/ic/handler-compiler.cc
@@ -561,5 +561,5 @@ void ElementHandlerCompiler::CompileElementHandlers(
     handlers->Add(cached_stub);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/ia32/access-compiler-ia32.cc b/src/ic/ia32/access-compiler-ia32.cc
index 9bcbef0..422a0be 100644
--- a/src/ic/ia32/access-compiler-ia32.cc
+++ b/src/ic/ia32/access-compiler-ia32.cc
@@ -38,7 +38,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 }
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/ia32/handler-compiler-ia32.cc b/src/ic/ia32/handler-compiler-ia32.cc
index d2257ef..8f5200a 100644
--- a/src/ic/ia32/handler-compiler-ia32.cc
+++ b/src/ic/ia32/handler-compiler-ia32.cc
@@ -808,7 +808,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/ia32/ic-compiler-ia32.cc b/src/ic/ia32/ic-compiler-ia32.cc
index 6788bc7..abeacc8 100644
--- a/src/ic/ia32/ic-compiler-ia32.cc
+++ b/src/ic/ia32/ic-compiler-ia32.cc
@@ -128,7 +128,7 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/ia32/ic-ia32.cc b/src/ic/ia32/ic-ia32.cc
index bb3d61d..6d54b07 100644
--- a/src/ic/ia32/ic-ia32.cc
+++ b/src/ic/ia32/ic-ia32.cc
@@ -851,7 +851,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
           : (*jmp_address == Assembler::kJnzShortOpcode ? not_carry : carry);
   *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/ia32/stub-cache-ia32.cc b/src/ic/ia32/stub-cache-ia32.cc
index 34b8bde..aa807a7 100644
--- a/src/ic/ia32/stub-cache-ia32.cc
+++ b/src/ic/ia32/stub-cache-ia32.cc
@@ -204,7 +204,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32
diff --git a/src/ic/ic-compiler.cc b/src/ic/ic-compiler.cc
index e1975fc..dee91ff 100644
--- a/src/ic/ic-compiler.cc
+++ b/src/ic/ic-compiler.cc
@@ -419,5 +419,5 @@ Handle<Code> PropertyICCompiler::CompileKeyedStoreMonomorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/ic-state.cc b/src/ic/ic-state.cc
index 0c71949..2fbab4b 100644
--- a/src/ic/ic-state.cc
+++ b/src/ic/ic-state.cc
@@ -511,5 +511,5 @@ CompareICState::State CompareICState::TargetState(
   UNREACHABLE();
   return GENERIC;  // Make the compiler happy.
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/ic.cc b/src/ic/ic.cc
index 9c8f079..a75142f 100644
--- a/src/ic/ic.cc
+++ b/src/ic/ic.cc
@@ -2906,5 +2906,5 @@ static const Address IC_utilities[] = {
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) { return IC_utilities[id]; }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/mips/access-compiler-mips.cc b/src/ic/mips/access-compiler-mips.cc
index dce7602..eb519d2 100644
--- a/src/ic/mips/access-compiler-mips.cc
+++ b/src/ic/mips/access-compiler-mips.cc
@@ -40,7 +40,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/ic/mips/handler-compiler-mips.cc b/src/ic/mips/handler-compiler-mips.cc
index 60df292..13ce921 100644
--- a/src/ic/mips/handler-compiler-mips.cc
+++ b/src/ic/mips/handler-compiler-mips.cc
@@ -778,7 +778,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/ic/mips/ic-compiler-mips.cc b/src/ic/mips/ic-compiler-mips.cc
index 1795312..7b88f32 100644
--- a/src/ic/mips/ic-compiler-mips.cc
+++ b/src/ic/mips/ic-compiler-mips.cc
@@ -134,7 +134,7 @@ void PropertyICCompiler::GenerateRuntimeSetProperty(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/ic/mips/ic-mips.cc b/src/ic/mips/ic-mips.cc
index 6fdb0ee..7dbaad7 100644
--- a/src/ic/mips/ic-mips.cc
+++ b/src/ic/mips/ic-mips.cc
@@ -870,7 +870,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
     patcher.ChangeBranchCondition(eq);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/ic/mips/stub-cache-mips.cc b/src/ic/mips/stub-cache-mips.cc
index 0fbca7d..2048531 100644
--- a/src/ic/mips/stub-cache-mips.cc
+++ b/src/ic/mips/stub-cache-mips.cc
@@ -169,7 +169,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/ic/mips64/access-compiler-mips64.cc b/src/ic/mips64/access-compiler-mips64.cc
index 5e3cfc5..74b4b93 100644
--- a/src/ic/mips64/access-compiler-mips64.cc
+++ b/src/ic/mips64/access-compiler-mips64.cc
@@ -40,7 +40,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/ic/mips64/handler-compiler-mips64.cc b/src/ic/mips64/handler-compiler-mips64.cc
index f60e8c6..d83c807 100644
--- a/src/ic/mips64/handler-compiler-mips64.cc
+++ b/src/ic/mips64/handler-compiler-mips64.cc
@@ -779,7 +779,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/ic/mips64/ic-compiler-mips64.cc b/src/ic/mips64/ic-compiler-mips64.cc
index a3dcdf7..df67fb9 100644
--- a/src/ic/mips64/ic-compiler-mips64.cc
+++ b/src/ic/mips64/ic-compiler-mips64.cc
@@ -134,7 +134,7 @@ void PropertyICCompiler::GenerateRuntimeSetProperty(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
index 2c1a20f..770fa77 100644
--- a/src/ic/mips64/ic-mips64.cc
+++ b/src/ic/mips64/ic-mips64.cc
@@ -870,7 +870,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
     patcher.ChangeBranchCondition(eq);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/ic/mips64/stub-cache-mips64.cc b/src/ic/mips64/stub-cache-mips64.cc
index c718095..1802b60 100644
--- a/src/ic/mips64/stub-cache-mips64.cc
+++ b/src/ic/mips64/stub-cache-mips64.cc
@@ -170,7 +170,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/ic/ppc/access-compiler-ppc.cc b/src/ic/ppc/access-compiler-ppc.cc
index e98f517..aa3859a 100644
--- a/src/ic/ppc/access-compiler-ppc.cc
+++ b/src/ic/ppc/access-compiler-ppc.cc
@@ -40,7 +40,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ic/ppc/handler-compiler-ppc.cc b/src/ic/ppc/handler-compiler-ppc.cc
index 5cb6f22..db8ee68 100644
--- a/src/ic/ppc/handler-compiler-ppc.cc
+++ b/src/ic/ppc/handler-compiler-ppc.cc
@@ -784,7 +784,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM
diff --git a/src/ic/ppc/ic-compiler-ppc.cc b/src/ic/ppc/ic-compiler-ppc.cc
index 9f33a59..ad72c23 100644
--- a/src/ic/ppc/ic-compiler-ppc.cc
+++ b/src/ic/ppc/ic-compiler-ppc.cc
@@ -129,7 +129,7 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ic/ppc/ic-ppc.cc b/src/ic/ppc/ic-ppc.cc
index 84cc09e..fdb88ae 100644
--- a/src/ic/ppc/ic-ppc.cc
+++ b/src/ic/ppc/ic-ppc.cc
@@ -891,7 +891,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
     patcher.EmitCondition(eq);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ic/ppc/stub-cache-ppc.cc b/src/ic/ppc/stub-cache-ppc.cc
index 541de4c..57b3245 100644
--- a/src/ic/ppc/stub-cache-ppc.cc
+++ b/src/ic/ppc/stub-cache-ppc.cc
@@ -187,7 +187,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ic/stub-cache.cc b/src/ic/stub-cache.cc
index e3a4938..630e671 100644
--- a/src/ic/stub-cache.cc
+++ b/src/ic/stub-cache.cc
@@ -143,5 +143,5 @@ void StubCache::CollectMatchingMaps(SmallMapList* types, Handle<Name> name,
     }
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ic/x64/access-compiler-x64.cc b/src/ic/x64/access-compiler-x64.cc
index cd9196f..6acc950 100644
--- a/src/ic/x64/access-compiler-x64.cc
+++ b/src/ic/x64/access-compiler-x64.cc
@@ -40,7 +40,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/ic/x64/handler-compiler-x64.cc b/src/ic/x64/handler-compiler-x64.cc
index 8288d89..43754c3 100644
--- a/src/ic/x64/handler-compiler-x64.cc
+++ b/src/ic/x64/handler-compiler-x64.cc
@@ -803,7 +803,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/ic/x64/ic-compiler-x64.cc b/src/ic/x64/ic-compiler-x64.cc
index 89e7aee..4fcd7b7 100644
--- a/src/ic/x64/ic-compiler-x64.cc
+++ b/src/ic/x64/ic-compiler-x64.cc
@@ -136,7 +136,7 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(MapHandleList* maps,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/ic/x64/ic-x64.cc b/src/ic/x64/ic-x64.cc
index 5bc04d3..40aa231 100644
--- a/src/ic/x64/ic-x64.cc
+++ b/src/ic/x64/ic-x64.cc
@@ -849,7 +849,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
           : (*jmp_address == Assembler::kJnzShortOpcode ? not_carry : carry);
   *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/ic/x64/stub-cache-x64.cc b/src/ic/x64/stub-cache-x64.cc
index 9421f53..34f5162 100644
--- a/src/ic/x64/stub-cache-x64.cc
+++ b/src/ic/x64/stub-cache-x64.cc
@@ -161,7 +161,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/ic/x87/access-compiler-x87.cc b/src/ic/x87/access-compiler-x87.cc
index 9456ec8..d5fde5d 100644
--- a/src/ic/x87/access-compiler-x87.cc
+++ b/src/ic/x87/access-compiler-x87.cc
@@ -38,7 +38,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
 }
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/ic/x87/handler-compiler-x87.cc b/src/ic/x87/handler-compiler-x87.cc
index 32ca191..056bd95 100644
--- a/src/ic/x87/handler-compiler-x87.cc
+++ b/src/ic/x87/handler-compiler-x87.cc
@@ -808,7 +808,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/ic/x87/ic-compiler-x87.cc b/src/ic/x87/ic-compiler-x87.cc
index 160e9e9..3697708 100644
--- a/src/ic/x87/ic-compiler-x87.cc
+++ b/src/ic/x87/ic-compiler-x87.cc
@@ -128,7 +128,7 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/ic/x87/ic-x87.cc b/src/ic/x87/ic-x87.cc
index e6a8769..ee236a6 100644
--- a/src/ic/x87/ic-x87.cc
+++ b/src/ic/x87/ic-x87.cc
@@ -851,7 +851,7 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
           : (*jmp_address == Assembler::kJnzShortOpcode ? not_carry : carry);
   *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/ic/x87/stub-cache-x87.cc b/src/ic/x87/stub-cache-x87.cc
index 036c6a6..dfbba47 100644
--- a/src/ic/x87/stub-cache-x87.cc
+++ b/src/ic/x87/stub-cache-x87.cc
@@ -204,7 +204,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/icu_util.cc b/src/icu_util.cc
index b323942..0225130 100644
--- a/src/icu_util.cc
+++ b/src/icu_util.cc
@@ -86,4 +86,5 @@ bool InitializeICU(const char* icu_data_file) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/interface-descriptors.cc b/src/interface-descriptors.cc
index 6149650..099b2fb 100644
--- a/src/interface-descriptors.cc
+++ b/src/interface-descriptors.cc
@@ -171,5 +171,5 @@ void GrowArrayElementsDescriptor::Initialize(
   Register registers[] = {ContextRegister(), ObjectRegister(), KeyRegister()};
   data->Initialize(arraysize(registers), registers, NULL);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/interpreter-irregexp.cc b/src/interpreter-irregexp.cc
index 2aedfb4..97c9ba0 100644
--- a/src/interpreter-irregexp.cc
+++ b/src/interpreter-irregexp.cc
@@ -606,4 +606,5 @@ RegExpImpl::IrregexpResult IrregexpInterpreter::Match(
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/isolate.cc b/src/isolate.cc
index a8ed6e8..93005e3 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2796,4 +2796,5 @@ bool PostponeInterruptsScope::Intercept(StackGuard::InterruptFlag flag) {
   return false;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index 5d34ba6..b410d47 100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -6161,4 +6161,5 @@ bool RegExpEngine::TooMuchRegExpCode(Handle<String> pattern) {
   }
   return too_much;
 }
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/layout-descriptor.cc b/src/layout-descriptor.cc
index 66a1f0f..25cece8 100644
--- a/src/layout-descriptor.cc
+++ b/src/layout-descriptor.cc
@@ -284,5 +284,5 @@ bool LayoutDescriptor::IsConsistentWithMap(Map* map, bool check_tail) {
   }
   return true;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/lithium-allocator.cc b/src/lithium-allocator.cc
index 36c8c7d..79d6cfe 100644
--- a/src/lithium-allocator.cc
+++ b/src/lithium-allocator.cc
@@ -2190,4 +2190,5 @@ LAllocatorPhase::~LAllocatorPhase() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/lithium-codegen.cc b/src/lithium-codegen.cc
index 89df2ce..6fac0b9 100644
--- a/src/lithium-codegen.cc
+++ b/src/lithium-codegen.cc
@@ -198,4 +198,5 @@ Deoptimizer::DeoptInfo LCodeGenBase::MakeDeoptInfo(
   deopt_info.inlining_id = enter_inlined ? enter_inlined->inlining_id() : 0;
   return deopt_info;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/lithium.cc b/src/lithium.cc
index ba3517d..21ba883 100644
--- a/src/lithium.cc
+++ b/src/lithium.cc
@@ -726,4 +726,5 @@ LPhase::~LPhase() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/liveedit.cc b/src/liveedit.cc
index 064a4c6..fa291fe 100644
--- a/src/liveedit.cc
+++ b/src/liveedit.cc
@@ -2060,4 +2060,5 @@ bool LiveEditFunctionTracker::IsActive(Isolate* isolate) {
   return isolate->active_function_info_listener() != NULL;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/log-utils.cc b/src/log-utils.cc
index 278cff1..835ed8e 100644
--- a/src/log-utils.cc
+++ b/src/log-utils.cc
@@ -240,4 +240,5 @@ void Log::MessageBuilder::WriteToLogFile() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/log.cc b/src/log.cc
index 320a60b..c634d28 100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -1900,4 +1900,5 @@ FILE* Logger::TearDown() {
   return log_->Close();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/lookup.cc b/src/lookup.cc
index 889988b..eb83be5 100644
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -410,4 +410,5 @@ bool LookupIterator::SkipInterceptor(JSObject* holder) {
   }
   return interceptor_state_ == InterceptorState::kProcessNonMasking;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/messages.cc b/src/messages.cc
index 85a1128..ce63755 100644
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -367,4 +367,5 @@ MaybeHandle<String> MessageTemplate::FormatMessage(int template_index,
 
   return builder.Finish();
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc
index 5073202..c1f72d1 100644
--- a/src/mips/assembler-mips.cc
+++ b/src/mips/assembler-mips.cc
@@ -3039,6 +3039,7 @@ void Assembler::PopulateConstantPool(ConstantPoolArray* constant_pool) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc
index f277492..e20a408 100644
--- a/src/mips/builtins-mips.cc
+++ b/src/mips/builtins-mips.cc
@@ -1840,6 +1840,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index 97f04ae..e833ea0 100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -5567,6 +5567,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/codegen-mips.cc b/src/mips/codegen-mips.cc
index a04b8cb..23780d8 100644
--- a/src/mips/codegen-mips.cc
+++ b/src/mips/codegen-mips.cc
@@ -1262,6 +1262,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate,
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/constants-mips.cc b/src/mips/constants-mips.cc
index 9facbda..bf27287 100644
--- a/src/mips/constants-mips.cc
+++ b/src/mips/constants-mips.cc
@@ -339,6 +339,7 @@ Instruction::Type Instruction::InstructionType() const {
 }
 
 
-} }   // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/cpu-mips.cc b/src/mips/cpu-mips.cc
index f2d5065..acc7af2 100644
--- a/src/mips/cpu-mips.cc
+++ b/src/mips/cpu-mips.cc
@@ -54,6 +54,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif  // USE_SIMULATOR.
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/debug-mips.cc b/src/mips/debug-mips.cc
index 45dbc75..81e69ed 100644
--- a/src/mips/debug-mips.cc
+++ b/src/mips/debug-mips.cc
@@ -290,6 +290,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/deoptimizer-mips.cc b/src/mips/deoptimizer-mips.cc
index 88dbcaf..4956ff3 100644
--- a/src/mips/deoptimizer-mips.cc
+++ b/src/mips/deoptimizer-mips.cc
@@ -407,4 +407,5 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips/disasm-mips.cc b/src/mips/disasm-mips.cc
index f688764..381e2f1 100644
--- a/src/mips/disasm-mips.cc
+++ b/src/mips/disasm-mips.cc
@@ -1321,8 +1321,8 @@ int Decoder::InstructionDecode(byte* instr_ptr) {
 }
 
 
-} }  // namespace v8::internal
-
+}  // namespace internal
+}  // namespace v8
 
 
 //------------------------------------------------------------------------------
diff --git a/src/mips/frames-mips.cc b/src/mips/frames-mips.cc
index b65f1bf..555f8a8 100644
--- a/src/mips/frames-mips.cc
+++ b/src/mips/frames-mips.cc
@@ -37,6 +37,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc
index c81f346..bf6e02b 100644
--- a/src/mips/full-codegen-mips.cc
+++ b/src/mips/full-codegen-mips.cc
@@ -5522,6 +5522,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/interface-descriptors-mips.cc b/src/mips/interface-descriptors-mips.cc
index f34284e..17419cf 100644
--- a/src/mips/interface-descriptors-mips.cc
+++ b/src/mips/interface-descriptors-mips.cc
@@ -387,7 +387,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
index cd76b18..910c83a 100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -6067,4 +6067,5 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips/lithium-gap-resolver-mips.cc b/src/mips/lithium-gap-resolver-mips.cc
index 1bec0c8..df92ab9 100644
--- a/src/mips/lithium-gap-resolver-mips.cc
+++ b/src/mips/lithium-gap-resolver-mips.cc
@@ -296,4 +296,5 @@ void LGapResolver::EmitMove(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips/lithium-mips.cc b/src/mips/lithium-mips.cc
index 8397013..eebab79 100644
--- a/src/mips/lithium-mips.cc
+++ b/src/mips/lithium-mips.cc
@@ -2620,6 +2620,7 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
   return MarkAsCall(DefineFixed(result, cp), instr);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
index b735157..8b6c4a4 100644
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -6129,6 +6129,7 @@ void MacroAssembler::TruncatingDiv(Register result,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/regexp-macro-assembler-mips.cc b/src/mips/regexp-macro-assembler-mips.cc
index cd14e38..f298021 100644
--- a/src/mips/regexp-macro-assembler-mips.cc
+++ b/src/mips/regexp-macro-assembler-mips.cc
@@ -1241,6 +1241,7 @@ void RegExpMacroAssemblerMIPS::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS
diff --git a/src/mips/simulator-mips.cc b/src/mips/simulator-mips.cc
index abddd91..087baca 100644
--- a/src/mips/simulator-mips.cc
+++ b/src/mips/simulator-mips.cc
@@ -4433,7 +4433,8 @@ uintptr_t Simulator::PopAddress() {
 
 #undef UNSUPPORTED
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // USE_SIMULATOR
 
diff --git a/src/mips64/assembler-mips64.cc b/src/mips64/assembler-mips64.cc
index 08f70ad..85e8a1d 100644
--- a/src/mips64/assembler-mips64.cc
+++ b/src/mips64/assembler-mips64.cc
@@ -3131,6 +3131,7 @@ void Assembler::PopulateConstantPool(ConstantPoolArray* constant_pool) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc
index 3aa4ebb..028d565 100644
--- a/src/mips64/builtins-mips64.cc
+++ b/src/mips64/builtins-mips64.cc
@@ -1849,6 +1849,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
index 9a530b6..fb8345b 100644
--- a/src/mips64/code-stubs-mips64.cc
+++ b/src/mips64/code-stubs-mips64.cc
@@ -5610,6 +5610,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/codegen-mips64.cc b/src/mips64/codegen-mips64.cc
index 05a193c..4f45b08 100644
--- a/src/mips64/codegen-mips64.cc
+++ b/src/mips64/codegen-mips64.cc
@@ -1153,6 +1153,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate,
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/constants-mips64.cc b/src/mips64/constants-mips64.cc
index 1d96c4c..5ebadb3 100644
--- a/src/mips64/constants-mips64.cc
+++ b/src/mips64/constants-mips64.cc
@@ -362,6 +362,7 @@ Instruction::Type Instruction::InstructionType() const {
 }
 
 
-} }   // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/cpu-mips64.cc b/src/mips64/cpu-mips64.cc
index 027d5a1..9c600bf 100644
--- a/src/mips64/cpu-mips64.cc
+++ b/src/mips64/cpu-mips64.cc
@@ -54,6 +54,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif  // USE_SIMULATOR.
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/debug-mips64.cc b/src/mips64/debug-mips64.cc
index 6067424..402de78 100644
--- a/src/mips64/debug-mips64.cc
+++ b/src/mips64/debug-mips64.cc
@@ -293,6 +293,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/deoptimizer-mips64.cc b/src/mips64/deoptimizer-mips64.cc
index d9743bf..703203a 100644
--- a/src/mips64/deoptimizer-mips64.cc
+++ b/src/mips64/deoptimizer-mips64.cc
@@ -411,4 +411,5 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips64/disasm-mips64.cc b/src/mips64/disasm-mips64.cc
index 67715ff..b0b528f 100644
--- a/src/mips64/disasm-mips64.cc
+++ b/src/mips64/disasm-mips64.cc
@@ -1507,8 +1507,8 @@ int Decoder::InstructionDecode(byte* instr_ptr) {
 }
 
 
-} }  // namespace v8::internal
-
+}  // namespace internal
+}  // namespace v8
 
 
 //------------------------------------------------------------------------------
diff --git a/src/mips64/frames-mips64.cc b/src/mips64/frames-mips64.cc
index 2991248..e34be5e 100644
--- a/src/mips64/frames-mips64.cc
+++ b/src/mips64/frames-mips64.cc
@@ -38,6 +38,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc
index 29caab4..30cbfe3 100644
--- a/src/mips64/full-codegen-mips64.cc
+++ b/src/mips64/full-codegen-mips64.cc
@@ -5529,6 +5529,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/interface-descriptors-mips64.cc b/src/mips64/interface-descriptors-mips64.cc
index 2ed9bd9..d1adba5 100644
--- a/src/mips64/interface-descriptors-mips64.cc
+++ b/src/mips64/interface-descriptors-mips64.cc
@@ -387,7 +387,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc
index 5e7eb20..89ba285 100644
--- a/src/mips64/lithium-codegen-mips64.cc
+++ b/src/mips64/lithium-codegen-mips64.cc
@@ -6128,4 +6128,5 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips64/lithium-gap-resolver-mips64.cc b/src/mips64/lithium-gap-resolver-mips64.cc
index d965f65..1006d72 100644
--- a/src/mips64/lithium-gap-resolver-mips64.cc
+++ b/src/mips64/lithium-gap-resolver-mips64.cc
@@ -297,4 +297,5 @@ void LGapResolver::EmitMove(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/mips64/lithium-mips64.cc b/src/mips64/lithium-mips64.cc
index 97826e2..c0671e1 100644
--- a/src/mips64/lithium-mips64.cc
+++ b/src/mips64/lithium-mips64.cc
@@ -2620,6 +2620,7 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc
index 31b35d7..842ed8a 100644
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -6199,6 +6199,7 @@ void MacroAssembler::TruncatingDiv(Register result,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/regexp-macro-assembler-mips64.cc b/src/mips64/regexp-macro-assembler-mips64.cc
index 5c28ab6..ca62f5b 100644
--- a/src/mips64/regexp-macro-assembler-mips64.cc
+++ b/src/mips64/regexp-macro-assembler-mips64.cc
@@ -1286,6 +1286,7 @@ void RegExpMacroAssemblerMIPS::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64
diff --git a/src/mips64/simulator-mips64.cc b/src/mips64/simulator-mips64.cc
index 4b251f2..f6f3f8c 100644
--- a/src/mips64/simulator-mips64.cc
+++ b/src/mips64/simulator-mips64.cc
@@ -4581,7 +4581,8 @@ uintptr_t Simulator::PopAddress() {
 
 
 #undef UNSUPPORTED
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // USE_SIMULATOR
 
diff --git a/src/modules.cc b/src/modules.cc
index da643ed..2e6cfc0 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -57,5 +57,5 @@ const AstRawString* ModuleDescriptor::LookupLocalExport(
   DCHECK_NOT_NULL(entry->value);
   return static_cast<const AstRawString*>(entry->value);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/objects-debug.cc b/src/objects-debug.cc
index e78238d..3548dd6 100644
--- a/src/objects-debug.cc
+++ b/src/objects-debug.cc
@@ -1287,4 +1287,5 @@ void Code::VerifyEmbeddedObjects(VerifyMode mode) {
 
 #endif  // DEBUG
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/objects-printer.cc b/src/objects-printer.cc
index dc134d4..b4b0761 100644
--- a/src/objects-printer.cc
+++ b/src/objects-printer.cc
@@ -1213,4 +1213,5 @@ void JSObject::PrintTransitions(std::ostream& os) {  // NOLINT
   TransitionArray::PrintTransitions(os, map()->raw_transitions());
 }
 #endif  // defined(DEBUG) || defined(OBJECT_PRINT)
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/objects.cc b/src/objects.cc
index f4112d3..543ef93 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -17427,4 +17427,5 @@ void PropertyCell::SetValueWithInvalidation(Handle<PropertyCell> cell,
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/optimizing-compile-dispatcher.cc b/src/optimizing-compile-dispatcher.cc
index a2f2970..f5c57cd 100644
--- a/src/optimizing-compile-dispatcher.cc
+++ b/src/optimizing-compile-dispatcher.cc
@@ -356,5 +356,5 @@ void OptimizingCompileDispatcher::AddToOsrBuffer(OptimizedCompileJob* job) {
   osr_buffer_[osr_buffer_cursor_] = job;
   osr_buffer_cursor_ = (osr_buffer_cursor_ + 1) % osr_buffer_capacity_;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/parser.cc b/src/parser.cc
index 196853c..ff2c446 100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -5796,4 +5796,5 @@ Expression* Parser::SpreadCallNew(Expression* function,
   return factory()->NewCallRuntime(
       ast_value_factory()->reflect_construct_string(), NULL, args, pos);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/pattern-rewriter.cc b/src/pattern-rewriter.cc
index e414205..7be3ff8 100644
--- a/src/pattern-rewriter.cc
+++ b/src/pattern-rewriter.cc
@@ -417,5 +417,5 @@ NOT_A_PATTERN(WithStatement)
 NOT_A_PATTERN(Yield)
 
 #undef NOT_A_PATTERN
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/pending-compilation-error-handler.cc b/src/pending-compilation-error-handler.cc
index dcc64bc..098db62 100644
--- a/src/pending-compilation-error-handler.cc
+++ b/src/pending-compilation-error-handler.cc
@@ -58,5 +58,5 @@ void PendingCompilationErrorHandler::ThrowPendingError(Isolate* isolate,
 
   isolate->Throw(*error, &location);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ppc/assembler-ppc.cc b/src/ppc/assembler-ppc.cc
index 7778ab1..f5929ec 100644
--- a/src/ppc/assembler-ppc.cc
+++ b/src/ppc/assembler-ppc.cc
@@ -2387,7 +2387,7 @@ Handle<ConstantPoolArray> Assembler::NewConstantPool(Isolate* isolate) {
 void Assembler::PopulateConstantPool(ConstantPoolArray* constant_pool) {
   DCHECK(!FLAG_enable_ool_constant_pool);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc
index 48e45db..6e44bc6 100644
--- a/src/ppc/builtins-ppc.cc
+++ b/src/ppc/builtins-ppc.cc
@@ -1866,7 +1866,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/code-stubs-ppc.cc b/src/ppc/code-stubs-ppc.cc
index a86fbb0..08dd1e5 100644
--- a/src/ppc/code-stubs-ppc.cc
+++ b/src/ppc/code-stubs-ppc.cc
@@ -5658,7 +5658,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/codegen-ppc.cc b/src/ppc/codegen-ppc.cc
index c0398ae..aae38f4 100644
--- a/src/ppc/codegen-ppc.cc
+++ b/src/ppc/codegen-ppc.cc
@@ -677,7 +677,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate, byte* sequence, Code::Age age,
     }
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/constants-ppc.cc b/src/ppc/constants-ppc.cc
index f32f25a..f019089 100644
--- a/src/ppc/constants-ppc.cc
+++ b/src/ppc/constants-ppc.cc
@@ -85,7 +85,7 @@ int Registers::Number(const char* name) {
   // No register with the requested name found.
   return kNoRegister;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/cpu-ppc.cc b/src/ppc/cpu-ppc.cc
index d42420c..1a9390b 100644
--- a/src/ppc/cpu-ppc.cc
+++ b/src/ppc/cpu-ppc.cc
@@ -57,7 +57,7 @@ void CpuFeatures::FlushICache(void* buffer, size_t size) {
 
 #endif  // USE_SIMULATOR
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/debug-ppc.cc b/src/ppc/debug-ppc.cc
index 905267d..4dd4220 100644
--- a/src/ppc/debug-ppc.cc
+++ b/src/ppc/debug-ppc.cc
@@ -300,7 +300,7 @@ void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
 const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/deoptimizer-ppc.cc b/src/ppc/deoptimizer-ppc.cc
index 74c88e3..fff67bd 100644
--- a/src/ppc/deoptimizer-ppc.cc
+++ b/src/ppc/deoptimizer-ppc.cc
@@ -362,5 +362,5 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ppc/disasm-ppc.cc b/src/ppc/disasm-ppc.cc
index 2486741..02ef88b 100644
--- a/src/ppc/disasm-ppc.cc
+++ b/src/ppc/disasm-ppc.cc
@@ -1292,8 +1292,8 @@ int Decoder::InstructionDecode(byte* instr_ptr) {
 
   return Instruction::kInstrSize;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 //------------------------------------------------------------------------------
diff --git a/src/ppc/frames-ppc.cc b/src/ppc/frames-ppc.cc
index 00af7c9..a09bbeb 100644
--- a/src/ppc/frames-ppc.cc
+++ b/src/ppc/frames-ppc.cc
@@ -38,7 +38,7 @@ Object*& ExitFrame::constant_pool_slot() const {
   UNREACHABLE();
   return Memory::Object_at(NULL);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/full-codegen-ppc.cc b/src/ppc/full-codegen-ppc.cc
index ef69848..845303f 100644
--- a/src/ppc/full-codegen-ppc.cc
+++ b/src/ppc/full-codegen-ppc.cc
@@ -5520,6 +5520,6 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
          isolate->builtins()->OsrAfterStackCheck()->entry());
   return OSR_AFTER_STACK_CHECK;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/interface-descriptors-ppc.cc b/src/ppc/interface-descriptors-ppc.cc
index 2d0a0e2..e3d970b 100644
--- a/src/ppc/interface-descriptors-ppc.cc
+++ b/src/ppc/interface-descriptors-ppc.cc
@@ -387,7 +387,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/lithium-codegen-ppc.cc b/src/ppc/lithium-codegen-ppc.cc
index ce17f25..716486e 100644
--- a/src/ppc/lithium-codegen-ppc.cc
+++ b/src/ppc/lithium-codegen-ppc.cc
@@ -6280,5 +6280,5 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ppc/lithium-gap-resolver-ppc.cc b/src/ppc/lithium-gap-resolver-ppc.cc
index c261b66..3528bf5 100644
--- a/src/ppc/lithium-gap-resolver-ppc.cc
+++ b/src/ppc/lithium-gap-resolver-ppc.cc
@@ -284,5 +284,5 @@ void LGapResolver::EmitMove(int index) {
 
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ppc/lithium-ppc.cc b/src/ppc/lithium-ppc.cc
index 7cb5be8..ffe3d2c 100644
--- a/src/ppc/lithium-ppc.cc
+++ b/src/ppc/lithium-ppc.cc
@@ -2620,5 +2620,5 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
       new (zone()) LAllocateBlockContext(context, function);
   return MarkAsCall(DefineFixed(result, cp), instr);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ppc/regexp-macro-assembler-ppc.cc b/src/ppc/regexp-macro-assembler-ppc.cc
index 5f754ca..05e84e4 100644
--- a/src/ppc/regexp-macro-assembler-ppc.cc
+++ b/src/ppc/regexp-macro-assembler-ppc.cc
@@ -1249,7 +1249,7 @@ void RegExpMacroAssemblerPPC::LoadCurrentCharacterUnchecked(int cp_offset,
 #undef __
 
 #endif  // V8_INTERPRETED_REGEXP
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/ppc/simulator-ppc.cc b/src/ppc/simulator-ppc.cc
index 31fcc9e..1932631 100644
--- a/src/ppc/simulator-ppc.cc
+++ b/src/ppc/simulator-ppc.cc
@@ -3898,8 +3898,8 @@ uintptr_t Simulator::PopAddress() {
   set_register(sp, current_sp + sizeof(uintptr_t));
   return address;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // USE_SIMULATOR
 #endif  // V8_TARGET_ARCH_PPC
diff --git a/src/preparse-data.cc b/src/preparse-data.cc
index 9b25b73..ffbfbab 100644
--- a/src/preparse-data.cc
+++ b/src/preparse-data.cc
@@ -76,4 +76,5 @@ ScriptData* CompleteParserRecorder::GetScriptData() {
 }
 
 
-} }  // namespace v8::internal.
+}  // namespace internal
+}  // namespace v8.
diff --git a/src/prettyprinter.cc b/src/prettyprinter.cc
index 160bb6f..aa331da 100644
--- a/src/prettyprinter.cc
+++ b/src/prettyprinter.cc
@@ -1533,4 +1533,5 @@ void AstPrinter::VisitSuperReference(SuperReference* node) {
 
 #endif  // DEBUG
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index 30d36eb..070a9ee 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -696,4 +696,5 @@ CodeEntry* ProfileGenerator::EntryForVMState(StateTag tag) {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/property.cc b/src/property.cc
index 3b4ddaf..93ba43c 100644
--- a/src/property.cc
+++ b/src/property.cc
@@ -82,4 +82,5 @@ std::ostream& operator<<(std::ostream& os, const Descriptor& d) {
   return os;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/regexp-macro-assembler-irregexp.cc b/src/regexp-macro-assembler-irregexp.cc
index 5574730..7bd3b56 100644
--- a/src/regexp-macro-assembler-irregexp.cc
+++ b/src/regexp-macro-assembler-irregexp.cc
@@ -453,4 +453,5 @@ void RegExpMacroAssemblerIrregexp::Expand() {
 
 #endif  // V8_INTERPRETED_REGEXP
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/regexp-macro-assembler-tracer.cc b/src/regexp-macro-assembler-tracer.cc
index 00055ed..19fae2f 100644
--- a/src/regexp-macro-assembler-tracer.cc
+++ b/src/regexp-macro-assembler-tracer.cc
@@ -415,4 +415,5 @@ Handle<HeapObject> RegExpMacroAssemblerTracer::GetCode(Handle<String> source) {
   return assembler_->GetCode(source);
 }
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/regexp-macro-assembler.cc b/src/regexp-macro-assembler.cc
index 6228ce4..48cbbf3 100644
--- a/src/regexp-macro-assembler.cc
+++ b/src/regexp-macro-assembler.cc
@@ -307,4 +307,5 @@ Address NativeRegExpMacroAssembler::GrowStack(Address stack_pointer,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/regexp-stack.cc b/src/regexp-stack.cc
index f114ae4..0ef4942 100644
--- a/src/regexp-stack.cc
+++ b/src/regexp-stack.cc
@@ -84,4 +84,5 @@ Address RegExpStack::EnsureCapacity(size_t size) {
 }
 
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/rewriter.cc b/src/rewriter.cc
index 4780538..ee08d88 100644
--- a/src/rewriter.cc
+++ b/src/rewriter.cc
@@ -248,4 +248,5 @@ bool Rewriter::Rewrite(ParseInfo* info) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 838888a..351bca7 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -260,4 +260,5 @@ void RuntimeProfiler::OptimizeNow() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/safepoint-table.cc b/src/safepoint-table.cc
index a0ae5b2..5214b7b 100644
--- a/src/safepoint-table.cc
+++ b/src/safepoint-table.cc
@@ -212,5 +212,5 @@ uint32_t SafepointTableBuilder::EncodeExceptPC(const DeoptimizationInfo& info,
 }
 
 
-
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/sampler.cc b/src/sampler.cc
index 5f6f2e2..79b5bff 100644
--- a/src/sampler.cc
+++ b/src/sampler.cc
@@ -775,4 +775,5 @@ void Sampler::DoSample() {
 #endif  // USE_SIGNALS
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/scanner-character-streams.cc b/src/scanner-character-streams.cc
index bc5cde4..442bc75 100644
--- a/src/scanner-character-streams.cc
+++ b/src/scanner-character-streams.cc
@@ -559,4 +559,5 @@ void ExternalTwoByteStringUtf16CharacterStream::ResetToBookmark() {
   pos_ = bookmark_;
   buffer_cursor_ = raw_data_ + bookmark_;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/scanner.cc b/src/scanner.cc
index 8405591..a2ca30a 100644
--- a/src/scanner.cc
+++ b/src/scanner.cc
@@ -1630,4 +1630,5 @@ byte* DuplicateFinder::BackupKey(Vector<const uint8_t> bytes,
   return backing_store_.EndSequence().start();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/scopeinfo.cc b/src/scopeinfo.cc
index 4a0254b..b819b17 100644
--- a/src/scopeinfo.cc
+++ b/src/scopeinfo.cc
@@ -724,4 +724,5 @@ Handle<ModuleInfo> ModuleInfo::Create(Isolate* isolate,
   return info;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/scopes.cc b/src/scopes.cc
index 21a8805..3d52204 100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -1579,4 +1579,5 @@ int Scope::ContextLocalCount() const {
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS -
       (function_ != NULL && function_->proxy()->var()->IsContextSlot() ? 1 : 0);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/snapshot/natives-external.cc b/src/snapshot/natives-external.cc
index e02a24c..3649c2a 100644
--- a/src/snapshot/natives-external.cc
+++ b/src/snapshot/natives-external.cc
@@ -232,6 +232,5 @@ Vector<const char> NativesCollection<type>::GetScriptsSource() {
 template class NativesCollection<CORE>;
 template class NativesCollection<EXPERIMENTAL>;
 template class NativesCollection<EXTRAS>;
-
-}  // namespace v8::internal
+}  // namespace internal
 }  // namespace v8
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index 4b06b9a..08f2300 100644
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -2693,4 +2693,5 @@ SerializedCodeData* SerializedCodeData::FromCachedData(Isolate* isolate,
   delete scd;
   return NULL;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/snapshot/snapshot-common.cc b/src/snapshot/snapshot-common.cc
index 0e07cc1..381a83a 100644
--- a/src/snapshot/snapshot-common.cc
+++ b/src/snapshot/snapshot-common.cc
@@ -226,4 +226,5 @@ Vector<const byte> Snapshot::ExtractContextData(const v8::StartupData* data) {
   int context_length = data->raw_size - context_offset;
   return Vector<const byte>(context_data, context_length);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/snapshot/snapshot-empty.cc b/src/snapshot/snapshot-empty.cc
index 0eea940..464d3a8 100644
--- a/src/snapshot/snapshot-empty.cc
+++ b/src/snapshot/snapshot-empty.cc
@@ -25,4 +25,5 @@ void DisposeNatives() {}
 
 
 const v8::StartupData* Snapshot::DefaultSnapshotBlob() { return NULL; }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/snapshot/snapshot-external.cc b/src/snapshot/snapshot-external.cc
index f5e3de4..1d5476c 100644
--- a/src/snapshot/snapshot-external.cc
+++ b/src/snapshot/snapshot-external.cc
@@ -40,4 +40,5 @@ const v8::StartupData* Snapshot::DefaultSnapshotBlob() {
       external_startup_data_mutex.Pointer());
   return &external_startup_blob;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/snapshot/snapshot-source-sink.cc b/src/snapshot/snapshot-source-sink.cc
index c0179b7..7048c35 100644
--- a/src/snapshot/snapshot-source-sink.cc
+++ b/src/snapshot/snapshot-source-sink.cc
@@ -62,6 +62,5 @@ bool SnapshotByteSource::GetBlob(const byte** data, int* number_of_bytes) {
     return false;
   }
 }
-
-}  // namespace v8::internal
+}  // namespace internal
 }  // namespace v8
diff --git a/src/string-builder.cc b/src/string-builder.cc
index 38c3188..c7488ab 100644
--- a/src/string-builder.cc
+++ b/src/string-builder.cc
@@ -107,5 +107,5 @@ void IncrementalStringBuilder::AppendString(Handle<String> string) {
       factory()->NewConsString(accumulator(), string).ToHandleChecked();
   set_accumulator(concat);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/string-search.cc b/src/string-search.cc
index 0c18762..837f938 100644
--- a/src/string-search.cc
+++ b/src/string-search.cc
@@ -16,4 +16,5 @@ namespace internal {
 // good_suffix_shift_table()
 // suffix_table()
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/string-stream.cc b/src/string-stream.cc
index d53cdc0..00deaea 100644
--- a/src/string-stream.cc
+++ b/src/string-stream.cc
@@ -562,4 +562,5 @@ char* HeapStringAllocator::grow(unsigned* bytes) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/strings-storage.cc b/src/strings-storage.cc
index 6b19339..533fa89 100644
--- a/src/strings-storage.cc
+++ b/src/strings-storage.cc
@@ -119,5 +119,5 @@ HashMap::Entry* StringsStorage::GetEntry(const char* str, int len) {
   uint32_t hash = StringHasher::HashSequentialString(str, len, hash_seed_);
   return names_.LookupOrInsert(const_cast<char*>(str), hash);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/strtod.cc b/src/strtod.cc
index 2b48af3..ec26845 100644
--- a/src/strtod.cc
+++ b/src/strtod.cc
@@ -419,4 +419,5 @@ double Strtod(Vector<const char> buffer, int exponent) {
   return BignumStrtod(trimmed, exponent, guess);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/third_party/fdlibm/fdlibm.cc b/src/third_party/fdlibm/fdlibm.cc
index b8bc243..ea3efd3 100644
--- a/src/third_party/fdlibm/fdlibm.cc
+++ b/src/third_party/fdlibm/fdlibm.cc
@@ -290,5 +290,5 @@ int rempio2(double x, double* y) {
   }
   return n;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/token.cc b/src/token.cc
index db88271..73e883f 100644
--- a/src/token.cc
+++ b/src/token.cc
@@ -37,4 +37,5 @@ const char Token::token_type[] = {
 #undef KT
 #undef KK
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/transitions.cc b/src/transitions.cc
index 9fe9e86..63bb7fa 100644
--- a/src/transitions.cc
+++ b/src/transitions.cc
@@ -513,4 +513,5 @@ int TransitionArray::Search(PropertyKind kind, Name* name,
   }
   return SearchDetails(transition, kind, attributes, out_insertion_index);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/type-feedback-vector.cc b/src/type-feedback-vector.cc
index e3703a9..42aadc3 100644
--- a/src/type-feedback-vector.cc
+++ b/src/type-feedback-vector.cc
@@ -559,5 +559,5 @@ Name* KeyedLoadICNexus::FindFirstName() const {
   }
   return NULL;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/type-info.cc b/src/type-info.cc
index 6705c05..f8bfea8 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -519,4 +519,5 @@ void TypeFeedbackOracle::SetInfo(TypeFeedbackId ast_id, Object* target) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/types.cc b/src/types.cc
index e9a9acb..1879615 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -1367,4 +1367,5 @@ template TypeImpl<HeapTypeConfig>::TypeHandle
   TypeImpl<HeapTypeConfig>::Convert<Type>(
     TypeImpl<ZoneTypeConfig>::TypeHandle, TypeImpl<HeapTypeConfig>::Region*);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/typing.cc b/src/typing.cc
index c0d3ddd..8579009 100644
--- a/src/typing.cc
+++ b/src/typing.cc
@@ -789,4 +789,5 @@ void AstTyper::VisitExportDeclaration(ExportDeclaration* declaration) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/utils.cc b/src/utils.cc
index 5370e38..9f502bd 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -435,4 +435,5 @@ bool DoubleToBoolean(double d) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/v8.cc b/src/v8.cc
index 49a104f..fcffebb 100644
--- a/src/v8.cc
+++ b/src/v8.cc
@@ -143,4 +143,5 @@ void V8::SetSnapshotBlob(StartupData* snapshot_blob) {
   CHECK(false);
 #endif
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/variables.cc b/src/variables.cc
index 0c94d75..49846fe 100644
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -71,4 +71,5 @@ int Variable::CompareIndex(Variable* const* v, Variable* const* w) {
   return x - y;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/version.cc b/src/version.cc
index eaef96d..eae80c8 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -79,4 +79,5 @@ void Version::GetSONAME(Vector<char> str) {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc
index cafa402..d67a92b 100644
--- a/src/x64/assembler-x64.cc
+++ b/src/x64/assembler-x64.cc
@@ -3954,6 +3954,7 @@ bool RelocInfo::IsInConstantPool() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
index 00f89c0..7ec210a 100644
--- a/src/x64/builtins-x64.cc
+++ b/src/x64/builtins-x64.cc
@@ -1787,6 +1787,7 @@ void Builtins::Generate_OsrAfterStackCheck(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index dcd5e45..9459474 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -5427,6 +5427,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
index ceee954..0fa7dc4 100644
--- a/src/x64/codegen-x64.cc
+++ b/src/x64/codegen-x64.cc
@@ -724,6 +724,7 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int index) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/cpu-x64.cc b/src/x64/cpu-x64.cc
index 59a187f..0224b23 100644
--- a/src/x64/cpu-x64.cc
+++ b/src/x64/cpu-x64.cc
@@ -39,6 +39,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/debug-x64.cc b/src/x64/debug-x64.cc
index 41afd36..f0aa192 100644
--- a/src/x64/debug-x64.cc
+++ b/src/x64/debug-x64.cc
@@ -302,6 +302,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc
index 02e9d2e..cfb4fab 100644
--- a/src/x64/deoptimizer-x64.cc
+++ b/src/x64/deoptimizer-x64.cc
@@ -354,6 +354,7 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/frames-x64.cc b/src/x64/frames-x64.cc
index 114945b..8687861 100644
--- a/src/x64/frames-x64.cc
+++ b/src/x64/frames-x64.cc
@@ -37,6 +37,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
index 947de32..7a6d3fb 100644
--- a/src/x64/full-codegen-x64.cc
+++ b/src/x64/full-codegen-x64.cc
@@ -5455,6 +5455,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/interface-descriptors-x64.cc b/src/x64/interface-descriptors-x64.cc
index 982a9df..6e5b7f9 100644
--- a/src/x64/interface-descriptors-x64.cc
+++ b/src/x64/interface-descriptors-x64.cc
@@ -389,7 +389,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
index 1aaae6a..14909b1 100644
--- a/src/x64/lithium-codegen-x64.cc
+++ b/src/x64/lithium-codegen-x64.cc
@@ -6029,6 +6029,7 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/lithium-gap-resolver-x64.cc b/src/x64/lithium-gap-resolver-x64.cc
index d10e1a1..79e7020 100644
--- a/src/x64/lithium-gap-resolver-x64.cc
+++ b/src/x64/lithium-gap-resolver-x64.cc
@@ -314,6 +314,7 @@ void LGapResolver::EmitSwap(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc
index 18d282a..69bf82e 100644
--- a/src/x64/lithium-x64.cc
+++ b/src/x64/lithium-x64.cc
@@ -2707,6 +2707,7 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index f2c6a38..1485a24 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -5097,6 +5097,7 @@ void MacroAssembler::TruncatingDiv(Register dividend, int32_t divisor) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x64/regexp-macro-assembler-x64.cc b/src/x64/regexp-macro-assembler-x64.cc
index e953182..f1eb072 100644
--- a/src/x64/regexp-macro-assembler-x64.cc
+++ b/src/x64/regexp-macro-assembler-x64.cc
@@ -1356,6 +1356,7 @@ void RegExpMacroAssemblerX64::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64
diff --git a/src/x87/assembler-x87.cc b/src/x87/assembler-x87.cc
index 43694de..44cb8ee 100644
--- a/src/x87/assembler-x87.cc
+++ b/src/x87/assembler-x87.cc
@@ -2086,6 +2086,7 @@ void LogGeneratedCodeCoverage(const char* file_line) {
 
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/builtins-x87.cc b/src/x87/builtins-x87.cc
index e5ad7e5..2fa599b 100644
--- a/src/x87/builtins-x87.cc
+++ b/src/x87/builtins-x87.cc
@@ -1711,7 +1711,7 @@ void Builtins::Generate_OsrAfterStackCheck(MacroAssembler* masm) {
 }
 
 #undef __
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
index 7da27aa..7f8571f 100644
--- a/src/x87/code-stubs-x87.cc
+++ b/src/x87/code-stubs-x87.cc
@@ -5139,6 +5139,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/codegen-x87.cc b/src/x87/codegen-x87.cc
index 1321461..f9f079f 100644
--- a/src/x87/codegen-x87.cc
+++ b/src/x87/codegen-x87.cc
@@ -626,6 +626,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/cpu-x87.cc b/src/x87/cpu-x87.cc
index 03816df..84e385d 100644
--- a/src/x87/cpu-x87.cc
+++ b/src/x87/cpu-x87.cc
@@ -39,6 +39,7 @@ void CpuFeatures::FlushICache(void* start, size_t size) {
 #endif
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/debug-x87.cc b/src/x87/debug-x87.cc
index 4604b69..865ca8b 100644
--- a/src/x87/debug-x87.cc
+++ b/src/x87/debug-x87.cc
@@ -323,6 +323,7 @@ const bool LiveEdit::kFrameDropperSupported = true;
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/deoptimizer-x87.cc b/src/x87/deoptimizer-x87.cc
index edc08ab..11ff537 100644
--- a/src/x87/deoptimizer-x87.cc
+++ b/src/x87/deoptimizer-x87.cc
@@ -470,6 +470,7 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 #undef __
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/frames-x87.cc b/src/x87/frames-x87.cc
index 6091b45..0de0588 100644
--- a/src/x87/frames-x87.cc
+++ b/src/x87/frames-x87.cc
@@ -37,6 +37,7 @@ Object*& ExitFrame::constant_pool_slot() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/full-codegen-x87.cc b/src/x87/full-codegen-x87.cc
index 485abda..edd2d83 100644
--- a/src/x87/full-codegen-x87.cc
+++ b/src/x87/full-codegen-x87.cc
@@ -5430,6 +5430,7 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/interface-descriptors-x87.cc b/src/x87/interface-descriptors-x87.cc
index 99ad597..702369a 100644
--- a/src/x87/interface-descriptors-x87.cc
+++ b/src/x87/interface-descriptors-x87.cc
@@ -387,7 +387,7 @@ void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) {
   };
   data->Initialize(arraysize(registers), registers, representations);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/lithium-codegen-x87.cc b/src/x87/lithium-codegen-x87.cc
index 611ed89..1e23f99 100644
--- a/src/x87/lithium-codegen-x87.cc
+++ b/src/x87/lithium-codegen-x87.cc
@@ -6446,6 +6446,7 @@ void LCodeGen::DoAllocateBlockContext(LAllocateBlockContext* instr) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/lithium-gap-resolver-x87.cc b/src/x87/lithium-gap-resolver-x87.cc
index 6a64275..b2f9b26 100644
--- a/src/x87/lithium-gap-resolver-x87.cc
+++ b/src/x87/lithium-gap-resolver-x87.cc
@@ -445,6 +445,7 @@ void LGapResolver::EmitSwap(int index) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/lithium-x87.cc b/src/x87/lithium-x87.cc
index 4d59c43..889df61 100644
--- a/src/x87/lithium-x87.cc
+++ b/src/x87/lithium-x87.cc
@@ -2739,6 +2739,7 @@ LInstruction* LChunkBuilder::DoAllocateBlockContext(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc
index 4d1079f..3896348 100644
--- a/src/x87/macro-assembler-x87.cc
+++ b/src/x87/macro-assembler-x87.cc
@@ -3102,6 +3102,7 @@ void MacroAssembler::TruncatingDiv(Register dividend, int32_t divisor) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/src/x87/regexp-macro-assembler-x87.cc b/src/x87/regexp-macro-assembler-x87.cc
index ddad44d..e043f6e 100644
--- a/src/x87/regexp-macro-assembler-x87.cc
+++ b/src/x87/regexp-macro-assembler-x87.cc
@@ -1223,6 +1223,7 @@ void RegExpMacroAssemblerX87::LoadCurrentCharacterUnchecked(int cp_offset,
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87
diff --git a/test/cctest/compiler/test-linkage.cc b/test/cctest/compiler/test-linkage.cc
index b903336..252c431 100644
--- a/test/cctest/compiler/test-linkage.cc
+++ b/test/cctest/compiler/test-linkage.cc
@@ -114,5 +114,4 @@ TEST(TestLinkageStubCall) {
   // TODO(titzer): test linkage creation for outgoing stub calls.
 }
 
-
 #endif  // V8_TURBOFAN_TARGET
diff --git a/test/cctest/compiler/test-representation-change.cc b/test/cctest/compiler/test-representation-change.cc
index 55f054a..7aa0e38 100644
--- a/test/cctest/compiler/test-representation-change.cc
+++ b/test/cctest/compiler/test-representation-change.cc
@@ -100,9 +100,9 @@ class RepresentationChangerTester : public HandleAndZoneScope,
     CHECK_EQ(n, c);
   }
 };
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 
 static const MachineType all_reps[] = {kRepBit,     kRepWord32,  kRepWord64,
diff --git a/test/cctest/compiler/test-run-deopt.cc b/test/cctest/compiler/test-run-deopt.cc
index 28d3cd8..71883e2 100644
--- a/test/cctest/compiler/test-run-deopt.cc
+++ b/test/cctest/compiler/test-run-deopt.cc
@@ -7,13 +7,12 @@
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/function-tester.h"
 
-using namespace v8;
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 
 #if V8_TURBOFAN_TARGET
 
-static void IsOptimized(const FunctionCallbackInfo<v8::Value>& args) {
+static void IsOptimized(const v8::FunctionCallbackInfo<v8::Value>& args) {
   JavaScriptFrameIterator it(CcTest::i_isolate());
   JavaScriptFrame* frame = it.frame();
   return args.GetReturnValue().Set(frame->is_optimized());
@@ -21,8 +20,9 @@ static void IsOptimized(const FunctionCallbackInfo<v8::Value>& args) {
 
 
 static void InstallIsOptimizedHelper(v8::Isolate* isolate) {
-  Local<v8::Context> context = isolate->GetCurrentContext();
-  Local<v8::FunctionTemplate> t = FunctionTemplate::New(isolate, IsOptimized);
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::FunctionTemplate> t =
+      v8::FunctionTemplate::New(isolate, IsOptimized);
   context->Global()->Set(v8_str("IsOptimized"), t->GetFunction());
 }
 
diff --git a/test/cctest/gay-fixed.cc b/test/cctest/gay-fixed.cc
index 81463ac..86ebb24 100644
--- a/test/cctest/gay-fixed.cc
+++ b/test/cctest/gay-fixed.cc
@@ -100046,4 +100046,5 @@ Vector<const PrecomputedFixed> PrecomputedFixedRepresentations() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/gay-precision.cc b/test/cctest/gay-precision.cc
index 6ab2715..68d29f8 100644
--- a/test/cctest/gay-precision.cc
+++ b/test/cctest/gay-precision.cc
@@ -100047,4 +100047,5 @@ Vector<const PrecomputedPrecision> PrecomputedPrecisionRepresentations() {
                                             number_elements);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/gay-shortest.cc b/test/cctest/gay-shortest.cc
index 896ea4c..4560553 100644
--- a/test/cctest/gay-shortest.cc
+++ b/test/cctest/gay-shortest.cc
@@ -100047,4 +100047,5 @@ Vector<const PrecomputedShortest> PrecomputedShortestRepresentations() {
                                            number_elements);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/print-extension.cc b/test/cctest/print-extension.cc
index d1af359..33f33ca 100644
--- a/test/cctest/print-extension.cc
+++ b/test/cctest/print-extension.cc
@@ -48,4 +48,5 @@ void PrintExtension::Print(const v8::FunctionCallbackInfo<v8::Value>& args) {
   printf("\n");
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/profiler-extension.cc b/test/cctest/profiler-extension.cc
index 263fc4f..c8cb0fb 100644
--- a/test/cctest/profiler-extension.cc
+++ b/test/cctest/profiler-extension.cc
@@ -72,4 +72,5 @@ void ProfilerExtension::StopProfiling(
       : v8::String::Empty(args.GetIsolate()));
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index 89fdabb..59b2bad 100644
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -425,7 +425,8 @@ void CheckDebuggerUnloaded(bool check_functions) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 // Check that the debugger has been fully unloaded.
diff --git a/test/cctest/test-global-object.cc b/test/cctest/test-global-object.cc
index 204164a..9cc755e 100644
--- a/test/cctest/test-global-object.cc
+++ b/test/cctest/test-global-object.cc
@@ -29,12 +29,10 @@
 
 #include "test/cctest/cctest.h"
 
-using namespace v8;
-
 // This test fails if properties on the prototype of the global object appear
 // as declared globals.
 TEST(StrictUndeclaredGlobalVariable) {
-  HandleScope scope(CcTest::isolate());
+  v8::HandleScope scope(CcTest::isolate());
   v8::Local<v8::String> var_name = v8_str("x");
   LocalContext context;
   v8::TryCatch try_catch(CcTest::isolate());
diff --git a/test/cctest/test-hydrogen-types.cc b/test/cctest/test-hydrogen-types.cc
index 0ac53bd..93fdf7b 100644
--- a/test/cctest/test-hydrogen-types.cc
+++ b/test/cctest/test-hydrogen-types.cc
@@ -8,7 +8,6 @@
 
 using namespace v8::internal;
 
-
 static const HType kTypes[] = {
   #define DECLARE_TYPE(Name, mask) HType::Name(),
   HTYPE_LIST(DECLARE_TYPE)
diff --git a/test/cctest/test-microtask-delivery.cc b/test/cctest/test-microtask-delivery.cc
index 601290c..5befdfb 100644
--- a/test/cctest/test-microtask-delivery.cc
+++ b/test/cctest/test-microtask-delivery.cc
@@ -29,7 +29,6 @@
 
 #include "test/cctest/cctest.h"
 
-using namespace v8;
 namespace i = v8::internal;
 
 namespace {
@@ -38,7 +37,7 @@ class HarmonyIsolate {
   HarmonyIsolate() {
     v8::Isolate::CreateParams create_params;
     create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
-    isolate_ = Isolate::New(create_params);
+    isolate_ = v8::Isolate::New(create_params);
     isolate_->Enter();
   }
 
@@ -47,17 +46,17 @@ class HarmonyIsolate {
     isolate_->Dispose();
   }
 
-  Isolate* GetIsolate() const { return isolate_; }
+  v8::Isolate* GetIsolate() const { return isolate_; }
 
  private:
-  Isolate* isolate_;
+  v8::Isolate* isolate_;
 };
 }
 
 
 TEST(MicrotaskDeliverySimple) {
   HarmonyIsolate isolate;
-  HandleScope scope(isolate.GetIsolate());
+  v8::HandleScope scope(isolate.GetIsolate());
   LocalContext context(isolate.GetIsolate());
   CompileRun(
       "var ordering = [];"
@@ -95,16 +94,16 @@ TEST(MicrotaskDeliverySimple) {
 
 TEST(MicrotaskPerIsolateState) {
   HarmonyIsolate isolate;
-  HandleScope scope(isolate.GetIsolate());
+  v8::HandleScope scope(isolate.GetIsolate());
   LocalContext context1(isolate.GetIsolate());
   isolate.GetIsolate()->SetAutorunMicrotasks(false);
   CompileRun(
       "var obj = { calls: 0 };");
-  Handle<Value> obj = CompileRun("obj");
+  v8::Handle<v8::Value> obj = CompileRun("obj");
   {
     LocalContext context2(isolate.GetIsolate());
-    context2->Global()->Set(String::NewFromUtf8(isolate.GetIsolate(), "obj"),
-                            obj);
+    context2->Global()->Set(
+        v8::String::NewFromUtf8(isolate.GetIsolate(), "obj"), obj);
     CompileRun(
         "var resolver = {};"
         "new Promise(function(resolve) {"
@@ -118,8 +117,8 @@ TEST(MicrotaskPerIsolateState) {
   }
   {
     LocalContext context3(isolate.GetIsolate());
-    context3->Global()->Set(String::NewFromUtf8(isolate.GetIsolate(), "obj"),
-                            obj);
+    context3->Global()->Set(
+        v8::String::NewFromUtf8(isolate.GetIsolate(), "obj"), obj);
     CompileRun(
         "var foo = { id: 1 };"
         "Object.observe(foo, function() {"
@@ -129,8 +128,8 @@ TEST(MicrotaskPerIsolateState) {
   }
   {
     LocalContext context4(isolate.GetIsolate());
-    context4->Global()->Set(String::NewFromUtf8(isolate.GetIsolate(), "obj"),
-                            obj);
+    context4->Global()->Set(
+        v8::String::NewFromUtf8(isolate.GetIsolate(), "obj"), obj);
     isolate.GetIsolate()->RunMicrotasks();
     CHECK_EQ(2, CompileRun("obj.calls")->Int32Value());
   }
diff --git a/test/cctest/test-reloc-info.cc b/test/cctest/test-reloc-info.cc
index a238c3a..bbb0116 100644
--- a/test/cctest/test-reloc-info.cc
+++ b/test/cctest/test-reloc-info.cc
@@ -120,4 +120,5 @@ TEST(Positions) {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/test-spaces.cc b/test/cctest/test-spaces.cc
index 848c72b..85b33c9 100644
--- a/test/cctest/test-spaces.cc
+++ b/test/cctest/test-spaces.cc
@@ -145,7 +145,8 @@ class TestCodeRangeScope {
   DISALLOW_COPY_AND_ASSIGN(TestCodeRangeScope);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 static void VerifyMemoryChunk(Isolate* isolate,
diff --git a/test/cctest/test-threads.cc b/test/cctest/test-threads.cc
index e192bc1..5f2cdae 100644
--- a/test/cctest/test-threads.cc
+++ b/test/cctest/test-threads.cc
@@ -32,12 +32,7 @@
 #include "src/isolate.h"
 
 
-enum Turn {
-  FILL_CACHE,
-  CLEAN_CACHE,
-  SECOND_TIME_FILL_CACHE,
-  DONE
-};
+enum Turn { FILL_CACHE, CLEAN_CACHE, SECOND_TIME_FILL_CACHE, CACHE_DONE };
 
 static Turn turn = FILL_CACHE;
 
@@ -76,7 +71,7 @@ class ThreadA : public v8::base::Thread {
     // Rerun the script.
     CHECK(script->Run()->IsTrue());
 
-    turn = DONE;
+    turn = CACHE_DONE;
   }
 };
 
@@ -116,7 +111,7 @@ TEST(JSFunctionResultCachesInTwoThreads) {
   threadA.Join();
   threadB.Join();
 
-  CHECK_EQ(DONE, turn);
+  CHECK_EQ(CACHE_DONE, turn);
 }
 
 class ThreadIdValidationThread : public v8::base::Thread {
diff --git a/test/cctest/test-version.cc b/test/cctest/test-version.cc
index 7de4467..50fca16 100644
--- a/test/cctest/test-version.cc
+++ b/test/cctest/test-version.cc
@@ -46,7 +46,8 @@ void SetVersion(int major, int minor, int build, int patch,
   Version::soname_ = soname;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 static void CheckVersion(int major, int minor, int build,
diff --git a/test/cctest/test-weakmaps.cc b/test/cctest/test-weakmaps.cc
index 1255578..31b812e 100644
--- a/test/cctest/test-weakmaps.cc
+++ b/test/cctest/test-weakmaps.cc
@@ -34,7 +34,6 @@
 
 using namespace v8::internal;
 
-
 static Isolate* GetIsolateFrom(LocalContext* context) {
   return reinterpret_cast<Isolate*>((*context)->GetIsolate());
 }
diff --git a/test/cctest/test-weaksets.cc b/test/cctest/test-weaksets.cc
index 8ed1812..3595af2 100644
--- a/test/cctest/test-weaksets.cc
+++ b/test/cctest/test-weaksets.cc
@@ -34,7 +34,6 @@
 
 using namespace v8::internal;
 
-
 static Isolate* GetIsolateFrom(LocalContext* context) {
   return reinterpret_cast<Isolate*>((*context)->GetIsolate());
 }
diff --git a/test/cctest/trace-extension.cc b/test/cctest/trace-extension.cc
index a95532f..e7f097f 100644
--- a/test/cctest/trace-extension.cc
+++ b/test/cctest/trace-extension.cc
@@ -151,4 +151,5 @@ void TraceExtension::JSEntrySPLevel2(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
-- 
2.7.4