Bug 883697 (part 4a) - Make include guards consistent in still more of js/src/. r=njn.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Wed, 19 Jun 2013 18:04:28 -0700
changeset 135802 fa4e688f5daa7998893c3aeaa34ea28a75f23e7f
parent 135801 aedf5992770a8c80df9104dc111059760f5be928
child 135803 4bce31cdb901d261089c5118e1fce423939d2401
push id24852
push userryanvm@gmail.com
push dateThu, 20 Jun 2013 23:22:28 +0000
treeherdermozilla-central@b3cbafd5eb99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs883697
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 883697 (part 4a) - Make include guards consistent in still more of js/src/. r=njn.
js/src/gc/Barrier-inl.h
js/src/gc/Barrier.h
js/src/gc/FindSCCs-inl.h
js/src/gc/FindSCCs.h
js/src/gc/GCInternals.h
js/src/gc/Heap.h
js/src/gc/Marking.h
js/src/gc/Memory.h
js/src/gc/Nursery-inl.h
js/src/gc/Nursery.h
js/src/gc/Statistics.h
js/src/gc/StoreBuffer.h
js/src/gc/Zone.h
js/src/vm/ArgumentsObject-inl.h
js/src/vm/ArgumentsObject.h
js/src/vm/BooleanObject-inl.h
js/src/vm/BooleanObject.h
js/src/vm/CommonPropertyNames.h
js/src/vm/DateTime.h
js/src/vm/Debugger-inl.h
js/src/vm/Debugger.h
js/src/vm/ForkJoin.h
js/src/vm/GlobalObject-inl.h
js/src/vm/GlobalObject.h
js/src/vm/Interpreter-inl.h
js/src/vm/Interpreter.h
js/src/vm/Keywords.h
js/src/vm/MatchPairs.h
js/src/vm/Monitor.h
js/src/vm/NumberObject-inl.h
js/src/vm/NumberObject.h
js/src/vm/NumericConversions.h
js/src/vm/ObjectImpl-inl.h
js/src/vm/ObjectImpl.h
js/src/vm/Probes-inl.h
js/src/vm/Probes.h
js/src/vm/RegExpObject-inl.h
js/src/vm/RegExpObject.h
js/src/vm/RegExpStatics-inl.h
js/src/vm/RegExpStatics.h
js/src/vm/SPSProfiler.h
js/src/vm/ScopeObject-inl.h
js/src/vm/ScopeObject.h
js/src/vm/Shape-inl.h
js/src/vm/Shape.h
js/src/vm/Stack-inl.h
js/src/vm/Stack.h
js/src/vm/String-inl.h
js/src/vm/String.h
js/src/vm/StringBuffer.h
js/src/vm/StringObject-inl.h
js/src/vm/StringObject.h
js/src/vm/ThreadPool.h
js/src/vm/Unicode.h
js/src/vm/Xdr.h
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_barrier_inl_h___
-#define jsgc_barrier_inl_h___
+#ifndef gc_Barrier_inl_h
+#define gc_Barrier_inl_h
 
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
 #include "gc/StoreBuffer.h"
 
 #include "vm/ObjectImpl-inl.h"
 #include "vm/String-inl.h"
 
@@ -580,9 +580,9 @@ ReadBarrieredValue::operator const Value
 inline JSObject &
 ReadBarrieredValue::toObject() const
 {
     return get().toObject();
 }
 
 } /* namespace js */
 
-#endif /* jsgc_barrier_inl_h___ */
+#endif /* gc_Barrier_inl_h */
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_barrier_h___
-#define jsgc_barrier_h___
+#ifndef gc_Barrier_h
+#define gc_Barrier_h
 
 #include "jsapi.h"
 
 #include "gc/Heap.h"
 #include "js/HashTable.h"
 #include "js/RootingAPI.h"
 
 /*
@@ -654,9 +654,9 @@ template <class T> struct IsRelocatableH
                                                     { static const bool result = false; };
 template <> struct IsRelocatableHeapType<HeapSlot>  { static const bool result = false; };
 template <> struct IsRelocatableHeapType<HeapValue> { static const bool result = false; };
 template <> struct IsRelocatableHeapType<HeapId>    { static const bool result = false; };
 
 } /* namespace tl */
 } /* namespace js */
 
-#endif /* jsgc_barrier_h___ */
+#endif /* gc_Barrier_h */
--- a/js/src/gc/FindSCCs-inl.h
+++ b/js/src/gc/FindSCCs-inl.h
@@ -1,14 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef gc_FindSCCs_inl_h
+#define gc_FindSCCs_inl_h
+
 #include "jsfriendapi.h"
 
 #include "gc/FindSCCs.h"
 
 namespace js {
 namespace gc {
 
 template<class Node>
@@ -140,8 +143,10 @@ template<class Node>
 ComponentFinder<Node>::mergeGroups(Node *first)
 {
     for (Node *v = first; v; v = v->gcNextGraphNode)
         v->gcNextGraphComponent = NULL;
 }
 
 } /* namespace gc */
 } /* namespace js */
