From: mstarzinger <mstarzinger@chromium.org>
Date: Wed, 30 Sep 2015 13:46:56 +0000 (-0700)
Subject: [presubmit] Enable readability/namespace linter checking.
X-Git-Tag: upstream/4.7.83~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52b9bc8f5b8f31cd32c308ee43aa1a4d53bc295d;p=platform%2Fupstream%2Fv8.git

[presubmit] Enable readability/namespace linter checking.

This enables linter checking for "readability/namespace" violations
during presubmit and instead marks the few known exceptions that we
allow explicitly.

R=bmeurer@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#31019}
---

diff --git a/include/v8.h b/include/v8.h
index 3953543..a51da93 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -146,7 +146,7 @@ template<typename T> class CustomArguments;
 class PropertyCallbackArguments;
 class FunctionCallbackArguments;
 class GlobalHandles;
-}
+}  // namespace internal
 
 
 /**
diff --git a/src/accessors.h b/src/accessors.h
index 3c0079d..6c1765c 100644
--- a/src/accessors.h
+++ b/src/accessors.h
@@ -106,6 +106,7 @@ class Accessors : public AllStatic {
       Handle<ExecutableAccessorInfo> accessor);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ACCESSORS_H_
diff --git a/src/allocation-site-scopes.h b/src/allocation-site-scopes.h
index 9e287c1..87b469a 100644
--- a/src/allocation-site-scopes.h
+++ b/src/allocation-site-scopes.h
@@ -95,6 +95,7 @@ class AllocationSiteUsageContext : public AllocationSiteContext {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ALLOCATION_SITE_SCOPES_H_
diff --git a/src/allocation.h b/src/allocation.h
index 292e1fe..7c1e023 100644
--- a/src/allocation.h
+++ b/src/allocation.h
@@ -88,6 +88,7 @@ class FreeStoreAllocationPolicy {
 void* AlignedAlloc(size_t size, size_t alignment);
 void AlignedFree(void *ptr);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ALLOCATION_H_
diff --git a/src/api.h b/src/api.h
index 1229279..62ce67c 100644
--- a/src/api.h
+++ b/src/api.h
@@ -642,6 +642,7 @@ class Testing {
   static v8::Testing::StressType stress_type_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_API_H_
diff --git a/src/arguments.h b/src/arguments.h
index ed995e7..63a3706 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -283,6 +283,7 @@ static Type __RT_impl_##Name(Arguments args, Isolate* isolate)
 #define RUNTIME_FUNCTION_RETURN_PAIR(Name) \
     RUNTIME_FUNCTION_RETURNS_TYPE(ObjectPair, Name)
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARGUMENTS_H_
diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h
index 8f8956c..ff44f40 100644
--- a/src/arm/assembler-arm-inl.h
+++ b/src/arm/assembler-arm-inl.h
@@ -666,6 +666,7 @@ void Assembler::set_target_address_at(Address pc, Address constant_pool,
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_ASSEMBLER_ARM_INL_H_
diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
index 1d1cc48..2ada571 100644
--- a/src/arm/assembler-arm.h
+++ b/src/arm/assembler-arm.h
@@ -1667,6 +1667,7 @@ class EnsureSpace BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_ASSEMBLER_ARM_H_
diff --git a/src/arm/code-stubs-arm.h b/src/arm/code-stubs-arm.h
index e572fd9..845e38a 100644
--- a/src/arm/code-stubs-arm.h
+++ b/src/arm/code-stubs-arm.h
@@ -311,6 +311,7 @@ class NameDictionaryLookupStub: public PlatformCodeStub {
   DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_CODE_STUBS_ARM_H_
diff --git a/src/arm/codegen-arm.h b/src/arm/codegen-arm.h
index d36ce59..f54fb71 100644
--- a/src/arm/codegen-arm.h
+++ b/src/arm/codegen-arm.h
@@ -44,6 +44,7 @@ class MathExpGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_CODEGEN_ARM_H_
diff --git a/src/arm/constants-arm.h b/src/arm/constants-arm.h
index 6d544f3..efc060a 100644
--- a/src/arm/constants-arm.h
+++ b/src/arm/constants-arm.h
@@ -702,6 +702,7 @@ class VFPRegisters {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_CONSTANTS_ARM_H_
diff --git a/src/arm/frames-arm.h b/src/arm/frames-arm.h
index dcba34f..1ea7b1a 100644
--- a/src/arm/frames-arm.h
+++ b/src/arm/frames-arm.h
@@ -128,6 +128,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_FRAMES_ARM_H_
diff --git a/src/arm/interface-descriptors-arm.h b/src/arm/interface-descriptors-arm.h
index 6201adc..a649279 100644
--- a/src/arm/interface-descriptors-arm.h
+++ b/src/arm/interface-descriptors-arm.h
@@ -20,7 +20,7 @@ class PlatformInterfaceDescriptor {
  private:
   TargetAddressStorageMode storage_mode_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_INTERFACE_DESCRIPTORS_ARM_H_
diff --git a/src/arm/lithium-arm.h b/src/arm/lithium-arm.h
index 8954710..a3dac05 100644
--- a/src/arm/lithium-arm.h
+++ b/src/arm/lithium-arm.h
@@ -2885,6 +2885,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_LITHIUM_ARM_H_
diff --git a/src/arm/lithium-codegen-arm.h b/src/arm/lithium-codegen-arm.h
index dc58479..47f5cea 100644
--- a/src/arm/lithium-codegen-arm.h
+++ b/src/arm/lithium-codegen-arm.h
@@ -393,6 +393,7 @@ class LDeferredCode : public ZoneObject {
   int instruction_index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_LITHIUM_CODEGEN_ARM_H_
diff --git a/src/arm/lithium-gap-resolver-arm.h b/src/arm/lithium-gap-resolver-arm.h
index 88f1a7b..06cefef 100644
--- a/src/arm/lithium-gap-resolver-arm.h
+++ b/src/arm/lithium-gap-resolver-arm.h
@@ -57,6 +57,7 @@ class LGapResolver final BASE_EMBEDDED {
   bool need_to_restore_root_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_LITHIUM_GAP_RESOLVER_ARM_H_
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
index d78bf8f..9787818 100644
--- a/src/arm/macro-assembler-arm.h
+++ b/src/arm/macro-assembler-arm.h
@@ -1564,6 +1564,7 @@ inline MemOperand GlobalObjectOperand()  {
 #endif
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_MACRO_ASSEMBLER_ARM_H_
diff --git a/src/arm/simulator-arm.h b/src/arm/simulator-arm.h
index a972a77..0c6aaf8 100644
--- a/src/arm/simulator-arm.h
+++ b/src/arm/simulator-arm.h
@@ -55,7 +55,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #else  // !defined(USE_SIMULATOR)
 // Running with a simulator.
@@ -459,7 +460,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_ARM_SIMULATOR_ARM_H_
diff --git a/src/arm64/assembler-arm64-inl.h b/src/arm64/assembler-arm64-inl.h
index f02207f..15085d5 100644
--- a/src/arm64/assembler-arm64-inl.h
+++ b/src/arm64/assembler-arm64-inl.h
@@ -1259,6 +1259,7 @@ void Assembler::ClearRecordedAstId() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_ASSEMBLER_ARM64_INL_H_
diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
index f20be83..3fa8513 100644
--- a/src/arm64/assembler-arm64.h
+++ b/src/arm64/assembler-arm64.h
@@ -2296,6 +2296,7 @@ class EnsureSpace BASE_EMBEDDED {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_ASSEMBLER_ARM64_H_
diff --git a/src/arm64/code-stubs-arm64.h b/src/arm64/code-stubs-arm64.h
index 1b64a62..34115338 100644
--- a/src/arm64/code-stubs-arm64.h
+++ b/src/arm64/code-stubs-arm64.h
@@ -384,6 +384,7 @@ class NameDictionaryLookupStub: public PlatformCodeStub {
   DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_CODE_STUBS_ARM64_H_
diff --git a/src/arm64/codegen-arm64.h b/src/arm64/codegen-arm64.h
index 2f01c51..7100ef1 100644
--- a/src/arm64/codegen-arm64.h
+++ b/src/arm64/codegen-arm64.h
@@ -43,6 +43,7 @@ class MathExpGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_CODEGEN_ARM64_H_
diff --git a/src/arm64/constants-arm64.h b/src/arm64/constants-arm64.h
index 1529c64..db68e42 100644
--- a/src/arm64/constants-arm64.h
+++ b/src/arm64/constants-arm64.h
@@ -1237,6 +1237,7 @@ enum UnallocatedOp {
   UnallocatedFMask = 0x00000000
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_CONSTANTS_ARM64_H_
diff --git a/src/arm64/decoder-arm64-inl.h b/src/arm64/decoder-arm64-inl.h
index c29f2d3..e00105e 100644
--- a/src/arm64/decoder-arm64-inl.h
+++ b/src/arm64/decoder-arm64-inl.h
@@ -644,6 +644,7 @@ void Decoder<V>::DecodeAdvSIMDDataProcessing(Instruction* instr) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_DECODER_ARM64_INL_H_
diff --git a/src/arm64/decoder-arm64.h b/src/arm64/decoder-arm64.h
index 6140bc2..b1ef41f 100644
--- a/src/arm64/decoder-arm64.h
+++ b/src/arm64/decoder-arm64.h
@@ -181,6 +181,7 @@ class Decoder : public V {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_DECODER_ARM64_H_
diff --git a/src/arm64/delayed-masm-arm64-inl.h b/src/arm64/delayed-masm-arm64-inl.h
index 2c44630..54239a1 100644
--- a/src/arm64/delayed-masm-arm64-inl.h
+++ b/src/arm64/delayed-masm-arm64-inl.h
@@ -50,6 +50,7 @@ void DelayedMasm::LoadObject(Register result, Handle<Object> object) {
 
 #undef __
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_DELAYED_MASM_ARM64_INL_H_
diff --git a/src/arm64/delayed-masm-arm64.h b/src/arm64/delayed-masm-arm64.h
index 76227a3..92daed2 100644
--- a/src/arm64/delayed-masm-arm64.h
+++ b/src/arm64/delayed-masm-arm64.h
@@ -159,6 +159,7 @@ class DelayedMasm BASE_EMBEDDED {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_DELAYED_MASM_ARM64_H_
diff --git a/src/arm64/disasm-arm64.h b/src/arm64/disasm-arm64.h
index c6b189b..cd43af3 100644
--- a/src/arm64/disasm-arm64.h
+++ b/src/arm64/disasm-arm64.h
@@ -85,6 +85,7 @@ class PrintDisassembler: public Disassembler {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_DISASM_ARM64_H
diff --git a/src/arm64/frames-arm64.h b/src/arm64/frames-arm64.h
index 9e65517..7835144 100644
--- a/src/arm64/frames-arm64.h
+++ b/src/arm64/frames-arm64.h
@@ -63,6 +63,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_FRAMES_ARM64_H_
diff --git a/src/arm64/instructions-arm64.h b/src/arm64/instructions-arm64.h
index 145a7c9..5c652e3 100644
--- a/src/arm64/instructions-arm64.h
+++ b/src/arm64/instructions-arm64.h
@@ -532,7 +532,8 @@ enum DebugParameters {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_ARM64_INSTRUCTIONS_ARM64_H_
diff --git a/src/arm64/instrument-arm64.h b/src/arm64/instrument-arm64.h
index 86ddfcb..02816e9 100644
--- a/src/arm64/instrument-arm64.h
+++ b/src/arm64/instrument-arm64.h
@@ -80,6 +80,7 @@ class Instrument: public DecoderVisitor {
   uint64_t sample_period_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_INSTRUMENT_ARM64_H_
diff --git a/src/arm64/interface-descriptors-arm64.h b/src/arm64/interface-descriptors-arm64.h
index 76def88..20ab8cb 100644
--- a/src/arm64/interface-descriptors-arm64.h
+++ b/src/arm64/interface-descriptors-arm64.h
@@ -20,7 +20,7 @@ class PlatformInterfaceDescriptor {
  private:
   TargetAddressStorageMode storage_mode_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_INTERFACE_DESCRIPTORS_ARM64_H_
diff --git a/src/arm64/lithium-arm64.h b/src/arm64/lithium-arm64.h
index a77a6da..4a06025 100644
--- a/src/arm64/lithium-arm64.h
+++ b/src/arm64/lithium-arm64.h
@@ -3254,6 +3254,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_LITHIUM_ARM64_H_
diff --git a/src/arm64/lithium-codegen-arm64.h b/src/arm64/lithium-codegen-arm64.h
index 20e572c..8be1cfe 100644
--- a/src/arm64/lithium-codegen-arm64.h
+++ b/src/arm64/lithium-codegen-arm64.h
@@ -460,6 +460,7 @@ class BranchGenerator BASE_EMBEDDED {
   LCodeGen* codegen_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_LITHIUM_CODEGEN_ARM64_H_
diff --git a/src/arm64/lithium-gap-resolver-arm64.h b/src/arm64/lithium-gap-resolver-arm64.h
index 8866db4..e362df1 100644
--- a/src/arm64/lithium-gap-resolver-arm64.h
+++ b/src/arm64/lithium-gap-resolver-arm64.h
@@ -92,6 +92,7 @@ class LGapResolver BASE_EMBEDDED {
   LOperand* saved_destination_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_LITHIUM_GAP_RESOLVER_ARM64_H_
diff --git a/src/arm64/macro-assembler-arm64-inl.h b/src/arm64/macro-assembler-arm64-inl.h
index 445513b..9b4abe5 100644
--- a/src/arm64/macro-assembler-arm64-inl.h
+++ b/src/arm64/macro-assembler-arm64-inl.h
@@ -1683,6 +1683,7 @@ void MacroAssembler::AnnotateInstrumentation(const char* marker_name) {
   movn(xzr, (marker_name[1] << 8) | marker_name[0]);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_MACRO_ASSEMBLER_ARM64_INL_H_
diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h
index 769140d..ade2e36 100644
--- a/src/arm64/macro-assembler-arm64.h
+++ b/src/arm64/macro-assembler-arm64.h
@@ -2278,7 +2278,8 @@ class InlineSmiCheckInfo {
   class DeltaBits : public BitField<uint32_t, 5, 32-5> {};
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #ifdef GENERATED_CODE_COVERAGE
 #error "Unsupported option"
diff --git a/src/arm64/simulator-arm64.h b/src/arm64/simulator-arm64.h
index e4d9a81..a86a7ad 100644
--- a/src/arm64/simulator-arm64.h
+++ b/src/arm64/simulator-arm64.h
@@ -911,6 +911,7 @@ class SimulatorStack : public v8::internal::AllStatic {
 
 #endif  // !defined(USE_SIMULATOR)
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_SIMULATOR_ARM64_H_
diff --git a/src/arm64/utils-arm64.h b/src/arm64/utils-arm64.h
index da91fd5..df42973 100644
--- a/src/arm64/utils-arm64.h
+++ b/src/arm64/utils-arm64.h
@@ -151,6 +151,7 @@ inline float FusedMultiplyAdd(float op1, float op2, float a) {
   return fmaf(op1, op2, a);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM64_UTILS_ARM64_H_
diff --git a/src/assembler.h b/src/assembler.h
index 433b9b8..f218112 100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -1277,6 +1277,7 @@ class ConstantPoolBuilder BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ASSEMBLER_H_
diff --git a/src/assert-scope.h b/src/assert-scope.h
index 8757a32..84e6990 100644
--- a/src/assert-scope.h
+++ b/src/assert-scope.h
@@ -170,6 +170,7 @@ typedef PerIsolateAssertScopeDebugOnly<COMPILATION_ASSERT, false>
 // Scope to introduce an exception to DisallowDeoptimization.
 typedef PerIsolateAssertScopeDebugOnly<COMPILATION_ASSERT, true>
     AllowCompilation;
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ASSERT_SCOPE_H_
diff --git a/src/ast-expression-visitor.cc b/src/ast-expression-visitor.cc
index 782d4bb..4a4bc60 100644
--- a/src/ast-expression-visitor.cc
+++ b/src/ast-expression-visitor.cc
@@ -350,7 +350,7 @@ void AstExpressionVisitor::VisitSuperPropertyReference(
 
 
 void AstExpressionVisitor::VisitSuperCallReference(SuperCallReference* expr) {}
-}
 
 
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ast-expression-visitor.h b/src/ast-expression-visitor.h
index 43b34ba..b2b1f43 100644
--- a/src/ast-expression-visitor.h
+++ b/src/ast-expression-visitor.h
@@ -43,7 +43,7 @@ class AstExpressionVisitor : public AstVisitor {
 
   DISALLOW_COPY_AND_ASSIGN(AstExpressionVisitor);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_AST_EXPRESSION_VISITOR_H_
diff --git a/src/ast-literal-reindexer.cc b/src/ast-literal-reindexer.cc
index e5729c7..c0052ac 100644
--- a/src/ast-literal-reindexer.cc
+++ b/src/ast-literal-reindexer.cc
@@ -316,5 +316,5 @@ void AstLiteralReindexer::VisitFunctionLiteral(FunctionLiteral* node) {
 void AstLiteralReindexer::Reindex(Expression* pattern) {
   pattern->Accept(this);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/ast-literal-reindexer.h b/src/ast-literal-reindexer.h
index 2fe920b..9d48d21 100644
--- a/src/ast-literal-reindexer.h
+++ b/src/ast-literal-reindexer.h
@@ -39,7 +39,7 @@ class AstLiteralReindexer final : public AstVisitor {
 
   DISALLOW_COPY_AND_ASSIGN(AstLiteralReindexer);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_AST_LITERAL_REINDEXER
diff --git a/src/ast-value-factory.cc b/src/ast-value-factory.cc
index 68cf015..e790ea2 100644
--- a/src/ast-value-factory.cc
+++ b/src/ast-value-factory.cc
@@ -49,7 +49,7 @@ class OneByteStringStream {
   int pos_;
 };
 
-}
+}  // namespace
 
 class AstRawStringInternalizationKey : public HashTableKey {
  public:
diff --git a/src/ast-value-factory.h b/src/ast-value-factory.h
index 69fc6cc..c2bfb83 100644
--- a/src/ast-value-factory.h
+++ b/src/ast-value-factory.h
@@ -366,7 +366,8 @@ class AstValueFactory {
   OTHER_CONSTANTS(F)
 #undef F
 };
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #undef STRING_CONSTANTS
 #undef OTHER_CONSTANTS
diff --git a/src/ast.h b/src/ast.h
index 4764918..9784797 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -3622,6 +3622,7 @@ class AstNodeFactory final BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_AST_H_
diff --git a/src/background-parsing-task.h b/src/background-parsing-task.h
index e999161..c224303 100644
--- a/src/background-parsing-task.h
+++ b/src/background-parsing-task.h
@@ -54,7 +54,7 @@ class BackgroundParsingTask : public ScriptCompiler::ScriptStreamingTask {
   StreamedSource* source_;  // Not owned.
   int stack_size_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_BACKGROUND_PARSING_TASK_H_
diff --git a/src/base/atomicops.h b/src/base/atomicops.h
index e76b3d0..3e628fe 100644
--- a/src/base/atomicops.h
+++ b/src/base/atomicops.h
@@ -133,7 +133,8 @@ Atomic64 Acquire_Load(volatile const Atomic64* ptr);
 Atomic64 Release_Load(volatile const Atomic64* ptr);
 #endif  // V8_HOST_ARCH_64_BIT
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 // Include our platform specific implementation.
 #if defined(THREAD_SANITIZER)
diff --git a/src/base/atomicops_internals_arm64_gcc.h b/src/base/atomicops_internals_arm64_gcc.h
index b01783e..f24050a 100644
--- a/src/base/atomicops_internals_arm64_gcc.h
+++ b/src/base/atomicops_internals_arm64_gcc.h
@@ -311,6 +311,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
   return *ptr;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_ARM_GCC_H_
diff --git a/src/base/atomicops_internals_arm_gcc.h b/src/base/atomicops_internals_arm_gcc.h
index e399657..f4c9d8c 100644
--- a/src/base/atomicops_internals_arm_gcc.h
+++ b/src/base/atomicops_internals_arm_gcc.h
@@ -296,6 +296,7 @@ inline void NoBarrier_Store(volatile Atomic8* ptr, Atomic8 value) {
 
 inline Atomic8 NoBarrier_Load(volatile const Atomic8* ptr) { return *ptr; }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_ARM_GCC_H_
diff --git a/src/base/atomicops_internals_atomicword_compat.h b/src/base/atomicops_internals_atomicword_compat.h
index 0530ced..4f758a7 100644
--- a/src/base/atomicops_internals_atomicword_compat.h
+++ b/src/base/atomicops_internals_atomicword_compat.h
@@ -92,7 +92,8 @@ inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
       reinterpret_cast<volatile const Atomic32*>(ptr));
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // !defined(V8_HOST_ARCH_64_BIT)
 
diff --git a/src/base/atomicops_internals_mac.h b/src/base/atomicops_internals_mac.h
index 84f9dbc..c112506 100644
--- a/src/base/atomicops_internals_mac.h
+++ b/src/base/atomicops_internals_mac.h
@@ -210,6 +210,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
 #endif  // defined(__LP64__)
 
 #undef ATOMICOPS_COMPILER_BARRIER
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_MAC_H_
diff --git a/src/base/atomicops_internals_mips64_gcc.h b/src/base/atomicops_internals_mips64_gcc.h
index ccb973c..85b4e46 100644
--- a/src/base/atomicops_internals_mips64_gcc.h
+++ b/src/base/atomicops_internals_mips64_gcc.h
@@ -302,6 +302,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
   return *ptr;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_
diff --git a/src/base/atomicops_internals_mips_gcc.h b/src/base/atomicops_internals_mips_gcc.h
index 442fdd0..8d65db2 100644
--- a/src/base/atomicops_internals_mips_gcc.h
+++ b/src/base/atomicops_internals_mips_gcc.h
@@ -155,6 +155,7 @@ inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
   return *ptr;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_
diff --git a/src/base/atomicops_internals_portable.h b/src/base/atomicops_internals_portable.h
index a3a6e74..bb99973 100644
--- a/src/base/atomicops_internals_portable.h
+++ b/src/base/atomicops_internals_portable.h
@@ -132,7 +132,7 @@ inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
 inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
   return __sync_add_and_fetch(ptr, 0);
 }
-}
-}  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_
diff --git a/src/base/atomicops_internals_ppc_gcc.h b/src/base/atomicops_internals_ppc_gcc.h
index daa27b4..0d16500 100644
--- a/src/base/atomicops_internals_ppc_gcc.h
+++ b/src/base/atomicops_internals_ppc_gcc.h
@@ -162,7 +162,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
 }
 
 #endif
-}
-}  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_PPC_GCC_H_
diff --git a/src/base/atomicops_internals_x86_gcc.cc b/src/base/atomicops_internals_x86_gcc.cc
index ab7dd8d..c031030 100644
--- a/src/base/atomicops_internals_x86_gcc.cc
+++ b/src/base/atomicops_internals_x86_gcc.cc
@@ -47,7 +47,8 @@ struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures = {
 #endif
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 namespace {
 
diff --git a/src/base/atomicops_internals_x86_gcc.h b/src/base/atomicops_internals_x86_gcc.h
index ec87c42..55bc44c 100644
--- a/src/base/atomicops_internals_x86_gcc.h
+++ b/src/base/atomicops_internals_x86_gcc.h
@@ -267,7 +267,8 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
 
 #endif  // defined(__x86_64__)
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #undef ATOMICOPS_COMPILER_BARRIER
 
diff --git a/src/base/atomicops_internals_x86_msvc.h b/src/base/atomicops_internals_x86_msvc.h
index adc4031..c37bc78 100644
--- a/src/base/atomicops_internals_x86_msvc.h
+++ b/src/base/atomicops_internals_x86_msvc.h
@@ -197,6 +197,7 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
 
 #endif  // defined(_WIN64)
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
diff --git a/src/base/cpu.cc b/src/base/cpu.cc
index 4f58720..692494a 100644
--- a/src/base/cpu.cc
+++ b/src/base/cpu.cc
@@ -691,4 +691,5 @@ CPU::CPU()
 #endif  // V8_HOST_ARCH_PPC
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/cpu.h b/src/base/cpu.h
index 1dc0a91..ca108fa 100644
--- a/src/base/cpu.h
+++ b/src/base/cpu.h
@@ -145,6 +145,7 @@ class CPU final {
   bool is_fp64_mode_;
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_CPU_H_
diff --git a/src/base/lazy-instance.h b/src/base/lazy-instance.h
index a20689a..4c0a3f8 100644
--- a/src/base/lazy-instance.h
+++ b/src/base/lazy-instance.h
@@ -232,6 +232,7 @@ struct LazyDynamicInstance {
       CreateTrait, InitOnceTrait, DestroyTrait> type;
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_LAZY_INSTANCE_H_
diff --git a/src/base/macros.h b/src/base/macros.h
index 6dc96f4..f47b0b9 100644
--- a/src/base/macros.h
+++ b/src/base/macros.h
@@ -417,7 +417,8 @@ template <>
 inline bool is_fundamental<uint8_t>() {
   return true;
 }
-}
-}  // namespace v8::base
+
+}  // namespace base
+}  // namespace v8
 
 #endif   // V8_BASE_MACROS_H_
diff --git a/src/base/once.cc b/src/base/once.cc
index eaabf40..818a9f2 100644
--- a/src/base/once.cc
+++ b/src/base/once.cc
@@ -50,4 +50,5 @@ void CallOnceImpl(OnceType* once, PointerArgFunction init_func, void* arg) {
   }
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/once.h b/src/base/once.h
index 6bf741d..790a886 100644
--- a/src/base/once.h
+++ b/src/base/once.h
@@ -97,6 +97,7 @@ inline void CallOnce(OnceType* once,
   }
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_ONCE_H_
diff --git a/src/base/platform/condition-variable.cc b/src/base/platform/condition-variable.cc
index e5b9bd0..fcd6cf7 100644
--- a/src/base/platform/condition-variable.cc
+++ b/src/base/platform/condition-variable.cc
@@ -313,4 +313,5 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
 
 #endif  // V8_OS_POSIX
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/condition-variable.h b/src/base/platform/condition-variable.h
index 9cb7064..72d6f28 100644
--- a/src/base/platform/condition-variable.h
+++ b/src/base/platform/condition-variable.h
@@ -113,6 +113,7 @@ typedef LazyStaticInstance<
 
 #define LAZY_CONDITION_VARIABLE_INITIALIZER LAZY_STATIC_INSTANCE_INITIALIZER
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_CONDITION_VARIABLE_H_
diff --git a/src/base/platform/elapsed-timer.h b/src/base/platform/elapsed-timer.h
index 3fe7e8f..f9a9ef4 100644
--- a/src/base/platform/elapsed-timer.h
+++ b/src/base/platform/elapsed-timer.h
@@ -92,6 +92,7 @@ class ElapsedTimer final {
 #endif
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_ELAPSED_TIMER_H_
diff --git a/src/base/platform/mutex.cc b/src/base/platform/mutex.cc
index 8b1e305..1401605 100644
--- a/src/base/platform/mutex.cc
+++ b/src/base/platform/mutex.cc
@@ -188,4 +188,5 @@ bool RecursiveMutex::TryLock() {
   return true;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/mutex.h b/src/base/platform/mutex.h
index 18e85de..61df19d 100644
--- a/src/base/platform/mutex.h
+++ b/src/base/platform/mutex.h
@@ -210,6 +210,7 @@ class LockGuard final {
   DISALLOW_COPY_AND_ASSIGN(LockGuard);
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_MUTEX_H_
diff --git a/src/base/platform/platform-aix.cc b/src/base/platform/platform-aix.cc
index 03e9aa3..ea2824d 100644
--- a/src/base/platform/platform-aix.cc
+++ b/src/base/platform/platform-aix.cc
@@ -239,5 +239,5 @@ bool VirtualMemory::ReleaseRegion(void* base, size_t size) {
 
 
 bool VirtualMemory::HasLazyCommits() { return true; }
-}
-}  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-cygwin.cc b/src/base/platform/platform-cygwin.cc
index 18f151a..a49e287 100644
--- a/src/base/platform/platform-cygwin.cc
+++ b/src/base/platform/platform-cygwin.cc
@@ -252,4 +252,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-freebsd.cc b/src/base/platform/platform-freebsd.cc
index b279e0c..8b33980 100644
--- a/src/base/platform/platform-freebsd.cc
+++ b/src/base/platform/platform-freebsd.cc
@@ -255,4 +255,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-linux.cc b/src/base/platform/platform-linux.cc
index 2a2abfe..a4b742a 100644
--- a/src/base/platform/platform-linux.cc
+++ b/src/base/platform/platform-linux.cc
@@ -388,4 +388,5 @@ bool VirtualMemory::HasLazyCommits() {
   return true;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-macos.cc b/src/base/platform/platform-macos.cc
index f16f329..419281f 100644
--- a/src/base/platform/platform-macos.cc
+++ b/src/base/platform/platform-macos.cc
@@ -249,4 +249,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-openbsd.cc b/src/base/platform/platform-openbsd.cc
index 369dd8e..af145e2 100644
--- a/src/base/platform/platform-openbsd.cc
+++ b/src/base/platform/platform-openbsd.cc
@@ -286,4 +286,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-qnx.cc b/src/base/platform/platform-qnx.cc
index b166528..3c90467 100644
--- a/src/base/platform/platform-qnx.cc
+++ b/src/base/platform/platform-qnx.cc
@@ -312,4 +312,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform-solaris.cc b/src/base/platform/platform-solaris.cc
index 7e07f1a..a2ce2c1 100644
--- a/src/base/platform/platform-solaris.cc
+++ b/src/base/platform/platform-solaris.cc
@@ -208,4 +208,5 @@ bool VirtualMemory::HasLazyCommits() {
   return false;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/platform.h b/src/base/platform/platform.h
index 2d08ecb..b96a207 100644
--- a/src/base/platform/platform.h
+++ b/src/base/platform/platform.h
@@ -479,6 +479,7 @@ class Thread {
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_PLATFORM_H_
diff --git a/src/base/platform/semaphore.cc b/src/base/platform/semaphore.cc
index 0679c00..d542862 100644
--- a/src/base/platform/semaphore.cc
+++ b/src/base/platform/semaphore.cc
@@ -201,4 +201,5 @@ bool Semaphore::WaitFor(const TimeDelta& rel_time) {
 
 #endif  // V8_OS_MACOSX
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/semaphore.h b/src/base/platform/semaphore.h
index fa13101..18700d1 100644
--- a/src/base/platform/semaphore.h
+++ b/src/base/platform/semaphore.h
@@ -96,6 +96,7 @@ struct LazySemaphore {
 
 #define LAZY_SEMAPHORE_INITIALIZER LAZY_DYNAMIC_INSTANCE_INITIALIZER
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_SEMAPHORE_H_
diff --git a/src/base/platform/time.cc b/src/base/platform/time.cc
index 5162182..e847d54 100644
--- a/src/base/platform/time.cc
+++ b/src/base/platform/time.cc
@@ -644,4 +644,5 @@ bool TimeTicks::KernelTimestampAvailable() {
 
 #endif  // V8_OS_WIN
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/platform/time.h b/src/base/platform/time.h
index 5fc01e8..29300e5 100644
--- a/src/base/platform/time.h
+++ b/src/base/platform/time.h
@@ -398,6 +398,7 @@ inline TimeTicks operator+(const TimeDelta& delta, const TimeTicks& ticks) {
   return ticks + delta;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_PLATFORM_TIME_H_
diff --git a/src/base/utils/random-number-generator.cc b/src/base/utils/random-number-generator.cc
index 29a48ff..4cf06a9 100644
--- a/src/base/utils/random-number-generator.cc
+++ b/src/base/utils/random-number-generator.cc
@@ -136,4 +136,5 @@ void RandomNumberGenerator::SetSeed(int64_t seed) {
   seed_ = (seed ^ kMultiplier) & kMask;
 }
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
diff --git a/src/base/utils/random-number-generator.h b/src/base/utils/random-number-generator.h
index 62c6b27..10f2789 100644
--- a/src/base/utils/random-number-generator.h
+++ b/src/base/utils/random-number-generator.h
@@ -94,6 +94,7 @@ class RandomNumberGenerator final {
   int64_t seed_;
 };
 
-} }  // namespace v8::base
+}  // namespace base
+}  // namespace v8
 
 #endif  // V8_BASE_UTILS_RANDOM_NUMBER_GENERATOR_H_
diff --git a/src/bignum-dtoa.h b/src/bignum-dtoa.h
index d42801b..dab27ba 100644
--- a/src/bignum-dtoa.h
+++ b/src/bignum-dtoa.h
@@ -55,6 +55,7 @@ enum BignumDtoaMode {
 void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits,
                 Vector<char> buffer, int* length, int* point);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_BIGNUM_DTOA_H_
diff --git a/src/bignum.h b/src/bignum.h
index 7ebdae4..167c184 100644
--- a/src/bignum.h
+++ b/src/bignum.h
@@ -115,6 +115,7 @@ class Bignum {
   DISALLOW_COPY_AND_ASSIGN(Bignum);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_BIGNUM_H_
diff --git a/src/bootstrapper.h b/src/bootstrapper.h
index 659d74a..105c2d0 100644
--- a/src/bootstrapper.h
+++ b/src/bootstrapper.h
@@ -176,6 +176,7 @@ class NativesExternalStringResource final
   size_t length_;
 };
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_BOOTSTRAPPER_H_
diff --git a/src/builtins.h b/src/builtins.h
index d912960..db4dfed 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -326,6 +326,7 @@ class Builtins {
   DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_BUILTINS_H_
diff --git a/src/cached-powers.h b/src/cached-powers.h
index bfe3635..fade5c9 100644
--- a/src/cached-powers.h
+++ b/src/cached-powers.h
@@ -37,6 +37,7 @@ class PowersOfTenCache {
                                                int* found_exponent);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CACHED_POWERS_H_
diff --git a/src/char-predicates-inl.h b/src/char-predicates-inl.h
index d90f919..ab5caa7 100644
--- a/src/char-predicates-inl.h
+++ b/src/char-predicates-inl.h
@@ -85,6 +85,7 @@ inline bool IsRegExpNewline(uc16 c) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CHAR_PREDICATES_INL_H_
diff --git a/src/char-predicates.h b/src/char-predicates.h
index 89f4171..3161ae4 100644
--- a/src/char-predicates.h
+++ b/src/char-predicates.h
@@ -79,6 +79,7 @@ struct WhiteSpaceOrLineTerminator {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CHAR_PREDICATES_H_
diff --git a/src/checks.h b/src/checks.h
index bd79866..80404e8 100644
--- a/src/checks.h
+++ b/src/checks.h
@@ -23,7 +23,8 @@ extern bool FLAG_enable_slow_asserts;
 const bool FLAG_enable_slow_asserts = false;
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #define DCHECK_TAG_ALIGNED(address)             \
   DCHECK((reinterpret_cast<intptr_t>(address) & \
diff --git a/src/code-stubs.h b/src/code-stubs.h
index 163fdd8..f5f8bd2 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -597,7 +597,8 @@ class RuntimeCallHelper {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #if V8_TARGET_ARCH_IA32
 #include "src/ia32/code-stubs-ia32.h"
diff --git a/src/codegen.h b/src/codegen.h
index 04f1309..7019d3d 100644
--- a/src/codegen.h
+++ b/src/codegen.h
@@ -170,6 +170,7 @@ class CodeAgingHelper {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CODEGEN_H_
diff --git a/src/compilation-cache.h b/src/compilation-cache.h
index 2d7609e..2295f4c 100644
--- a/src/compilation-cache.h
+++ b/src/compilation-cache.h
@@ -236,6 +236,7 @@ class CompilationCache {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILATION_CACHE_H_
diff --git a/src/compilation-dependencies.h b/src/compilation-dependencies.h
index c142208..e7ee58f 100644
--- a/src/compilation-dependencies.h
+++ b/src/compilation-dependencies.h
@@ -61,7 +61,7 @@ class CompilationDependencies {
   DependentCode* Get(Handle<Object> object);
   void Set(Handle<Object> object, Handle<DependentCode> dep);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DEPENDENCIES_H_
diff --git a/src/compiler.h b/src/compiler.h
index 45cf7b5..ed38559 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -716,6 +716,7 @@ class CompilationPhase BASE_EMBEDDED {
   DISALLOW_COPY_AND_ASSIGN(CompilationPhase);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILER_H_
diff --git a/src/compiler/arm64/instruction-codes-arm64.h b/src/compiler/arm64/instruction-codes-arm64.h
index c2a52af..cbc0ac4 100644
--- a/src/compiler/arm64/instruction-codes-arm64.h
+++ b/src/compiler/arm64/instruction-codes-arm64.h
@@ -158,8 +158,8 @@ namespace compiler {
   V(Operand2_R_SXTB)  /* %r0 SXTB (signed extend byte) */       \
   V(Operand2_R_SXTH)  /* %r0 SXTH (signed extend halfword) */
 
