diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index da9dd4a77a03..228d2f731f8a 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -4,8 +4,8 @@
  * 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"
@@ -585,4 +585,4 @@ ReadBarrieredValue::toObject() const
 
 } /* namespace js */
 
-#endif /* jsgc_barrier_inl_h___ */
+#endif /* gc_Barrier_inl_h */
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 90a99af0d8f5..05d0d925c06e 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -659,4 +659,4 @@ template <> struct IsRelocatableHeapType<HeapId>    { static const bool result =
 } /* namespace tl */
 } /* namespace js */
 
-#endif /* jsgc_barrier_h___ */
+#endif /* gc_Barrier_h */
diff --git a/js/src/gc/FindSCCs-inl.h b/js/src/gc/FindSCCs-inl.h
index 24ae0b1de3eb..cd22337e99b6 100644
--- a/js/src/gc/FindSCCs-inl.h
+++ b/js/src/gc/FindSCCs-inl.h
@@ -4,6 +4,9 @@
  * 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"
@@ -145,3 +148,5 @@ ComponentFinder<Node>::mergeGroups(Node *first)
 
 } /* namespace gc */
 } /* namespace js */
+
+#endif /* gc_FindSCCs_inl_h */
diff --git a/js/src/gc/FindSCCs.h b/js/src/gc/FindSCCs.h
index c8ed79d70a9c..93003409816b 100644
--- a/js/src/gc/FindSCCs.h
+++ b/js/src/gc/FindSCCs.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -99,4 +99,4 @@ class ComponentFinder
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_findsccs_h___ */
+#endif /* gc_FindSCCs_h */
diff --git a/js/src/gc/GCInternals.h b/js/src/gc/GCInternals.h
index 17d766ad72c0..0c6338f1516a 100644
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -144,4 +144,4 @@ struct AutoStopVerifyingBarriers
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* jsgc_internal_h___ */
+#endif /* gc_GCInternals_h */
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index 097c2944eea2..c55dc0cf317d 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -4,8 +4,8 @@
  * 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"
@@ -1063,4 +1063,4 @@ InFreeList(ArenaHeader *aheader, void *thing)
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_heap_h___ */
+#endif /* gc_Heap_h */
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index 2c81eaf80947..a265c44062a4 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -4,8 +4,8 @@
  * 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"
@@ -410,4 +410,4 @@ TraceChildren(JSTracer *trc, void *thing, JSGCTraceKind kind);
 
 } /* namespace js */
 
-#endif /* gc_marking_h___ */
+#endif /* gc_Marking_h */
diff --git a/js/src/gc/Memory.h b/js/src/gc/Memory.h
index b73c266bf2cb..795841a127f0 100644
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -4,8 +4,8 @@
  * 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"
@@ -36,4 +36,4 @@ size_t GetPageFaultCount();
 } // namespace gc
 } // namespace js
 
-#endif // jsgc_memory_h___
+#endif /* gc_Memory_h */
diff --git a/js/src/gc/Nursery-inl.h b/js/src/gc/Nursery-inl.h
index c2b2e789a914..bb1c8dca3892 100644
--- a/js/src/gc/Nursery-inl.h
+++ b/js/src/gc/Nursery-inl.h
@@ -5,9 +5,10 @@
  * 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"
@@ -79,5 +80,6 @@ js::Nursery::getForwardedPointer(T **ref)
     return true;
 }
 
-#endif /* gc_Nursery_inl_h__ */
 #endif /* JSGC_GENERATIONAL */
+
+#endif /* gc_Nursery_inl_h */
diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h
index 1bf59054279a..be5b65641923 100644
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -5,8 +5,8 @@
  * 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
 
@@ -239,4 +239,4 @@ class Nursery
 } /* namespace js */
 
 #endif /* JSGC_GENERATIONAL */
-#endif /* jsgc_nursery_h___ */
+#endif /* gc_Nursery_h */
diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h
index 6cdf2ff6b203..80a192defdb1 100644
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -4,8 +4,8 @@
  * 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"
@@ -228,4 +228,4 @@ struct AutoSCC
 } /* namespace gcstats */
 } /* namespace js */
 
-#endif /* jsgc_statistics_h___ */
+#endif /* gc_Statistics_h */
diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h
index db3a29670cc6..ba561eb9c9f8 100644
--- a/js/src/gc/StoreBuffer.h
+++ b/js/src/gc/StoreBuffer.h
@@ -4,8 +4,8 @@
  * 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
 
