Bug 883697 (part 2) - Make include guards consistent in some of js/src/. r=njn.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Wed, 19 Jun 2013 17:59:46 -0700
changeset 147291 cba55a540e2a526b37fa6e66e4701ba747cbd2d4
parent 147290 41caf6414eae175be5af4ca6456ea0ae11c11150
child 147292 aedf5992770a8c80df9104dc111059760f5be928
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [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 2) - Make include guards consistent in some of js/src/. r=njn.
js/src/TraceLogging.h
js/src/devtools/Instruments.h
js/src/devtools/sharkctl.h
js/src/devtools/vprof/vprof.h
js/src/ds/BitArray.h
js/src/ds/InlineMap.h
js/src/ds/LifoAlloc.h
js/src/ds/PriorityQueue.h
js/src/ds/Sort.h
js/src/ds/SplayTree.h
js/src/editline/editline.h
js/src/editline/unix.h
js/src/gdb/gdb-tests.h
js/src/jsalloc.h
js/src/jsanalyze.h
js/src/jsanalyzeinlines.h
js/src/jsapi-tests/tests.h
js/src/jsapi.h
js/src/jsarray.h
js/src/jsatom.h
js/src/jsatominlines.h
js/src/jsbool.h
js/src/jsboolinlines.h
js/src/jsclass.h
js/src/jsclist.h
js/src/jsclone.h
js/src/jscntxt.h
js/src/jscntxtinlines.h
js/src/jscompartment.h
js/src/jscompartmentinlines.h
js/src/jscpucfg.h
js/src/jscrashformat.h
js/src/jscrashreport.h
js/src/jsdate.h
js/src/jsdbgapi.h
js/src/jsdhash.h
js/src/jsdtoa.h
js/src/jsexn.h
js/src/jsfriendapi.h
js/src/jsfun.h
js/src/jsfuninlines.h
js/src/jsgc.h
js/src/jsgcinlines.h
js/src/jsinfer.h
js/src/jsinferinlines.h
js/src/jsiter.h
js/src/jslibmath.h
js/src/jslock.h
js/src/jsmath.h
js/src/jsnativestack.h
js/src/jsnum.h
js/src/jsobj.h
js/src/jsobjinlines.h
js/src/json.h
js/src/jsonparser.h
js/src/jsopcode.h
js/src/jsopcodeinlines.h
js/src/jsprf.h
js/src/jspropertytree.h
js/src/jsprototypes.h
js/src/jsproxy.h
js/src/jsprvtd.h
js/src/jspubtd.h
js/src/jsreflect.h
js/src/jsscript.h
js/src/jsscriptinlines.h
js/src/jsstr.h
js/src/jsstrinlines.h
js/src/jstypes.h
js/src/jsutil.h
js/src/jsversion.h
js/src/jswatchpoint.h
js/src/jsweakcache.h
js/src/jsweakmap.h
js/src/jswin.h
js/src/jsworkers.h
js/src/jswrapper.h
js/src/perf/jsperf.h
js/src/prmjtime.h
js/src/shell/jsheaptools.h
js/src/shell/jsoptparse.h
--- a/js/src/TraceLogging.h
+++ b/js/src/TraceLogging.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/. */
 
-#if !defined(TraceLogging_h__)
-#define TraceLogging_h__
+#ifndef TraceLogging_h
+#define TraceLogging_h
 
 #include "jsscript.h"
 
 namespace js {
 
 class TraceLogging
 {
   public:
@@ -108,10 +108,9 @@ class AutoTraceLog {
     ~AutoTraceLog()
     {
         logger->log(stop);
     }
 };
 
 }  /* namespace js */
 
-#endif // TraceLogging_h__
-
+#endif /* TraceLogging_h */
--- a/js/src/devtools/Instruments.h
+++ b/js/src/devtools/Instruments.h
@@ -1,21 +1,21 @@
 /* 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 Instruments_h__
-#define Instruments_h__
+#ifndef devtools_Instruments_h
+#define devtools_Instruments_h
 
 #ifdef __APPLE__
 
 namespace Instruments {
 
 bool Start();
 void Pause();
 bool Resume();
 void Stop(const char* profileName);
 
 }
 
 #endif /* __APPLE__ */
 
-#endif /* Instruments_h__ */
+#endif /* devtools_Instruments_h */
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -1,24 +1,24 @@
 /* -*- 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 _SHARKCTL_H
-#define _SHARKCTL_H
+#ifndef devtools_sharkctl_h
+#define devtools_sharkctl_h
 
 #ifdef __APPLE__
 
 #include <mach/mach.h>
 #include <stdint.h>
 
 namespace Shark {
 
 bool Start();
 void Stop();
 
 }
 
-#endif
+#endif /* __APPLE__ */
 
-#endif
+#endif /* devtools_sharkctl_h */
--- a/js/src/devtools/vprof/vprof.h
+++ b/js/src/devtools/vprof/vprof.h
@@ -36,18 +36,18 @@
 //    _VAL, _COUNT, _SUM, _MIN, _MAX, and the general purpose registers
 //    _IVAR1, ..., IVAR4      general integer registrs
 //    _I64VAR1, ..., I64VAR4  general integer64 registrs
 //    _DVAR1, ..., _DVAR4     general double registers
 //    _GENPTR a generic pointer that can be used by the client
 //    the number of registers can be changed in vprof.h
 //
 
-#ifndef __VPROF__
-#define __VPROF__
+#ifndef devtools_vprof_vprof_h
+#define devtools_vprof_vprof_h
 //
 // If the application for which you want to use vprof is threaded, THREADED must be defined as 1, otherwise define it as 0
 //
 // If your application is not threaded, define THREAD_SAFE 0,
 // otherwise, you have the option of setting THREAD_SAFE to 1 which results in exact counts or to 0 which results in a much more efficient but non-exact counts
 //
 #define THREADED 0
 #define THREAD_SAFE 0
@@ -267,9 +267,9 @@ typedef struct entry {
 #define _I64VAR2 ((entry_t)vprofID)->i64var[2]
 #define _I64VAR3 ((entry_t)vprofID)->i64var[3]
 
 #define _DVAR0 ((entry_t)vprofID)->dvar[0]
 #define _DVAR1 ((entry_t)vprofID)->dvar[1]
 #define _DVAR2 ((entry_t)vprofID)->dvar[2]
 #define _DVAR3 ((entry_t)vprofID)->dvar[3]
 
-#endif /* __VPROF__ */
+#endif /* devtools_vprof_vprof_h */
--- a/js/src/ds/BitArray.h
+++ b/js/src/ds/BitArray.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 BitArray_h__
-#define BitArray_h__
+#ifndef ds_BitArray_h
+#define ds_BitArray_h
 
 #include "jstypes.h" 
 
 #include "js/TemplateLib.h" 
 
 namespace js {
 
 template <size_t nbits>
@@ -56,9 +56,9 @@ class BitArray {
                                    uintptr_t *indexp, uintptr_t *maskp) const {
         *indexp = offset >> tl::FloorLog2<JS_BITS_PER_WORD>::result;
         *maskp = uintptr_t(1) << (offset & (JS_BITS_PER_WORD - 1));
     }
 };
 
 } /* namespace js */
 
-#endif
+#endif /* ds_BitArray_h */
--- a/js/src/ds/InlineMap.h
+++ b/js/src/ds/InlineMap.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 InlineMap_h__
-#define InlineMap_h__
+#ifndef ds_InlineMap_h
+#define ds_InlineMap_h
 
 #include "js/HashTable.h"
 
 namespace js {
 
 /*
  * A type can only be used as an InlineMap key if zero is an invalid key value
  * (and thus may be used as a tombstone value by InlineMap).
@@ -368,9 +368,9 @@ class InlineMap
 
     Range all() const {
         return usingMap() ? Range(map.all()) : Range(inl, inl + inlNext);
     }
 }; /* class InlineMap */
 
 } /* namespace js */
 
-#endif
+#endif /* ds_InlineMap_h */
--- a/js/src/ds/LifoAlloc.h
+++ b/js/src/ds/LifoAlloc.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 LifoAlloc_h__
-#define LifoAlloc_h__
+#ifndef ds_LifoAlloc_h
+#define ds_LifoAlloc_h
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/TypeTraits.h"
 
 // This data structure supports stacky LIFO allocation (mark/release and
 // LifoAllocScope). It does not maintain one contiguous segment; instead, it
@@ -403,9 +403,9 @@ class LifoAllocScope
         JS_ASSERT(shouldRelease);
         lifoAlloc->release(mark);
         shouldRelease = false;
     }
 };
 
 } // namespace js
 