+
+#endif /* gc_FindSCCs_inl_h */
--- a/js/src/gc/FindSCCs.h
+++ b/js/src/gc/FindSCCs.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_findsccs_h___
-#define gc_findsccs_h___
+#ifndef gc_FindSCCs_h
+#define gc_FindSCCs_h
 
 #include "jsutil.h"
 
 namespace js {
 namespace gc {
 
 template<class Node>
 struct GraphNodeBase
@@ -94,9 +94,9 @@ class ComponentFinder
     Node           *cur;
     uintptr_t      stackLimit;
     bool           stackFull;
 };
 
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_findsccs_h___ */
+#endif /* gc_FindSCCs_h */
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_internal_h___
-#define jsgc_internal_h___
+#ifndef gc_GCInternals_h
+#define gc_GCInternals_h
 
 #include "jsapi.h"
 
 namespace js {
 namespace gc {
 
 void
 MarkRuntime(JSTracer *trc, bool useSavedRoots = false);
@@ -139,9 +139,9 @@ struct AutoStopVerifyingBarriers
 {
     AutoStopVerifyingBarriers(JSRuntime *, bool) {}
 };
 #endif /* JS_GC_ZEAL */
 
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* jsgc_internal_h___ */
+#endif /* gc_GCInternals_h */
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_heap_h___
-#define gc_heap_h___
+#ifndef gc_Heap_h
+#define gc_Heap_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 
 #include "jspubtd.h"
@@ -1058,9 +1058,9 @@ InFreeList(ArenaHeader *aheader, void *t
          */
         span = span->nextSpan();
     }
 }
 
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_heap_h___ */
+#endif /* gc_Heap_h */
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_marking_h___
-#define gc_marking_h___
+#ifndef gc_Marking_h
+#define gc_Marking_h
 
 #include "jsgc.h"
 #include "jscntxt.h"
 #include "jslock.h"
 
 #include "gc/Barrier.h"
 #include "gc/Nursery.h"
 #include "js/TemplateLib.h"
@@ -405,9 +405,9 @@ TraceKind(LazyScript *lazy)
 
 } /* namespace gc */
 
 void
 TraceChildren(JSTracer *trc, void *thing, JSGCTraceKind kind);
 
 } /* namespace js */
 
-#endif /* gc_marking_h___ */
+#endif /* gc_Marking_h */
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_memory_h___
-#define jsgc_memory_h___
+#ifndef gc_Memory_h
+#define gc_Memory_h
 
 #include <stddef.h>
 #include "jsgc.h"
 
 namespace js {
 namespace gc {
 
 // Sanity check that our compiled configuration matches the currently running
@@ -31,9 +31,9 @@ bool MarkPagesUnused(void *p, size_t siz
 bool MarkPagesInUse(void *p, size_t size);
 
 // Returns #(hard faults) + #(soft faults)
 size_t GetPageFaultCount();
 
 } // namespace gc
 } // namespace js
 
-#endif // jsgc_memory_h___
+#endif /* gc_Memory_h */
--- a/js/src/gc/Nursery-inl.h
+++ b/js/src/gc/Nursery-inl.h
@@ -1,18 +1,19 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=4 sw=4 et tw=79 ft=cpp:
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef gc_Nursery_inl_h
+#define gc_Nursery_inl_h
+
 #ifdef JSGC_GENERATIONAL
-#ifndef gc_Nursery_inl_h__
-#define gc_Nursery_inl_h__
 
 #include "gc/Heap.h"
 #include "gc/Nursery.h"
 
 namespace js {
 namespace gc {
 
 /*
@@ -74,10 +75,11 @@ js::Nursery::getForwardedPointer(T **ref
     const gc::RelocationOverlay *overlay = reinterpret_cast<const gc::RelocationOverlay *>(*ref);
     if (!overlay->isForwarded())
         return false;
     /* This static cast from Cell* restricts T to valid (GC thing) types. */
     *ref = static_cast<T *>(overlay->forwardingAddress());
     return true;
 }
 
-#endif /* gc_Nursery_inl_h__ */
 #endif /* JSGC_GENERATIONAL */
+
+#endif /* gc_Nursery_inl_h */
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=78:
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_nursery_h___
-#define jsgc_nursery_h___
+#ifndef gc_Nursery_h
+#define gc_Nursery_h
 
 #ifdef JSGC_GENERATIONAL
 
 #include "ds/BitArray.h"
 #include "js/HashTable.h"
 
 #include "jsgc.h"
 #include "jspubtd.h"
@@ -234,9 +234,9 @@ class Nursery
     friend class ion::MacroAssembler;
     friend class ion::ICStubCompiler;
     friend class ion::BaselineCompiler;
 };
 
 } /* namespace js */
 
 #endif /* JSGC_GENERATIONAL */
-#endif /* jsgc_nursery_h___ */
+#endif /* gc_Nursery_h */
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_statistics_h___
-#define jsgc_statistics_h___
+#ifndef gc_Statistics_h
+#define gc_Statistics_h
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
 #include "jsfriendapi.h"
 #include "jspubtd.h"
 
 #include "js/GCAPI.h"
@@ -223,9 +223,9 @@ struct AutoSCC
     unsigned scc;
     int64_t start;
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
 } /* namespace gcstats */
 } /* namespace js */
 