@@ -443,4 +443,4 @@ class StoreBuffer
 
 #endif /* JSGC_GENERATIONAL */
 
-#endif /* jsgc_storebuffer_h___ */
+#endif /* gc_StoreBuffer_h */
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 4e1eb3d5c429..499f8b493254 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -4,8 +4,8 @@
  * 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"
@@ -415,4 +415,4 @@ typedef CompartmentsIterT<ZonesIter> CompartmentsIter;
 
 } /* namespace js */
 
-#endif /* gc_zone_h___ */
+#endif /* gc_Zone_h */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
index 82880151cd5e..871c41e23ad5 100644
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -161,4 +161,4 @@ NormalArgumentsObject::clearCallee()
 
 } /* namespace js */
 
-#endif /* ArgumentsObject_inl_h___ */
+#endif /* vm_ArgumentsObject_inl_h */
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 81dc51b61f99..26767d7c7e93 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -253,4 +253,4 @@ JSObject::is<js::ArgumentsObject>() const
     return is<js::NormalArgumentsObject>() || is<js::StrictArgumentsObject>();
 }
 
-#endif /* ArgumentsObject_h___ */
+#endif /* vm_ArgumentsObject_h */
diff --git a/js/src/vm/BooleanObject-inl.h b/js/src/vm/BooleanObject-inl.h
index 7c7a82ea58f9..b401da761ad5 100644
--- a/js/src/vm/BooleanObject-inl.h
+++ b/js/src/vm/BooleanObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -26,4 +26,4 @@ BooleanObject::create(JSContext *cx, bool b)
 
 } // namespace js
 
-#endif /* BooleanObject_inl_h__ */
+#endif /* vm_BooleanObject_inl_h */
diff --git a/js/src/vm/BooleanObject.h b/js/src/vm/BooleanObject.h
index e23b120757a7..11cdf59c0a7b 100644
--- a/js/src/vm/BooleanObject.h
+++ b/js/src/vm/BooleanObject.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -43,4 +43,4 @@ class BooleanObject : public JSObject
 
 } // namespace js
 
-#endif /* BooleanObject_h__ */
+#endif /* vm_BooleanObject_h */
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index f803b094bfae..9fc3b1d06ec3 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -6,8 +6,8 @@
 
 /* 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"
@@ -159,4 +159,4 @@
     macro(boolean, boolean, "boolean") \
     macro(null, null, "null")
 
-#endif /* CommonPropertyNames_h__ */
+#endif /* vm_CommonPropertyNames_h */
diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
index 965cf2b5eaa4..fb0a0293eb80 100644
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -4,8 +4,8 @@
  * 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"
@@ -157,4 +157,4 @@ class DateTimeInfo
 
 }  /* namespace js */
 
-#endif /* DateTime_h___ */
+#endif /* vm_DateTime_h */
diff --git a/js/src/vm/Debugger-inl.h b/js/src/vm/Debugger-inl.h
index c05766ed9e52..10375e584306 100644
--- a/js/src/vm/Debugger-inl.h
+++ b/js/src/vm/Debugger-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -22,4 +22,4 @@ js::Debugger::onLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok)
     return ok;
 }
 
-#endif  // Debugger_inl_h__
+#endif /* vm_Debugger_inl_h */
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index c7f9927d94c4..1e3fa60783a3 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -696,4 +696,4 @@ EvaluateInEnv(JSContext *cx, Handle<Env*> env, HandleValue thisv, AbstractFrameP
 
 }
 
-#endif /* Debugger_h__ */
+#endif /* vm_Debugger_h */
diff --git a/js/src/vm/ForkJoin.h b/js/src/vm/ForkJoin.h
index 8dbd82cc7152..543866073246 100644
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -4,8 +4,8 @@
  * 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"
@@ -495,4 +495,4 @@ js::ForkJoinSlice::Current()
 #endif
 }
 
-#endif // ForkJoin_h__
+#endif /* vm_ForkJoin_h */
diff --git a/js/src/vm/GlobalObject-inl.h b/js/src/vm/GlobalObject-inl.h
index 845daad5d76e..b75ab5687462 100644
--- a/js/src/vm/GlobalObject-inl.h
+++ b/js/src/vm/GlobalObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -219,4 +219,4 @@ GlobalObject::setIntrinsicsHolder(JSObject *obj)
 
 } // namespace js
 