-}  // namespace internal
 }  // namespace compiler
+}  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_ARM64_INSTRUCTION_CODES_ARM64_H_
diff --git a/src/compiler/ast-loop-assignment-analyzer.h b/src/compiler/ast-loop-assignment-analyzer.h
index cd56d0a..c2b47a7 100644
--- a/src/compiler/ast-loop-assignment-analyzer.h
+++ b/src/compiler/ast-loop-assignment-analyzer.h
@@ -70,8 +70,8 @@ class AstLoopAssignmentAnalyzer : public AstVisitor {
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
   DISALLOW_COPY_AND_ASSIGN(AstLoopAssignmentAnalyzer);
 };
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILER_AST_LOOP_ASSIGNMENT_ANALYZER_H_
diff --git a/src/compiler/c-linkage.cc b/src/compiler/c-linkage.cc
index 76ddd2e..af5f813 100644
--- a/src/compiler/c-linkage.cc
+++ b/src/compiler/c-linkage.cc
@@ -223,6 +223,7 @@ CallDescriptor* Linkage::GetSimplifiedCDescriptor(
       CallDescriptor::kNoFlags,      // flags
       "c-call");
 }
-}
-}
-}
+
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
diff --git a/src/compiler/frame.h b/src/compiler/frame.h
index 0b06678..9764b26 100644
--- a/src/compiler/frame.h
+++ b/src/compiler/frame.h
@@ -184,8 +184,8 @@ class FrameOffset {
   static const int kFromSp = 1;
   static const int kFromFp = 0;
 };
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILER_FRAME_H_
diff --git a/src/compiler/interpreter-assembler.cc b/src/compiler/interpreter-assembler.cc
index 1f5c0a2..43ef6db 100644
--- a/src/compiler/interpreter-assembler.cc
+++ b/src/compiler/interpreter-assembler.cc
@@ -452,6 +452,6 @@ Schedule* InterpreterAssembler::schedule() {
 Zone* InterpreterAssembler::zone() { return raw_assembler_->zone(); }
 
 
-}  // namespace interpreter
+}  // namespace compiler
 }  // namespace internal
 }  // namespace v8