-#endif /* jsgc_statistics_h___ */
+#endif /* gc_Statistics_h */
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_storebuffer_h___
-#define jsgc_storebuffer_h___
+#ifndef gc_StoreBuffer_h
+#define gc_StoreBuffer_h
 
 #ifdef JSGC_GENERATIONAL
 
 #ifndef JSGC_USE_EXACT_ROOTING
 # error "Generational GC requires exact rooting."
 #endif
 
 #include "jsgc.h"
@@ -438,9 +438,9 @@ class StoreBuffer
     void setOverflowed();
 };
 
 } /* namespace gc */
 } /* namespace js */
 
 #endif /* JSGC_GENERATIONAL */
 
-#endif /* jsgc_storebuffer_h___ */
+#endif /* gc_StoreBuffer_h */
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_zone_h___
-#define gc_zone_h___
+#ifndef gc_Zone_h
+#define gc_Zone_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/Util.h"
 
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsgc.h"
@@ -410,9 +410,9 @@ class CompartmentsIterT
     operator JSCompartment *() const { return get(); }
     JSCompartment *operator->() const { return get(); }
 };
 
 typedef CompartmentsIterT<ZonesIter> CompartmentsIter;
 
 } /* namespace js */
 
-#endif /* gc_zone_h___ */
+#endif /* gc_Zone_h */
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ArgumentsObject_inl_h___
-#define ArgumentsObject_inl_h___
+#ifndef vm_ArgumentsObject_inl_h
+#define vm_ArgumentsObject_inl_h
 
 #include "vm/ArgumentsObject.h"
 
 #include "vm/ScopeObject.h"
 
 namespace js {
 
 inline uint32_t
@@ -156,9 +156,9 @@ NormalArgumentsObject::callee() const
 inline void
 NormalArgumentsObject::clearCallee()
 {
     data()->callee.set(zone(), MagicValue(JS_OVERWRITTEN_CALLEE));
 }
 
 } /* namespace js */
 
-#endif /* ArgumentsObject_inl_h___ */
+#endif /* vm_ArgumentsObject_inl_h */
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ArgumentsObject_h___
-#define ArgumentsObject_h___
+#ifndef vm_ArgumentsObject_h
+#define vm_ArgumentsObject_h
 
 #include "jsfun.h"
 
 namespace js {
 
 class AbstractFramePtr;
 
 namespace ion {
@@ -248,9 +248,9 @@ class StrictArgumentsObject : public Arg
 
 template<>
 inline bool
 JSObject::is<js::ArgumentsObject>() const
 {
     return is<js::NormalArgumentsObject>() || is<js::StrictArgumentsObject>();
 }
 
-#endif /* ArgumentsObject_h___ */
+#endif /* vm_ArgumentsObject_h */
--- a/js/src/vm/BooleanObject-inl.h
+++ b/js/src/vm/BooleanObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BooleanObject_inl_h___
-#define BooleanObject_inl_h___
+#ifndef vm_BooleanObject_inl_h
+#define vm_BooleanObject_inl_h
 
 #include "vm/BooleanObject.h"
 
 #include "jsobjinlines.h"
 
 namespace js {
 
 inline BooleanObject *
@@ -21,9 +21,9 @@ BooleanObject::create(JSContext *cx, boo
         return NULL;
     BooleanObject &boolobj = obj->as<BooleanObject>();
     boolobj.setPrimitiveValue(b);
     return &boolobj;
 }
 
 } // namespace js
 
-#endif /* BooleanObject_inl_h__ */
+#endif /* vm_BooleanObject_inl_h */
--- a/js/src/vm/BooleanObject.h
+++ b/js/src/vm/BooleanObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BooleanObject_h___
-#define BooleanObject_h___
+#ifndef vm_BooleanObject_h
+#define vm_BooleanObject_h
 
 #include "jsbool.h"
 
 namespace js {
 
 class BooleanObject : public JSObject
 {
     /* Stores this Boolean object's [[PrimitiveValue]]. */
@@ -38,9 +38,9 @@ class BooleanObject : public JSObject
 
     /* For access to init, as Boolean.prototype is special. */
     friend JSObject *
     ::js_InitBooleanClass(JSContext *cx, js::HandleObject global);
 };
 
 } // namespace js
 
-#endif /* BooleanObject_h__ */
+#endif /* vm_BooleanObject_h */
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -1,18 +1,18 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* A higher-order macro for enumerating all cached property names. */
 
-#ifndef CommonPropertyNames_h__
-#define CommonPropertyNames_h__
+#ifndef vm_CommonPropertyNames_h
+#define vm_CommonPropertyNames_h
 
 #include "jsprototypes.h"
 #include "jsversion.h"
 
 #define FOR_EACH_COMMON_PROPERTYNAME(macro) \
     macro(anonymous, anonymous, "anonymous") \
     macro(apply, apply, "apply") \
     macro(arguments, arguments, "arguments") \
@@ -154,9 +154,9 @@
     macro(undefined, undefined, "undefined") \
     macro(object, object, "object") \
     macro(function, function, "function") \
     macro(string, string, "string") \
     macro(number, number, "number") \
     macro(boolean, boolean, "boolean") \
     macro(null, null, "null")
 
-#endif /* CommonPropertyNames_h__ */
+#endif /* vm_CommonPropertyNames_h */
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef DateTime_h___
-#define DateTime_h___
+#ifndef vm_DateTime_h
+#define vm_DateTime_h
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/StandardInteger.h"
 
 #include "NumericConversions.h"
 
 namespace js {
@@ -152,9 +152,9 @@ class DateTimeInfo
 
     static const int64_t RangeExpansionAmount = 30 * SecondsPerDay;
 
     void sanityCheck();
 };
 
 }  /* namespace js */
 
-#endif /* DateTime_h___ */
+#endif /* vm_DateTime_h */
--- a/js/src/vm/Debugger-inl.h
+++ b/js/src/vm/Debugger-inl.h
@@ -1,25 +1,25 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Debugger_inl_h__
-#define Debugger_inl_h__
+#ifndef vm_Debugger_inl_h
+#define vm_Debugger_inl_h
 
 #include "vm/Debugger.h"
 
 #include "vm/Stack-inl.h"
 
 inline bool
 js::Debugger::onLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok)
 {
     /* Traps must be cleared from eval frames, see slowPathOnLeaveFrame. */
     bool evalTraps = frame.isEvalFrame() &&
                      frame.script()->hasAnyBreakpointsOrStepMode();
     if (!cx->compartment()->getDebuggees().empty() || evalTraps)
         ok = slowPathOnLeaveFrame(cx, frame, ok);
     return ok;
 }
 