-#endif
+#endif /* ds_LifoAlloc_h */
--- a/js/src/ds/PriorityQueue.h
+++ b/js/src/ds/PriorityQueue.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 jspriorityqueue_h_
-#define jspriorityqueue_h_
+#ifndef ds_PriorityQueue_h
+#define ds_PriorityQueue_h
 
 #include "js/Vector.h"
 
 namespace js {
 
 /*
  * Class which represents a heap based priority queue using a vector.
  * Inserting elements and removing the highest priority one are both O(log n).
@@ -127,9 +127,9 @@ class PriorityQueue
         T tmp = heap[a];
         heap[a] = heap[b];
         heap[b] = tmp;
     }
 };
 
 }  /* namespace js */
 
-#endif /* jspriorityqueue_h_ */
+#endif /* ds_PriorityQueue_h */
--- a/js/src/ds/Sort.h
+++ b/js/src/ds/Sort.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 Sort_h__
-#define Sort_h__
+#ifndef ds_Sort_h
+#define ds_Sort_h
 
 #include "jstypes.h"
 
 namespace js {
 
 namespace detail {
 
 template<typename T>
@@ -129,9 +129,9 @@ MergeSort(T *array, size_t nelems, T *sc
     }
     if (vec1 == scratch)
         detail::CopyNonEmptyArray(array, scratch, nelems);
     return true;
 }
 
 } /* namespace js */
 
-#endif
+#endif /* ds_Sort_h */
--- a/js/src/ds/SplayTree.h
+++ b/js/src/ds/SplayTree.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 jssplaytree_h_
-#define jssplaytree_h_
+#ifndef ds_SplayTree_h
+#define ds_SplayTree_h
 
 #include "LifoAlloc.h"
 
 namespace js {
 
 /*
  * Class which represents a splay tree with nodes allocated from a LifoAlloc.
  * Splay trees are balanced binary search trees for which search, insert and
@@ -272,9 +272,9 @@ class SplayTree
 #else
         return NULL;
 #endif
     }
 };
 
 }  /* namespace js */
 
-#endif /* jssplaytree_h_ */
+#endif /* ds_SplayTree_h */
--- a/js/src/editline/editline.h
+++ b/js/src/editline/editline.h
@@ -1,13 +1,16 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * 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 editline_editline_h
+#define editline_editline_h
+
 /*
  * Copyright 1992,1993 Simmule Turner and Rich Salz.  All rights reserved.
  *
  * This software is not subject to any license of the American Telephone
  * and Telegraph Company or of the Regents of the University of California.
  *
  * Permission is granted to anyone to use this software for any purpose on
  * any computer system, and to alter it and redistribute it freely, subject
@@ -94,8 +97,9 @@ extern char	*strchr();
 extern char	*strrchr();
 extern char	*strcpy();
 extern char	*strdup();
 extern int	strcmp();
 extern int	strlen();
 extern int	strncmp();
 #endif	/* !defined(HAVE_STDLIB) */
 
+#endif /* editline_editline_h */
--- a/js/src/editline/unix.h
+++ b/js/src/editline/unix.h
@@ -1,13 +1,16 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * 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 editline_unix_h
+#define editline_unix_h
+
 /*
  * Copyright 1992,1993 Simmule Turner and Rich Salz.  All rights reserved.
  *
  * This software is not subject to any license of the American Telephone
  * and Telegraph Company or of the Regents of the University of California.
  *
  * Permission is granted to anyone to use this software for any purpose on
  * any computer system, and to alter it and redistribute it freely, subject
@@ -41,8 +44,9 @@ typedef struct dirent	DIRENTRY;
 #include <sys/dir.h>
 typedef struct direct	DIRENTRY;
 #endif	/* defined(USE_DIRENT) */
 
 #if	!defined(S_ISDIR)
 #define S_ISDIR(m)		(((m) & S_IFMT) == S_IFDIR)
 #endif	/* !defined(S_ISDIR) */
 
+#endif /* editline_unix_h */
--- a/js/src/gdb/gdb-tests.h
+++ b/js/src/gdb/gdb-tests.h
@@ -1,15 +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/. */
 
+#ifndef gdb_gdb_tests_h
+#define gdb_gdb_tests_h
+
 // Support for C++ fragments to be used by Python unit tests for SpiderMonkey's
 // GDB support.
 //
 // That is:
 // - js/src/gdb/mozilla holds the actual GDB SpiderMonkey support code.
 // - Each '.py' file in js/src/gdb/tests is a unit test for the above.
 // - Each '.cpp' file in js/src/gdb/tests is C++ code for one of the unit tests
 //   to run.
@@ -63,8 +66,9 @@ class FRAGMENT_CLASS_NAME(category, subn
     static FRAGMENT_CLASS_NAME(category, subname) singleton;                                    \
 };                                                                                              \
 FRAGMENT_CLASS_NAME(category, subname) FRAGMENT_CLASS_NAME(category, subname)::singleton;       \
 void FRAGMENT_CLASS_NAME(category, subname)::run(JSContext *cx, const char **&argv)
 
 #define FRAGMENT_STRING_NAME(category, subname) (#category "." #subname)
 #define FRAGMENT_CLASS_NAME(category, subname) Fragment_ ## category ## _ ## subname
 
+#endif /* gdb_gdb_tests_h */
--- a/js/src/jsalloc.h
+++ b/js/src/jsalloc.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 jsalloc_h_
-#define jsalloc_h_
+#ifndef jsalloc_h
+#define jsalloc_h
 
 #include "js/Utility.h"
 
 struct JSContext;
 
 namespace js {
 
 /*
@@ -92,9 +92,9 @@ class TempAllocPolicy
         js_free(p);
     }
 
     JS_FRIEND_API(void) reportAllocOverflow() const;
 };
 
 } /* namespace js */
 
-#endif /* jsalloc_h_ */
+#endif /* jsalloc_h */
--- a/js/src/jsanalyze.h
+++ b/js/src/jsanalyze.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/. */
 
 /* Definitions for javascript analysis. */
 
-#ifndef jsanalyze_h___
-#define jsanalyze_h___
+#ifndef jsanalyze_h
+#define jsanalyze_h
 
 #include "mozilla/PodOperations.h"
 
 #include "jscompartment.h"
 #include "jscntxt.h"
 #include "jsinfer.h"
 #include "jsscript.h"
 
@@ -1091,9 +1091,9 @@ namespace mozilla {
 template <> struct IsPod<js::analyze::LifetimeVariable> : TrueType {};
 template <> struct IsPod<js::analyze::LoopAnalysis>     : TrueType {};
 template <> struct IsPod<js::analyze::SlotValue>        : TrueType {};
 template <> struct IsPod<js::analyze::SSAValue>         : TrueType {};
 template <> struct IsPod<js::analyze::SSAUseChain>      : TrueType {};
 
 } /* namespace mozilla */
 
-#endif // jsanalyze_h___
+#endif /* jsanalyze_h */
--- a/js/src/jsanalyzeinlines.h
+++ b/js/src/jsanalyzeinlines.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 jsanalyzeinlines_h___
-#define jsanalyzeinlines_h___
+#ifndef jsanalyzeinlines_h
+#define jsanalyzeinlines_h
 
 #include "jsanalyze.h"
 
 #include "jsopcodeinlines.h"
 
 namespace js {
 namespace analyze {
 
@@ -112,9 +112,9 @@ inline types::StackTypeSet *
 CrossScriptSSA::getValueTypes(const CrossSSAValue &cv)
 {
     return getFrame(cv.frame).script->analysis()->getValueTypes(cv.v);
 }
 
 } /* namespace analyze */
 } /* namespace js */
 
-#endif // jsanalyzeinlines_h___
+#endif /* jsanalyzeinlines_h */
--- a/js/src/jsapi-tests/tests.h
+++ b/js/src/jsapi-tests/tests.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 jsapi_tests_tests_h
+#define jsapi_tests_tests_h
+
 #include "mozilla/Util.h"
 
 #include "jsapi.h"
 #include "jsprvtd.h"
 #include "jsalloc.h"
 
 // For js::gc::AutoSuppressGC
 #include "jsgc.h"
@@ -391,8 +394,10 @@ class TempFile {
         if (::remove(name) != 0) {
             fprintf(stderr, "error deleting temporary file '%s': %s\n",
                     name, strerror(errno));
             exit(1);
         }
         name = NULL;
     }
 };
+
+#endif /* jsapi_tests_tests_h */
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.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/. */
 
 /* JavaScript API. */
 
-#ifndef jsapi_h___
-#define jsapi_h___
+#ifndef jsapi_h
+#define jsapi_h
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/RangedPtr.h"
 #include "mozilla/StandardInteger.h"
 #include "mozilla/ThreadLocal.h"
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -5118,9 +5118,9 @@ using JS::MutableHandleScript;
 using JS::MutableHandleString;
 using JS::MutableHandleId;
 using JS::MutableHandleValue;
 
 using JS::Zone;
 
 } /* namespace js */
 
-#endif /* jsapi_h___ */
+#endif /* jsapi_h */
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.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/. */
 
 /* JS Array interface. */
 
-#ifndef jsarray_h___
-#define jsarray_h___
+#ifndef jsarray_h
+#define jsarray_h
 
 #include "jspubtd.h"
 #include "jsobj.h"
 
 namespace js {
 /* 2^32-2, inclusive */
 const uint32_t MAX_ARRAY_INDEX = 4294967294u;
 }
@@ -141,9 +141,9 @@ js_ArrayInfo(JSContext *cx, unsigned arg
  */
 extern JSBool
 js_NewbornArrayPush(JSContext *cx, js::HandleObject obj, const js::Value &v);
 
 /* Array constructor native. Exposed only so the JIT can know its address. */
 JSBool
 js_Array(JSContext *cx, unsigned argc, js::Value *vp);
 
-#endif /* jsarray_h___ */
+#endif /* jsarray_h */
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.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 jsatom_h___
-#define jsatom_h___
+#ifndef jsatom_h
+#define jsatom_h
 
 #include "mozilla/HashFunctions.h"
 
 #include <stddef.h>
 #include "jsalloc.h"
 #include "jsapi.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
@@ -234,9 +234,9 @@ inline JSAtom *
 ToAtom(JSContext *cx, typename MaybeRooted<Value, allowGC>::HandleType v);
 
 template<XDRMode mode>
 bool
 XDRAtom(XDRState<mode> *xdr, js::MutableHandleAtom atomp);
 
 } /* namespace js */
 
-#endif /* jsatom_h___ */
+#endif /* jsatom_h */
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.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 jsatominlines_h___
-#define jsatominlines_h___
+#ifndef jsatominlines_h
+#define jsatominlines_h
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/RangedPtr.h"
 
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
@@ -196,9 +196,9 @@ ClassName(JSProtoKey key, JSContext *cx)
                      JSProto_LIMIT * sizeof(FixedHeapPtr<PropertyName>) <=
                      sizeof(JSAtomState));
     JS_STATIC_ASSERT(JSProto_Null == 0);
     return (&cx->runtime()->atomState.Null)[key];
 }
 
 } // namespace js
 