-#endif
+#endif /* vm_GlobalObject_inl_h */
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h
index 8c46ae8db679..cc5c56eb04c5 100644
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -481,4 +481,4 @@ JSObject::asGlobal()
     return *static_cast<js::GlobalObject *>(this);
 }
 
-#endif /* GlobalObject_h___ */
+#endif /* vm_GlobalObject_h */
diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
index 662cc826674f..10fc4486f5b7 100644
--- a/js/src/vm/Interpreter-inl.h
+++ b/js/src/vm/Interpreter-inl.h
@@ -4,8 +4,8 @@
  * 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"
@@ -1033,4 +1033,4 @@ class FastInvokeGuard
 
 }  /* namespace js */
 
-#endif /* Interpreter_inl_h__ */
+#endif /* vm_Interpreter_inl_h */
diff --git a/js/src/vm/Interpreter.h b/js/src/vm/Interpreter.h
index 7de9e4f00bf4..9447dfaa9e2c 100644
--- a/js/src/vm/Interpreter.h
+++ b/js/src/vm/Interpreter.h
@@ -4,11 +4,13 @@
  * 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"
@@ -541,4 +543,4 @@ InitGetterSetterOperation(JSContext *cx, jsbytecode *pc, HandleObject obj, Handl
 
 }  /* namespace js */
 
-#endif /* Interpreter_h___ */
+#endif /* vm_Interpreter_h */
diff --git a/js/src/vm/Keywords.h b/js/src/vm/Keywords.h
index cc2d5dbc982e..1fb416fbff2a 100644
--- a/js/src/vm/Keywords.h
+++ b/js/src/vm/Keywords.h
@@ -6,8 +6,8 @@
 
 /* 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"
 
@@ -84,4 +84,4 @@
     FOR_LET_KEYWORD(macro) \
     FOR_YIELD_KEYWORD(macro)
 
-#endif /* Keywords_h_ */
+#endif /* vm_Keywords_h */
diff --git a/js/src/vm/MatchPairs.h b/js/src/vm/MatchPairs.h
index 26e997b22cff..408cc808a8ef 100644
--- a/js/src/vm/MatchPairs.h
+++ b/js/src/vm/MatchPairs.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -158,4 +158,4 @@ struct MatchConduit
 
 } /* namespace js */
 
-#endif /* MatchPairs_h__ */
+#endif /* vm_MatchPairs_h */
diff --git a/js/src/vm/Monitor.h b/js/src/vm/Monitor.h
index af31537bc935..9aaa504542e8 100644
--- a/js/src/vm/Monitor.h
+++ b/js/src/vm/Monitor.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -115,4 +115,4 @@ class AutoUnlockMonitor
 
 } // namespace js
 
-#endif // Monitor_h__
+#endif /* vm_Monitor_h */
diff --git a/js/src/vm/NumberObject-inl.h b/js/src/vm/NumberObject-inl.h
index b0cd30bd6d4a..90d7aba0ef96 100644
--- a/js/src/vm/NumberObject-inl.h
+++ b/js/src/vm/NumberObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -26,4 +26,4 @@ NumberObject::create(JSContext *cx, double d)
 
 } // namespace js
 
-#endif /* NumberObject_inl_h__ */
+#endif /* vm_NumberObject_inl_h */
diff --git a/js/src/vm/NumberObject.h b/js/src/vm/NumberObject.h
index d21a50cabf21..efc804fd8907 100644
--- a/js/src/vm/NumberObject.h
+++ b/js/src/vm/NumberObject.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -43,4 +43,4 @@ class NumberObject : public JSObject
 
 } // namespace js
 
-#endif /* NumberObject_h__ */
+#endif /* vm_NumberObject_h */
diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
index 496b742b802b..61511a0d2dae 100644
--- a/js/src/vm/NumericConversions.h
+++ b/js/src/vm/NumericConversions.h
@@ -4,8 +4,8 @@
  * 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"
@@ -299,4 +299,4 @@ ToInteger(double d)
 
 } /* namespace js */
 
-#endif /* NumericConversions_h__ */
+#endif /* vm_NumericConversions_h */
diff --git a/js/src/vm/ObjectImpl-inl.h b/js/src/vm/ObjectImpl-inl.h
index 745d75116f52..51d9ff45a7a2 100644
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/ObjectImpl-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -462,4 +462,4 @@ js::ObjectImpl::initPrivate(void *data)
     privateRef(numFixedSlots()) = data;
 }
 