-#endif  // Debugger_inl_h__
+#endif /* vm_Debugger_inl_h */
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Debugger_h__
-#define Debugger_h__
+#ifndef vm_Debugger_h
+#define vm_Debugger_h
 
 #include "mozilla/LinkedList.h"
 
 #include "jsapi.h"
 #include "jsclist.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsweakmap.h"
@@ -691,9 +691,9 @@ Debugger::onNewGlobalObject(JSContext *c
 
 extern JSBool
 EvaluateInEnv(JSContext *cx, Handle<Env*> env, HandleValue thisv, AbstractFramePtr frame,
               StableCharPtr chars, unsigned length, const char *filename, unsigned lineno,
               MutableHandleValue rval);
 
 }
 
-#endif /* Debugger_h__ */
+#endif /* vm_Debugger_h */
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ForkJoin_h__
-#define ForkJoin_h__
+#ifndef vm_ForkJoin_h
+#define vm_ForkJoin_h
 
 #include "jscntxt.h"
 #include "vm/ThreadPool.h"
 #include "jsgc.h"
 #include "ion/Ion.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // Read Me First
@@ -490,9 +490,9 @@ js::ForkJoinSlice::Current()
 {
 #if defined(JS_THREADSAFE) && defined(JS_ION)
     return (ForkJoinSlice*) PR_GetThreadPrivate(ThreadPrivateIndex);
 #else
     return NULL;
 #endif
 }
 
-#endif // ForkJoin_h__
+#endif /* vm_ForkJoin_h */
--- a/js/src/vm/GlobalObject-inl.h
+++ b/js/src/vm/GlobalObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef GlobalObject_inl_h___
-#define GlobalObject_inl_h___
+#ifndef vm_GlobalObject_inl_h
+#define vm_GlobalObject_inl_h
 
 #include "vm/GlobalObject.h"
 
 #include "gc/Barrier-inl.h"
 #include "vm/ObjectImpl-inl.h"
 
 namespace js {
 
@@ -214,9 +214,9 @@ void
 GlobalObject::setIntrinsicsHolder(JSObject *obj)
 {
     JS_ASSERT(getSlotRef(INTRINSICS).isUndefined());
     setSlot(INTRINSICS, ObjectValue(*obj));
 }
 
 } // namespace js
 
-#endif
+#endif /* vm_GlobalObject_inl_h */
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef GlobalObject_h___
-#define GlobalObject_h___
+#ifndef vm_GlobalObject_h
+#define vm_GlobalObject_h
 
 #include "mozilla/DebugOnly.h"
 
 #include "jsarray.h"
 #include "jsbool.h"
 #include "jsexn.h"
 #include "jsfun.h"
 #include "jsnum.h"
@@ -476,9 +476,9 @@ JSObject::isGlobal() const
 
 js::GlobalObject &
 JSObject::asGlobal()
 {
     JS_ASSERT(isGlobal());
     return *static_cast<js::GlobalObject *>(this);
 }
 
-#endif /* GlobalObject_h___ */
+#endif /* vm_GlobalObject_h */
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Interpreter_inl_h__
-#define Interpreter_inl_h__
+#ifndef vm_Interpreter_inl_h
+#define vm_Interpreter_inl_h
 
 #include "jsapi.h"
 #include "jsbool.h"
 #include "jscompartment.h"
 #include "jsinfer.h"
 #include "jslibmath.h"
 #include "jsnum.h"
 #include "jsstr.h"
@@ -1028,9 +1028,9 @@ class FastInvokeGuard
 
   private:
     FastInvokeGuard(const FastInvokeGuard& other) MOZ_DELETE;
     const FastInvokeGuard& operator=(const FastInvokeGuard& other) MOZ_DELETE;
 };
 
 }  /* namespace js */
 
-#endif /* Interpreter_inl_h__ */
+#endif /* vm_Interpreter_inl_h */
--- a/js/src/vm/Interpreter.h
+++ b/js/src/vm/Interpreter.h
@@ -1,19 +1,21 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Interpreter_h___
-#define Interpreter_h___
+#ifndef vm_Interpreter_h
+#define vm_Interpreter_h
+
 /*
  * JS interpreter interface.
  */