-#endif /* jsatominlines_h___ */
+#endif /* jsatominlines_h */
--- a/js/src/jsbool.h
+++ b/js/src/jsbool.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 jsbool_h___
-#define jsbool_h___
+#ifndef jsbool_h
+#define jsbool_h
 /*
  * JS boolean interface.
  */
 
 #include "jsapi.h"
 
 extern JSObject *
 js_InitBooleanClass(JSContext *cx, js::HandleObject obj);
@@ -20,9 +20,9 @@ js_BooleanToString(JSContext *cx, JSBool
 
 namespace js {
 
 inline bool
 BooleanGetPrimitiveValue(HandleObject obj, JSContext *cx);
 
 } /* namespace js */
 
-#endif /* jsbool_h___ */
+#endif /* jsbool_h */
--- a/js/src/jsboolinlines.h
+++ b/js/src/jsboolinlines.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 jsboolinlines_h___
-#define jsboolinlines_h___
+#ifndef jsboolinlines_h
+#define jsboolinlines_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
 
 #include "js/RootingAPI.h"
 
 #include "vm/BooleanObject-inl.h"
 
@@ -34,9 +34,9 @@ EmulatesUndefined(JSObject *obj)
     JSObject *actual = MOZ_LIKELY(!obj->isWrapper()) ? obj : UncheckedUnwrap(obj);
     bool emulatesUndefined = actual->getClass()->emulatesUndefined();
     MOZ_ASSERT_IF(emulatesUndefined, obj->type()->flags & types::OBJECT_FLAG_EMULATES_UNDEFINED);
     return emulatesUndefined;
 }
 
 } /* namespace js */
 
-#endif /* jsboolinlines_h___ */
+#endif /* jsboolinlines_h */
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.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 jsclass_h__
-#define jsclass_h__
+#ifndef jsclass_h
+#define jsclass_h
 /*
  * A JSClass acts as a vtable for JS objects that allows JSAPI clients to
  * control various aspects of the behavior of an object like property lookup.
  * js::Class is an engine-private extension that allows more control over
  * object behavior and, e.g., allows custom slow layout.
  */
 #include "jsapi.h"
 #include "jsprvtd.h"
@@ -391,9 +391,9 @@ template <> struct GCMethods<SpecialId>
 {
     static SpecialId initial() { return SpecialId(); }
     static ThingRootKind kind() { return THING_ROOT_ID; }
     static bool poisoned(SpecialId id) { return IsPoisonedSpecialId(id); }
 };
 
 }  /* namespace js */
 