-#endif /* ObjectImpl_inl_h__ */
+#endif /* vm_ObjectImpl_inl_h */
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index 5adef6d453c8..980f935bdbab 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -4,8 +4,8 @@
  * 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"
@@ -1639,4 +1639,4 @@ template <> struct GCMethods<PropertyId>
 
 } /* namespace js */
 
-#endif /* ObjectImpl_h__ */
+#endif /* vm_ObjectImpl_h */
diff --git a/js/src/vm/Probes-inl.h b/js/src/vm/Probes-inl.h
index eec9d15b40c7..8869be3199a0 100644
--- a/js/src/vm/Probes-inl.h
+++ b/js/src/vm/Probes-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -124,4 +124,4 @@ Probes::stopExecution(JSScript *script)
 
 } /* namespace js */
  
-#endif  // Probes_inl_h__
+#endif /* vm_Probes_inl_h */
diff --git a/js/src/vm/Probes.h b/js/src/vm/Probes.h
index d94410c24d7e..a17ba975b0cf 100644
--- a/js/src/vm/Probes.h
+++ b/js/src/vm/Probes.h
@@ -4,8 +4,8 @@
  * 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"
@@ -170,4 +170,4 @@ Probes::finalizeObject(JSObject *obj)
 
 } /* namespace js */
 
-#endif  // Probes_h__
+#endif /* vm_Probes_h */
diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
index 49f87636e031..9a6d81d9cd8b 100644
--- a/js/src/vm/RegExpObject-inl.h
+++ b/js/src/vm/RegExpObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -169,4 +169,4 @@ MatchPairs::checkAgainst(size_t inputLength)
 
 } /* namespace js */
 
-#endif
+#endif /* vm_RegExpObject_inl_h */
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index dd60df4f7f0a..2d70d66c5ad3 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -401,4 +401,4 @@ CloneScriptRegExpObject(JSContext *cx, RegExpObject &re);
 
 } /* namespace js */
 
-#endif
+#endif /* vm_RegExpObject_h */
diff --git a/js/src/vm/RegExpStatics-inl.h b/js/src/vm/RegExpStatics-inl.h
index c3311e825f18..f33e008e882a 100644
--- a/js/src/vm/RegExpStatics-inl.h
+++ b/js/src/vm/RegExpStatics-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -583,4 +583,4 @@ JSContext::regExpStatics()
     return global()->getRegExpStatics();
 }
 
-#endif
+#endif /* vm_RegExpStatics_inl_h */
diff --git a/js/src/vm/RegExpStatics.h b/js/src/vm/RegExpStatics.h
index 5d5355058799..4778d00a1713 100644
--- a/js/src/vm/RegExpStatics.h
+++ b/js/src/vm/RegExpStatics.h
@@ -4,8 +4,8 @@
  * 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>
 
@@ -22,4 +22,4 @@ size_t SizeOfRegExpStaticsData(const JSObject *obj, JSMallocSizeOfFun mallocSize
 
 } /* namespace js */
 
-#endif /* RegExpStatics_h__ */
+#endif /* vm_RegExpStatics_h */
diff --git a/js/src/vm/SPSProfiler.h b/js/src/vm/SPSProfiler.h
index 487c770cd66f..f9b426e69fef 100644
--- a/js/src/vm/SPSProfiler.h
+++ b/js/src/vm/SPSProfiler.h
@@ -4,8 +4,8 @@
  * 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>
 
@@ -390,4 +390,4 @@ class SPSInstrumentation
 
 } /* namespace js */
 
-#endif /* SPSProfiler_h__ */
+#endif /* vm_SPSProfiler_h */
diff --git a/js/src/vm/ScopeObject-inl.h b/js/src/vm/ScopeObject-inl.h
index 54c41204ec61..55ac0e616899 100644
--- a/js/src/vm/ScopeObject-inl.h
+++ b/js/src/vm/ScopeObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -270,4 +270,4 @@ ClonedBlockObject::setVar(unsigned i, const Value &v, MaybeCheckAliasing checkAl
 
 }  /* namespace js */
 
-#endif /* ScopeObject_inl_h___ */
+#endif /* vm_ScopeObject_inl_h */
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index d386d83bb28b..4acf849cda3b 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -4,8 +4,8 @@
  * 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"
@@ -648,4 +648,4 @@ JSObject::is<js::DebugScopeObject>() const
     return getClass() == &js::ObjectProxyClass && js_IsDebugScopeSlow(const_cast<JSObject*>(this));
 }
 