+
 #include "jsiter.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
 
 #include "vm/Stack.h"
 
 namespace js {
 
@@ -536,9 +538,9 @@ InitGetterSetterOperation(JSContext *cx,
                           HandleValue val);
 
 bool
 InitGetterSetterOperation(JSContext *cx, jsbytecode *pc, HandleObject obj, HandleValue idval,
                           HandleValue val);
 
 }  /* namespace js */
 
-#endif /* Interpreter_h___ */
+#endif /* vm_Interpreter_h */
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -1,18 +1,18 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* A higher-order macro for enumerating keyword tokens. */
 
-#ifndef Keywords_h_
-#define Keywords_h_
+#ifndef vm_Keywords_h
+#define vm_Keywords_h
 
 #include "jsversion.h"
 
 #if JS_HAS_CONST
 #  define FOR_CONST_KEYWORD(macro) \
       macro(const, const_, TOK_CONST, JSOP_DEFCONST, JSVERSION_DEFAULT)
 #else
 #  define FOR_CONST_KEYWORD(macro) \
@@ -79,9 +79,9 @@
     macro(protected, protected_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
     macro(public, public_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
     macro(static, static_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
     /* Various conditional keywords. */ \
     FOR_CONST_KEYWORD(macro) \
     FOR_LET_KEYWORD(macro) \
     FOR_YIELD_KEYWORD(macro)
 
-#endif /* Keywords_h_ */
+#endif /* vm_Keywords_h */
--- a/js/src/vm/MatchPairs.h
+++ b/js/src/vm/MatchPairs.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef MatchPairs_h__
-#define MatchPairs_h__
+#ifndef vm_MatchPairs_h
+#define vm_MatchPairs_h
 
 #include "ds/LifoAlloc.h"
 
 /*
  * RegExp match results are succinctly represented by pairs of integer
  * indices delimiting (start, limit] segments of the input string.
  *
  * The pair count for a given RegExp match is the capturing parentheses
@@ -153,9 +153,9 @@ struct MatchConduit
     explicit MatchConduit(MatchPairs *pairs) {
         isPair = false;
         u.pairs = pairs;
     }
 };
 
 } /* namespace js */
 
-#endif /* MatchPairs_h__ */
+#endif /* vm_MatchPairs_h */
--- a/js/src/vm/Monitor.h
+++ b/js/src/vm/Monitor.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Monitor_h__
-#define Monitor_h__
+#ifndef vm_Monitor_h
+#define vm_Monitor_h
 
 #include "jslock.h"
 
 namespace js {
 
 // A base class used for types intended to be used in a parallel
 // fashion, such as the workers in the |ThreadPool| class.  Combines a
 // lock and a condition variable.  You can acquire the lock or signal
@@ -110,9 +110,9 @@ class AutoUnlockMonitor
 #ifdef JS_THREADSAFE
         PR_Lock(monitor.lock_);
 #endif
     }
 };
 
 } // namespace js
 
-#endif // Monitor_h__
+#endif /* vm_Monitor_h */
--- a/js/src/vm/NumberObject-inl.h
+++ b/js/src/vm/NumberObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef NumberObject_inl_h___
-#define NumberObject_inl_h___
+#ifndef vm_NumberObject_inl_h
+#define vm_NumberObject_inl_h
 
 #include "NumberObject.h"
 
 #include "jsobjinlines.h"
 
 namespace js {
 
 inline NumberObject *
@@ -21,9 +21,9 @@ NumberObject::create(JSContext *cx, doub
         return NULL;
     NumberObject &numobj = obj->as<NumberObject>();
     numobj.setPrimitiveValue(d);
     return &numobj;
 }
 
 } // namespace js
 
-#endif /* NumberObject_inl_h__ */
+#endif /* vm_NumberObject_inl_h */
--- a/js/src/vm/NumberObject.h
+++ b/js/src/vm/NumberObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef NumberObject_h___
-#define NumberObject_h___
+#ifndef vm_NumberObject_h
+#define vm_NumberObject_h
 
 #include "jsnum.h"
 
 namespace js {
 
 class NumberObject : public JSObject
 {
     /* Stores this Number object's [[PrimitiveValue]]. */
@@ -38,9 +38,9 @@ class NumberObject : public JSObject
 
     /* For access to init, as Number.prototype is special. */
     friend JSObject *
     ::js_InitNumberClass(JSContext *cx, js::HandleObject global);
 };
 
 } // namespace js
 
-#endif /* NumberObject_h__ */
+#endif /* vm_NumberObject_h */
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef NumericConversions_h___
-#define NumericConversions_h___
+#ifndef vm_NumericConversions_h
+#define vm_NumericConversions_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Casting.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/TypeTraits.h"
 
 #include <math.h>
 
@@ -294,9 +294,9 @@ ToInteger(double d)
 
     bool neg = (d < 0);
     d = floor(neg ? -d : d);
     return neg ? -d : d;
 }
 
 } /* namespace js */
 
-#endif /* NumericConversions_h__ */
+#endif /* vm_NumericConversions_h */
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ObjectImpl_inl_h___
-#define ObjectImpl_inl_h___
+#ifndef vm_ObjectImpl_inl_h
+#define vm_ObjectImpl_inl_h
 
 #include "mozilla/Assertions.h"
 
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsproxy.h"
 
 #include "gc/Heap.h"