-#endif  /* jsclass_h__ */
+#endif  /* jsclass_h */
--- a/js/src/jsclist.h
+++ b/js/src/jsclist.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 jsclist_h___
-#define jsclist_h___
+#ifndef jsclist_h
+#define jsclist_h
 
 #include "jstypes.h"
 
 /*
 ** Circular linked list
 */
 typedef struct JSCListStr {
     struct JSCListStr *next;
@@ -99,9 +99,9 @@ typedef struct JSCListStr {
     JS_BEGIN_MACRO         \
         (_l)->next = (_l); \
         (_l)->prev = (_l); \
     JS_END_MACRO
 
 #define JS_INIT_STATIC_CLIST(_l) \
     {(_l), (_l)}
 
-#endif /* jsclist_h___ */
+#endif /* jsclist_h */
--- a/js/src/jsclone.h
+++ b/js/src/jsclone.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 jsclone_h___
-#define jsclone_h___
+#ifndef jsclone_h
+#define jsclone_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
 
 #include "js/HashTable.h"
 #include "js/Vector.h"
 
 namespace js {
@@ -199,9 +199,9 @@ struct JSStructuredCloneWriter {
 
     // List of transferable objects
     JS::RootedValue transferable;
     js::AutoObjectHashSet transferableObjects;
 
     friend JSBool JS_WriteTypedArray(JSStructuredCloneWriter *w, jsval v);
 };
 
-#endif /* jsclone_h___ */
+#endif /* jsclone_h */
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.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/. */
 
 /* JS execution context. */
 
-#ifndef jscntxt_h___
-#define jscntxt_h___
+#ifndef jscntxt_h
+#define jscntxt_h
 
 #include "mozilla/LinkedList.h"
 #include "mozilla/PodOperations.h"
 
 #include <string.h>
 #include <setjmp.h>
 
 #include "jsapi.h"
@@ -2375,9 +2375,9 @@ JSBool intrinsic_Dump(JSContext *cx, uns
 
 } /* namespace js */
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #pragma warning(pop)
 #endif
 
-#endif /* jscntxt_h___ */
+#endif /* jscntxt_h */
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.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 jscntxtinlines_h___
-#define jscntxtinlines_h___
+#ifndef jscntxtinlines_h
+#define jscntxtinlines_h
 
 #include "jscntxt.h"
 
 #include "jscompartment.h"
 #include "jsfriendapi.h"
 #include "jsgc.h"
 #include "jsiter.h"
 
@@ -569,9 +569,9 @@ JSContext::leaveCompartment(JSCompartmen
 
 inline void
 JSContext::setCompartment(JSCompartment *comp)
 {
     compartment_ = comp;
     zone_ = comp ? comp->zone() : NULL;
 }
 
-#endif /* jscntxtinlines_h___ */
+#endif /* jscntxtinlines_h */
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.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 jscompartment_h___
-#define jscompartment_h___
+#ifndef jscompartment_h
+#define jscompartment_h
 
 #include "mozilla/Util.h"
 
 #include "jscntxt.h"
 #include "jsgc.h"
 #include "jsobj.h"
 
 #include "gc/Zone.h"
@@ -553,10 +553,9 @@ class AutoWrapperRooter : private AutoGC
 
   private:
     WrapperValue value;
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
 } /* namespace js */
 
-#endif /* jscompartment_h___ */
-
+#endif /* jscompartment_h */
--- a/js/src/jscompartmentinlines.h
+++ b/js/src/jscompartmentinlines.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 jscompartment_inlines_h___
-#define jscompartment_inlines_h___
+#ifndef jscompartmentinlines_h
+#define jscompartmentinlines_h
 
 #include "jscompartment.h"
 
 #include "jscntxtinlines.h"
 
 inline void
 JSCompartment::initGlobal(js::GlobalObject &global)
 {
@@ -75,9 +75,9 @@ class AutoEnterAtomsCompartment
     ~AutoEnterAtomsCompartment()
     {
         cx->setCompartment(oldCompartment);
     }
 };
 
 } /* namespace js */
 
-#endif /* jscompartment_inlines_h___ */
+#endif /* jscompartmentinlines_h */
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.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 js_cpucfg___
-#define js_cpucfg___
+#ifndef jscpucfg_h
+#define jscpucfg_h
 
 #define JS_HAVE_LONG_LONG
 
 #if defined(_WIN64)
 
 # if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
 #  define IS_LITTLE_ENDIAN 1
 #  undef  IS_BIG_ENDIAN
@@ -109,9 +109,9 @@
 #ifndef JS_STACK_GROWTH_DIRECTION
 # ifdef __hppa
 #  define JS_STACK_GROWTH_DIRECTION (1)
 # else
 #  define JS_STACK_GROWTH_DIRECTION (-1)
 # endif
 #endif
 
-#endif /* js_cpucfg___ */
+#endif /* jscpucfg_h */
--- a/js/src/jscrashformat.h
+++ b/js/src/jscrashformat.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 jscrashformat_h___
-#define jscrashformat_h___
+#ifndef jscrashformat_h
+#define jscrashformat_h
 
 #include <string.h>
 
 namespace js {
 namespace crash {
 
 const static int crash_cookie_len = 16;
 const static char crash_cookie[crash_cookie_len] = "*J*S*CRASHDATA*";
@@ -69,9 +69,9 @@ struct CrashRing
 /* These are the tag values for each entry in the CrashRing. */
 enum {
     JS_CRASH_TAG_GC = 0x200
 };
 
 } /* namespace crash */
 } /* namespace js */
 
-#endif
+#endif /* jscrashformat_h */
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.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 jscrashreport_h___
-#define jscrashreport_h___
+#ifndef jscrashreport_h
+#define jscrashreport_h
 
 #include "mozilla/GuardObjects.h"
 #include "mozilla/StandardInteger.h"
 
 namespace js {
 namespace crash {
 
 void
@@ -48,9 +48,9 @@ class StackBuffer
   private:
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
     volatile unsigned char buffer[size + 4];
 };
 
 } /* namespace crash */
 } /* namespace js */
 
-#endif /* jscrashreport_h___ */
+#endif /* jscrashreport_h */
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -3,18 +3,18 @@
  * 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/. */
 
 /*
  * JS Date class interface.
  */
 
-#ifndef jsdate_h___
-#define jsdate_h___
+#ifndef jsdate_h
+#define jsdate_h
 
 #include "jsapi.h"
 #include "jstypes.h"
 
 #include "js/Date.h"
 
 extern "C" {
 class JSObject;
@@ -63,9 +63,9 @@ js_DateGetMinutes(JSContext *cx, JSObjec
 
 extern JS_FRIEND_API(int)
 js_DateGetSeconds(JSObject *obj);
 
 /* Date constructor native. Exposed only so the JIT can know its address. */
 JSBool
 js_Date(JSContext *cx, unsigned argc, js::Value *vp);
 
-#endif /* jsdate_h___ */
+#endif /* jsdate_h */
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.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 jsdbgapi_h___
-#define jsdbgapi_h___
+#ifndef jsdbgapi_h
+#define jsdbgapi_h
 /*
  * JS debugger API.
  */
 #include "jsprvtd.h"
 
 namespace JS {
 
 struct FrameDescription
@@ -453,9 +453,9 @@ JS_DumpPCCounts(JSContext *cx, JSScript 
 
 extern JS_PUBLIC_API(void)
 JS_DumpCompartmentPCCounts(JSContext *cx);
 
 /* Call the context debug handler on the topmost scripted frame. */
 extern JS_FRIEND_API(JSBool)
 js_CallContextDebugHandler(JSContext *cx);
 
-#endif /* jsdbgapi_h___ */
+#endif /* jsdbgapi_h */
--- a/js/src/jsdhash.h
+++ b/js/src/jsdhash.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 jsdhash_h___
-#define jsdhash_h___
+#ifndef jsdhash_h
+#define jsdhash_h
 
 /*
  * Double hashing, a la Knuth 6.
  *
  * Try to keep this file in sync with xpcom/glue/pldhash.h.
  */
 #include "jstypes.h"
 
@@ -605,9 +605,9 @@ JS_DHashMarkTableImmutable(JSDHashTable 
 
 #ifdef JS_DHASHMETER
 #include <stdio.h>
 
 extern JS_PUBLIC_API(void)
 JS_DHashTableDumpMeter(JSDHashTable *table, JSDHashEnumerator dump, FILE *fp);
 #endif
 
-#endif /* jsdhash_h___ */
+#endif /* jsdhash_h */
--- a/js/src/jsdtoa.h
+++ b/js/src/jsdtoa.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 jsdtoa_h___
-#define jsdtoa_h___
+#ifndef jsdtoa_h
+#define jsdtoa_h
 /*
  * Public interface to portable double-precision floating point to string
  * and back conversion package.
  */
 #include <stddef.h>
 
 struct DtoaState;
 
@@ -102,9 +102,9 @@ js_dtostr(DtoaState *state, char *buffer
  * not equal to itself).
  *
  * Return NULL if out of memory.  If the result is not NULL, it must be
  * released via js_free().
  */
 char *
 js_dtobasestr(DtoaState *state, int base, double d);
 
-#endif /* jsdtoa_h___ */
+#endif /* jsdtoa_h */
--- a/js/src/jsexn.h
+++ b/js/src/jsexn.h
@@ -3,18 +3,18 @@
  * 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/. */
 
 /*
  * JS runtime exception classes.
  */
 
-#ifndef jsexn_h___
-#define jsexn_h___
+#ifndef jsexn_h
+#define jsexn_h
 
 #include "jsapi.h"
 
 /*
  * Initialize the exception constructor/prototype hierarchy.
  */
 extern JSObject *
 js_InitExceptionClasses(JSContext *cx, js::HandleObject obj);
@@ -71,9 +71,9 @@ js_CopyErrorObject(JSContext *cx, js::Ha
 static JS_INLINE JSProtoKey
 GetExceptionProtoKey(int exn)
 {
     JS_ASSERT(JSEXN_ERR <= exn);
     JS_ASSERT(exn < JSEXN_LIMIT);
     return JSProtoKey(JSProto_Error + exn);
 }
 
-#endif /* jsexn_h___ */
+#endif /* jsexn_h */
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.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 jsfriendapi_h___
-#define jsfriendapi_h___
+#ifndef jsfriendapi_h
+#define jsfriendapi_h
 
 #include "jsclass.h"
 #include "jspubtd.h"
 #include "jsprvtd.h"
 
 #include "js/CallArgs.h"
 
 /*
@@ -1752,9 +1752,9 @@ DefaultValue(JSContext *cx, HandleObject
 
 extern JS_FRIEND_API(JSBool)
 js_DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
                      const js::PropertyDescriptor& descriptor, JSBool *bp);
 
 extern JS_FRIEND_API(JSBool)
 js_ReportIsNotFunction(JSContext *cx, const JS::Value& v);
 
-#endif /* jsfriendapi_h___ */
+#endif /* jsfriendapi_h */
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.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 jsfun_h___
-#define jsfun_h___
+#ifndef jsfun_h
+#define jsfun_h
 /*
  * JS function definitions.
  */
 #include "jsprvtd.h"
 #include "jsobj.h"
 
 #include "gc/Barrier.h"
 
@@ -464,9 +464,9 @@ js_fun_apply(JSContext *cx, unsigned arg
 
 extern JSBool
 js_fun_call(JSContext *cx, unsigned argc, js::Value *vp);
 
 extern JSObject*
 js_fun_bind(JSContext *cx, js::HandleObject target, js::HandleValue thisArg,
             js::Value *boundArgs, unsigned argslen);
 
-#endif /* jsfun_h___ */
+#endif /* jsfun_h */
--- a/js/src/jsfuninlines.h
+++ b/js/src/jsfuninlines.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 jsfuninlines_h___
-#define jsfuninlines_h___
+#ifndef jsfuninlines_h
+#define jsfuninlines_h
 
 #include "jsfun.h"
 #include "jsscript.h"
 
 #include "vm/GlobalObject.h"
 
 #include "vm/ScopeObject-inl.h"
 #include "vm/String-inl.h"
@@ -278,9 +278,9 @@ JSFunction::getBoundFunctionTarget() con
 }
 
 inline bool
 js::Class::isCallable() const
 {
     return this == &js::FunctionClass || call;
 }
 
-#endif /* jsfuninlines_h___ */
+#endif /* jsfuninlines_h */
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.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/. */
 
 /* JS Garbage Collector. */
 
-#ifndef jsgc_h___
-#define jsgc_h___
+#ifndef jsgc_h
+#define jsgc_h
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Util.h"
 
 #include "jsalloc.h"
 #include "jsclass.h"
 #include "jslock.h"
 #include "jspubtd.h"
@@ -1321,9 +1321,9 @@ struct AutoDisableProxyCheck
 };
 #endif
 
 void
 PurgeJITCaches(JS::Zone *zone);
 
 } /* namespace js */
 
-#endif /* jsgc_h___ */
+#endif /* jsgc_h */
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.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 jsgcinlines_h___
-#define jsgcinlines_h___
+#ifndef jsgcinlines_h
+#define jsgcinlines_h
 
 #include "jsgc.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jslock.h"
 
 #include "js/RootingAPI.h"
 #include "js/TemplateLib.h"
@@ -590,9 +590,9 @@ js_NewGCShape(JSContext *cx)
 template <js::AllowGC allowGC>
 inline js::BaseShape *
 js_NewGCBaseShape(JSContext *cx)
 {
     return js::gc::NewGCThing<js::BaseShape, allowGC>(cx, js::gc::FINALIZE_BASE_SHAPE,
                                                       sizeof(js::BaseShape), js::gc::TenuredHeap);
 }
 
-#endif /* jsgcinlines_h___ */
+#endif /* jsgcinlines_h */
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.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/. */
 
 /* Definitions related to javascript type inference. */
 
-#ifndef jsinfer_h___
-#define jsinfer_h___
+#ifndef jsinfer_h
+#define jsinfer_h
 
 #include "jsalloc.h"
 #include "jsfriendapi.h"
 
 #include "ds/LifoAlloc.h"
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
 #include "js/HashTable.h"
@@ -1500,9 +1500,9 @@ inline const char * TypeObjectString(Typ
 #endif
 
 /* Print a warning, dump state and abort the program. */
 MOZ_NORETURN void TypeFailure(JSContext *cx, const char *fmt, ...);
 
 } /* namespace types */
 } /* namespace js */
 
-#endif // jsinfer_h___
+#endif /* jsinfer_h */
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -24,18 +24,18 @@
 #include "vm/NumberObject.h"
 #include "vm/StringObject.h"
 
 #include "jsanalyzeinlines.h"
 
 #include "gc/Barrier-inl.h"
 #include "vm/Stack-inl.h"
 
-#ifndef jsinferinlines_h___
-#define jsinferinlines_h___
+#ifndef jsinferinlines_h
+#define jsinferinlines_h
 
 inline bool
 js::TaggedProto::isObject() const
 {
     /* Skip NULL and Proxy::LazyProto. */
     return uintptr_t(proto) > uintptr_t(Proxy::LazyProto);
 }
 
@@ -1830,9 +1830,9 @@ struct GCMethods<types::Type>
 };
 
 } // namespace js
 
 namespace JS {
 template<> class AnchorPermitted<js::types::TypeObject *> { };
 }  // namespace JS
 
-#endif // jsinferinlines_h___
+#endif /* jsinferinlines_h */
--- a/js/src/jsiter.h
+++ b/js/src/jsiter.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 jsiter_h___
-#define jsiter_h___
+#ifndef jsiter_h
+#define jsiter_h
 
 /*
  * JavaScript iterators.
  */
 #include "jscntxt.h"
 
 #include "gc/Barrier.h"
 #include "vm/Stack.h"
@@ -354,9 +354,9 @@ bool
 GeneratorHasMarkableFrame(JSGenerator *gen);
 
 } /* namespace js */
 #endif
 
 extern JSObject *
 js_InitIteratorClasses(JSContext *cx, js::HandleObject obj);
 
-#endif /* jsiter_h___ */
+#endif /* jsiter_h */
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.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 _LIBMATH_H
-#define _LIBMATH_H
+#ifndef jslibmath_h
+#define jslibmath_h
 
 #include "mozilla/FloatingPoint.h"
 
 #include <math.h>
 #include "jsnum.h"
 
 /*
  * Use system provided math routines.
@@ -67,10 +67,9 @@ inline double
 NumberMod(double a, double b) {
     if (b == 0) 
         return js_NaN;
     return js_fmod(a, b);
 }
 
 }
 
-#endif /* _LIBMATH_H */
-
+#endif /* jslibmath_h */
--- a/js/src/jslock.h
+++ b/js/src/jslock.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 jslock_h__
-#define jslock_h__
+#ifndef jslock_h
+#define jslock_h
 
 #include "jsapi.h"
 
 #ifdef JS_THREADSAFE
 
 # include "pratom.h"
 # include "prlock.h"
 # include "prcvar.h"
@@ -35,9 +35,9 @@ typedef struct PRLock PRLock;
 
 # define JS_ATOMIC_INCREMENT(p)      (++*(p))
 # define JS_ATOMIC_DECREMENT(p)      (--*(p))
 # define JS_ATOMIC_ADD(p,v)          (*(p) += (v))
 # define JS_ATOMIC_SET(p,v)          (*(p) = (v))
 
 #endif /* JS_THREADSAFE */
 
-#endif /* jslock_h___ */
+#endif /* jslock_h */
--- a/js/src/jsmath.h
+++ b/js/src/jsmath.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 jsmath_h___
-#define jsmath_h___
+#ifndef jsmath_h
+#define jsmath_h
 
 #include "jsapi.h"
 
 namespace js {
 
 typedef double (*UnaryFunType)(double);
 
 class MathCache
@@ -169,9 +169,9 @@ powi(double x, int y);
 extern double
 ecmaPow(double x, double y);
 
 extern JSBool
 math_imul(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 
-#endif /* jsmath_h___ */
+#endif /* jsmath_h */
--- a/js/src/jsnativestack.h
+++ b/js/src/jsnativestack.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 jsnativestack_h__
-#define jsnativestack_h__
+#ifndef jsnativestack_h
+#define jsnativestack_h
 
 #include "js/Utility.h"
 
 namespace js {
 
 extern void *
 GetNativeStackBaseImpl();
 
@@ -19,9 +19,9 @@ GetNativeStackBase()
 {
     uintptr_t stackBase = reinterpret_cast<uintptr_t>(GetNativeStackBaseImpl());
     JS_ASSERT(stackBase % sizeof(void *) == 0);
     return stackBase;
 }
 
 } /* namespace js */
 
-#endif /* jsnativestack_h__ */
+#endif /* jsnativestack_h */
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.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 jsnum_h___
-#define jsnum_h___
+#ifndef jsnum_h
+#define jsnum_h
 
 #include "mozilla/FloatingPoint.h"
 
 #include "jscntxt.h"
 
 #include "vm/NumericConversions.h"
 
 extern double js_PositiveInfinity;
@@ -260,9 +260,9 @@ SafeMul(int32_t one, int32_t two, int32_
 {
     *res = one * two;
     int64_t ores = (int64_t)one * (int64_t)two;
     return ores == (int64_t)*res;
 }
 
 } /* namespace js */
 
-#endif /* jsnum_h___ */
+#endif /* jsnum_h */
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.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 jsobj_h___
-#define jsobj_h___
+#ifndef jsobj_h
+#define jsobj_h
 
 /*
  * JS object definitions.
  *
  * A JS object consists of a possibly-shared object descriptor containing
  * ordered property names, called the map; and a dense vector of property
  * values, called slots.  The map/slot pointer pair is GC'ed, while the map
  * is reference counted and the slot vector is malloc'ed.
@@ -1427,9 +1427,9 @@ Throw(JSContext *cx, JSObject *obj, unsi
  * js::ProxyHandler, or the JSAPI with precisely the right semantics for it.
  */
 extern bool
 CheckDefineProperty(JSContext *cx, HandleObject obj, HandleId id, HandleValue value,
                     PropertyOp getter, StrictPropertyOp setter, unsigned attrs);
 
 }  /* namespace js */
 
-#endif /* jsobj_h___ */
+#endif /* jsobj_h */
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.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 jsobjinlines_h___
-#define jsobjinlines_h___
+#ifndef jsobjinlines_h
+#define jsobjinlines_h
 
 #include "jsobj.h"
 
 #include "jswrapper.h"
 
 #include "vm/NumberObject.h"
 #include "vm/Probes.h"
 #include "vm/StringObject.h"
@@ -1705,9 +1705,9 @@ js_PurgeScopeChain(JSContext *cx, JS::Ha
 }
 
 inline void
 js::DestroyIdArray(FreeOp *fop, JSIdArray *ida)
 {
     fop->free_(ida);
 }
 
-#endif /* jsobjinlines_h___ */
+#endif /* jsobjinlines_h */
--- a/js/src/json.h
+++ b/js/src/json.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 json_h___
-#define json_h___
+#ifndef json_h
+#define json_h
 
 #include "js/CharacterEncoding.h"
 #include "js/RootingAPI.h"
 #include "js/Value.h"
 #include "js/Vector.h"
 #include "vm/StringBuffer.h"
 
 extern JSObject *
@@ -23,9 +23,9 @@ js_Stringify(JSContext *cx, js::MutableH
 namespace js {
 
 extern bool
 ParseJSONWithReviver(JSContext *cx, JS::StableCharPtr chars, size_t length, HandleValue reviver,
                      MutableHandleValue vp);
 
 } // namespace js
 
-#endif /* json_h___ */
+#endif /* json_h */
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.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 jsonparser_h___
-#define jsonparser_h___
+#ifndef jsonparser_h
+#define jsonparser_h
 
 #include "mozilla/Attributes.h"
 
 #include "jsapi.h"
 
 #include "vm/String.h"
 
 namespace js {
@@ -208,9 +208,9 @@ class MOZ_STACK_CLASS JSONParser : priva
 
   private:
     JSONParser(const JSONParser &other) MOZ_DELETE;
     void operator=(const JSONParser &other) MOZ_DELETE;
 };
 
 } /* namespace js */
 
-#endif /* jsonparser_h___ */
+#endif /* jsonparser_h */
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.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 jsopcode_h___
-#define jsopcode_h___
+#ifndef jsopcode_h
+#define jsopcode_h
 
 /*
  * JS bytecode definitions.
  */
 #include <stddef.h>
 #include "jsprvtd.h"
 #include "jspubtd.h"
 #include "jsutil.h"
@@ -681,9 +681,9 @@ namespace js {
 namespace ion { struct IonScriptCounts; }
 void
 DumpIonScriptCounts(js::Sprinter *sp, ion::IonScriptCounts *ionCounts);
 }
 #endif
 
 #endif
 
-#endif /* jsopcode_h___ */
+#endif /* jsopcode_h */
--- a/js/src/jsopcodeinlines.h
+++ b/js/src/jsopcodeinlines.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 jsopcodeinlines_h__
-#define jsopcodeinlines_h__
+#ifndef jsopcodeinlines_h
+#define jsopcodeinlines_h
 
 #include "jsautooplen.h"
 
 #include "frontend/SourceNotes.h"
 
 namespace js {
 
 static inline unsigned
@@ -173,9 +173,9 @@ public:
         return lineHeader;
     }
 
     uint32_t getLine() const { return lineno; }
 };
 
 }
 