diff --git a/src/compiler/interpreter-assembler.h b/src/compiler/interpreter-assembler.h
index 67ab9cc..f77ed22 100644
--- a/src/compiler/interpreter-assembler.h
+++ b/src/compiler/interpreter-assembler.h
@@ -178,7 +178,7 @@ class InterpreterAssembler {
   DISALLOW_COPY_AND_ASSIGN(InterpreterAssembler);
 };
 
-}  // namespace interpreter
+}  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
diff --git a/src/compiler/verifier.h b/src/compiler/verifier.h
index cee323e..428558d 100644
--- a/src/compiler/verifier.h
+++ b/src/compiler/verifier.h
@@ -56,8 +56,8 @@ class ScheduleVerifier {
  public:
   static void Run(Schedule* schedule);
 };
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILER_VERIFIER_H_
diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
index 4c99171..4954705 100644
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -1816,6 +1816,6 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
 
 #undef __
 
-}  // namespace internal
 }  // namespace compiler
+}  // namespace internal
 }  // namespace v8
diff --git a/src/context-measure.cc b/src/context-measure.cc
index da4aae4..0b87e39 100644
--- a/src/context-measure.cc
+++ b/src/context-measure.cc
@@ -74,5 +74,5 @@ void ContextMeasure::VisitPointers(Object** start, Object** end) {
     MeasureObject(HeapObject::cast(*current));
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/context-measure.h b/src/context-measure.h
index f01c374..adfefbf 100644
--- a/src/context-measure.h
+++ b/src/context-measure.h
@@ -41,7 +41,7 @@ class ContextMeasure : public ObjectVisitor {
 
   DISALLOW_COPY_AND_ASSIGN(ContextMeasure);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CONTEXT_MEASURE_H_
diff --git a/src/contexts.h b/src/contexts.h
index fdd6650..9739c72 100644
--- a/src/contexts.h
+++ b/src/contexts.h
@@ -552,6 +552,7 @@ class Context: public FixedArray {
   STATIC_ASSERT(EMBEDDER_DATA_INDEX == Internals::kContextEmbedderDataIndex);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CONTEXTS_H_
diff --git a/src/conversions-inl.h b/src/conversions-inl.h
index 4b3ac27..f1ccb15 100644
--- a/src/conversions-inl.h
+++ b/src/conversions-inl.h
@@ -758,6 +758,7 @@ double InternalStringToDouble(UnicodeCache* unicode_cache,
   return (sign == NEGATIVE) ? -converted : converted;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CONVERSIONS_INL_H_
diff --git a/src/counters.h b/src/counters.h
index 740b2a8..7d41501 100644
--- a/src/counters.h
+++ b/src/counters.h
@@ -886,6 +886,7 @@ class Counters {
   DISALLOW_IMPLICIT_CONSTRUCTORS(Counters);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COUNTERS_H_
diff --git a/src/date.h b/src/date.h
index 813d312..813e5b8 100644
--- a/src/date.h
+++ b/src/date.h
@@ -276,6 +276,7 @@ class DateCache {
   base::TimezoneCache* tz_cache_;
 };
 
-} }   // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/dateparser-inl.h b/src/dateparser-inl.h
index e0b5cf9..5b3ac46 100644
--- a/src/dateparser-inl.h
+++ b/src/dateparser-inl.h
@@ -327,6 +327,7 @@ DateParser::DateToken DateParser::ParseES6DateTime(
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DATEPARSER_INL_H_
diff --git a/src/dateparser.h b/src/dateparser.h
index d40e384..ad9ce70 100644
--- a/src/dateparser.h
+++ b/src/dateparser.h
@@ -366,6 +366,7 @@ class DateParser : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DATEPARSER_H_
diff --git a/src/debug/debug.h b/src/debug/debug.h
index 6a963c8..e319469 100644
--- a/src/debug/debug.h
+++ b/src/debug/debug.h
@@ -762,6 +762,7 @@ class DebugCodegen : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DEBUG_DEBUG_H_
diff --git a/src/debug/liveedit.h b/src/debug/liveedit.h
index 251368f..29fe605 100644
--- a/src/debug/liveedit.h
+++ b/src/debug/liveedit.h
@@ -364,6 +364,7 @@ class SharedInfoWrapper : public JSArrayBasedStruct<SharedInfoWrapper> {
   friend class JSArrayBasedStruct<SharedInfoWrapper>;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif /* V8_DEBUG_LIVEEDIT_H_ */
diff --git a/src/disassembler.h b/src/disassembler.h
index 32e48c4..ac53f77 100644
--- a/src/disassembler.h
+++ b/src/disassembler.h
@@ -20,6 +20,7 @@ class Disassembler : public AllStatic {
                     Code* code = NULL);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DISASSEMBLER_H_
diff --git a/src/diy-fp.h b/src/diy-fp.h
index e0daf27..1325c94 100644
--- a/src/diy-fp.h
+++ b/src/diy-fp.h
@@ -93,6 +93,7 @@ class DiyFp {
   int e_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DIY_FP_H_
diff --git a/src/double.h b/src/double.h
index cb12628..f21bd74 100644
--- a/src/double.h
+++ b/src/double.h
@@ -204,6 +204,7 @@ class Double {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DOUBLE_H_
diff --git a/src/dtoa.h b/src/dtoa.h
index ca6277e..9f190ab 100644
--- a/src/dtoa.h
+++ b/src/dtoa.h
@@ -59,6 +59,7 @@ const int kBase10MaximalLength = 17;
 void DoubleToAscii(double v, DtoaMode mode, int requested_digits,
                    Vector<char> buffer, int* sign, int* length, int* point);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_DTOA_H_
diff --git a/src/effects.h b/src/effects.h
index 8d539f6..0204718 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -329,6 +329,7 @@ class NestedEffects: public
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EFFECTS_H_
diff --git a/src/elements-kind.h b/src/elements-kind.h
index 1397bd7..5f6cd62 100644
--- a/src/elements-kind.h
+++ b/src/elements-kind.h
@@ -226,6 +226,7 @@ inline bool IsTransitionableFastElementsKind(ElementsKind from_kind) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ELEMENTS_KIND_H_
diff --git a/src/elements.h b/src/elements.h
index fcc9002..27695b8 100644
--- a/src/elements.h
+++ b/src/elements.h
@@ -189,6 +189,7 @@ MUST_USE_RESULT MaybeHandle<Object> ArrayConstructInitializeElements(
     Handle<JSArray> array,
     Arguments* args);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ELEMENTS_H_
diff --git a/src/execution.h b/src/execution.h
index 84f106a..0b603ee 100644
--- a/src/execution.h
+++ b/src/execution.h
@@ -247,6 +247,7 @@ class StackGuard final {
   DISALLOW_COPY_AND_ASSIGN(StackGuard);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXECUTION_H_
diff --git a/src/expression-classifier.h b/src/expression-classifier.h
index fb45f41..0c4e588 100644
--- a/src/expression-classifier.h
+++ b/src/expression-classifier.h
@@ -279,7 +279,8 @@ class ExpressionClassifier {
   Error strong_mode_formal_parameter_error_;
   DuplicateFinder* duplicate_finder_;
 };
-}
-}  // v8::internal
+
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXPRESSION_CLASSIFIER_H
diff --git a/src/extensions/externalize-string-extension.h b/src/extensions/externalize-string-extension.h
index 009e818..c8907b4 100644
--- a/src/extensions/externalize-string-extension.h
+++ b/src/extensions/externalize-string-extension.h
@@ -22,6 +22,7 @@ class ExternalizeStringExtension : public v8::Extension {
   static const char* const kSource;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXTENSIONS_EXTERNALIZE_STRING_EXTENSION_H_
diff --git a/src/extensions/free-buffer-extension.h b/src/extensions/free-buffer-extension.h
index bb1418c..6bc5e57 100644
--- a/src/extensions/free-buffer-extension.h
+++ b/src/extensions/free-buffer-extension.h
@@ -19,6 +19,7 @@ class FreeBufferExtension : public v8::Extension {
   static void FreeBuffer(const v8::FunctionCallbackInfo<v8::Value>& args);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXTENSIONS_FREE_BUFFER_EXTENSION_H_
diff --git a/src/extensions/gc-extension.h b/src/extensions/gc-extension.h
index 9143391..9be0d4b 100644
--- a/src/extensions/gc-extension.h
+++ b/src/extensions/gc-extension.h
@@ -30,6 +30,7 @@ class GCExtension : public v8::Extension {
   char buffer_[50];
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXTENSIONS_GC_EXTENSION_H_
diff --git a/src/extensions/statistics-extension.h b/src/extensions/statistics-extension.h
index 5dac409..714f86a 100644
--- a/src/extensions/statistics-extension.h
+++ b/src/extensions/statistics-extension.h
@@ -21,6 +21,7 @@ class StatisticsExtension : public v8::Extension {
   static const char* const kSource;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXTENSIONS_STATISTICS_EXTENSION_H_
diff --git a/src/extensions/trigger-failure-extension.h b/src/extensions/trigger-failure-extension.h
index 4b10bdc..7c7ecf8 100644
--- a/src/extensions/trigger-failure-extension.h
+++ b/src/extensions/trigger-failure-extension.h
@@ -26,6 +26,7 @@ class TriggerFailureExtension : public v8::Extension {
   static const char* const kSource;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXTENSIONS_TRIGGER_FAILURE_EXTENSION_H_
diff --git a/src/factory.h b/src/factory.h
index b7602e0..4160f0d 100644
--- a/src/factory.h
+++ b/src/factory.h
@@ -720,6 +720,7 @@ class Factory final {
   void ReinitializeJSProxy(Handle<JSProxy> proxy, InstanceType type, int size);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FACTORY_H_
diff --git a/src/fast-dtoa.h b/src/fast-dtoa.h
index 38e8a82..d9e3ba8 100644
--- a/src/fast-dtoa.h
+++ b/src/fast-dtoa.h
@@ -57,6 +57,7 @@ bool FastDtoa(double d,
               int* length,
               int* decimal_point);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FAST_DTOA_H_
diff --git a/src/field-index-inl.h b/src/field-index-inl.h
index b8bc67b..2e6693c 100644
--- a/src/field-index-inl.h
+++ b/src/field-index-inl.h
@@ -118,6 +118,7 @@ inline int FieldIndex::GetKeyedLookupCacheIndex() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/field-index.h b/src/field-index.h
index 67515be..ae054a6 100644
--- a/src/field-index.h
+++ b/src/field-index.h
@@ -111,6 +111,7 @@ class FieldIndex final {
   int bit_field_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/fixed-dtoa.h b/src/fixed-dtoa.h
index 0a6cb50..f8a29e0 100644
--- a/src/fixed-dtoa.h
+++ b/src/fixed-dtoa.h
@@ -29,6 +29,7 @@ namespace internal {
 bool FastFixedDtoa(double v, int fractional_count,
                    Vector<char> buffer, int* length, int* decimal_point);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FIXED_DTOA_H_
diff --git a/src/flags.h b/src/flags.h
index 545c172..7bf5151 100644
--- a/src/flags.h
+++ b/src/flags.h
@@ -63,6 +63,7 @@ class FlagList {
   static uint32_t Hash();
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FLAGS_H_
diff --git a/src/frames-inl.h b/src/frames-inl.h
index cccd4d1..2a02f90 100644
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -286,6 +286,7 @@ inline StackFrame* SafeStackFrameIterator::frame() const {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FRAMES_INL_H_
diff --git a/src/frames.h b/src/frames.h
index d6bfd7a..9d06b48 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -949,6 +949,7 @@ class StackFrameLocator BASE_EMBEDDED {
 // zone memory.
 Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FRAMES_H_
diff --git a/src/full-codegen/full-codegen.h b/src/full-codegen/full-codegen.h
index 02da16b..9051a46 100644
--- a/src/full-codegen/full-codegen.h
+++ b/src/full-codegen/full-codegen.h
@@ -1081,6 +1081,7 @@ class BackEdgeTable {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FULL_CODEGEN_FULL_CODEGEN_H_
diff --git a/src/func-name-inferrer.h b/src/func-name-inferrer.h
index 8b077f9..8bc0e6c 100644
--- a/src/func-name-inferrer.h
+++ b/src/func-name-inferrer.h
@@ -109,6 +109,7 @@ class FuncNameInferrer : public ZoneObject {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FUNC_NAME_INFERRER_H_
diff --git a/src/futex-emulation.h b/src/futex-emulation.h
index e7e2230..9949bdf 100644
--- a/src/futex-emulation.h
+++ b/src/futex-emulation.h
@@ -125,7 +125,7 @@ class FutexEmulation : public AllStatic {
   static base::LazyMutex mutex_;
   static base::LazyInstance<FutexWaitList>::type wait_list_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FUTEX_EMULATION_H_
diff --git a/src/global-handles.h b/src/global-handles.h
index 0ee8c20..63c1760 100644
--- a/src/global-handles.h
+++ b/src/global-handles.h
@@ -438,6 +438,7 @@ class EternalHandles {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_GLOBAL_HANDLES_H_
diff --git a/src/globals.h b/src/globals.h
index 9d4bafb..337947a 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1020,7 +1020,8 @@ inline FunctionKind WithObjectLiteralBit(FunctionKind kind) {
   DCHECK(IsValidFunctionKind(kind));
   return kind;
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 namespace i = v8::internal;
 
diff --git a/src/hashmap.h b/src/hashmap.h
index ee3797f..f94def7 100644
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -350,6 +350,7 @@ class TemplateHashMap: private TemplateHashMapImpl<AllocationPolicy> {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HASHMAP_H_
diff --git a/src/heap/array-buffer-tracker.h b/src/heap/array-buffer-tracker.h
index c12557a..7ba22fb 100644
--- a/src/heap/array-buffer-tracker.h
+++ b/src/heap/array-buffer-tracker.h
@@ -68,6 +68,6 @@ class ArrayBufferTracker {
   std::map<void*, size_t> live_array_buffers_for_scavenge_;
   std::map<void*, size_t> not_yet_discovered_array_buffers_for_scavenge_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 #endif  // V8_HEAP_ARRAY_BUFFER_TRACKER_H_
diff --git a/src/heap/gc-idle-time-handler.cc b/src/heap/gc-idle-time-handler.cc
index f77c015..73dd857 100644
--- a/src/heap/gc-idle-time-handler.cc
+++ b/src/heap/gc-idle-time-handler.cc
@@ -186,5 +186,5 @@ GCIdleTimeAction GCIdleTimeHandler::Compute(double idle_time_in_ms,
 }
 
 
-}
-}
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/gc-tracer.h b/src/heap/gc-tracer.h
index de48d23..8036cde 100644
--- a/src/heap/gc-tracer.h
+++ b/src/heap/gc-tracer.h
@@ -555,7 +555,7 @@ class GCTracer {
 
   DISALLOW_COPY_AND_ASSIGN(GCTracer);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_GC_TRACER_H_
diff --git a/src/heap/heap-inl.h b/src/heap/heap-inl.h
index c1e18a7..856d3aa 100644
--- a/src/heap/heap-inl.h
+++ b/src/heap/heap-inl.h
@@ -701,7 +701,7 @@ void VerifySmisVisitor::VisitPointers(Object** start, Object** end) {
     CHECK((*current)->IsSmi());
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_HEAP_INL_H_
diff --git a/src/heap/heap.h b/src/heap/heap.h
index 0e427de..6f8a124 100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -2712,7 +2712,7 @@ class PathTracer : public ObjectVisitor {
   DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer);
 };
 #endif  // DEBUG
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_HEAP_H_
diff --git a/src/heap/incremental-marking-job.h b/src/heap/incremental-marking-job.h
index fad46c1..c998139 100644
--- a/src/heap/incremental-marking-job.h
+++ b/src/heap/incremental-marking-job.h
@@ -75,7 +75,7 @@ class IncrementalMarkingJob {
   bool delayed_task_pending_;
   bool made_progress_since_last_delayed_task_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_INCREMENTAL_MARKING_JOB_H_
diff --git a/src/heap/incremental-marking.h b/src/heap/incremental-marking.h
index 8f38b5a..ee1290e 100644
--- a/src/heap/incremental-marking.h
+++ b/src/heap/incremental-marking.h
@@ -276,7 +276,7 @@ class IncrementalMarking {
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_INCREMENTAL_MARKING_H_
diff --git a/src/heap/mark-compact.h b/src/heap/mark-compact.h
index 724650c..527800f 100644
--- a/src/heap/mark-compact.h
+++ b/src/heap/mark-compact.h
@@ -850,7 +850,7 @@ class EvacuationScope BASE_EMBEDDED {
 
 
 const char* AllocationSpaceName(AllocationSpace space);
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_MARK_COMPACT_H_
diff --git a/src/heap/memory-reducer.cc b/src/heap/memory-reducer.cc
index 45d6bd3..24663db 100644
--- a/src/heap/memory-reducer.cc
+++ b/src/heap/memory-reducer.cc
@@ -225,5 +225,5 @@ void MemoryReducer::ScheduleTimer(double delay_ms) {
 
 void MemoryReducer::TearDown() { state_ = State(kDone, 0, 0, 0.0); }
 
-}  // internal
-}  // v8
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/objects-visiting-inl.h b/src/heap/objects-visiting-inl.h
index 55734fd..ab0b357 100644
--- a/src/heap/objects-visiting-inl.h
+++ b/src/heap/objects-visiting-inl.h
@@ -902,7 +902,7 @@ void Code::CodeIterateBody(Heap* heap) {
     it.rinfo()->template Visit<StaticVisitor>(heap);
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_OBJECTS_VISITING_INL_H_
diff --git a/src/heap/objects-visiting.h b/src/heap/objects-visiting.h
index 1eba887..6b0381b 100644
--- a/src/heap/objects-visiting.h
+++ b/src/heap/objects-visiting.h
@@ -491,7 +491,7 @@ class WeakObjectRetainer;
 // access the next-element pointers.
 template <class T>
 Object* VisitWeakList(Heap* heap, Object* list, WeakObjectRetainer* retainer);
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_OBJECTS_VISITING_H_
diff --git a/src/heap/scavenge-job.cc b/src/heap/scavenge-job.cc
index c380443..faf90fa 100644
--- a/src/heap/scavenge-job.cc
+++ b/src/heap/scavenge-job.cc
@@ -112,5 +112,5 @@ void ScavengeJob::ScheduleIdleTask(Heap* heap) {
     }
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/heap/scavenge-job.h b/src/heap/scavenge-job.h
index c9e508e..56299a1 100644
--- a/src/heap/scavenge-job.h
+++ b/src/heap/scavenge-job.h
@@ -74,7 +74,7 @@ class ScavengeJob {
   bool idle_task_rescheduled_;
   int bytes_allocated_since_the_last_task_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_SCAVENGE_JOB_H_
diff --git a/src/heap/spaces-inl.h b/src/heap/spaces-inl.h
index a12ed6f..cd76fe6 100644
--- a/src/heap/spaces-inl.h
+++ b/src/heap/spaces-inl.h
@@ -487,7 +487,7 @@ intptr_t LargeObjectSpace::Available() {
   return ObjectSizeFor(heap()->isolate()->memory_allocator()->Available());
 }
 
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_SPACES_INL_H_
diff --git a/src/heap/spaces.h b/src/heap/spaces.h
index 2223808..a4664d7 100644
--- a/src/heap/spaces.h
+++ b/src/heap/spaces.h
@@ -2973,7 +2973,7 @@ struct CommentStatistic {
   static const int kMaxComments = 64;
 };
 #endif
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HEAP_SPACES_H_
diff --git a/src/heap/store-buffer-inl.h b/src/heap/store-buffer-inl.h
index 1f3dda2..e11ad87 100644
--- a/src/heap/store-buffer-inl.h
+++ b/src/heap/store-buffer-inl.h
@@ -48,7 +48,7 @@ void StoreBuffer::EnterDirectlyIntoStoreBuffer(Address addr) {
     }
   }
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STORE_BUFFER_INL_H_
diff --git a/src/heap/store-buffer.h b/src/heap/store-buffer.h
index 37a78eb..08dcebf 100644
--- a/src/heap/store-buffer.h
+++ b/src/heap/store-buffer.h
@@ -227,7 +227,7 @@ class DontMoveStoreBufferEntriesScope {
   StoreBuffer* store_buffer_;
   bool stored_state_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STORE_BUFFER_H_
diff --git a/src/hydrogen-alias-analysis.h b/src/hydrogen-alias-analysis.h
index 368dd5f..1ab078e 100644
--- a/src/hydrogen-alias-analysis.h
+++ b/src/hydrogen-alias-analysis.h
@@ -68,6 +68,7 @@ class HAliasAnalyzer : public ZoneObject {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_ALIAS_ANALYSIS_H_
diff --git a/src/hydrogen-bce.h b/src/hydrogen-bce.h
index 70c0a07..a5b1f3f 100644
--- a/src/hydrogen-bce.h
+++ b/src/hydrogen-bce.h
@@ -46,6 +46,7 @@ class HBoundsCheckEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_BCE_H_
diff --git a/src/hydrogen-bch.h b/src/hydrogen-bch.h
index 852c264..708bbd4 100644
--- a/src/hydrogen-bch.h
+++ b/src/hydrogen-bch.h
@@ -27,6 +27,7 @@ class HBoundsCheckHoistingPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_BCE_H_
diff --git a/src/hydrogen-canonicalize.h b/src/hydrogen-canonicalize.h
index eb23033..693085b 100644
--- a/src/hydrogen-canonicalize.h
+++ b/src/hydrogen-canonicalize.h
@@ -23,6 +23,7 @@ class HCanonicalizePhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_CANONICALIZE_H_
diff --git a/src/hydrogen-check-elimination.h b/src/hydrogen-check-elimination.h
index 7102a43..fdba949 100644
--- a/src/hydrogen-check-elimination.h
+++ b/src/hydrogen-check-elimination.h
@@ -68,6 +68,7 @@ class HCheckEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_CHECK_ELIMINATION_H_
diff --git a/src/hydrogen-dce.h b/src/hydrogen-dce.h
index af3679d..08f5326 100644
--- a/src/hydrogen-dce.h
+++ b/src/hydrogen-dce.h
@@ -29,6 +29,7 @@ class HDeadCodeEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_DCE_H_
diff --git a/src/hydrogen-dehoist.h b/src/hydrogen-dehoist.h
index 4aab30f..11e8386 100644
--- a/src/hydrogen-dehoist.h
+++ b/src/hydrogen-dehoist.h
@@ -23,6 +23,7 @@ class HDehoistIndexComputationsPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_DEHOIST_H_
diff --git a/src/hydrogen-environment-liveness.h b/src/hydrogen-environment-liveness.h
index e595927..f97a78c 100644
--- a/src/hydrogen-environment-liveness.h
+++ b/src/hydrogen-environment-liveness.h
@@ -63,6 +63,7 @@ class HEnvironmentLivenessAnalysisPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif /* V8_HYDROGEN_ENVIRONMENT_LIVENESS_H_ */
diff --git a/src/hydrogen-escape-analysis.h b/src/hydrogen-escape-analysis.h
index 0726b8e..be5f9f4 100644
--- a/src/hydrogen-escape-analysis.h
+++ b/src/hydrogen-escape-analysis.h
@@ -65,6 +65,7 @@ class HEscapeAnalysisPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_ESCAPE_ANALYSIS_H_
diff --git a/src/hydrogen-flow-engine.h b/src/hydrogen-flow-engine.h
index 257ab46..9735ea8 100644
--- a/src/hydrogen-flow-engine.h
+++ b/src/hydrogen-flow-engine.h
@@ -214,6 +214,7 @@ class HFlowEngine {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_FLOW_ENGINE_H_
diff --git a/src/hydrogen-gvn.h b/src/hydrogen-gvn.h
index fc7f273..ae45ecb 100644
--- a/src/hydrogen-gvn.h
+++ b/src/hydrogen-gvn.h
@@ -148,6 +148,7 @@ class HGlobalValueNumberingPhase final : public HPhase {
   DISALLOW_COPY_AND_ASSIGN(HGlobalValueNumberingPhase);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_GVN_H_
diff --git a/src/hydrogen-infer-representation.h b/src/hydrogen-infer-representation.h
index d07f89d..883173d 100644
--- a/src/hydrogen-infer-representation.h
+++ b/src/hydrogen-infer-representation.h
@@ -29,6 +29,7 @@ class HInferRepresentationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_INFER_REPRESENTATION_H_
diff --git a/src/hydrogen-infer-types.h b/src/hydrogen-infer-types.h
index 41337ac..e5f5ef9 100644
--- a/src/hydrogen-infer-types.h
+++ b/src/hydrogen-infer-types.h
@@ -31,6 +31,7 @@ class HInferTypesPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_INFER_TYPES_H_
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index 9f5bc20..0c272fe 100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -7983,6 +7983,7 @@ class HAllocateBlockContext: public HTemplateInstruction<2> {
 #undef DECLARE_INSTRUCTION
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_INSTRUCTIONS_H_
diff --git a/src/hydrogen-load-elimination.h b/src/hydrogen-load-elimination.h
index e6b432c..862df71 100644
--- a/src/hydrogen-load-elimination.h
+++ b/src/hydrogen-load-elimination.h
@@ -22,6 +22,7 @@ class HLoadEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_LOAD_ELIMINATION_H_
diff --git a/src/hydrogen-mark-deoptimize.h b/src/hydrogen-mark-deoptimize.h
index 52a6ef9..ad498cd 100644
--- a/src/hydrogen-mark-deoptimize.h
+++ b/src/hydrogen-mark-deoptimize.h
@@ -47,6 +47,7 @@ class HComputeChangeUndefinedToNaN : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_MARK_DEOPTIMIZE_H_
diff --git a/src/hydrogen-mark-unreachable.h b/src/hydrogen-mark-unreachable.h
index d43d22b..a7b2459 100644
--- a/src/hydrogen-mark-unreachable.h
+++ b/src/hydrogen-mark-unreachable.h
@@ -25,6 +25,7 @@ class HMarkUnreachableBlocksPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_MARK_UNREACHABLE_H_
diff --git a/src/hydrogen-osr.h b/src/hydrogen-osr.h
index 433548c..6a63988 100644
--- a/src/hydrogen-osr.h
+++ b/src/hydrogen-osr.h
@@ -49,6 +49,7 @@ class HOsrBuilder : public ZoneObject {
   ZoneList<HUnknownOSRValue*>* osr_values_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_OSR_H_
diff --git a/src/hydrogen-range-analysis.h b/src/hydrogen-range-analysis.h
index 1269ec7..f553302 100644
--- a/src/hydrogen-range-analysis.h
+++ b/src/hydrogen-range-analysis.h
@@ -45,6 +45,7 @@ class HRangeAnalysisPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_RANGE_ANALYSIS_H_
diff --git a/src/hydrogen-redundant-phi.h b/src/hydrogen-redundant-phi.h
index 7f5ec4e..7af46a4 100644
--- a/src/hydrogen-redundant-phi.h
+++ b/src/hydrogen-redundant-phi.h
@@ -28,6 +28,7 @@ class HRedundantPhiEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_REDUNDANT_PHI_H_
diff --git a/src/hydrogen-removable-simulates.h b/src/hydrogen-removable-simulates.h
index 9bd2505..569b974 100644
--- a/src/hydrogen-removable-simulates.h
+++ b/src/hydrogen-removable-simulates.h
@@ -23,6 +23,7 @@ class HMergeRemovableSimulatesPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_REMOVABLE_SIMULATES_H_
diff --git a/src/hydrogen-representation-changes.h b/src/hydrogen-representation-changes.h
index 2f5958a..0d60739 100644
--- a/src/hydrogen-representation-changes.h
+++ b/src/hydrogen-representation-changes.h
@@ -27,6 +27,7 @@ class HRepresentationChangesPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_REPRESENTATION_CHANGES_H_
diff --git a/src/hydrogen-sce.h b/src/hydrogen-sce.h
index 276d348..04b0f07 100644
--- a/src/hydrogen-sce.h
+++ b/src/hydrogen-sce.h
@@ -20,6 +20,7 @@ class HStackCheckEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_SCE_H_
diff --git a/src/hydrogen-store-elimination.h b/src/hydrogen-store-elimination.h
index 35a23a2..d818be9 100644
--- a/src/hydrogen-store-elimination.h
+++ b/src/hydrogen-store-elimination.h
@@ -29,6 +29,7 @@ class HStoreEliminationPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/hydrogen-types.h b/src/hydrogen-types.h
index fe13345..ebfbac3 100644
--- a/src/hydrogen-types.h
+++ b/src/hydrogen-types.h
@@ -86,6 +86,7 @@ class HType final {
 
 
 std::ostream& operator<<(std::ostream& os, const HType& t);
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // HYDROGEN_TYPES_H_
diff --git a/src/hydrogen-uint32-analysis.h b/src/hydrogen-uint32-analysis.h
index 4d2797f..6667469 100644
--- a/src/hydrogen-uint32-analysis.h
+++ b/src/hydrogen-uint32-analysis.h
@@ -31,6 +31,7 @@ class HUint32AnalysisPhase : public HPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_UINT32_ANALYSIS_H_
diff --git a/src/hydrogen.h b/src/hydrogen.h
index c1215a3..59dec09 100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -3073,6 +3073,7 @@ class NoObservableSideEffectsScope final {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_HYDROGEN_H_
diff --git a/src/i18n.h b/src/i18n.h
index ea8380b..a8db4d1 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -128,6 +128,7 @@ class BreakIterator {
   BreakIterator();
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_I18N_H_
diff --git a/src/ia32/assembler-ia32-inl.h b/src/ia32/assembler-ia32-inl.h
index 17ae01a..6c9c538 100644
--- a/src/ia32/assembler-ia32-inl.h
+++ b/src/ia32/assembler-ia32-inl.h
@@ -559,6 +559,7 @@ Operand::Operand(Immediate imm) {
   set_modrm(0, ebp);
   set_dispr(imm.x_, imm.rmode_);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_ASSEMBLER_IA32_INL_H_
diff --git a/src/ia32/assembler-ia32.h b/src/ia32/assembler-ia32.h
index 57987bc..fd5cf1a 100644
--- a/src/ia32/assembler-ia32.h
+++ b/src/ia32/assembler-ia32.h
@@ -1595,6 +1595,7 @@ class EnsureSpace BASE_EMBEDDED {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_ASSEMBLER_IA32_H_
diff --git a/src/ia32/code-stubs-ia32.h b/src/ia32/code-stubs-ia32.h
index c09b27b..fc6ba80 100644
--- a/src/ia32/code-stubs-ia32.h
+++ b/src/ia32/code-stubs-ia32.h
@@ -385,6 +385,7 @@ class RecordWriteStub: public PlatformCodeStub {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_CODE_STUBS_IA32_H_
diff --git a/src/ia32/codegen-ia32.h b/src/ia32/codegen-ia32.h
index 2382388..03bb128 100644
--- a/src/ia32/codegen-ia32.h
+++ b/src/ia32/codegen-ia32.h
@@ -42,6 +42,7 @@ class MathExpGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_CODEGEN_IA32_H_
diff --git a/src/ia32/frames-ia32.h b/src/ia32/frames-ia32.h
index a5ce6a5..609dfec 100644
--- a/src/ia32/frames-ia32.h
+++ b/src/ia32/frames-ia32.h
@@ -80,6 +80,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_FRAMES_IA32_H_
diff --git a/src/ia32/lithium-codegen-ia32.h b/src/ia32/lithium-codegen-ia32.h
index a26903a..5de35d8 100644
--- a/src/ia32/lithium-codegen-ia32.h
+++ b/src/ia32/lithium-codegen-ia32.h
@@ -398,6 +398,7 @@ class LDeferredCode : public ZoneObject {
   int instruction_index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_LITHIUM_CODEGEN_IA32_H_
diff --git a/src/ia32/lithium-gap-resolver-ia32.h b/src/ia32/lithium-gap-resolver-ia32.h
index d36e78b..07a1878 100644
--- a/src/ia32/lithium-gap-resolver-ia32.h
+++ b/src/ia32/lithium-gap-resolver-ia32.h
@@ -80,6 +80,7 @@ class LGapResolver final BASE_EMBEDDED {
   int spilled_register_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_LITHIUM_GAP_RESOLVER_IA32_H_
diff --git a/src/ia32/lithium-ia32.h b/src/ia32/lithium-ia32.h
index 9e4b885..c59b336 100644
--- a/src/ia32/lithium-ia32.h
+++ b/src/ia32/lithium-ia32.h
@@ -2885,6 +2885,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_LITHIUM_IA32_H_
diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h
index 508e209..68c4435 100644
--- a/src/ia32/macro-assembler-ia32.h
+++ b/src/ia32/macro-assembler-ia32.h
@@ -1129,6 +1129,7 @@ extern void LogGeneratedCodeCoverage(const char* file_line);
 #endif
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_MACRO_ASSEMBLER_IA32_H_
diff --git a/src/ia32/simulator-ia32.h b/src/ia32/simulator-ia32.h
index 02a8e9c..af7ee3c 100644
--- a/src/ia32/simulator-ia32.h
+++ b/src/ia32/simulator-ia32.h
@@ -43,6 +43,7 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IA32_SIMULATOR_IA32_H_
diff --git a/src/ic/access-compiler.h b/src/ic/access-compiler.h
index a5beb71..223bde4 100644
--- a/src/ic/access-compiler.h
+++ b/src/ic/access-compiler.h
@@ -81,7 +81,7 @@ class PropertyAccessCompiler BASE_EMBEDDED {
   // Ensure that MacroAssembler has a reasonable size.
   STATIC_ASSERT(sizeof(MacroAssembler) < 128 * kPointerSize);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_ACCESS_COMPILER_H_
diff --git a/src/ic/call-optimization.h b/src/ic/call-optimization.h
index 01947d7..7963d1c 100644
--- a/src/ic/call-optimization.h
+++ b/src/ic/call-optimization.h
@@ -61,7 +61,7 @@ class CallOptimization BASE_EMBEDDED {
   Handle<FunctionTemplateInfo> expected_receiver_type_;
   Handle<CallHandlerInfo> api_call_info_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_CALL_OPTIMIZATION_H_
diff --git a/src/ic/handler-compiler.h b/src/ic/handler-compiler.h
index f5dafe9..4154b58 100644
--- a/src/ic/handler-compiler.h
+++ b/src/ic/handler-compiler.h
@@ -297,7 +297,7 @@ class ElementHandlerCompiler : public PropertyHandlerCompiler {
 
   static void GenerateStoreSlow(MacroAssembler* masm);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_HANDLER_COMPILER_H_
diff --git a/src/ic/ic-compiler.h b/src/ic/ic-compiler.h
index ee6597d..ff32404 100644
--- a/src/ic/ic-compiler.h
+++ b/src/ic/ic-compiler.h
@@ -125,7 +125,7 @@ class PropertyICCompiler : public PropertyAccessCompiler {
 };
 
 
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_IC_COMPILER_H_
diff --git a/src/ic/ic-inl.h b/src/ic/ic-inl.h
index 646b73d..0998894 100644
--- a/src/ic/ic-inl.h
+++ b/src/ic/ic-inl.h
@@ -193,7 +193,7 @@ bool IC::AddressIsDeoptimizedCode(Isolate* isolate, Address address) {
   return (host->kind() == Code::OPTIMIZED_FUNCTION &&
           host->marked_for_deoptimization());
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_INL_H_
diff --git a/src/ic/ic-state.h b/src/ic/ic-state.h
index b529b8c..6d014d1 100644
--- a/src/ic/ic-state.h
+++ b/src/ic/ic-state.h
@@ -268,7 +268,8 @@ class StoreICState final BASE_EMBEDDED {
  private:
   const ExtraICState state_;
 };
-}
-}
+
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_STATE_H_
diff --git a/src/ic/ic.h b/src/ic/ic.h
index d65d7a8..b88fe68 100644
--- a/src/ic/ic.h
+++ b/src/ic/ic.h
@@ -685,7 +685,7 @@ class ToBooleanIC : public IC {
 enum InlinedSmiCheck { ENABLE_INLINED_SMI_CHECK, DISABLE_INLINED_SMI_CHECK };
 void PatchInlinedSmiCode(Address address, InlinedSmiCheck check);
 
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IC_H_
diff --git a/src/ic/stub-cache.h b/src/ic/stub-cache.h
index cb1b628..4b27e6e 100644
--- a/src/ic/stub-cache.h
+++ b/src/ic/stub-cache.h
@@ -165,7 +165,7 @@ class StubCache {
 
   DISALLOW_COPY_AND_ASSIGN(StubCache);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STUB_CACHE_H_
diff --git a/src/icu_util.h b/src/icu_util.h
index cd98ff0..c308dec 100644
--- a/src/icu_util.h
+++ b/src/icu_util.h
@@ -14,6 +14,7 @@ namespace internal {
 // function should be called before ICU is used.
 bool InitializeICU(const char* icu_data_file);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ICU_UTIL_H_
diff --git a/src/identity-map.h b/src/identity-map.h
index 2143e24..7c3e6a9 100644
--- a/src/identity-map.h
+++ b/src/identity-map.h
@@ -92,7 +92,7 @@ class IdentityMap : public IdentityMapBase {
     *(reinterpret_cast<V*>(GetEntry(key))) = value;
   }
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_IDENTITY_MAP_H_
diff --git a/src/interface-descriptors.cc b/src/interface-descriptors.cc
index b71f973..73090d6 100644
--- a/src/interface-descriptors.cc
+++ b/src/interface-descriptors.cc
@@ -29,7 +29,7 @@ Type* AnyTagged(Zone* zone) {
 Type* ExternalPointer(Zone* zone) {
   return Type::Intersect(Type::Internal(), Type::UntaggedPointer(), zone);
 }
-}
+}  // namespace
 
 
 Type::FunctionType* CallInterfaceDescriptor::BuildDefaultFunctionType(
diff --git a/src/interface-descriptors.h b/src/interface-descriptors.h
index 534313f..05b43dc 100644
--- a/src/interface-descriptors.h
+++ b/src/interface-descriptors.h
@@ -720,8 +720,8 @@ class PushArgsAndCallDescriptor : public CallInterfaceDescriptor {
   CallDescriptors::Key name##Descriptor::key() { return CallDescriptors::name; }
 INTERFACE_DESCRIPTOR_LIST(DEF_KEY)
 #undef DEF_KEY
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #if V8_TARGET_ARCH_ARM64
diff --git a/src/isolate.h b/src/isolate.h
index 035b4b3..daddfda 100644
--- a/src/isolate.h
+++ b/src/isolate.h
@@ -1550,6 +1550,7 @@ class CodeTracer final : public Malloced {
   int scope_depth_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ISOLATE_H_
diff --git a/src/json-parser.h b/src/json-parser.h
index cac4979..2188953 100644
--- a/src/json-parser.h
+++ b/src/json-parser.h
@@ -845,6 +845,7 @@ Handle<String> JsonParser<seq_one_byte>::ScanJsonString() {
   return result;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_JSON_PARSER_H_
diff --git a/src/json-stringifier.h b/src/json-stringifier.h
index 260cade..c06256d 100644
--- a/src/json-stringifier.h
+++ b/src/json-stringifier.h
@@ -675,6 +675,7 @@ void BasicJsonStringifier::SerializeString(Handle<String> object) {
   }
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_JSON_STRINGIFIER_H_
diff --git a/src/layout-descriptor-inl.h b/src/layout-descriptor-inl.h
index 3771064..31ab5d1 100644
--- a/src/layout-descriptor-inl.h
+++ b/src/layout-descriptor-inl.h
@@ -250,7 +250,7 @@ bool LayoutDescriptorHelper::IsTagged(int offset_in_bytes) {
 
   return layout_descriptor_->IsTagged(field_index);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LAYOUT_DESCRIPTOR_INL_H_
diff --git a/src/layout-descriptor.h b/src/layout-descriptor.h
index 11d8d35..5a80e73 100644
--- a/src/layout-descriptor.h
+++ b/src/layout-descriptor.h
@@ -153,7 +153,7 @@ class LayoutDescriptorHelper {
   int header_size_;
   LayoutDescriptor* layout_descriptor_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LAYOUT_DESCRIPTOR_H_
diff --git a/src/libplatform/default-platform.cc b/src/libplatform/default-platform.cc
index ddceab5..383d8ce 100644
--- a/src/libplatform/default-platform.cc
+++ b/src/libplatform/default-platform.cc
@@ -168,4 +168,5 @@ double DefaultPlatform::MonotonicallyIncreasingTime() {
   return base::TimeTicks::HighResolutionNow().ToInternalValue() /
          static_cast<double>(base::Time::kMicrosecondsPerSecond);
 }
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
diff --git a/src/libplatform/default-platform.h b/src/libplatform/default-platform.h
index 94ef9c5..0dbedb6 100644
--- a/src/libplatform/default-platform.h
+++ b/src/libplatform/default-platform.h
@@ -68,7 +68,8 @@ class DefaultPlatform : public Platform {
 };
 
 
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
 
 
 #endif  // V8_LIBPLATFORM_DEFAULT_PLATFORM_H_
diff --git a/src/libplatform/task-queue.cc b/src/libplatform/task-queue.cc
index 7a9071f..0a630ed 100644
--- a/src/libplatform/task-queue.cc
+++ b/src/libplatform/task-queue.cc
@@ -53,4 +53,5 @@ void TaskQueue::Terminate() {
   process_queue_semaphore_.Signal();
 }
 
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
diff --git a/src/libplatform/task-queue.h b/src/libplatform/task-queue.h
index eb9d698..efe9e07 100644
--- a/src/libplatform/task-queue.h
+++ b/src/libplatform/task-queue.h
@@ -41,7 +41,8 @@ class TaskQueue {
   DISALLOW_COPY_AND_ASSIGN(TaskQueue);
 };
 
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
 
 
 #endif  // V8_LIBPLATFORM_TASK_QUEUE_H_
diff --git a/src/libplatform/worker-thread.cc b/src/libplatform/worker-thread.cc
index 9963715..a8e714a 100644
--- a/src/libplatform/worker-thread.cc
+++ b/src/libplatform/worker-thread.cc
@@ -28,4 +28,5 @@ void WorkerThread::Run() {
   }
 }
 
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
diff --git a/src/libplatform/worker-thread.h b/src/libplatform/worker-thread.h
index 730e039..6a55a6b 100644
--- a/src/libplatform/worker-thread.h
+++ b/src/libplatform/worker-thread.h
@@ -32,7 +32,8 @@ class WorkerThread : public base::Thread {
   DISALLOW_COPY_AND_ASSIGN(WorkerThread);
 };
 
-} }  // namespace v8::platform
+}  // namespace platform
+}  // namespace v8
 
 
 #endif  // V8_LIBPLATFORM_WORKER_THREAD_H_
diff --git a/src/list-inl.h b/src/list-inl.h
index 5a247d5..9a2d11f 100644
--- a/src/list-inl.h
+++ b/src/list-inl.h
@@ -286,6 +286,7 @@ int SortedListBSearch(const List<T>& list, T elem) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LIST_INL_H_
diff --git a/src/list.h b/src/list.h
index d935f76..8b8a5dd 100644
--- a/src/list.h
+++ b/src/list.h
@@ -229,7 +229,8 @@ template <typename T>
 int SortedListBSearch(const List<T>& list, T elem);
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_LIST_H_
diff --git a/src/lithium-allocator-inl.h b/src/lithium-allocator-inl.h
index 98923ae..bad2996 100644
--- a/src/lithium-allocator-inl.h
+++ b/src/lithium-allocator-inl.h
@@ -54,6 +54,7 @@ void LAllocator::SetLiveRangeAssignedRegister(LiveRange* range, int reg) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LITHIUM_ALLOCATOR_INL_H_
diff --git a/src/lithium-allocator.h b/src/lithium-allocator.h
index 7c94772..bd5127d 100644
--- a/src/lithium-allocator.h
+++ b/src/lithium-allocator.h
@@ -568,6 +568,7 @@ class LAllocatorPhase : public CompilationPhase {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LITHIUM_ALLOCATOR_H_
diff --git a/src/lithium-codegen.h b/src/lithium-codegen.h
index ce04da9..c654ff7 100644
--- a/src/lithium-codegen.h
+++ b/src/lithium-codegen.h
@@ -91,6 +91,7 @@ class LCodeGenBase BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LITHIUM_CODEGEN_H_
diff --git a/src/lithium-inl.h b/src/lithium-inl.h
index 1a10773..cd15a45 100644
--- a/src/lithium-inl.h
+++ b/src/lithium-inl.h
@@ -108,7 +108,7 @@ LOperand* UseIterator::Current() {
 void UseIterator::Advance() {
   input_iterator_.Done() ? env_iterator_.Advance() : input_iterator_.Advance();
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LITHIUM_INL_H_
diff --git a/src/lithium.h b/src/lithium.h
index 046de19..97c5c1d 100644
--- a/src/lithium.h
+++ b/src/lithium.h
@@ -835,6 +835,7 @@ class UseIterator BASE_EMBEDDED {
 
 class LInstruction;
 class LCodeGen;
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LITHIUM_H_
diff --git a/src/log-inl.h b/src/log-inl.h
index 520d05c..70c74bc 100644
--- a/src/log-inl.h
+++ b/src/log-inl.h
@@ -38,6 +38,7 @@ void Logger::CallEventLogger(Isolate* isolate, const char* name, StartEnd se,
     }
   }
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LOG_INL_H_
diff --git a/src/log-utils.h b/src/log-utils.h
index 87dab52..0ceaccb 100644
--- a/src/log-utils.h
+++ b/src/log-utils.h
@@ -134,6 +134,7 @@ class Log {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LOG_UTILS_H_
diff --git a/src/log.h b/src/log.h
index 33c1b29..064115b 100644
--- a/src/log.h
+++ b/src/log.h
@@ -526,7 +526,8 @@ class CodeEventLogger : public CodeEventListener {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_LOG_H_
diff --git a/src/lookup-inl.h b/src/lookup-inl.h
index 3df2194..003ae5a 100644
--- a/src/lookup-inl.h
+++ b/src/lookup-inl.h
@@ -136,7 +136,7 @@ LookupIterator::State LookupIterator::LookupNonMaskingInterceptorInHolder(
   UNREACHABLE();
   return state_;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LOOKUP_INL_H_
diff --git a/src/lookup.h b/src/lookup.h
index 3888ed6..8365cfc 100644
--- a/src/lookup.h
+++ b/src/lookup.h
@@ -316,6 +316,7 @@ class LookupIterator final BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_LOOKUP_H_
diff --git a/src/macro-assembler.h b/src/macro-assembler.h
index c865a5f..fd2aa7c 100644
--- a/src/macro-assembler.h
+++ b/src/macro-assembler.h
@@ -278,6 +278,7 @@ class AllocationUtils {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MACRO_ASSEMBLER_H_
diff --git a/src/messages.h b/src/messages.h
index bb78f3d..2c574a5 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -490,6 +490,7 @@ class ErrorToStringHelper {
 
   List<Handle<JSObject> > visited_;
 };
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MESSAGES_H_
diff --git a/src/mips/assembler-mips-inl.h b/src/mips/assembler-mips-inl.h
index f4bddf5..01f33a5 100644
--- a/src/mips/assembler-mips-inl.h
+++ b/src/mips/assembler-mips-inl.h
@@ -485,6 +485,7 @@ void Assembler::emit(Instr x) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_ASSEMBLER_MIPS_INL_H_
diff --git a/src/mips/assembler-mips.h b/src/mips/assembler-mips.h
index c47f6d3..331e310 100644
--- a/src/mips/assembler-mips.h
+++ b/src/mips/assembler-mips.h
@@ -1450,6 +1450,7 @@ class EnsureSpace BASE_EMBEDDED {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_ASSEMBLER_MIPS_H_
diff --git a/src/mips/code-stubs-mips.h b/src/mips/code-stubs-mips.h
index 67228e0..9009ec2 100644
--- a/src/mips/code-stubs-mips.h
+++ b/src/mips/code-stubs-mips.h
@@ -343,6 +343,7 @@ class NameDictionaryLookupStub: public PlatformCodeStub {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_CODE_STUBS_MIPS_H_
diff --git a/src/mips/codegen-mips.h b/src/mips/codegen-mips.h
index f79ad4e..22784fc 100644
--- a/src/mips/codegen-mips.h
+++ b/src/mips/codegen-mips.h
@@ -46,6 +46,7 @@ class MathExpGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_CODEGEN_MIPS_H_
diff --git a/src/mips/constants-mips.h b/src/mips/constants-mips.h
index fcbda80..813e33a 100644
--- a/src/mips/constants-mips.h
+++ b/src/mips/constants-mips.h
@@ -1178,6 +1178,7 @@ Instruction::Type Instruction::InstructionType(TypeChecks checks) const {
 
 #undef OpcodeToBitNumber
 #undef FunctionFieldToBitNumber
-} }   // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif    // #ifndef V8_MIPS_CONSTANTS_H_
diff --git a/src/mips/frames-mips.h b/src/mips/frames-mips.h
index 0452ece..849dea2 100644
--- a/src/mips/frames-mips.h
+++ b/src/mips/frames-mips.h
@@ -169,6 +169,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/mips/lithium-codegen-mips.h b/src/mips/lithium-codegen-mips.h
index 858c7f1..9aab4df 100644
--- a/src/mips/lithium-codegen-mips.h
+++ b/src/mips/lithium-codegen-mips.h
@@ -426,6 +426,7 @@ class LDeferredCode : public ZoneObject {
   int instruction_index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_CODEGEN_MIPS_H_
diff --git a/src/mips/lithium-gap-resolver-mips.h b/src/mips/lithium-gap-resolver-mips.h
index 7374da7..6ede420 100644
--- a/src/mips/lithium-gap-resolver-mips.h
+++ b/src/mips/lithium-gap-resolver-mips.h
@@ -53,6 +53,7 @@ class LGapResolver final BASE_EMBEDDED {
   LOperand* saved_destination_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_GAP_RESOLVER_MIPS_H_
diff --git a/src/mips/lithium-mips.h b/src/mips/lithium-mips.h
index ed3332c..cb62e35 100644
--- a/src/mips/lithium-mips.h
+++ b/src/mips/lithium-mips.h
@@ -2843,6 +2843,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_MIPS_H_
diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h
index 1608c95..c8e21c4 100644
--- a/src/mips/macro-assembler-mips.h
+++ b/src/mips/macro-assembler-mips.h
@@ -1744,6 +1744,7 @@ class CodePatcher {
 #define ACCESS_MASM(masm) masm->
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_MACRO_ASSEMBLER_MIPS_H_
diff --git a/src/mips/simulator-mips.h b/src/mips/simulator-mips.h
index bd30172..796d08f 100644
--- a/src/mips/simulator-mips.h
+++ b/src/mips/simulator-mips.h
@@ -55,7 +55,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 // Calculated the stack limit beyond which we will throw stack overflow errors.
 // This macro must be called from a C++ method. It relies on being able to take
@@ -480,7 +481,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_MIPS_SIMULATOR_MIPS_H_
diff --git a/src/mips64/assembler-mips64-inl.h b/src/mips64/assembler-mips64-inl.h
index 16ca33a..62dc2d3 100644
--- a/src/mips64/assembler-mips64-inl.h
+++ b/src/mips64/assembler-mips64-inl.h
@@ -488,6 +488,7 @@ void Assembler::emit(uint64_t x) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_ASSEMBLER_MIPS_INL_H_
diff --git a/src/mips64/assembler-mips64.h b/src/mips64/assembler-mips64.h
index be57f29..b1be0e8 100644
--- a/src/mips64/assembler-mips64.h
+++ b/src/mips64/assembler-mips64.h
@@ -1507,6 +1507,7 @@ class EnsureSpace BASE_EMBEDDED {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ARM_ASSEMBLER_MIPS_H_
diff --git a/src/mips64/code-stubs-mips64.h b/src/mips64/code-stubs-mips64.h
index c54a3d0..2e18f59 100644
--- a/src/mips64/code-stubs-mips64.h
+++ b/src/mips64/code-stubs-mips64.h
@@ -344,6 +344,7 @@ class NameDictionaryLookupStub: public PlatformCodeStub {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_CODE_STUBS_MIPS64_H_
diff --git a/src/mips64/codegen-mips64.h b/src/mips64/codegen-mips64.h
index f79ad4e..22784fc 100644
--- a/src/mips64/codegen-mips64.h
+++ b/src/mips64/codegen-mips64.h
@@ -46,6 +46,7 @@ class MathExpGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_CODEGEN_MIPS_H_
diff --git a/src/mips64/constants-mips64.h b/src/mips64/constants-mips64.h
index f23f103..1de058b 100644
--- a/src/mips64/constants-mips64.h
+++ b/src/mips64/constants-mips64.h
@@ -1252,6 +1252,7 @@ Instruction::Type Instruction::InstructionType(TypeChecks checks) const {
 
 #undef OpcodeToBitNumber
 #undef FunctionFieldToBitNumber
-} }   // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif    // #ifndef V8_MIPS_CONSTANTS_H_
diff --git a/src/mips64/frames-mips64.h b/src/mips64/frames-mips64.h
index 9b6d326..9c42d8d 100644
--- a/src/mips64/frames-mips64.h
+++ b/src/mips64/frames-mips64.h
@@ -169,6 +169,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/src/mips64/lithium-codegen-mips64.h b/src/mips64/lithium-codegen-mips64.h
index b08de16..7133f6d 100644
--- a/src/mips64/lithium-codegen-mips64.h
+++ b/src/mips64/lithium-codegen-mips64.h
@@ -429,6 +429,7 @@ class LDeferredCode : public ZoneObject {
   int instruction_index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_CODEGEN_MIPS_H_
diff --git a/src/mips64/lithium-gap-resolver-mips64.h b/src/mips64/lithium-gap-resolver-mips64.h
index 7374da7..6ede420 100644
--- a/src/mips64/lithium-gap-resolver-mips64.h
+++ b/src/mips64/lithium-gap-resolver-mips64.h
@@ -53,6 +53,7 @@ class LGapResolver final BASE_EMBEDDED {
   LOperand* saved_destination_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_GAP_RESOLVER_MIPS_H_
diff --git a/src/mips64/lithium-mips64.h b/src/mips64/lithium-mips64.h
index 01463c9..0720c7e 100644
--- a/src/mips64/lithium-mips64.h
+++ b/src/mips64/lithium-mips64.h
@@ -2889,6 +2889,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_LITHIUM_MIPS_H_
diff --git a/src/mips64/macro-assembler-mips64.h b/src/mips64/macro-assembler-mips64.h
index 5dfee07..68acbe3 100644
--- a/src/mips64/macro-assembler-mips64.h
+++ b/src/mips64/macro-assembler-mips64.h
@@ -1841,6 +1841,7 @@ class CodePatcher {
 #define ACCESS_MASM(masm) masm->
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MIPS_MACRO_ASSEMBLER_MIPS_H_
diff --git a/src/mips64/simulator-mips64.h b/src/mips64/simulator-mips64.h
index e45cbd4..68d518e 100644
--- a/src/mips64/simulator-mips64.h
+++ b/src/mips64/simulator-mips64.h
@@ -84,7 +84,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 // Calculated the stack limit beyond which we will throw stack overflow errors.
 // This macro must be called from a C++ method. It relies on being able to take
@@ -526,7 +527,8 @@ class SimulatorStack : public v8::internal::AllStatic {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_MIPS_SIMULATOR_MIPS_H_
diff --git a/src/modules.h b/src/modules.h
index 33afd61..f1dbd25 100644
--- a/src/modules.h
+++ b/src/modules.h
@@ -115,6 +115,7 @@ class ModuleDescriptor : public ZoneObject {
   int index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MODULES_H_
diff --git a/src/objects-inl.h b/src/objects-inl.h
index 3d39278..58ccefa 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -8046,6 +8046,7 @@ String::SubStringRange::iterator String::SubStringRange::end() {
 #undef NOBARRIER_READ_BYTE_FIELD
 #undef NOBARRIER_WRITE_BYTE_FIELD
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_OBJECTS_INL_H_
diff --git a/src/objects.h b/src/objects.h
index 8566545..a9d6fff 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -10624,6 +10624,8 @@ class KeyAccumulator final BASE_EMBEDDED {
   int length_;
   DISALLOW_COPY_AND_ASSIGN(KeyAccumulator);
 };
-} }  // namespace v8::internal
+
+}  // NOLINT, false-positive due to second-order macros.
+}  // NOLINT, false-positive due to second-order macros.
 
 #endif  // V8_OBJECTS_H_
diff --git a/src/optimizing-compile-dispatcher.h b/src/optimizing-compile-dispatcher.h
index ad09dfa..9c4e4cb 100644
--- a/src/optimizing-compile-dispatcher.h
+++ b/src/optimizing-compile-dispatcher.h
@@ -131,7 +131,7 @@ class OptimizingCompileDispatcher {
   // is not safe to access them directly.
   int recompilation_delay_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_OPTIMIZING_COMPILE_DISPATCHER_H_
diff --git a/src/parser.h b/src/parser.h
index cf4cdad..940b569 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -1373,6 +1373,7 @@ void ParserTraits::AddParameterInitializationBlock(
     }
   }
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PARSER_H_
diff --git a/src/ppc/assembler-ppc-inl.h b/src/ppc/assembler-ppc-inl.h
index b1e2825..4f6a35d 100644
--- a/src/ppc/assembler-ppc-inl.h
+++ b/src/ppc/assembler-ppc-inl.h
@@ -720,7 +720,7 @@ void Assembler::set_target_address_at(Address pc, Address constant_pool,
   }
   UNREACHABLE();
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_ASSEMBLER_PPC_INL_H_
diff --git a/src/ppc/assembler-ppc.h b/src/ppc/assembler-ppc.h
index a1c08ad..c1d6358 100644
--- a/src/ppc/assembler-ppc.h
+++ b/src/ppc/assembler-ppc.h
@@ -1612,7 +1612,7 @@ class EnsureSpace BASE_EMBEDDED {
  public:
   explicit EnsureSpace(Assembler* assembler) { assembler->CheckBuffer(); }
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_ASSEMBLER_PPC_H_
diff --git a/src/ppc/code-stubs-ppc.h b/src/ppc/code-stubs-ppc.h
index bc6c26b..ef4bdce 100644
--- a/src/ppc/code-stubs-ppc.h
+++ b/src/ppc/code-stubs-ppc.h
@@ -322,7 +322,7 @@ class NameDictionaryLookupStub : public PlatformCodeStub {
   DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR();
   DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_CODE_STUBS_PPC_H_
diff --git a/src/ppc/codegen-ppc.h b/src/ppc/codegen-ppc.h
index f8da74e..7f19bee 100644
--- a/src/ppc/codegen-ppc.h
+++ b/src/ppc/codegen-ppc.h
@@ -35,7 +35,7 @@ class MathExpGenerator : public AllStatic {
  private:
   DISALLOW_COPY_AND_ASSIGN(MathExpGenerator);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_CODEGEN_PPC_H_
diff --git a/src/ppc/constants-ppc.h b/src/ppc/constants-ppc.h
index b304bad..ece27a3 100644
--- a/src/ppc/constants-ppc.h
+++ b/src/ppc/constants-ppc.h
@@ -592,7 +592,7 @@ class FPRegisters {
  private:
   static const char* names_[kNumFPRegisters];
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_CONSTANTS_PPC_H_
diff --git a/src/ppc/frames-ppc.h b/src/ppc/frames-ppc.h
index d5b6d3c..f5beb5c 100644
--- a/src/ppc/frames-ppc.h
+++ b/src/ppc/frames-ppc.h
@@ -185,7 +185,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_FRAMES_PPC_H_
diff --git a/src/ppc/lithium-codegen-ppc.h b/src/ppc/lithium-codegen-ppc.h
index 117dc57..d48ee05 100644
--- a/src/ppc/lithium-codegen-ppc.h
+++ b/src/ppc/lithium-codegen-ppc.h
@@ -358,7 +358,7 @@ class LDeferredCode : public ZoneObject {
   Label* external_exit_;
   int instruction_index_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_LITHIUM_CODEGEN_PPC_H_
diff --git a/src/ppc/lithium-gap-resolver-ppc.h b/src/ppc/lithium-gap-resolver-ppc.h
index 7741080..e7cd789 100644
--- a/src/ppc/lithium-gap-resolver-ppc.h
+++ b/src/ppc/lithium-gap-resolver-ppc.h
@@ -52,7 +52,7 @@ class LGapResolver final BASE_EMBEDDED {
   bool in_cycle_;
   LOperand* saved_destination_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_LITHIUM_GAP_RESOLVER_PPC_H_
diff --git a/src/ppc/lithium-ppc.h b/src/ppc/lithium-ppc.h
index e862a11..304a365 100644
--- a/src/ppc/lithium-ppc.h
+++ b/src/ppc/lithium-ppc.h
@@ -2760,7 +2760,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_LITHIUM_PPC_H_
diff --git a/src/ppc/macro-assembler-ppc.h b/src/ppc/macro-assembler-ppc.h
index cfc1530..09f6cab 100644
--- a/src/ppc/macro-assembler-ppc.h
+++ b/src/ppc/macro-assembler-ppc.h
@@ -1566,7 +1566,7 @@ inline MemOperand GlobalObjectOperand() {
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PPC_MACRO_ASSEMBLER_PPC_H_
diff --git a/src/ppc/simulator-ppc.h b/src/ppc/simulator-ppc.h
index 042b2ad..0df30da 100644
--- a/src/ppc/simulator-ppc.h
+++ b/src/ppc/simulator-ppc.h
@@ -54,8 +54,8 @@ class SimulatorStack : public v8::internal::AllStatic {
 
   static inline void UnregisterCTryCatch() {}
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #else  // !defined(USE_SIMULATOR)
 // Running with a simulator.
@@ -422,8 +422,8 @@ class SimulatorStack : public v8::internal::AllStatic {
     Simulator::current(Isolate::Current())->PopAddress();
   }
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_PPC_SIMULATOR_PPC_H_
diff --git a/src/preparse-data-format.h b/src/preparse-data-format.h
index 560693f..c68a684 100644
--- a/src/preparse-data-format.h
+++ b/src/preparse-data-format.h
@@ -35,6 +35,7 @@ struct PreparseDataConstants {
 };
 
 
-} }  // namespace v8::internal.
+}  // namespace internal
+}  // namespace v8.
 
 #endif  // V8_PREPARSE_DATA_FORMAT_H_
diff --git a/src/preparse-data.h b/src/preparse-data.h
index f7ed1ed..711ff3b 100644
--- a/src/preparse-data.h
+++ b/src/preparse-data.h
@@ -206,6 +206,7 @@ class CompleteParserRecorder : public ParserRecorder {
 };
 
 
-} }  // namespace v8::internal.
+}  // namespace internal
+}  // namespace v8.
 
 #endif  // V8_PREPARSE_DATA_H_
diff --git a/src/preparser.cc b/src/preparser.cc
index 1bdcb85..4ff2c95 100644
--- a/src/preparser.cc
+++ b/src/preparser.cc
@@ -1237,4 +1237,5 @@ PreParser::Expression PreParser::ParseV8Intrinsic(bool* ok) {
 #undef CHECK_OK
 
 
-} }  // v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/preparser.h b/src/preparser.h
index 50dbcf1..3739447 100644
--- a/src/preparser.h
+++ b/src/preparser.h
@@ -4183,6 +4183,7 @@ void ParserBase<Traits>::ClassLiteralChecker::CheckProperty(
     return;
   }
 }
-} }  // v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PREPARSER_H
diff --git a/src/prettyprinter.h b/src/prettyprinter.h
index 1971cfe..33aa1eb 100644
--- a/src/prettyprinter.h
+++ b/src/prettyprinter.h
@@ -133,6 +133,7 @@ class AstPrinter: public PrettyPrinter {
 
 #endif  // DEBUG
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PRETTYPRINTER_H_
diff --git a/src/profiler/allocation-tracker.h b/src/profiler/allocation-tracker.h
index ebda3db..03802a5 100644
--- a/src/profiler/allocation-tracker.h
+++ b/src/profiler/allocation-tracker.h
@@ -152,6 +152,7 @@ class AllocationTracker {
   DISALLOW_COPY_AND_ASSIGN(AllocationTracker);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ALLOCATION_TRACKER_H_
diff --git a/src/profiler/circular-queue-inl.h b/src/profiler/circular-queue-inl.h
index 66b4af5..428945a 100644
--- a/src/profiler/circular-queue-inl.h
+++ b/src/profiler/circular-queue-inl.h
@@ -64,6 +64,7 @@ typename SamplingCircularQueue<T, L>::Entry* SamplingCircularQueue<T, L>::Next(
   return next;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_CIRCULAR_QUEUE_INL_H_
diff --git a/src/profiler/circular-queue.h b/src/profiler/circular-queue.h
index 3508b37..272843b 100644
--- a/src/profiler/circular-queue.h
+++ b/src/profiler/circular-queue.h
@@ -63,6 +63,7 @@ class SamplingCircularQueue {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_CIRCULAR_QUEUE_H_
diff --git a/src/profiler/cpu-profiler-inl.h b/src/profiler/cpu-profiler-inl.h
index df727ae..ea82c55 100644
--- a/src/profiler/cpu-profiler-inl.h
+++ b/src/profiler/cpu-profiler-inl.h
@@ -74,6 +74,7 @@ void ProfilerEventsProcessor::FinishTickSample() {
   ticks_buffer_.FinishEnqueue();
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_CPU_PROFILER_INL_H_
diff --git a/src/profiler/cpu-profiler.h b/src/profiler/cpu-profiler.h
index 2d67327..2326bb7 100644
--- a/src/profiler/cpu-profiler.h
+++ b/src/profiler/cpu-profiler.h
@@ -270,7 +270,8 @@ class CpuProfiler : public CodeEventListener {
   DISALLOW_COPY_AND_ASSIGN(CpuProfiler);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_PROFILER_CPU_PROFILER_H_
diff --git a/src/profiler/heap-profiler.h b/src/profiler/heap-profiler.h
index b304f38..d6fcbbd 100644
--- a/src/profiler/heap-profiler.h
+++ b/src/profiler/heap-profiler.h
@@ -79,6 +79,7 @@ class HeapProfiler {
   base::Mutex profiler_mutex_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_HEAP_PROFILER_H_
diff --git a/src/profiler/heap-snapshot-generator-inl.h b/src/profiler/heap-snapshot-generator-inl.h
index 12e37f5..fb1e891 100644
--- a/src/profiler/heap-snapshot-generator-inl.h
+++ b/src/profiler/heap-snapshot-generator-inl.h
@@ -43,6 +43,7 @@ HeapGraphEdge** HeapEntry::children_arr() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_INL_H_
diff --git a/src/profiler/heap-snapshot-generator.h b/src/profiler/heap-snapshot-generator.h
index 1baebee..4b3d1f0 100644
--- a/src/profiler/heap-snapshot-generator.h
+++ b/src/profiler/heap-snapshot-generator.h
@@ -616,6 +616,7 @@ class HeapSnapshotJSONSerializer {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_HEAP_SNAPSHOT_GENERATOR_H_
diff --git a/src/profiler/profile-generator-inl.h b/src/profiler/profile-generator-inl.h
index c2e98cc..e8205c7 100644
--- a/src/profiler/profile-generator-inl.h
+++ b/src/profiler/profile-generator-inl.h
@@ -43,6 +43,7 @@ ProfileNode::ProfileNode(ProfileTree* tree, CodeEntry* entry)
 inline unsigned ProfileNode::function_id() const {
   return tree_->GetFunctionId(this);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_PROFILE_GENERATOR_INL_H_
diff --git a/src/profiler/profile-generator.h b/src/profiler/profile-generator.h
index ce58d70..cd79dfa 100644
--- a/src/profiler/profile-generator.h
+++ b/src/profiler/profile-generator.h
@@ -383,6 +383,7 @@ class ProfileGenerator {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_PROFILE_GENERATOR_H_
diff --git a/src/profiler/sampler.h b/src/profiler/sampler.h
index ed932c0..354e935 100644
--- a/src/profiler/sampler.h
+++ b/src/profiler/sampler.h
@@ -130,6 +130,7 @@ class Sampler {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_SAMPLER_H_
diff --git a/src/profiler/unbound-queue-inl.h b/src/profiler/unbound-queue-inl.h
index fef7bec..8c45d09 100644
--- a/src/profiler/unbound-queue-inl.h
+++ b/src/profiler/unbound-queue-inl.h
@@ -77,6 +77,7 @@ Record* UnboundQueue<Record>::Peek() const {
   return &next->value;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_UNBOUND_QUEUE_INL_H_
diff --git a/src/profiler/unbound-queue.h b/src/profiler/unbound-queue.h
index a63c327..c53b35a 100644
--- a/src/profiler/unbound-queue.h
+++ b/src/profiler/unbound-queue.h
@@ -42,6 +42,7 @@ class UnboundQueue BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROFILER_UNBOUND_QUEUE_
diff --git a/src/property-details.h b/src/property-details.h
index 33d3b8d..ca37927 100644
--- a/src/property-details.h
+++ b/src/property-details.h
@@ -371,6 +371,7 @@ class PropertyDetails BASE_EMBEDDED {
 std::ostream& operator<<(std::ostream& os,
                          const PropertyAttributes& attributes);
 std::ostream& operator<<(std::ostream& os, const PropertyDetails& details);
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROPERTY_DETAILS_H_
diff --git a/src/property.h b/src/property.h
index 09ec5f2..b58c9c6 100644
--- a/src/property.h
+++ b/src/property.h
@@ -107,6 +107,7 @@ class AccessorConstantDescriptor final : public Descriptor {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_PROPERTY_H_
diff --git a/src/regexp/arm/regexp-macro-assembler-arm.h b/src/regexp/arm/regexp-macro-assembler-arm.h
index 123a957..c6cff65 100644
--- a/src/regexp/arm/regexp-macro-assembler-arm.h
+++ b/src/regexp/arm/regexp-macro-assembler-arm.h
@@ -214,6 +214,7 @@ class RegExpMacroAssemblerARM: public NativeRegExpMacroAssembler {
 #endif  // V8_INTERPRETED_REGEXP
 
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_ARM_REGEXP_MACRO_ASSEMBLER_ARM_H_
diff --git a/src/regexp/arm64/regexp-macro-assembler-arm64.h b/src/regexp/arm64/regexp-macro-assembler-arm64.h
index a48291a..0dc5195 100644
--- a/src/regexp/arm64/regexp-macro-assembler-arm64.h
+++ b/src/regexp/arm64/regexp-macro-assembler-arm64.h
@@ -289,6 +289,7 @@ class RegExpMacroAssemblerARM64: public NativeRegExpMacroAssembler {
 #endif  // V8_INTERPRETED_REGEXP
 
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_ARM64_REGEXP_MACRO_ASSEMBLER_ARM64_H_
diff --git a/src/regexp/bytecodes-irregexp.h b/src/regexp/bytecodes-irregexp.h
index 2769142..d6110a3 100644
--- a/src/regexp/bytecodes-irregexp.h
+++ b/src/regexp/bytecodes-irregexp.h
@@ -76,6 +76,8 @@ BYTECODE_ITERATOR(DECLARE_BYTECODES)
   static const int BC_##name##_LENGTH = length;
 BYTECODE_ITERATOR(DECLARE_BYTECODE_LENGTH)
 #undef DECLARE_BYTECODE_LENGTH
-} }
+
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_BYTECODES_IRREGEXP_H_
diff --git a/src/regexp/ia32/regexp-macro-assembler-ia32.h b/src/regexp/ia32/regexp-macro-assembler-ia32.h
index 8ec0a9e..06b9699 100644
--- a/src/regexp/ia32/regexp-macro-assembler-ia32.h
+++ b/src/regexp/ia32/regexp-macro-assembler-ia32.h
@@ -196,6 +196,7 @@ class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler {
 };
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_IA32_REGEXP_MACRO_ASSEMBLER_IA32_H_
diff --git a/src/regexp/interpreter-irregexp.h b/src/regexp/interpreter-irregexp.h
index d97d3b0..244af99 100644
--- a/src/regexp/interpreter-irregexp.h
+++ b/src/regexp/interpreter-irregexp.h
@@ -23,6 +23,7 @@ class IrregexpInterpreter {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_INTERPRETER_IRREGEXP_H_
diff --git a/src/regexp/jsregexp-inl.h b/src/regexp/jsregexp-inl.h
index 118f3db..3eb7c3c 100644
--- a/src/regexp/jsregexp-inl.h
+++ b/src/regexp/jsregexp-inl.h
@@ -78,6 +78,7 @@ int32_t* RegExpImpl::GlobalCache::LastSuccessfulMatch() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_JSREGEXP_INL_H_
diff --git a/src/regexp/mips/regexp-macro-assembler-mips.h b/src/regexp/mips/regexp-macro-assembler-mips.h
index 36fd4b1..da59546 100644
--- a/src/regexp/mips/regexp-macro-assembler-mips.h
+++ b/src/regexp/mips/regexp-macro-assembler-mips.h
@@ -220,6 +220,7 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler {
 #endif  // V8_INTERPRETED_REGEXP
 
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_MIPS_REGEXP_MACRO_ASSEMBLER_MIPS_H_
diff --git a/src/regexp/mips64/regexp-macro-assembler-mips64.h b/src/regexp/mips64/regexp-macro-assembler-mips64.h
index 84c85af..265bf77 100644
--- a/src/regexp/mips64/regexp-macro-assembler-mips64.h
+++ b/src/regexp/mips64/regexp-macro-assembler-mips64.h
@@ -262,6 +262,7 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler {
 #endif  // V8_INTERPRETED_REGEXP
 
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_MIPS_REGEXP_MACRO_ASSEMBLER_MIPS_H_
diff --git a/src/regexp/ppc/regexp-macro-assembler-ppc.h b/src/regexp/ppc/regexp-macro-assembler-ppc.h
index 2dd339e..04a0e5e 100644
--- a/src/regexp/ppc/regexp-macro-assembler-ppc.h
+++ b/src/regexp/ppc/regexp-macro-assembler-ppc.h
@@ -208,7 +208,7 @@ const RegList kRegExpCalleeSaved =
     1 << 25 | 1 << 26 | 1 << 27 | 1 << 28 | 1 << 29 | 1 << 30 | 1 << 31;
 
 #endif  // V8_INTERPRETED_REGEXP
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_PPC_REGEXP_MACRO_ASSEMBLER_PPC_H_
diff --git a/src/regexp/regexp-macro-assembler-irregexp-inl.h b/src/regexp/regexp-macro-assembler-irregexp-inl.h
index b86d28d..6f176cd 100644
--- a/src/regexp/regexp-macro-assembler-irregexp-inl.h
+++ b/src/regexp/regexp-macro-assembler-irregexp-inl.h
@@ -56,6 +56,7 @@ void RegExpMacroAssemblerIrregexp::Emit32(uint32_t word) {
 
 #endif  // V8_INTERPRETED_REGEXP
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_REGEXP_MACRO_ASSEMBLER_IRREGEXP_INL_H_
diff --git a/src/regexp/regexp-macro-assembler-irregexp.h b/src/regexp/regexp-macro-assembler-irregexp.h
index 556d78d..bbfe520 100644
--- a/src/regexp/regexp-macro-assembler-irregexp.h
+++ b/src/regexp/regexp-macro-assembler-irregexp.h
@@ -125,6 +125,7 @@ class RegExpMacroAssemblerIrregexp: public RegExpMacroAssembler {
 
 #endif  // V8_INTERPRETED_REGEXP
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_REGEXP_MACRO_ASSEMBLER_IRREGEXP_H_
diff --git a/src/regexp/regexp-macro-assembler-tracer.h b/src/regexp/regexp-macro-assembler-tracer.h
index d4092ce..f936419 100644
--- a/src/regexp/regexp-macro-assembler-tracer.h
+++ b/src/regexp/regexp-macro-assembler-tracer.h
@@ -81,6 +81,7 @@ class RegExpMacroAssemblerTracer: public RegExpMacroAssembler {
   RegExpMacroAssembler* assembler_;
 };
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_REGEXP_MACRO_ASSEMBLER_TRACER_H_
diff --git a/src/regexp/regexp-macro-assembler.h b/src/regexp/regexp-macro-assembler.h
index c3d94a6a..ea97d5b 100644
--- a/src/regexp/regexp-macro-assembler.h
+++ b/src/regexp/regexp-macro-assembler.h
@@ -245,6 +245,7 @@ class NativeRegExpMacroAssembler: public RegExpMacroAssembler {
 
 #endif  // V8_INTERPRETED_REGEXP
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
diff --git a/src/regexp/regexp-stack.h b/src/regexp/regexp-stack.h
index 9a6394e..aea46cf 100644
--- a/src/regexp/regexp-stack.h
+++ b/src/regexp/regexp-stack.h
@@ -124,6 +124,7 @@ class RegExpStack {
   DISALLOW_COPY_AND_ASSIGN(RegExpStack);
 };
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_REGEXP_STACK_H_
diff --git a/src/regexp/x64/regexp-macro-assembler-x64.h b/src/regexp/x64/regexp-macro-assembler-x64.h
index d690dc1..dbee9e8 100644
--- a/src/regexp/x64/regexp-macro-assembler-x64.h
+++ b/src/regexp/x64/regexp-macro-assembler-x64.h
@@ -276,6 +276,7 @@ class RegExpMacroAssemblerX64: public NativeRegExpMacroAssembler {
 
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_X64_REGEXP_MACRO_ASSEMBLER_X64_H_
diff --git a/src/regexp/x87/regexp-macro-assembler-x87.h b/src/regexp/x87/regexp-macro-assembler-x87.h
index f636ca0..0deea50 100644
--- a/src/regexp/x87/regexp-macro-assembler-x87.h
+++ b/src/regexp/x87/regexp-macro-assembler-x87.h
@@ -196,6 +196,7 @@ class RegExpMacroAssemblerX87: public NativeRegExpMacroAssembler {
 };
 #endif  // V8_INTERPRETED_REGEXP
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REGEXP_X87_REGEXP_MACRO_ASSEMBLER_X87_H_
diff --git a/src/rewriter.h b/src/rewriter.h
index b283a55..4e76cd6 100644
--- a/src/rewriter.h
+++ b/src/rewriter.h
@@ -22,6 +22,7 @@ class Rewriter {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_REWRITER_H_
diff --git a/src/runtime-profiler.h b/src/runtime-profiler.h
index eff443d..0d57929 100644
--- a/src/runtime-profiler.h
+++ b/src/runtime-profiler.h
@@ -39,6 +39,7 @@ class RuntimeProfiler {
   bool any_ic_changed_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_RUNTIME_PROFILER_H_
diff --git a/src/runtime/runtime-atomics.cc b/src/runtime/runtime-atomics.cc
index 84eab2c..636371c 100644
--- a/src/runtime/runtime-atomics.cc
+++ b/src/runtime/runtime-atomics.cc
@@ -721,5 +721,5 @@ RUNTIME_FUNCTION(Runtime_AtomicsIsLockFree) {
   uint32_t usize = NumberToUint32(*size);
   return isolate->heap()->ToBoolean(AtomicIsLockFree(usize));
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/runtime/runtime-futex.cc b/src/runtime/runtime-futex.cc
index a96758d..b2bad77 100644
--- a/src/runtime/runtime-futex.cc
+++ b/src/runtime/runtime-futex.cc
@@ -89,5 +89,5 @@ RUNTIME_FUNCTION(Runtime_AtomicsFutexNumWaitersForTesting) {
 
   return FutexEmulation::NumWaitersForTesting(isolate, array_buffer, addr);
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/runtime/runtime-utils.h b/src/runtime/runtime-utils.h
index 4b072b1..ded2c09 100644
--- a/src/runtime/runtime-utils.h
+++ b/src/runtime/runtime-utils.h
@@ -162,7 +162,7 @@ static inline ObjectPair MakePair(Object* x, Object* y) {
 }
 #endif
 
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_RUNTIME_RUNTIME_UTILS_H_
diff --git a/src/safepoint-table.h b/src/safepoint-table.h
index a7719e0..fbb0152 100644
--- a/src/safepoint-table.h
+++ b/src/safepoint-table.h
@@ -230,6 +230,7 @@ class SafepointTableBuilder BASE_EMBEDDED {
   DISALLOW_COPY_AND_ASSIGN(SafepointTableBuilder);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SAFEPOINT_TABLE_H_
diff --git a/src/scanner-character-streams.h b/src/scanner-character-streams.h
index a26f50a..b15da52 100644
--- a/src/scanner-character-streams.h
+++ b/src/scanner-character-streams.h
@@ -183,6 +183,7 @@ class ExternalTwoByteStringUtf16CharacterStream: public Utf16CharacterStream {
   size_t bookmark_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SCANNER_CHARACTER_STREAMS_H_
diff --git a/src/scanner.h b/src/scanner.h
index a86ed07..c136a61 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -763,6 +763,7 @@ class Scanner {
   bool has_multiline_comment_before_next_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SCANNER_H_
diff --git a/src/scopeinfo.h b/src/scopeinfo.h
index 70a17cd..2afc667 100644
--- a/src/scopeinfo.h
+++ b/src/scopeinfo.h
@@ -169,6 +169,7 @@ class ModuleInfo: public FixedArray {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SCOPEINFO_H_
diff --git a/src/scopes.h b/src/scopes.h
index 61bf633..3054f30 100644
--- a/src/scopes.h
+++ b/src/scopes.h
@@ -821,6 +821,7 @@ class Scope: public ZoneObject {
   int class_declaration_group_start_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SCOPES_H_
diff --git a/src/small-pointer-list.h b/src/small-pointer-list.h
index 241689e..9ece249 100644
--- a/src/small-pointer-list.h
+++ b/src/small-pointer-list.h
@@ -170,6 +170,7 @@ class SmallPointerList {
   DISALLOW_COPY_AND_ASSIGN(SmallPointerList);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SMALL_POINTER_LIST_H_
diff --git a/src/snapshot/natives.h b/src/snapshot/natives.h
index c923a0f..c1e2fcd 100644
--- a/src/snapshot/natives.h
+++ b/src/snapshot/natives.h
@@ -62,6 +62,7 @@ void ReadNatives();
 void DisposeNatives();
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SNAPSHOT_NATIVES_H_
diff --git a/src/snapshot/serialize.h b/src/snapshot/serialize.h
index 2863ede..97cea9a 100644
--- a/src/snapshot/serialize.h
+++ b/src/snapshot/serialize.h
@@ -981,6 +981,7 @@ class SerializedCodeData : public SerializedData {
   static const int kChecksum2Offset = kChecksum1Offset + kInt32Size;
   static const int kHeaderSize = kChecksum2Offset + kInt32Size;
 };
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SNAPSHOT_SERIALIZE_H_
diff --git a/src/snapshot/snapshot-source-sink.h b/src/snapshot/snapshot-source-sink.h
index e0290c9..af617cc 100644
--- a/src/snapshot/snapshot-source-sink.h
+++ b/src/snapshot/snapshot-source-sink.h
@@ -101,7 +101,7 @@ class SnapshotByteSink {
   List<byte> data_;
 };
 
-}  // namespace v8::internal
+}  // namespace internal
 }  // namespace v8
 
 #endif  // V8_SNAPSHOT_SNAPSHOT_SOURCE_SINK_H_
diff --git a/src/snapshot/snapshot.h b/src/snapshot/snapshot.h
index 1379644..f0b90bb 100644
--- a/src/snapshot/snapshot.h
+++ b/src/snapshot/snapshot.h
@@ -89,6 +89,7 @@ class Snapshot : public AllStatic {
 void SetSnapshotFromFile(StartupData* snapshot_blob);
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SNAPSHOT_SNAPSHOT_H_
diff --git a/src/splay-tree-inl.h b/src/splay-tree-inl.h
index 6c7b4f4..1adfdac 100644
--- a/src/splay-tree-inl.h
+++ b/src/splay-tree-inl.h
@@ -290,6 +290,7 @@ void SplayTree<Config, Allocator>::ForEachNode(Callback* callback) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SPLAY_TREE_INL_H_
diff --git a/src/splay-tree.h b/src/splay-tree.h
index 30e5d67..bee8429 100644
--- a/src/splay-tree.h
+++ b/src/splay-tree.h
@@ -198,6 +198,7 @@ class SplayTree {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_SPLAY_TREE_H_
diff --git a/src/string-builder.h b/src/string-builder.h
index 554277d..76b6f5b 100644
--- a/src/string-builder.h
+++ b/src/string-builder.h
@@ -429,7 +429,7 @@ void IncrementalStringBuilder::Append(SrcChar c) {
   }
   if (current_index_ == part_length_) Extend();
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STRING_BUILDER_H_
diff --git a/src/string-search.h b/src/string-search.h
index c0cc2ca..7db0993 100644
--- a/src/string-search.h
+++ b/src/string-search.h
@@ -563,6 +563,7 @@ int SearchString(Isolate* isolate,
   return search.Search(subject, start_index);
 }
 
-}}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STRING_SEARCH_H_
diff --git a/src/string-stream.h b/src/string-stream.h
index 2f11b18..03ea062 100644
--- a/src/string-stream.h
+++ b/src/string-stream.h
@@ -178,6 +178,7 @@ class StringStream final {
   DISALLOW_IMPLICIT_CONSTRUCTORS(StringStream);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STRING_STREAM_H_
diff --git a/src/strings-storage.h b/src/strings-storage.h
index 8fd9da7..bc3020d 100644
--- a/src/strings-storage.h
+++ b/src/strings-storage.h
@@ -41,7 +41,7 @@ class StringsStorage {
 
   DISALLOW_COPY_AND_ASSIGN(StringsStorage);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STRINGS_STORAGE_H_
diff --git a/src/strtod.h b/src/strtod.h
index 737b548..75e60b0 100644
--- a/src/strtod.h
+++ b/src/strtod.h
@@ -14,6 +14,7 @@ namespace internal {
 // contain a dot or a sign. It must not start with '0', and must not be empty.
 double Strtod(Vector<const char> buffer, int exponent);
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_STRTOD_H_
diff --git a/src/third_party/fdlibm/fdlibm.h b/src/third_party/fdlibm/fdlibm.h
index c7bc09a..1519809 100644
--- a/src/third_party/fdlibm/fdlibm.h
+++ b/src/third_party/fdlibm/fdlibm.h
@@ -25,7 +25,7 @@ int rempio2(double x, double* y);
 struct MathConstants {
   static const double constants[66];
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_FDLIBM_H_
diff --git a/src/token.h b/src/token.h
index db9092d..2443e84 100644
--- a/src/token.h
+++ b/src/token.h
@@ -318,6 +318,7 @@ class Token {
   static const char token_type[NUM_TOKENS];
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TOKEN_H_
diff --git a/src/transitions-inl.h b/src/transitions-inl.h
index f31eff9..a5ec52f 100644
--- a/src/transitions-inl.h
+++ b/src/transitions-inl.h
@@ -173,6 +173,7 @@ void TransitionArray::SetNumberOfTransitions(int number_of_transitions) {
   set(kTransitionLengthIndex, Smi::FromInt(number_of_transitions));
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TRANSITIONS_INL_H_
diff --git a/src/transitions.h b/src/transitions.h
index b0aab95..b979c97 100644
--- a/src/transitions.h
+++ b/src/transitions.h
@@ -302,6 +302,7 @@ class TransitionArray: public FixedArray {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TRANSITIONS_H_
diff --git a/src/type-feedback-vector-inl.h b/src/type-feedback-vector-inl.h
index 4d1c345..2301f03 100644
--- a/src/type-feedback-vector-inl.h
+++ b/src/type-feedback-vector-inl.h
@@ -166,7 +166,7 @@ void FeedbackNexus::SetFeedbackExtra(Object* feedback_extra,
 
 
 Isolate* FeedbackNexus::GetIsolate() const { return vector()->GetIsolate(); }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPE_FEEDBACK_VECTOR_INL_H_
diff --git a/src/type-feedback-vector.h b/src/type-feedback-vector.h
index 5c28fca..2d394b0 100644
--- a/src/type-feedback-vector.h
+++ b/src/type-feedback-vector.h
@@ -497,7 +497,7 @@ class KeyedStoreICNexus : public FeedbackNexus {
   InlineCacheState StateFromFeedback() const override;
   Name* FindFirstName() const override;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TRANSITIONS_H_
diff --git a/src/type-info.h b/src/type-info.h
index 96cc39f..c41720a 100644
--- a/src/type-info.h
+++ b/src/type-info.h
@@ -155,6 +155,7 @@ class TypeFeedbackOracle: public ZoneObject {
   DISALLOW_COPY_AND_ASSIGN(TypeFeedbackOracle);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPE_INFO_H_
diff --git a/src/types-inl.h b/src/types-inl.h
index 699d642..9af4bcc 100644
--- a/src/types-inl.h
+++ b/src/types-inl.h
@@ -481,6 +481,7 @@ void HeapTypeConfig::range_set_double(i::Handle<HeapTypeConfig::Range> range,
   i::Handle<Object> number = isolate->factory()->NewNumber(value);
   range->set(index + 2, *number);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPES_INL_H_
diff --git a/src/types.h b/src/types.h
index 3acd5cc..f78755e 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1186,6 +1186,7 @@ struct BoundsImpl {
 
 typedef BoundsImpl<ZoneTypeConfig> Bounds;
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPES_H_
diff --git a/src/typing-asm.cc b/src/typing-asm.cc
index f768896..501af02 100644
--- a/src/typing-asm.cc
+++ b/src/typing-asm.cc
@@ -1072,5 +1072,5 @@ void AsmTyper::VisitWithExpectation(Expression* expr, Type* expected_type,
   }
   expected_type_ = save;
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/typing-asm.h b/src/typing-asm.h
index 74c28fb..26ce65a 100644
--- a/src/typing-asm.h
+++ b/src/typing-asm.h
@@ -89,7 +89,7 @@ class AsmTyper : public AstVisitor {
 
   DISALLOW_COPY_AND_ASSIGN(AsmTyper);
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPING_ASM_H_
diff --git a/src/typing-reset.cc b/src/typing-reset.cc
index af7641b..90f152c 100644
--- a/src/typing-reset.cc
+++ b/src/typing-reset.cc
@@ -22,5 +22,5 @@ TypingReseter::TypingReseter(Isolate* isolate, Zone* zone,
 void TypingReseter::VisitExpression(Expression* expression) {
   expression->set_bounds(Bounds::Unbounded());
 }
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
diff --git a/src/typing-reset.h b/src/typing-reset.h
index b809eb2..4e589a3 100644
--- a/src/typing-reset.h
+++ b/src/typing-reset.h
@@ -20,7 +20,7 @@ class TypingReseter : public AstExpressionVisitor {
  protected:
   void VisitExpression(Expression* expression) override;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPING_RESET_H_
diff --git a/src/typing.h b/src/typing.h
index 8b3e97b..c8d9af8 100644
--- a/src/typing.h
+++ b/src/typing.h
@@ -76,6 +76,7 @@ class AstTyper: public AstVisitor {
   DISALLOW_COPY_AND_ASSIGN(AstTyper);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_TYPING_H_
diff --git a/src/unique.h b/src/unique.h
index 8805218..3497735 100644
--- a/src/unique.h
+++ b/src/unique.h
@@ -355,6 +355,7 @@ class UniqueSet final : public ZoneObject {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_UNIQUE_H_
diff --git a/src/v8.h b/src/v8.h
index f5b3b84..6016ef1 100644
--- a/src/v8.h
+++ b/src/v8.h
@@ -41,6 +41,7 @@ class V8 : public AllStatic {
   static v8::Platform* platform_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_V8_H_
diff --git a/src/v8memory.h b/src/v8memory.h
index 615ec4f..b1ae939 100644
--- a/src/v8memory.h
+++ b/src/v8memory.h
@@ -66,6 +66,7 @@ class Memory {
   }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_MEMORY_H_
diff --git a/src/v8threads.h b/src/v8threads.h
index 3e189d5..db0ed07 100644
--- a/src/v8threads.h
+++ b/src/v8threads.h
@@ -118,6 +118,7 @@ class ThreadManager {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_V8THREADS_H_
diff --git a/src/variables.h b/src/variables.h
index dcd2e6a..1c6290d 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -193,6 +193,7 @@ class ClassVariable : public Variable {
   // checks for functions too.
   int declaration_group_start_;
 };
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_VARIABLES_H_
diff --git a/src/vector.h b/src/vector.h
index 4f3128b..e4637c9 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -202,6 +202,7 @@ inline Vector<char> MutableCStrVector(char* data, int max) {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_VECTOR_H_
diff --git a/src/version.h b/src/version.h
index 2596bee..3395d7f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -47,6 +47,7 @@ class Version {
                          bool candidate, const char* soname);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_VERSION_H_
diff --git a/src/vm-state-inl.h b/src/vm-state-inl.h
index ac3941e..d60548d 100644
--- a/src/vm-state-inl.h
+++ b/src/vm-state-inl.h
@@ -78,6 +78,7 @@ Address ExternalCallbackScope::scope_address() {
 }
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_VM_STATE_INL_H_
diff --git a/src/vm-state.h b/src/vm-state.h
index 9838b87..81a90e3 100644
--- a/src/vm-state.h
+++ b/src/vm-state.h
@@ -46,7 +46,8 @@ class ExternalCallbackScope BASE_EMBEDDED {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 
 #endif  // V8_VM_STATE_H_
diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h
index c66e86d..1737658 100644
--- a/src/x64/assembler-x64-inl.h
+++ b/src/x64/assembler-x64-inl.h
@@ -629,6 +629,7 @@ void Operand::set_disp64(int64_t disp) {
   *p = disp;
   len_ += sizeof(disp);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_ASSEMBLER_X64_INL_H_
diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
index 47e4d2b..956e142 100644
--- a/src/x64/assembler-x64.h
+++ b/src/x64/assembler-x64.h
@@ -2148,6 +2148,7 @@ class EnsureSpace BASE_EMBEDDED {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_ASSEMBLER_X64_H_
diff --git a/src/x64/code-stubs-x64.h b/src/x64/code-stubs-x64.h
index 1344400..4e3715b 100644
--- a/src/x64/code-stubs-x64.h
+++ b/src/x64/code-stubs-x64.h
@@ -360,6 +360,7 @@ class RecordWriteStub: public PlatformCodeStub {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_CODE_STUBS_X64_H_
diff --git a/src/x64/codegen-x64.h b/src/x64/codegen-x64.h
index 728d040..09af38d 100644
--- a/src/x64/codegen-x64.h
+++ b/src/x64/codegen-x64.h
@@ -108,6 +108,7 @@ class StackArgumentsAccessor BASE_EMBEDDED {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_CODEGEN_X64_H_
diff --git a/src/x64/frames-x64.h b/src/x64/frames-x64.h
index 1d9cf1e..d213ecb 100644
--- a/src/x64/frames-x64.h
+++ b/src/x64/frames-x64.h
@@ -71,6 +71,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_FRAMES_X64_H_
diff --git a/src/x64/lithium-codegen-x64.h b/src/x64/lithium-codegen-x64.h
index e05b310..d5ca006 100644
--- a/src/x64/lithium-codegen-x64.h
+++ b/src/x64/lithium-codegen-x64.h
@@ -387,6 +387,7 @@ class LDeferredCode: public ZoneObject {
   int instruction_index_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_LITHIUM_CODEGEN_X64_H_
diff --git a/src/x64/lithium-gap-resolver-x64.h b/src/x64/lithium-gap-resolver-x64.h
index 7882da56..db1a4ac 100644
--- a/src/x64/lithium-gap-resolver-x64.h
+++ b/src/x64/lithium-gap-resolver-x64.h
@@ -44,6 +44,7 @@ class LGapResolver final BASE_EMBEDDED {
   ZoneList<LMoveOperands> moves_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_LITHIUM_GAP_RESOLVER_X64_H_
diff --git a/src/x64/lithium-x64.h b/src/x64/lithium-x64.h
index 6129516..42d5a54 100644
--- a/src/x64/lithium-x64.h
+++ b/src/x64/lithium-x64.h
@@ -2864,6 +2864,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::int
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_LITHIUM_X64_H_
diff --git a/src/x64/macro-assembler-x64.h b/src/x64/macro-assembler-x64.h
index 1fca0e3..75d4885 100644
--- a/src/x64/macro-assembler-x64.h
+++ b/src/x64/macro-assembler-x64.h
@@ -1640,6 +1640,7 @@ extern void LogGeneratedCodeCoverage(const char* file_line);
 #define ACCESS_MASM(masm) masm->
 #endif
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_MACRO_ASSEMBLER_X64_H_
diff --git a/src/x64/simulator-x64.h b/src/x64/simulator-x64.h
index 35cbdc7..99649ec 100644
--- a/src/x64/simulator-x64.h
+++ b/src/x64/simulator-x64.h
@@ -41,6 +41,7 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X64_SIMULATOR_X64_H_
diff --git a/src/x87/assembler-x87-inl.h b/src/x87/assembler-x87-inl.h
index 4543047..ef8876c 100644
--- a/src/x87/assembler-x87-inl.h
+++ b/src/x87/assembler-x87-inl.h
@@ -554,6 +554,7 @@ Operand::Operand(Immediate imm) {
   set_modrm(0, ebp);
   set_dispr(imm.x_, imm.rmode_);
 }
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_ASSEMBLER_X87_INL_H_
diff --git a/src/x87/assembler-x87.h b/src/x87/assembler-x87.h
index 1f454bc..2b5c7d2 100644
--- a/src/x87/assembler-x87.h
+++ b/src/x87/assembler-x87.h
@@ -1097,6 +1097,7 @@ class EnsureSpace BASE_EMBEDDED {
 #endif
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_ASSEMBLER_X87_H_
diff --git a/src/x87/code-stubs-x87.h b/src/x87/code-stubs-x87.h
index 25fc4d7..41c77f5 100644
--- a/src/x87/code-stubs-x87.h
+++ b/src/x87/code-stubs-x87.h
@@ -374,6 +374,7 @@ class RecordWriteStub: public PlatformCodeStub {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_CODE_STUBS_X87_H_
diff --git a/src/x87/codegen-x87.h b/src/x87/codegen-x87.h
index c23e866..e786b84 100644
--- a/src/x87/codegen-x87.h
+++ b/src/x87/codegen-x87.h
@@ -28,6 +28,7 @@ class StringCharLoadGenerator : public AllStatic {
   DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_CODEGEN_X87_H_
diff --git a/src/x87/frames-x87.h b/src/x87/frames-x87.h
index 89e6ebd..1b90078 100644
--- a/src/x87/frames-x87.h
+++ b/src/x87/frames-x87.h
@@ -80,6 +80,7 @@ class JavaScriptFrameConstants : public AllStatic {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_FRAMES_X87_H_
diff --git a/src/x87/lithium-codegen-x87.h b/src/x87/lithium-codegen-x87.h
index 2da1a31..08075e3 100644
--- a/src/x87/lithium-codegen-x87.h
+++ b/src/x87/lithium-codegen-x87.h
@@ -499,6 +499,7 @@ class LDeferredCode : public ZoneObject {
   LCodeGen::X87Stack x87_stack_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_LITHIUM_CODEGEN_X87_H_
diff --git a/src/x87/lithium-gap-resolver-x87.h b/src/x87/lithium-gap-resolver-x87.h
index cdd26b8..964f3b9 100644
--- a/src/x87/lithium-gap-resolver-x87.h
+++ b/src/x87/lithium-gap-resolver-x87.h
@@ -80,6 +80,7 @@ class LGapResolver final BASE_EMBEDDED {
   int spilled_register_;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_LITHIUM_GAP_RESOLVER_X87_H_
diff --git a/src/x87/lithium-x87.h b/src/x87/lithium-x87.h
index cc1a43f..2f392f8 100644
--- a/src/x87/lithium-x87.h
+++ b/src/x87/lithium-x87.h
@@ -2897,6 +2897,7 @@ class LChunkBuilder final : public LChunkBuilderBase {
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_LITHIUM_X87_H_
diff --git a/src/x87/macro-assembler-x87.h b/src/x87/macro-assembler-x87.h
index f1a8f82..4f165c9 100644
--- a/src/x87/macro-assembler-x87.h
+++ b/src/x87/macro-assembler-x87.h
@@ -1083,6 +1083,7 @@ extern void LogGeneratedCodeCoverage(const char* file_line);
 #endif
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_MACRO_ASSEMBLER_X87_H_
diff --git a/src/x87/simulator-x87.h b/src/x87/simulator-x87.h
index a780e83..3071842 100644
--- a/src/x87/simulator-x87.h
+++ b/src/x87/simulator-x87.h
@@ -43,6 +43,7 @@ class SimulatorStack : public v8::internal::AllStatic {
   static inline void UnregisterCTryCatch() { }
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_X87_SIMULATOR_X87_H_
diff --git a/src/zone-allocator.h b/src/zone-allocator.h
index 30abe21..f46151e 100644
--- a/src/zone-allocator.h
+++ b/src/zone-allocator.h
@@ -66,6 +66,7 @@ class zone_allocator {
 
 typedef zone_allocator<bool> ZoneBoolAllocator;
 typedef zone_allocator<int> ZoneIntAllocator;
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_ZONE_ALLOCATOR_H_
diff --git a/test/cctest/compiler/c-signature.h b/test/cctest/compiler/c-signature.h
index 8eaf632..6a17a29 100644
--- a/test/cctest/compiler/c-signature.h
+++ b/test/cctest/compiler/c-signature.h
@@ -159,8 +159,8 @@ typedef CSignature2<uint32_t, uint32_t, uint32_t> CSignature_u_uu;
 typedef CSignature2<float, float, float> CSignature_f_ff;
 typedef CSignature2<double, double, double> CSignature_d_dd;
 typedef CSignature2<Object*, Object*, Object*> CSignature_o_oo;
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_COMPILER_C_SIGNATURE_H_
diff --git a/test/cctest/compiler/function-tester.h b/test/cctest/compiler/function-tester.h
index c2b25e5..48f0b94 100644
--- a/test/cctest/compiler/function-tester.h
+++ b/test/cctest/compiler/function-tester.h
@@ -212,8 +212,8 @@ class FunctionTester : public InitializedHandleScope {
     return function;
   }
 };
-}
-}
-}  // namespace v8::internal::compiler
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_FUNCTION_TESTER_H_
diff --git a/test/cctest/compiler/test-loop-assignment-analysis.cc b/test/cctest/compiler/test-loop-assignment-analysis.cc
index b59f181..d155ae8 100644
--- a/test/cctest/compiler/test-loop-assignment-analysis.cc
+++ b/test/cctest/compiler/test-loop-assignment-analysis.cc
@@ -59,7 +59,7 @@ struct TestHelper : public HandleAndZoneScope {
     }
   }
 };
-}
+}  // namespace
 
 
 TEST(SimpleLoop1) {
diff --git a/test/cctest/expression-type-collector.cc b/test/cctest/expression-type-collector.cc
index 9ab85ed..d3fa3e8 100644
--- a/test/cctest/expression-type-collector.cc
+++ b/test/cctest/expression-type-collector.cc
@@ -24,7 +24,8 @@ struct {
     AST_NODE_LIST(DECLARE_VISIT)
 #undef DECLARE_VISIT
 };
-}
+
+}  // namespace
 
 
 ExpressionTypeCollector::ExpressionTypeCollector(
@@ -57,5 +58,6 @@ void ExpressionTypeCollector::VisitExpression(Expression* expression) {
   }
   result_->push_back(e);
 }
-}
-}
+
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/expression-type-collector.h b/test/cctest/expression-type-collector.h
index 2175f5a..e9ab362 100644
--- a/test/cctest/expression-type-collector.h
+++ b/test/cctest/expression-type-collector.h
@@ -33,7 +33,7 @@ class ExpressionTypeCollector : public AstExpressionVisitor {
  private:
   ZoneVector<ExpressionTypeEntry>* result_;
 };
-}
-}  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // V8_EXPRESSION_TYPE_COLLECTOR_H_
diff --git a/test/cctest/gay-fixed.h b/test/cctest/gay-fixed.h
index c14c11f..5baa6c2 100644
--- a/test/cctest/gay-fixed.h
+++ b/test/cctest/gay-fixed.h
@@ -44,6 +44,7 @@ struct PrecomputedFixed {
 // Gay's dtoa in mode "fixed".
 Vector<const PrecomputedFixed> PrecomputedFixedRepresentations();
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // GAY_FIXED_H_
diff --git a/test/cctest/gay-precision.h b/test/cctest/gay-precision.h
index 08aaa1d..0ba3462 100644
--- a/test/cctest/gay-precision.h
+++ b/test/cctest/gay-precision.h
@@ -44,6 +44,7 @@ struct PrecomputedPrecision {
 // Gay's dtoa in mode "precision".
 Vector<const PrecomputedPrecision> PrecomputedPrecisionRepresentations();
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // GAY_PRECISION_H_
diff --git a/test/cctest/gay-shortest.h b/test/cctest/gay-shortest.h
index 4efe76b..b76476e 100644
--- a/test/cctest/gay-shortest.h
+++ b/test/cctest/gay-shortest.h
@@ -41,6 +41,7 @@ struct PrecomputedShortest {
 
 Vector<const PrecomputedShortest> PrecomputedShortestRepresentations();
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif  // GAY_SHORTEST_H_
diff --git a/test/cctest/heap-tester.h b/test/cctest/heap-tester.h
index fc2e254..f8cdded 100644
--- a/test/cctest/heap-tester.h
+++ b/test/cctest/heap-tester.h
@@ -53,7 +53,8 @@ class HeapTester {
   /* test-api.cc */
   static void ResetWeakHandle(bool global_gc);
 };
-}
-}
+
+}  // namespace internal
+}  // namespace v8
 
 #endif  // HEAP_TESTER_H_
diff --git a/test/cctest/interpreter/test-bytecode-generator.cc b/test/cctest/interpreter/test-bytecode-generator.cc
index e0668d5..3ffe0d6 100644
--- a/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/test/cctest/interpreter/test-bytecode-generator.cc
@@ -905,4 +905,4 @@ TEST(IfConditions) {
 
 }  // namespace interpreter
 }  // namespace internal
-}  // namespance v8
+}  // namespace v8
diff --git a/test/cctest/print-extension.h b/test/cctest/print-extension.h
index b0d2b1c..c2961d0 100644
--- a/test/cctest/print-extension.h
+++ b/test/cctest/print-extension.h
@@ -42,6 +42,7 @@ class PrintExtension : public v8::Extension {
   static void Print(const v8::FunctionCallbackInfo<v8::Value>& args);
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/test/cctest/profiler-extension.h b/test/cctest/profiler-extension.h
index 6f816b3..093a76e 100644
--- a/test/cctest/profiler-extension.h
+++ b/test/cctest/profiler-extension.h
@@ -49,6 +49,7 @@ class ProfilerExtension : public v8::Extension {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/test/cctest/test-api-interceptors.cc b/test/cctest/test-api-interceptors.cc
index c0a8a28..0f94e59 100644
--- a/test/cctest/test-api-interceptors.cc
+++ b/test/cctest/test-api-interceptors.cc
@@ -3251,7 +3251,8 @@ void DatabaseSetter(Local<Name> name, Local<Value> value,
   db->Set(context, name, value).FromJust();
   info.GetReturnValue().Set(value);
 }
-}
+
+}  // namespace
 
 
 THREADED_TEST(NonMaskingInterceptorGlobalEvalRegression) {
diff --git a/test/cctest/test-array-list.cc b/test/cctest/test-array-list.cc
index 2852043..abcbf11 100644
--- a/test/cctest/test-array-list.cc
+++ b/test/cctest/test-array-list.cc
@@ -38,4 +38,5 @@ TEST(ArrayList) {
   CHECK_EQ(100, Smi::cast(array->Get(0))->value());
   CHECK_EQ(200, Smi::cast(array->Get(1))->value());
 }
-}
+
+}  // namespace
diff --git a/test/cctest/test-asm-validator.cc b/test/cctest/test-asm-validator.cc
index 0cc71ec..7b45a67 100644
--- a/test/cctest/test-asm-validator.cc
+++ b/test/cctest/test-asm-validator.cc
@@ -74,7 +74,8 @@ std::string Validate(Zone* zone, const char* source,
     return typer.error_message();
   }
 }
-}
+
+}  // namespace
 
 
 TEST(ValidateMinimum) {
@@ -439,7 +440,8 @@ void CheckStdlibShortcuts(Zone* zone, ZoneVector<ExpressionTypeEntry>& types,
   CHECK_VAR_NEW_SHORTCUT(f32, Bounds(cache.kFloat32Array));
   CHECK_VAR_NEW_SHORTCUT(f64, Bounds(cache.kFloat64Array));
 }
-}
+
+}  // namespace
 
 
 #define CHECK_FUNC_TYPES_BEGIN(func)                   \
diff --git a/test/cctest/test-ast-expression-visitor.cc b/test/cctest/test-ast-expression-visitor.cc
index 8bf4c60..5cef440 100644
--- a/test/cctest/test-ast-expression-visitor.cc
+++ b/test/cctest/test-ast-expression-visitor.cc
@@ -45,7 +45,8 @@ static void CollectTypes(HandleAndZoneScope* handles, const char* source,
       info.scope()->declarations()->at(0)->AsFunctionDeclaration()->fun(), dst)
       .Run();
 }
-}
+
+}  // namespace
 
 
 TEST(VisitExpressions) {
diff --git a/test/cctest/test-dictionary.cc b/test/cctest/test-dictionary.cc
index dc8a8b5..b732094 100644
--- a/test/cctest/test-dictionary.cc
+++ b/test/cctest/test-dictionary.cc
@@ -239,4 +239,4 @@ TEST(ObjectHashTableCausesGC) {
 }
 #endif
 
-}
+}  // namespace
diff --git a/test/cctest/test-feedback-vector.cc b/test/cctest/test-feedback-vector.cc
index d455ca0..efd0819 100644
--- a/test/cctest/test-feedback-vector.cc
+++ b/test/cctest/test-feedback-vector.cc
@@ -559,4 +559,5 @@ TEST(VectorStoreICBasic) {
   StoreICNexus nexus(feedback_vector, slot);
   CHECK_EQ(MONOMORPHIC, nexus.StateFromFeedback());
 }
-}
+
+}  // namespace
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
index 55e5538..909aba0 100644
--- a/test/cctest/test-heap-profiler.cc
+++ b/test/cctest/test-heap-profiler.cc
@@ -1351,7 +1351,8 @@ class TestActivityControl : public v8::ActivityControl {
   int total_;
   int abort_count_;
 };
-}
+
+}  // namespace
 
 
 TEST(TakeHeapSnapshotAborting) {
@@ -1444,7 +1445,8 @@ class TestRetainedObjectInfo : public v8::RetainedObjectInfo {
 
 
 i::List<TestRetainedObjectInfo*> TestRetainedObjectInfo::instances;
-}
+
+}  // namespace
 
 
 static const v8::HeapGraphNode* GetNode(const v8::HeapGraphNode* parent,
diff --git a/test/cctest/test-identity-map.cc b/test/cctest/test-identity-map.cc
index ee64c4d..8523f25 100644
--- a/test/cctest/test-identity-map.cc
+++ b/test/cctest/test-identity-map.cc
@@ -335,5 +335,6 @@ TEST(ExplicitGC) {
     t.CheckGet(num_keys[i], &num_keys[i]);
   }
 }
-}
-}
+
+}  // namespace internal
+}  // namespace v8
diff --git a/test/cctest/test-microtask-delivery.cc b/test/cctest/test-microtask-delivery.cc
index 5befdfb..415be3c 100644
--- a/test/cctest/test-microtask-delivery.cc
+++ b/test/cctest/test-microtask-delivery.cc
@@ -51,7 +51,7 @@ class HarmonyIsolate {
  private:
   v8::Isolate* isolate_;
 };
-}
+}  // namespace
 
 
 TEST(MicrotaskDeliverySimple) {
diff --git a/test/cctest/test-typing-reset.cc b/test/cctest/test-typing-reset.cc
index 426f411..1a5fc82 100644
--- a/test/cctest/test-typing-reset.cc
+++ b/test/cctest/test-typing-reset.cc
@@ -222,7 +222,8 @@ void CheckAllSame(ZoneVector<ExpressionTypeEntry>& types,
   }
   CHECK_TYPES_END
 }
-}
+
+}  // namespace
 
 
 TEST(ResetTypingInfo) {
diff --git a/test/cctest/test-unscopables-hidden-prototype.cc b/test/cctest/test-unscopables-hidden-prototype.cc
index acfc426..50db316 100644
--- a/test/cctest/test-unscopables-hidden-prototype.cc
+++ b/test/cctest/test-unscopables-hidden-prototype.cc
@@ -120,4 +120,5 @@ TEST(Unscopables) {
                   ->Int32Value(current_context)
                   .FromJust());
 }
-}
+
+}  // namespace
diff --git a/test/cctest/trace-extension.h b/test/cctest/trace-extension.h
index 792e437..53e178b 100644
--- a/test/cctest/trace-extension.h
+++ b/test/cctest/trace-extension.h
@@ -52,6 +52,7 @@ class TraceExtension : public v8::Extension {
   static const char* kSource;
 };
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/test/cctest/types-fuzz.h b/test/cctest/types-fuzz.h
index 7aa8d85..5c43e8e 100644
--- a/test/cctest/types-fuzz.h
+++ b/test/cctest/types-fuzz.h
@@ -340,6 +340,7 @@ class Types {
 };
 
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8
 
 #endif
diff --git a/test/unittests/compiler/node-matchers-unittest.cc b/test/unittests/compiler/node-matchers-unittest.cc
index 57174cc..f0cc407 100644
--- a/test/unittests/compiler/node-matchers-unittest.cc
+++ b/test/unittests/compiler/node-matchers-unittest.cc
@@ -38,7 +38,8 @@ void CheckBaseWithIndexAndDisplacement(Matcher* matcher, Node* index, int scale,
   EXPECT_EQ(base, matcher->base());
   EXPECT_EQ(displacement, matcher->displacement());
 }
-};
+
+}  // namespace
 
 
 TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
diff --git a/test/unittests/compiler/register-allocator-unittest.cc b/test/unittests/compiler/register-allocator-unittest.cc
index 23a118b..75942b6 100644
--- a/test/unittests/compiler/register-allocator-unittest.cc
+++ b/test/unittests/compiler/register-allocator-unittest.cc
@@ -75,7 +75,8 @@ bool IsParallelMovePresent(int instr_index, Instruction::GapPosition gap_pos,
   }
   return found_match;
 }
-}
+
+}  // namespace
 
 
 class RegisterAllocatorTest : public InstructionSequenceTest {
@@ -722,7 +723,8 @@ class SlotConstraintTest : public RegisterAllocatorTest,
  private:
   typedef ::testing::WithParamInterface<::testing::tuple<ParameterType, int>> B;
 };
-}
+
+}  // namespace
 
 
 #if GTEST_HAS_COMBINE
diff --git a/test/unittests/runtime/runtime-interpreter-unittest.cc b/test/unittests/runtime/runtime-interpreter-unittest.cc
index 0c3d414..97b7992 100644
--- a/test/unittests/runtime/runtime-interpreter-unittest.cc
+++ b/test/unittests/runtime/runtime-interpreter-unittest.cc
@@ -167,6 +167,6 @@ TEST_F(RuntimeInterpreterTest, ToBoolean) {
 }
 
 
-}  // Namespace interpreter
+}  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
diff --git a/tools/presubmit.py b/tools/presubmit.py
index 338c708..5029450 100755
--- a/tools/presubmit.py
+++ b/tools/presubmit.py
@@ -50,7 +50,6 @@ from subprocess import PIPE
 # build/include_what_you_use: Started giving false positives for variables
 #   named "string" and "map" assuming that you needed to include STL headers.
 # TODO(bmeurer): Fix and re-enable readability/check
-# TODO(mstarzinger): Fix and re-enable readability/namespace
 
 LINT_RULES = """
 -build/header_guard
@@ -59,7 +58,6 @@ LINT_RULES = """
 -build/namespaces
 -readability/check
 -readability/inheritance
--readability/namespace
 -readability/nolint
 +readability/streams
 -runtime/references
diff --git a/tools/shell-utils.h b/tools/shell-utils.h
index 31bd8ea..bfd729d 100644
--- a/tools/shell-utils.h
+++ b/tools/shell-utils.h
@@ -66,4 +66,5 @@ const byte* ReadFileAndRepeat(const char* name, int* size, int repeat) {
   return chars;
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8