@@ -457,9 +457,9 @@ js::ObjectImpl::setPrivateUnbarriered(vo
 }
 
 inline void
 js::ObjectImpl::initPrivate(void *data)
 {
     privateRef(numFixedSlots()) = data;
 }
 
-#endif /* ObjectImpl_inl_h__ */
+#endif /* vm_ObjectImpl_inl_h */
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ObjectImpl_h___
-#define ObjectImpl_h___
+#ifndef vm_ObjectImpl_h
+#define vm_ObjectImpl_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/StandardInteger.h"
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"
 
@@ -1634,9 +1634,9 @@ template <> struct GCMethods<PropertyId>
 {
     static PropertyId initial() { return PropertyId(); }
     static ThingRootKind kind() { return THING_ROOT_PROPERTY_ID; }
     static bool poisoned(PropertyId propid) { return IsPoisonedId(propid.asId()); }
 };
 
 } /* namespace js */
 
-#endif /* ObjectImpl_h__ */
+#endif /* vm_ObjectImpl_h */
--- a/js/src/vm/Probes-inl.h
+++ b/js/src/vm/Probes-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Probes_inl_h__
-#define Probes_inl_h__
+#ifndef vm_Probes_inl_h
+#define vm_Probes_inl_h
 
 #include "vm/Probes.h"
 
 #include "jscntxt.h"
 
 namespace js {
 
 /*
@@ -119,9 +119,9 @@ Probes::stopExecution(JSScript *script)
                                 script->lineno);
 #endif
 
     return ok;
 }
 
 } /* namespace js */
  
-#endif  // Probes_inl_h__
+#endif /* vm_Probes_inl_h */
--- a/js/src/vm/Probes.h
+++ b/js/src/vm/Probes.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Probes_h__
-#define Probes_h__
+#ifndef vm_Probes_h
+#define vm_Probes_h
 
 #include "jspubtd.h"
 #include "jsobj.h"
 #include "vm/Stack.h"
 
 #ifdef INCLUDE_MOZILLA_DTRACE
 #include "javascript-trace.h"
 #endif
@@ -165,9 +165,9 @@ Probes::finalizeObject(JSObject *obj)
     }
 #endif
 
     return ok;
 }
 
 } /* namespace js */
 
-#endif  // Probes_h__
+#endif /* vm_Probes_h */
--- a/js/src/vm/RegExpObject-inl.h
+++ b/js/src/vm/RegExpObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef RegExpObject_inl_h___
-#define RegExpObject_inl_h___
+#ifndef vm_RegExpObject_inl_h
+#define vm_RegExpObject_inl_h
 
 #include "mozilla/Util.h"
 
 #include "RegExpObject.h"
 
 #include "jsstrinlines.h"
 
 #include "String-inl.h"
@@ -164,9 +164,9 @@ MatchPairs::checkAgainst(size_t inputLen
             continue;
         JS_ASSERT(size_t(p.limit) <= inputLength);
     }
 #endif
 }
 
 } /* namespace js */
 
-#endif
+#endif /* vm_RegExpObject_inl_h */
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef RegExpObject_h__
-#define RegExpObject_h__
+#ifndef vm_RegExpObject_h
+#define vm_RegExpObject_h
 
 #include "mozilla/Attributes.h"
 
 #include <stddef.h>
 #include "jscntxt.h"
 #include "jsobj.h"
 
 #include "gc/Barrier.h"
@@ -396,9 +396,9 @@ template<XDRMode mode>
 bool
 XDRScriptRegExpObject(XDRState<mode> *xdr, HeapPtrObject *objp);
 
 extern JSObject *
 CloneScriptRegExpObject(JSContext *cx, RegExpObject &re);
 
 } /* namespace js */
 
-#endif
+#endif /* vm_RegExpObject_h */
--- a/js/src/vm/RegExpStatics-inl.h
+++ b/js/src/vm/RegExpStatics-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef RegExpStatics_inl_h__
-#define RegExpStatics_inl_h__
+#ifndef vm_RegExpStatics_inl_h
+#define vm_RegExpStatics_inl_h
 
 #include "vm/RegExpStatics.h"
 
 #include "gc/Marking.h"
 
 #include "jsinferinlines.h"
 
 #include "vm/String-inl.h"
@@ -578,9 +578,9 @@ RegExpStatics::checkInvariants()
 } /* namespace js */
 
 inline js::RegExpStatics *
 JSContext::regExpStatics()
 {
     return global()->getRegExpStatics();
 }
 
-#endif
+#endif /* vm_RegExpStatics_inl_h */
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -1,25 +1,25 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef RegExpStatics_h__
-#define RegExpStatics_h__
+#ifndef vm_RegExpStatics_h
+#define vm_RegExpStatics_h
 
 #include <stddef.h>
 
 #include "jspubtd.h"
 
 #include "js/Utility.h"
 
 namespace js {
 
 class PreserveRegExpStatics;
 class RegExpStatics;
 
 size_t SizeOfRegExpStaticsData(const JSObject *obj, JSMallocSizeOfFun mallocSizeOf);
 
 } /* namespace js */
 