-#endif /* jsopcodeinlines_h__ */
+#endif /* jsopcodeinlines_h */
--- a/js/src/jsprf.h
+++ b/js/src/jsprf.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 jsprf_h___
-#define jsprf_h___
+#ifndef jsprf_h
+#define jsprf_h
 
 /*
 ** API for PR printf like routines. Supports the following formats
 **      %d - decimal
 **      %u - unsigned decimal
 **      %x - unsigned hex
 **      %X - unsigned uppercase hex
 **      %o - unsigned octal
@@ -70,9 +70,9 @@ extern JS_PUBLIC_API(uint32_t) JS_sxprin
 /*
 ** va_list forms of the above.
 */
 extern JS_PUBLIC_API(uint32_t) JS_vsnprintf(char *out, uint32_t outlen, const char *fmt, va_list ap);
 extern JS_PUBLIC_API(char*) JS_vsmprintf(const char *fmt, va_list ap);
 extern JS_PUBLIC_API(char*) JS_vsprintf_append(char *last, const char *fmt, va_list ap);
 extern JS_PUBLIC_API(uint32_t) JS_vsxprintf(JSStuffFunc f, void *arg, const char *fmt, va_list ap);
 
-#endif /* jsprf_h___ */
+#endif /* jsprf_h */
--- a/js/src/jspropertytree.h
+++ b/js/src/jspropertytree.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 jspropertytree_h___
-#define jspropertytree_h___
+#ifndef jspropertytree_h
+#define jspropertytree_h
 
 #include "jsalloc.h"
 
 #include "js/HashTable.h"
 #include "js/RootingAPI.h"
 
 namespace js {
 
@@ -99,9 +99,9 @@ class PropertyTree
 
 #ifdef DEBUG
     static void dumpShapes(JSRuntime *rt);
 #endif
 };
 
 } /* namespace js */
 