-#endif /* ScopeObject_h___ */
+#endif /* vm_ScopeObject_h */
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index 5c66f019e901..f9122420f894 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -543,4 +543,4 @@ GetShapeAttributes(HandleShape shape)
 
 } /* namespace js */
 
-#endif /* Shape_inl_h__ */
+#endif /* vm_Shape_inl_h */
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 8a3b69265448..d1f5ed9fb9a0 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -4,8 +4,8 @@
  * 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"
@@ -1136,4 +1136,4 @@ template<> class AnchorPermitted<js::Shape *> { };
 template<> class AnchorPermitted<const js::Shape *> { };
 }
 
-#endif /* Shape_h___ */
+#endif /* vm_Shape_h */
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index d440df1e846e..48a17a24038d 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -907,4 +907,4 @@ InterpreterActivation::~InterpreterActivation()
 
 } /* namespace js */
 
-#endif /* Stack_inl_h__ */
+#endif /* vm_Stack_inl_h */
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index ce170ba18e10..0a277ffbf9fd 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -4,8 +4,8 @@
  * 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"
@@ -1921,4 +1921,4 @@ class AllFramesIter : public ScriptFrameIter
 };
 
 }  /* namespace js */
-#endif /* Stack_h__ */
+#endif /* vm_Stack_h */
diff --git a/js/src/vm/String-inl.h b/js/src/vm/String-inl.h
index 9feb52f18b36..571716139966 100644
--- a/js/src/vm/String-inl.h
+++ b/js/src/vm/String-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -509,4 +509,4 @@ JSExternalString::finalize(js::FreeOp *fop)
     fin->finalize(fin, const_cast<jschar *>(chars()));
 }
 
-#endif
+#endif /* vm_String_inl_h */
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index c09abf799119..1e29fbfb6894 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -992,4 +992,4 @@ JSAtom::asPropertyName()
     return static_cast<js::PropertyName *>(this);
 }
 
-#endif
+#endif /* vm_String_h */
diff --git a/js/src/vm/StringBuffer.h b/js/src/vm/StringBuffer.h
index dcb931e2f33b..9c40fec29581 100644
--- a/js/src/vm/StringBuffer.h
+++ b/js/src/vm/StringBuffer.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -149,4 +149,4 @@ BooleanToStringBuffer(JSContext *cx, bool b, StringBuffer &sb)
 
 }  /* namespace js */
 
-#endif /* StringBuffer_h___ */
+#endif /* vm_StringBuffer_h */
diff --git a/js/src/vm/StringObject-inl.h b/js/src/vm/StringObject-inl.h
index 2a43bfbc496d..1251877e79a2 100644
--- a/js/src/vm/StringObject-inl.h
+++ b/js/src/vm/StringObject-inl.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -54,4 +54,4 @@ StringObject::create(JSContext *cx, HandleString str, NewObjectKind newKind)
 
 } // namespace js
 
-#endif /* StringObject_inl_h__ */
+#endif /* vm_StringObject_inl_h */
diff --git a/js/src/vm/StringObject.h b/js/src/vm/StringObject.h
index 66f59b5c2652..34343bb32a28 100644
--- a/js/src/vm/StringObject.h
+++ b/js/src/vm/StringObject.h
@@ -4,8 +4,8 @@
  * 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"
@@ -67,4 +67,4 @@ class StringObject : public JSObject
 
 } // namespace js
 
-#endif /* StringObject_h__ */
+#endif /* vm_StringObject_h */
diff --git a/js/src/vm/ThreadPool.h b/js/src/vm/ThreadPool.h
index 75698d526ad5..5999341c0b0a 100644
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -4,8 +4,8 @@
  * 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"
@@ -103,4 +103,4 @@ class ThreadPool
 
 } // namespace js
 
-#endif // ThreadPool_h__
+#endif /* vm_ThreadPool_h */
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index 35b13a33fec7..5df215253991 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -224,4 +224,4 @@ ToLowerCase(jschar ch)
 } /* namespace unicode */
 } /* namespace js */
 
-#endif /* Unicode_h__ */
+#endif /* vm_Unicode_h */
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index b34a66e9bad4..8d24884b9d2f 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -4,8 +4,8 @@
  * 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"
 
@@ -244,4 +244,4 @@ class XDRDecoder : public XDRState<XDR_DECODE> {
 
 } /* namespace js */
 
-#endif /* Xdr_h___ */
+#endif /* vm_Xdr_h */