-#endif /* RegExpStatics_h__ */
+#endif /* vm_RegExpStatics_h */
--- a/js/src/vm/SPSProfiler.h
+++ b/js/src/vm/SPSProfiler.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SPSProfiler_h__
-#define SPSProfiler_h__
+#ifndef vm_SPSProfiler_h
+#define vm_SPSProfiler_h
 
 #include <stddef.h>
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/HashFunctions.h"
 
 #include "js/Utility.h"
@@ -385,9 +385,9 @@ class SPSInstrumentation
             JS_ASSERT(frame->script);
             masm.spsPopFrame(profiler_, scratch);
         }
     }
 };
 
 } /* namespace js */
 
-#endif /* SPSProfiler_h__ */
+#endif /* vm_SPSProfiler_h */
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ScopeObject_inl_h___
-#define ScopeObject_inl_h___
+#ifndef vm_ScopeObject_inl_h
+#define vm_ScopeObject_inl_h
 
 #include "ScopeObject.h"
 
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 template<>
@@ -265,9 +265,9 @@ inline void
 ClonedBlockObject::setVar(unsigned i, const Value &v, MaybeCheckAliasing checkAliasing)
 {
     JS_ASSERT_IF(checkAliasing, staticBlock().isAliased(i));
     setSlotValue(i, v);
 }
 
 }  /* namespace js */
 
-#endif /* ScopeObject_inl_h___ */
+#endif /* vm_ScopeObject_inl_h */
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ScopeObject_h___
-#define ScopeObject_h___
+#ifndef vm_ScopeObject_h
+#define vm_ScopeObject_h
 
 #include "jscntxt.h"
 #include "jsobj.h"
 #include "jsweakmap.h"
 
 #include "gc/Barrier.h"
 
 namespace js {
@@ -643,9 +643,9 @@ JSObject::is<js::ScopeObject>() const
 template<>
 inline bool
 JSObject::is<js::DebugScopeObject>() const
 {
     extern bool js_IsDebugScopeSlow(JSObject *obj);
     return getClass() == &js::ObjectProxyClass && js_IsDebugScopeSlow(const_cast<JSObject*>(this));
 }
 
-#endif /* ScopeObject_h___ */
+#endif /* vm_ScopeObject_h */
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Shape_inl_h__
-#define Shape_inl_h__
+#ifndef vm_Shape_inl_h
+#define vm_Shape_inl_h
 
 #include "mozilla/PodOperations.h"
 
 #include "jsarray.h"
 #include "jsbool.h"
 #include "jscntxt.h"
 #include "jsdbgapi.h"
 #include "jsfun.h"
@@ -538,9 +538,9 @@ IsImplicitDenseElement(Shape *prop)
 static inline uint8_t
 GetShapeAttributes(HandleShape shape)
 {
     return IsImplicitDenseElement(shape) ? JSPROP_ENUMERATE : shape->attributes();
 }
 
 } /* namespace js */
 
-#endif /* Shape_inl_h__ */
+#endif /* vm_Shape_inl_h */
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Shape_h___
-#define Shape_h___
+#ifndef vm_Shape_h
+#define vm_Shape_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 
 #include "jsobj.h"
 #include "jspropertytree.h"
 #include "jstypes.h"
 
@@ -1131,9 +1131,9 @@ template<> struct RootKind<BaseShape *> 
 #pragma warning(pop)
 #endif
 
 namespace JS {
 template<> class AnchorPermitted<js::Shape *> { };
 template<> class AnchorPermitted<const js::Shape *> { };
 }
 
-#endif /* Shape_h___ */
+#endif /* vm_Shape_h */
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Stack_inl_h__
-#define Stack_inl_h__
+#ifndef vm_Stack_inl_h
+#define vm_Stack_inl_h
 
 #include "mozilla/PodOperations.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
 #include "vm/Stack.h"
 #include "ion/BaselineFrame.h"
@@ -902,9 +902,9 @@ InterpreterActivation::InterpreterActiva
 {}
 
 // Define destructor explicitly to silence GCC used-but-never-defined warning.
 InterpreterActivation::~InterpreterActivation()
 {}
 
 } /* namespace js */
 
-#endif /* Stack_inl_h__ */
+#endif /* vm_Stack_inl_h */
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Stack_h__
-#define Stack_h__
+#ifndef vm_Stack_h
+#define vm_Stack_h
 
 #include "jsautooplen.h"
 #include "jsfun.h"
 #include "jsscript.h"
 #include "ion/IonFrameIterator.h"
 
 struct JSContext;
 struct JSCompartment;
@@ -1916,9 +1916,9 @@ class AllFramesIter : public ScriptFrame
 {
   public:
     AllFramesIter(JSContext *cx)
       : ScriptFrameIter(cx, ScriptFrameIter::ALL_CONTEXTS, ScriptFrameIter::GO_THROUGH_SAVED)
     {}
 };
 
 }  /* namespace js */
-#endif /* Stack_h__ */
+#endif /* vm_Stack_h */
--- a/js/src/vm/String-inl.h
+++ b/js/src/vm/String-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef String_inl_h__
-#define String_inl_h__
+#ifndef vm_String_inl_h
+#define vm_String_inl_h
 
 #include "vm/String.h"
 
 #include "mozilla/PodOperations.h"
 
 #include "jscntxt.h"
 #include "gc/Marking.h"
 