-#endif /* jspropertytree_h___ */
+#endif /* jspropertytree_h */
--- a/js/src/jsprototypes.h
+++ b/js/src/jsprototypes.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 JSProtoKey values. */
 
-#ifndef jsprototypes_h___
-#define jsprototypes_h___
+#ifndef jsprototypes_h
+#define jsprototypes_h
 
 #include "jsversion.h"
 
 /*
  * Enumerator codes in the second column must not change -- they are part of
  * the JS XDR API.  Also note the symbols in the third column are extern "C";
  * clients should use extern "C" {} as appropriate when using this macro.
  */
@@ -52,9 +52,9 @@
     macro(Proxy,                 31,     js_InitProxyClass) \
     macro(WeakMap,               32,     js_InitWeakMapClass) \
     macro(Map,                   33,     js_InitMapClass) \
     macro(Set,                   34,     js_InitSetClass) \
     macro(DataView,              35,     js_InitTypedArrayClasses) \
     macro(ParallelArray,         36,     js_InitParallelArrayClass) \
     macro(Intl,                  37,     js_InitIntlClass) \
 
-#endif /* jsprototypes_h___ */
+#endif /* jsprototypes_h */
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.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 jsproxy_h___
-#define jsproxy_h___
+#ifndef jsproxy_h
+#define jsproxy_h
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
 namespace js {
 
 class JS_FRIEND_API(Wrapper);
 
@@ -423,9 +423,9 @@ class JS_FRIEND_API(AutoWaivePolicy) {
 };
 #endif
 
 } /* namespace js */
 
 extern JS_FRIEND_API(JSObject *)
 js_InitProxyClass(JSContext *cx, JSHandleObject obj);
 