@@ -504,9 +504,9 @@ JSAtom::finalize(js::FreeOp *fop)
 
 inline void
 JSExternalString::finalize(js::FreeOp *fop)
 {
     const JSStringFinalizer *fin = externalFinalizer();
     fin->finalize(fin, const_cast<jschar *>(chars()));
 }
 
-#endif
+#endif /* vm_String_inl_h */
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef String_h_
-#define String_h_
+#ifndef vm_String_h
+#define vm_String_h
 
 #include "mozilla/PodOperations.h"
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "jsstr.h"
 
 #include "gc/Barrier.h"
@@ -987,9 +987,9 @@ JSAtom::asPropertyName()
 {
 #ifdef DEBUG
     uint32_t dummy;
     JS_ASSERT(!isIndex(&dummy));
 #endif
     return static_cast<js::PropertyName *>(this);
 }
 
-#endif
+#endif /* vm_String_h */
--- a/js/src/vm/StringBuffer.h
+++ b/js/src/vm/StringBuffer.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef StringBuffer_h___
-#define StringBuffer_h___
+#ifndef vm_StringBuffer_h
+#define vm_StringBuffer_h
 
 #include "mozilla/DebugOnly.h"
 
 #include "jscntxt.h"
 
 #include "js/Vector.h"
 
 namespace js {
@@ -144,9 +144,9 @@ ValueToStringBuffer(JSContext *cx, const
 inline bool
 BooleanToStringBuffer(JSContext *cx, bool b, StringBuffer &sb)
 {
     return b ? sb.append("true") : sb.append("false");
 }
 
 }  /* namespace js */
 
-#endif /* StringBuffer_h___ */
+#endif /* vm_StringBuffer_h */
--- a/js/src/vm/StringObject-inl.h
+++ b/js/src/vm/StringObject-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef StringObject_inl_h___
-#define StringObject_inl_h___
+#ifndef vm_StringObject_inl_h
+#define vm_StringObject_inl_h
 
 #include "StringObject.h"
 
 #include "jsobjinlines.h"
 
 namespace js {
 
 inline bool
@@ -49,9 +49,9 @@ StringObject::create(JSContext *cx, Hand
     Rooted<StringObject*> strobj(cx, &obj->as<StringObject>());
     if (!strobj->init(cx, str))
         return NULL;
     return strobj;
 }
 
 } // namespace js
 
-#endif /* StringObject_inl_h__ */
+#endif /* vm_StringObject_inl_h */
--- a/js/src/vm/StringObject.h
+++ b/js/src/vm/StringObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef StringObject_h___
-#define StringObject_h___
+#ifndef vm_StringObject_h
+#define vm_StringObject_h
 
 #include "jsobj.h"
 #include "jsstr.h"
 
 namespace js {
 
 class StringObject : public JSObject
 {
@@ -62,9 +62,9 @@ class StringObject : public JSObject
      * encodes the initial length property. Return the shape after changing
      * this String object's last property to it.
      */
     Shape *assignInitialShape(JSContext *cx);
 };
 
 } // namespace js
 
-#endif /* StringObject_h__ */
+#endif /* vm_StringObject_h */
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ThreadPool_h__
-#define ThreadPool_h__
+#ifndef vm_ThreadPool_h
+#define vm_ThreadPool_h
 
 #include <stddef.h>
 #include "mozilla/StandardInteger.h"
 #include "js/Vector.h"
 #include "jsalloc.h"
 
 #ifdef JS_THREADSAFE
 #  include "prtypes.h"
@@ -98,9 +98,9 @@ class ThreadPool
     // Wait until all worker threads have finished their current set
     // of jobs and then return.  You must not submit new jobs after
     // invoking |terminate()|.
     bool terminate();
 };
 
 } // namespace js
 
-#endif // ThreadPool_h__
+#endif /* vm_ThreadPool_h */
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Unicode_h__
-#define Unicode_h__
+#ifndef vm_Unicode_h
+#define vm_Unicode_h
 
 #include "jspubtd.h"
 
 extern const bool js_isidstart[];
 extern const bool js_isident[];
 extern const bool js_isspace[];
 
 namespace js {
@@ -219,9 +219,9 @@ ToLowerCase(jschar ch)
         return info.lowerCase;
 
     return uint16_t(ch) + info.lowerCase;
 }
 
 } /* namespace unicode */
 } /* namespace js */
 
-#endif /* Unicode_h__ */
+#endif /* vm_Unicode_h */
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Xdr_h___
-#define Xdr_h___
+#ifndef vm_Xdr_h
+#define vm_Xdr_h
 
 #include "mozilla/Endian.h"
 
 #include "jsapi.h"
 #include "jsprvtd.h"
 #include "jsnum.h"
 
 #include "vm/NumericConversions.h"
@@ -239,9 +239,9 @@ class XDRDecoder : public XDRState<XDR_D
   public:
     XDRDecoder(JSContext *cx, const void *data, uint32_t length,
                JSPrincipals *principals, JSPrincipals *originPrincipals);
 
 };
 
 } /* namespace js */
 
-#endif /* Xdr_h___ */
+#endif /* vm_Xdr_h */