-#endif
+#endif /* jsproxy_h */
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.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 jsprvtd_h___
-#define jsprvtd_h___
+#ifndef jsprvtd_h
+#define jsprvtd_h
 /*
  * JS private typename definitions.
  *
  * This header is included only in other .h files, for convenience and for
  * simplicity of type naming.  The alternative for structures is to use tags,
  * which are named the same as their typedef names (legal in C/C++, and less
  * noisy than suffixing the typedef name with "Struct" or "Str").  Instead,
  * all .h files that include this file may use the same typedef name, whether
@@ -293,9 +293,9 @@ typedef JSObject *
 /*
  * Hook that creates an iterator object for a given object. Returns the
  * iterator object or null if an error or exception was thrown on cx.
  */
 typedef JSObject *
 (* JSIteratorOp)(JSContext *cx, JSHandleObject obj, JSBool keysonly);
 
 
-#endif /* jsprvtd_h___ */
+#endif /* jsprvtd_h */
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.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 jspubtd_h___
-#define jspubtd_h___
+#ifndef jspubtd_h
+#define jspubtd_h
 
 /*
  * JS public API typedefs.
  */
 
 #include "jsprototypes.h"
 #include "jstypes.h"
 
@@ -383,9 +383,9 @@ struct PerThreadDataFriendFields
         // Tested by a JS_STATIC_ASSERT in |jsfriendapi.cpp|
         return reinterpret_cast<const PerThreadDataFriendFields *>(
             reinterpret_cast<const char*>(rt) + RuntimeMainThreadOffset);
     }
 };
 
 } /* namespace js */
 
-#endif /* jspubtd_h___ */
+#endif /* jspubtd_h */
--- a/js/src/jsreflect.h
+++ b/js/src/jsreflect.h
@@ -2,18 +2,18 @@
  * 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/. */
 
 /*
  * JS reflection package.
  */
-#ifndef jsreflect_h___
-#define jsreflect_h___
+#ifndef jsreflect_h
+#define jsreflect_h
 
 #include <stdlib.h>
 #include "jspubtd.h"
 
 namespace js {
 
 enum ASTType {
     AST_ERROR = -1,
@@ -90,9 +90,9 @@ enum PropKind {
 
 extern char const * const aopNames[];
 extern char const * const binopNames[];
 extern char const * const unopNames[];
 extern char const * const nodeTypeNames[];
 
 } /* namespace js */
 
-#endif /* jsreflect_h___ */
+#endif /* jsreflect_h */
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.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/. */
 
 /* JS script descriptor. */
 
-#ifndef jsscript_h___
-#define jsscript_h___
+#ifndef jsscript_h
+#define jsscript_h
 
 #include "mozilla/PodOperations.h"
 
 #include "jsdbgapi.h"
 #include "jsinfer.h"
 #include "jsopcode.h"
 
 #include "gc/Barrier.h"
@@ -1485,9 +1485,9 @@ CloneFunctionScript(JSContext *cx, Handl
  */
 template<XDRMode mode>
 bool
 XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enclosingScript,
           HandleFunction fun, MutableHandleScript scriptp);
 
 } /* namespace js */
 
-#endif /* jsscript_h___ */
+#endif /* jsscript_h */
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.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 jsscriptinlines_h___
-#define jsscriptinlines_h___
+#ifndef jsscriptinlines_h
+#define jsscriptinlines_h
 
 #include "jsautooplen.h"
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 
 #include "ion/AsmJS.h"
@@ -207,9 +207,9 @@ JSScript::originalFunction() const {
 
 inline void
 JSScript::setOriginalFunctionObject(JSObject *fun) {
     JS_ASSERT(isCallsiteClone);
     JS_ASSERT(fun->isFunction());
     enclosingScopeOrOriginalFunction_ = fun;
 }
 
-#endif /* jsscriptinlines_h___ */
+#endif /* jsscriptinlines_h */
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.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 jsstr_h___
-#define jsstr_h___
+#ifndef jsstr_h
+#define jsstr_h
 
 #include "mozilla/PodOperations.h"
 
 #include <ctype.h>
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jslock.h"
 #include "jsutil.h"
@@ -345,9 +345,9 @@ str_search(JSContext *cx, unsigned argc,
 JSBool
 str_split(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 
 extern JSBool
 js_String(JSContext *cx, unsigned argc, js::Value *vp);
 
-#endif /* jsstr_h___ */
+#endif /* jsstr_h */
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.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 jsstrinlines_h___
-#define jsstrinlines_h___
+#ifndef jsstrinlines_h
+#define jsstrinlines_h
 
 #include "mozilla/Attributes.h"
 
 #include "jsatom.h"
 #include "jsstr.h"
 
 #include "jscntxtinlines.h"
 #include "jsgcinlines.h"
@@ -119,9 +119,9 @@ CompareChars(const jschar *s1, size_t l1
     }
 
     *result = (int32_t)(l1 - l2);
     return true;
 }
 
 }  /* namespace js */
 
-#endif /* jsstrinlines_h___ */
+#endif /* jsstrinlines_h */
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -13,18 +13,18 @@
 **
 ** Since we do not wrap <stdlib.h> and all the other standard headers, authors
 ** of portable code will not know in general that they need these definitions.
 ** Instead of requiring these authors to find the dependent uses in their code
 ** and take the following steps only in those C files, we take steps once here
 ** for all C files.
 **/
 
-#ifndef jstypes_h___
-#define jstypes_h___
+#ifndef jstypes_h
+#define jstypes_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Util.h"
 
 #include "js-config.h"
 
 /***********************************************************************
 ** MACROS:      JS_EXTERN_API
@@ -274,9 +274,9 @@ typedef int JSBool;
 #ifdef __GNUC__
 # define JS_EXTENSION __extension__
 # define JS_EXTENSION_(s) __extension__ ({ s; })
 #else
 # define JS_EXTENSION
 # define JS_EXTENSION_(s) s
 #endif
 
-#endif /* jstypes_h___ */
+#endif /* jstypes_h */
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -3,18 +3,18 @@
  * 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/. */
 
 /*
  * PR assertion checker.
  */
 
-#ifndef jsutil_h___
-#define jsutil_h___
+#ifndef jsutil_h
+#define jsutil_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
 #include "mozilla/GuardObjects.h"
 
 #include "js/Utility.h"
 
 #ifdef USE_ZLIB
@@ -386,9 +386,9 @@ typedef size_t jsbitmap;
 
 #if !defined(JS_SILENCE_UNUSED_VALUE_IN_EXPR)
 # define JS_SILENCE_UNUSED_VALUE_IN_EXPR(expr)                                \
     JS_BEGIN_MACRO                                                            \
         expr;                                                                 \
     JS_END_MACRO
 #endif
 
-#endif /* jsutil_h___ */
+#endif /* jsutil_h */
--- a/js/src/jsversion.h
+++ b/js/src/jsversion.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 jsversion_h___
-#define jsversion_h___
+#ifndef jsversion_h
+#define jsversion_h
 
 /*
  * Deprecated JS_VERSION handler.
  */
 #ifdef JS_VERSION
 # if JS_VERSION == 185
 #  warning "JS_VERSION defined but unsupported (legacy)"
 # elif JS_VERSION < 185
@@ -59,9 +59,9 @@
 
 #if USE_NEW_OBJECT_REPRESENTATION
 #  define NEW_OBJECT_REPRESENTATION_ONLY() ((void)0)
 #else
 #  define NEW_OBJECT_REPRESENTATION_ONLY() \
      MOZ_NOT_REACHED("don't call this!  to be used in the new object representation")
 #endif
 
-#endif /* jsversion_h___ */
+#endif /* jsversion_h */
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.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 jswatchpoint_h___
-#define jswatchpoint_h___
+#ifndef jswatchpoint_h
+#define jswatchpoint_h
 
 #include "jsalloc.h"
 #include "jsprvtd.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
 #include "gc/Barrier.h"
 #include "js/HashTable.h"
@@ -69,9 +69,9 @@ class WatchpointMap {
     void trace(WeakMapTracer *trc);
 
   private:
     Map map;
 };
 
 }
 
-#endif /* jswatchpoint_h___ */
+#endif /* jswatchpoint_h */
--- a/js/src/jsweakcache.h
+++ b/js/src/jsweakcache.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 jsweakcache_h___
-#define jsweakcache_h___
+#ifndef jsweakcache_h
+#define jsweakcache_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsobj.h"
 #include "gc/Marking.h"
 
 namespace js {
 
@@ -99,9 +99,9 @@ class WeakValueCache : public HashMap<Ke
         for (Range r = Base::all(); !r.empty(); r.popFront())
             JS_ASSERT(!gc::IsAboutToBeFinalized(r.front().value));
 #endif
     }
 };
 
 } // namespace js
 
-#endif // jsweakcache_h___
+#endif /* jsweakcache_h */
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.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 jsweakmap_h___
-#define jsweakmap_h___
+#ifndef jsweakmap_h
+#define jsweakmap_h
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "jscompartment.h"
 #include "jsobj.h"
 
 #include "gc/Marking.h"
 #include "js/HashTable.h"
@@ -239,9 +239,9 @@ protected:
     }
 };
 
 } /* namespace js */
 
 extern JSObject *
 js_InitWeakMapClass(JSContext *cx, js::HandleObject obj);
 
-#endif
+#endif /* jsweakmap_h */
--- a/js/src/jswin.h
+++ b/js/src/jswin.h
@@ -1,20 +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 jswin_h
+#define jswin_h
+
 /*
  * This file is a wrapper around <windows.h> to prevent the mangling of
  * various function names throughout the codebase.
  */
 #ifdef XP_WIN
 # include <windows.h>
 # undef GetProp
 # undef SetProp
 # undef CONST
 # undef STRICT
 # undef LEGACY
 # undef THIS
 # undef PASSTHROUGH
 #endif
+
+#endif /* jswin_h */
--- a/js/src/jsworkers.h
+++ b/js/src/jsworkers.h
@@ -5,18 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * Definitions for managing off-main-thread work using a shared, per runtime
  * worklist. Worklist items are engine internal, and are distinct from e.g.
  * web workers.
  */
 
-#ifndef jsworkers_h___
-#define jsworkers_h___
+#ifndef jsworkers_h
+#define jsworkers_h
 
 #include "mozilla/GuardObjects.h"
 #include "mozilla/PodOperations.h"
 
 #include "jscntxt.h"
 #include "jslock.h"
 
 #include "ion/Ion.h"
@@ -252,9 +252,9 @@ class AutoUnlockWorkerThreadState
 #ifdef JS_PARALLEL_COMPILATION
         rt->workerThreadState->lock();
 #endif
     }
 };
 
 } /* namespace js */
 
-#endif // jsworkers_h___
+#endif /* jsworkers_h */
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.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 jswrapper_h___
-#define jswrapper_h___
+#ifndef jswrapper_h
+#define jswrapper_h
 
 #include "mozilla/Attributes.h"
 
 #include "jsapi.h"
 #include "jsproxy.h"
 
 namespace js {
 
@@ -292,9 +292,9 @@ struct JS_FRIEND_API(AutoMaybeTouchDeadZ
     JSRuntime *runtime;
     unsigned markCount;
     bool inIncremental;
     bool manipulatingDeadZones;
 };
 
 } /* namespace js */
 
-#endif
+#endif /* jswrapper_h */
--- a/js/src/perf/jsperf.h
+++ b/js/src/perf/jsperf.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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 jsperf_h___
-#define jsperf_h___
+#ifndef perf_jsperf_h
+#define perf_jsperf_h
 
 #include "jsapi.h"
 
 namespace JS {
 
 /*
  * JS::PerfMeasurement is a generic way to access detailed performance
  * measurement APIs provided by your operating system.  The details of
@@ -122,9 +122,9 @@ extern JS_FRIEND_API(JSObject*)
  * wrapper class, extract the C++ object.  Returns NULL if the
  * jsval is not an instance of the wrapper.
  */
 extern JS_FRIEND_API(PerfMeasurement*)
     ExtractPerfMeasurement(jsval wrapper);
 
 } // namespace JS
 
-#endif // jsperf_h___
+#endif /* perf_jsperf_h */
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.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 prmjtime_h___
-#define prmjtime_h___
+#ifndef prmjtime_h
+#define prmjtime_h
 
 #include <time.h>
 
 /*
  * Broken down form of 64 bit time value.
  */
 struct PRMJTime {
     int32_t tm_usec;            /* microseconds of second (0-999999) */
@@ -40,10 +40,9 @@ PRMJ_NowShutdown(void);
 #else
 #define PRMJ_NowShutdown()
 #endif
 
 /* Format a time value into a buffer. Same semantics as strftime() */
 extern size_t
 PRMJ_FormatTime(char *buf, int buflen, const char *fmt, PRMJTime *tm);
 
-#endif /* prmjtime_h___ */
-
+#endif /* prmjtime_h */
--- a/js/src/shell/jsheaptools.h
+++ b/js/src/shell/jsheaptools.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 jsheaptools_h___
-#define jsheaptools_h___
+#ifndef shell_jsheaptools_h
+#define shell_jsheaptools_h
 
 #include "jsapi.h"
 
 #ifdef DEBUG
 JSBool FindReferences(JSContext *cx, unsigned argc, jsval *vp);
 #endif /* DEBUG */
 
-#endif /* jsheaptools_h___ */
+#endif /* shell_jsheaptools_h */
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.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 jsoptparse_h__
-#define jsoptparse_h__
+#ifndef shell_jsoptparse_h
+#define shell_jsoptparse_h
 
 #include <stdio.h>
 
 #include "jsalloc.h"
 #include "jsutil.h"
 
 #include "js/Vector.h"
 
@@ -286,9 +286,9 @@ class OptionParser
      * displayed during parse_args).
      */
     bool getHelpOption() const;
 };
 
 } /* namespace cli */
 } /* namespace js */
 
-#endif /* jsoptparse_h__ */
+#endif /* shell_jsoptparse_h */