Bug 883697 (part 3) - Make include guards consistent in some more of js/src/. r=njn.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Wed, 19 Jun 2013 18:01:23 -0700
changeset 147292 aedf5992770a8c80df9104dc111059760f5be928
parent 147291 cba55a540e2a526b37fa6e66e4701ba747cbd2d4
child 147293 fa4e688f5daa7998893c3aeaa34ea28a75f23e7f
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 3) - Make include guards consistent in some more of js/src/. r=njn.
js/src/assembler/assembler/ARMAssembler.h
js/src/assembler/assembler/ARMv7Assembler.h
js/src/assembler/assembler/AbstractMacroAssembler.h
js/src/assembler/assembler/AssemblerBuffer.h
js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
js/src/assembler/assembler/CodeLocation.h
js/src/assembler/assembler/LinkBuffer.h
js/src/assembler/assembler/MIPSAssembler.h
js/src/assembler/assembler/MacroAssembler.h
js/src/assembler/assembler/MacroAssemblerARM.h
js/src/assembler/assembler/MacroAssemblerARMv7.h
js/src/assembler/assembler/MacroAssemblerCodeRef.h
js/src/assembler/assembler/MacroAssemblerMIPS.h
js/src/assembler/assembler/MacroAssemblerSparc.h
js/src/assembler/assembler/MacroAssemblerX86.h
js/src/assembler/assembler/MacroAssemblerX86Common.h
js/src/assembler/assembler/MacroAssemblerX86_64.h
js/src/assembler/assembler/RepatchBuffer.h
js/src/assembler/assembler/SparcAssembler.h
js/src/assembler/assembler/X86Assembler.h
js/src/assembler/jit/ExecutableAllocator.h
js/src/assembler/moco/MocoStubs.h
js/src/assembler/wtf/Assertions.h
js/src/assembler/wtf/Platform.h
js/src/assembler/wtf/SegmentedVector.h
js/src/assembler/wtf/VMTags.h
js/src/builtin/Eval.h
js/src/builtin/Intl.h
js/src/builtin/Iterator-inl.h
js/src/builtin/MapObject.h
js/src/builtin/Module.h
js/src/builtin/Object.h
js/src/builtin/ParallelArray.h
js/src/builtin/Profilers.h
js/src/builtin/RegExp.h
js/src/builtin/TestingFunctions.h
js/src/ctypes/CTypes.h
js/src/ctypes/Library.h
js/src/ctypes/typedefs.h
js/src/frontend/BytecodeCompiler.h
js/src/frontend/BytecodeEmitter-inl.h
js/src/frontend/BytecodeEmitter.h
js/src/frontend/FoldConstants.h
js/src/frontend/FullParseHandler.h
js/src/frontend/NameFunctions.h
js/src/frontend/ParseMaps-inl.h
js/src/frontend/ParseMaps.h
js/src/frontend/ParseNode-inl.h
js/src/frontend/ParseNode.h
js/src/frontend/Parser-inl.h
js/src/frontend/Parser.h
js/src/frontend/SharedContext-inl.h
js/src/frontend/SharedContext.h
js/src/frontend/SourceNotes.h
js/src/frontend/SyntaxParseHandler.h
js/src/frontend/TokenStream.h
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -23,18 +23,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMAssembler_h
+#define assembler_assembler_ARMAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
 // Some debug code uses s(n)printf for instruction logging.
 #include <stdio.h>
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
@@ -1700,9 +1700,9 @@ namespace JSC {
             return (uint32_t*)(((char*)m_buffer.data()) + src.offset());
         }
     }; // ARMAssembler
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMAssembler_h */
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -23,18 +23,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMv7Assembler_h
+#define assembler_assembler_ARMv7Assembler_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
 
 #include "AssemblerBuffer.h"
 #include "assembler/wtf/Assertions.h"
 #include "assembler/wtf/Vector.h"
@@ -1924,9 +1924,9 @@ private:
 
     Vector<LinkRecord> m_jumpsToLink;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMv7Assembler_h */
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AbstractMacroAssembler_h
-#define AbstractMacroAssembler_h
+#ifndef assembler_assembler_AbstractMacroAssembler_h
+#define assembler_assembler_AbstractMacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
 #include "assembler/assembler/CodeLocation.h"
 
 #if ENABLE_ASSEMBLER
 
 namespace JSC {
@@ -651,9 +651,9 @@ protected:
         AssemblerType::repatchLEAToLoadPtr(instruction.dataLocation());
     }
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AbstractMacroAssembler_h
+#endif /* assembler_assembler_AbstractMacroAssembler_h */
--- a/js/src/assembler/assembler/AssemblerBuffer.h
+++ b/js/src/assembler/assembler/AssemblerBuffer.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBuffer_h
-#define AssemblerBuffer_h
+#ifndef assembler_assembler_AssemblerBuffer_h
+#define assembler_assembler_AssemblerBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #include <string.h>
 #include <limits.h>
 #include "assembler/jit/ExecutableAllocator.h"
@@ -331,9 +331,9 @@ namespace JSC {
 #endif
         }
     };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBuffer_h
+#endif /* assembler_assembler_AssemblerBuffer_h */
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -23,18 +23,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBufferWithConstantPool_h
-#define AssemblerBufferWithConstantPool_h
+#ifndef assembler_assembler_AssemblerBufferWithConstantPool_h
+#define assembler_assembler_AssemblerBufferWithConstantPool_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #include "AssemblerBuffer.h"
 #include "assembler/wtf/SegmentedVector.h"
 #include "assembler/wtf/Assertions.h"
@@ -378,9 +378,9 @@ private:
     int m_lastConstDelta;
     int m_flushCount;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBufferWithConstantPool_h
+#endif /* assembler_assembler_AssemblerBufferWithConstantPool_h */
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef CodeLocation_h
-#define CodeLocation_h
+#ifndef assembler_assembler_CodeLocation_h
+#define assembler_assembler_CodeLocation_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
 
 #if ENABLE_ASSEMBLER
 
 namespace JSC {
 
@@ -181,9 +181,9 @@ inline CodeLocationDataLabel32 CodeLocat
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationDataLabel32(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // CodeLocation_h
+#endif /* assembler_assembler_CodeLocation_h */
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef LinkBuffer_h
-#define LinkBuffer_h
+#ifndef assembler_assembler_LinkBuffer_h
+#define assembler_assembler_LinkBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #include <assembler/MacroAssembler.h>
 
 namespace JSC {
@@ -225,9 +225,9 @@ protected:
     bool m_completed;
 #endif
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // LinkBuffer_h
+#endif /* assembler_assembler_LinkBuffer_h */
--- a/js/src/assembler/assembler/MIPSAssembler.h
+++ b/js/src/assembler/assembler/MIPSAssembler.h
@@ -21,18 +21,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MIPSAssembler_h
-#define MIPSAssembler_h
+#ifndef assembler_assembler_MIPSAssembler_h
+#define assembler_assembler_MIPSAssembler_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
 #include "AssemblerBuffer.h"
 #include "assembler/wtf/Assertions.h"
 #include "assembler/wtf/SegmentedVector.h"
 
 #include "methodjit/Logging.h"
@@ -1065,9 +1065,9 @@ private:
     AssemblerBuffer m_buffer;
     Jumps m_jumps;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MIPSAssembler_h
+#endif /* assembler_assembler_MIPSAssembler_h */
--- a/js/src/assembler/assembler/MacroAssembler.h
+++ b/js/src/assembler/assembler/MacroAssembler.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssembler_h
-#define MacroAssembler_h
+#ifndef assembler_assembler_MacroAssembler_h
+#define assembler_assembler_MacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #if WTF_CPU_ARM_THUMB2
 #include "MacroAssemblerARMv7.h"
 namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }
@@ -388,9 +388,9 @@ public:
 #endif
 
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssembler_h
+#endif /* assembler_assembler_MacroAssembler_h */
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -24,18 +24,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARM_h
-#define MacroAssemblerARM_h
+#ifndef assembler_assembler_MacroAssemblerARM_h
+#define assembler_assembler_MacroAssemblerARM_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
 #include "ARMAssembler.h"
 #include "AbstractMacroAssembler.h"
 
@@ -1537,9 +1537,9 @@ private:
 
     static const bool s_isVFPPresent;
 };
 
 }
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // MacroAssemblerARM_h
+#endif /* assembler_assembler_MacroAssemblerARM_h */
--- a/js/src/assembler/assembler/MacroAssemblerARMv7.h
+++ b/js/src/assembler/assembler/MacroAssemblerARMv7.h
@@ -23,18 +23,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARMv7_h
-#define MacroAssemblerARMv7_h
+#ifndef assembler_assembler_MacroAssemblerARMv7_h
+#define assembler_assembler_MacroAssemblerARMv7_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE(ASSEMBLER)
 
 #include "ARMv7Assembler.h"
 #include "AbstractMacroAssembler.h"
 
@@ -1215,9 +1215,9 @@ private:
         ARMv7Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
     }
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerARMv7_h
+#endif /* assembler_assembler_MacroAssemblerARMv7_h */
--- a/js/src/assembler/assembler/MacroAssemblerCodeRef.h
+++ b/js/src/assembler/assembler/MacroAssemblerCodeRef.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerCodeRef_h
-#define MacroAssemblerCodeRef_h
+#ifndef assembler_assembler_MacroAssemblerCodeRef_h
+#define assembler_assembler_MacroAssemblerCodeRef_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/jit/ExecutableAllocator.h"
 
 #if ENABLE_ASSEMBLER
 
 // ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid
 // instruction address on the platform (for example, check any alignment requirements).
@@ -217,9 +217,9 @@ public:
     ExecutablePool* m_executablePool;
     size_t m_size;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerCodeRef_h
+#endif /* assembler_assembler_MacroAssemblerCodeRef_h */
--- a/js/src/assembler/assembler/MacroAssemblerMIPS.h
+++ b/js/src/assembler/assembler/MacroAssemblerMIPS.h
@@ -19,18 +19,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MacroAssemblerMIPS_h
-#define MacroAssemblerMIPS_h
+#ifndef assembler_assembler_MacroAssemblerMIPS_h
+#define assembler_assembler_MacroAssemblerMIPS_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
 #include "AbstractMacroAssembler.h"
 #include "MIPSAssembler.h"
 
 namespace JSC {
 
@@ -2782,9 +2782,9 @@ private:
     }
 
 };
 
 }
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MacroAssemblerMIPS_h
+#endif /* assembler_assembler_MacroAssemblerMIPS_h */
--- a/js/src/assembler/assembler/MacroAssemblerSparc.h
+++ b/js/src/assembler/assembler/MacroAssemblerSparc.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 MacroAssemblerSparc_h
-#define MacroAssemblerSparc_h
+#ifndef assembler_assembler_MacroAssemblerSparc_h
+#define assembler_assembler_MacroAssemblerSparc_h
 
 #include <assembler/wtf/Platform.h>
 
 #if ENABLE_ASSEMBLER && WTF_CPU_SPARC
 
 #include "SparcAssembler.h"
 #include "AbstractMacroAssembler.h"
 
@@ -1453,9 +1453,9 @@ namespace JSC {
 
     };
 
 }
 
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // MacroAssemblerSparc_h
+#endif /* assembler_assembler_MacroAssemblerSparc_h */
--- a/js/src/assembler/assembler/MacroAssemblerX86.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_h
-#define MacroAssemblerX86_h
+#ifndef assembler_assembler_MacroAssemblerX86_h
+#define assembler_assembler_MacroAssemblerX86_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_X86
 
 #include "MacroAssemblerX86Common.h"
 
 namespace JSC {
@@ -255,9 +255,9 @@ private:
         X86Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
     }
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_h
+#endif /* assembler_assembler_MacroAssemblerX86_h */
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86Common_h
-#define MacroAssemblerX86Common_h
+#ifndef assembler_assembler_MacroAssemblerX86Common_h
+#define assembler_assembler_MacroAssemblerX86Common_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #include "X86Assembler.h"
 #include "AbstractMacroAssembler.h"
 
@@ -1512,9 +1512,9 @@ private:
     }
 #endif
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86Common_h
+#endif /* assembler_assembler_MacroAssemblerX86Common_h */
--- a/js/src/assembler/assembler/MacroAssemblerX86_64.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86_64.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_64_h
-#define MacroAssemblerX86_64_h
+#ifndef assembler_assembler_MacroAssemblerX86_64_h
+#define assembler_assembler_MacroAssemblerX86_64_h
 
 #include "mozilla/DebugOnly.h"
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_X86_64
 
 #include "MacroAssemblerX86Common.h"
@@ -596,9 +596,9 @@ private:
     }
 
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_64_h
+#endif /* assembler_assembler_MacroAssemblerX86_64_h */
--- a/js/src/assembler/assembler/RepatchBuffer.h
+++ b/js/src/assembler/assembler/RepatchBuffer.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef RepatchBuffer_h
-#define RepatchBuffer_h
+#ifndef assembler_assembler_RepatchBuffer_h
+#define assembler_assembler_RepatchBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #include <assembler/MacroAssembler.h>
 #include <moco/MocoStubs.h> //MOCO
 
@@ -155,9 +155,9 @@ protected:
     size_t m_size;
     bool mprot;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // RepatchBuffer_h
+#endif /* assembler_assembler_RepatchBuffer_h */
--- a/js/src/assembler/assembler/SparcAssembler.h
+++ b/js/src/assembler/assembler/SparcAssembler.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 SparcAssembler_h
-#define SparcAssembler_h
+#ifndef assembler_assembler_SparcAssembler_h
+#define assembler_assembler_SparcAssembler_h
 
 #include <assembler/wtf/Platform.h>
 
 // Some debug code uses s(n)printf for instruction logging.
 #include <stdio.h>
 
 #if ENABLE_ASSEMBLER && WTF_CPU_SPARC
 
@@ -1210,9 +1210,9 @@ namespace JSC {
 
 
     };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // SparcAssembler_h
+#endif /* assembler_assembler_SparcAssembler_h */
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef X86Assembler_h
-#define X86Assembler_h
+#ifndef assembler_assembler_X86Assembler_h
+#define assembler_assembler_X86Assembler_h
 
 #include <stdarg.h>
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && (WTF_CPU_X86 || WTF_CPU_X86_64)
 
 #include "AssemblerBuffer.h"
@@ -3496,9 +3496,9 @@ private:
         AssemblerBuffer m_buffer;
     } m_formatter;
 };
 
 } // namespace JSC
 
 #endif // ENABLE(ASSEMBLER) && CPU(X86)
 
-#endif // X86Assembler_h
+#endif /* assembler_assembler_X86Assembler_h */
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -18,18 +18,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ExecutableAllocator_h
-#define ExecutableAllocator_h
+#ifndef assembler_jit_ExecutableAllocator_h
+#define assembler_jit_ExecutableAllocator_h
 
 #include <stddef.h> // for ptrdiff_t
 #include <limits>
 
 #include "jsalloc.h"
 
 #include "assembler/wtf/Platform.h"
 #include "js/HashTable.h"
@@ -500,10 +500,9 @@ private:
 
     static size_t determinePageSize();
 };
 
 }
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // !defined(ExecutableAllocator)
-
+#endif /* assembler_jit_ExecutableAllocator_h */
--- a/js/src/assembler/moco/MocoStubs.h
+++ b/js/src/assembler/moco/MocoStubs.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 _include_assembler_moco_stubs_h_
-#define _include_assembler_moco_stubs_h_
+#ifndef assembler_moco_MocoStubs_h
+#define assembler_moco_MocoStubs_h
 
 namespace JSC {
 
 class JITCode {
 public:
   JITCode(void* start, size_t size)
     : m_start(start), m_size(size)
   { }
@@ -30,10 +30,9 @@ public:
   }
   JITCode& getJITCode() { return m_jitcode; }
 private:
   JITCode& m_jitcode;
 };
 
 } // namespace JSC
 
-#endif /* _include_assembler_moco_stubs_h_ */
-
+#endif /* assembler_moco_MocoStubs_h */
--- a/js/src/assembler/wtf/Assertions.h
+++ b/js/src/assembler/wtf/Assertions.h
@@ -18,18 +18,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WTF_Assertions_h
-#define WTF_Assertions_h
+#ifndef assembler_wtf_Assertions_h
+#define assembler_wtf_Assertions_h
 
 #include "Platform.h"
 #include "mozilla/Assertions.h"
 
 #ifndef DEBUG
    /*
     * Prevent unused-variable warnings by defining the macro WTF uses to test
     * for assertions taking effect.
@@ -41,10 +41,9 @@
 #define ASSERT_UNUSED(variable, assertion) do { \
     (void)variable; \
     ASSERT(assertion); \
 } while (0)
 #define ASSERT_NOT_REACHED() MOZ_NOT_REACHED("")
 #define CRASH() MOZ_CRASH()
 #define COMPILE_ASSERT(exp, name) MOZ_STATIC_ASSERT(exp, #name)
 
-#endif  // WTF_Assertions_h
-
+#endif /* assembler_wtf_Assertions_h */
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WTF_Platform_h
-#define WTF_Platform_h
+#ifndef assembler_wtf_Platform_h
+#define assembler_wtf_Platform_h
 
 /* ==== PLATFORM handles OS, operating environment, graphics API, and
    CPU. This macro will be phased out in favor of platform adaptation
    macros, policy decision macros, and top-level port definitions. ==== */
 #define PLATFORM(WTF_FEATURE) (defined WTF_PLATFORM_##WTF_FEATURE  && WTF_PLATFORM_##WTF_FEATURE)
 
 
 /* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
@@ -1228,9 +1228,9 @@
    to WTF causes many ports to break, and so this way we can address the build
    breakages one port at a time. */
 #define WTF_USE_EXPORT_MACROS 0
 
 #if WTF_PLATFORM_QT || WTF_PLATFORM_GTK
 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
 #endif
 
-#endif /* WTF_Platform_h */
+#endif /* assembler_wtf_Platform_h */
--- a/js/src/assembler/wtf/SegmentedVector.h
+++ b/js/src/assembler/wtf/SegmentedVector.h
@@ -21,18 +21,18 @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SegmentedVector_h
-#define SegmentedVector_h
+#ifndef assembler_wtf_SegmentedVector_h
+#define assembler_wtf_SegmentedVector_h
 
 #include "jsprvtd.h"
 #include "js/Vector.h"
 
 namespace WTF {
 
     // An iterator for SegmentedVector. It supports only the pre ++ operator
     template <typename T, size_t SegmentSize> class SegmentedVector;
@@ -256,9 +256,9 @@ namespace WTF {
         Segment m_inlineSegment;
         js::Vector<Segment*, 32 ,js::SystemAllocPolicy > m_segments;
     };
 
 } // namespace WTF
 
 using WTF::SegmentedVector;
 
-#endif // SegmentedVector_h
+#endif /* assembler_wtf_SegmentedVector_h */
--- a/js/src/assembler/wtf/VMTags.h
+++ b/js/src/assembler/wtf/VMTags.h
@@ -18,18 +18,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef VMTags_h
-#define VMTags_h
+#ifndef assembler_wtf_VMTags_h
+#define assembler_wtf_VMTags_h
 
 // On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
 // in order to aid tools that inspect system memory use. 
 #if WTF_PLATFORM_DARWIN
 
 #include <mach/vm_statistics.h>
 
 #if !defined(TARGETING_TIGER)
@@ -82,9 +82,9 @@
 #define VM_TAG_FOR_TCMALLOC_MEMORY -1
 #define VM_TAG_FOR_COLLECTOR_MEMORY -1
 #define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
 #define VM_TAG_FOR_REGISTERFILE_MEMORY -1
 #define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
 
 #endif // OS(DARWIN)
 
-#endif // VMTags_h
+#endif /* assembler_wtf_VMTags_h */
--- a/js/src/builtin/Eval.h
+++ b/js/src/builtin/Eval.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/. */
 
-#include "vm/Stack.h"
+#ifndef builtin_Eval_h
+#define builtin_Eval_h
 
-#ifndef Eval_h__
-#define Eval_h__
+#include "vm/Stack.h"
 
 namespace js {
 
 // The C++ native for 'eval' (ES5 15.1.2.1). The function is named "indirect
 // eval" because "direct eval" calls (as defined by the spec) will emit
 // JSOP_EVAL which in turn calls DirectEval. Thus, even though IndirectEval is
 // the callee function object for *all* calls to eval, it is by construction
 // only ever called in the case indirect eval.
@@ -42,9 +42,9 @@ extern bool
 IsAnyBuiltinEval(JSFunction *fun);
 
 // Return the principals to assign to code compiled for a call to
 // eval or the Function constructor.
 extern JSPrincipals *
 PrincipalsForCompiledCode(const CallReceiver &call, JSContext *cx);
 
 }  // namespace js
-#endif  // Eval_h__
+#endif /* builtin_Eval_h */
--- a/js/src/builtin/Intl.h
+++ b/js/src/builtin/Intl.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 Intl_h___
-#define Intl_h___
+#ifndef builtin_Intl_h
+#define builtin_Intl_h
 
 #include "jsapi.h"
 
 #include "js/RootingAPI.h"
 
 struct JSContext;
 class JSObject;
 
@@ -181,9 +181,9 @@ intl_patternForSkeleton(JSContext *cx, u
  *
  * Usage: formatted = intl_FormatDateTime(dateTimeFormat, x)
  */
 extern JSBool
 intl_FormatDateTime(JSContext *cx, unsigned argc, Value *vp);
 
 } // namespace js
 
-#endif /* Intl_h___ */
+#endif /* builtin_Intl_h */
--- a/js/src/builtin/Iterator-inl.h
+++ b/js/src/builtin/Iterator-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Iterator_inl_h_
-#define Iterator_inl_h_
+#ifndef builtin_Iterator_inl_h
+#define builtin_Iterator_inl_h
 
 #include "jsiter.h"
 #include "vm/ObjectImpl-inl.h"
 
 js::NativeIterator *
 js::PropertyIteratorObject::getNativeIterator() const
 {
     JS_ASSERT(is<PropertyIteratorObject>());
@@ -18,9 +18,9 @@ js::PropertyIteratorObject::getNativeIte
 }
 
 inline void
 js::PropertyIteratorObject::setNativeIterator(js::NativeIterator *ni)
 {
     setPrivate(ni);
 }
 
-#endif  // Iterator_inl_h_
+#endif /* builtin_Iterator_inl_h */
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/MapObject.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 MapObject_h__
-#define MapObject_h__
+#ifndef builtin_MapObject_h
+#define builtin_MapObject_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsobj.h"
 
 namespace js {
 
 /*
@@ -159,9 +159,9 @@ class SetObject : public JSObject {
 } /* namespace js */
 
 extern JSObject *
 js_InitMapClass(JSContext *cx, js::HandleObject obj);
 
 extern JSObject *
 js_InitSetClass(JSContext *cx, js::HandleObject obj);
 
-#endif  /* MapObject_h__ */
+#endif /* builtin_MapObject_h */
--- a/js/src/builtin/Module.h
+++ b/js/src/builtin/Module.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 Module_h___
-#define Module_h___
+#ifndef builtin_Module_h
+#define builtin_Module_h
 
 #include "jsobj.h"
 
 namespace js {
 
 class Module : public JSObject {
   public:
     static Module *create(JSContext *cx, js::HandleAtom atom);
@@ -30,9 +30,9 @@ class Module : public JSObject {
     inline void setScript(JSScript *script);
 
     static const uint32_t ATOM_SLOT = 0;
     static const uint32_t SCRIPT_SLOT = 1;
 };
 
 } // namespace js
 
-#endif // Module_h___
+#endif /* builtin_Module_h */
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -1,23 +1,23 @@
 /* -*- 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 Object_h___
-#define Object_h___
+#ifndef builtin_Object_h
+#define builtin_Object_h
 
 #include "jsobj.h"
 
 namespace js {
 
 extern const JSFunctionSpec object_methods[];
 extern const JSFunctionSpec object_static_methods[];
 
 /* Object constructor native. Exposed only so the JIT can know its address. */
 extern JSBool
 obj_construct(JSContext *cx, unsigned argc, js::Value *vp);
 
 } /* namespace js */
 
-#endif
+#endif /* builtin_Object_h */
--- a/js/src/builtin/ParallelArray.h
+++ b/js/src/builtin/ParallelArray.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 ParallelArray_h__
-#define ParallelArray_h__
+#ifndef builtin_ParallelArray_h
+#define builtin_ParallelArray_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsobj.h"
 
 #include "ion/Ion.h"
 #include "vm/ForkJoin.h"
 #include "vm/ThreadPool.h"
@@ -52,9 +52,9 @@ class ParallelArrayObject : public JSObj
     static bool is(const Value &v);
 };
 
 } // namespace js
 
 extern JSObject *
 js_InitParallelArrayClass(JSContext *cx, js::HandleObject obj);
 
-#endif // ParallelArray_h__
+#endif /* builtin_ParallelArray_h */
--- a/js/src/builtin/Profilers.h
+++ b/js/src/builtin/Profilers.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/. */
 
 /*
  * Functions for controlling profilers from within JS: Valgrind, Perf,
  * Shark, etc.
  */
-#ifndef Profilers_h___
-#define Profilers_h___
+#ifndef builtin_Profilers_h
+#define builtin_Profilers_h
 
 #include "jstypes.h"
 
 /**
  * Start any profilers that are available and have been configured on for this
  * platform. This is NOT thread safe.
  *
  * The profileName is used by some profilers to describe the current profiling
@@ -81,9 +81,9 @@ js_DumpCallgrind(const char *outfile);
 extern JS_FRIEND_API(JSBool)
 js_StartPerf();
 
 extern JS_FRIEND_API(JSBool)
 js_StopPerf();
 
 #endif /* __linux__ */
 
-#endif /* Profilers_h___ */
+#endif /* builtin_Profilers_h */
--- a/js/src/builtin/RegExp.h
+++ b/js/src/builtin/RegExp.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 RegExp_h___
-#define RegExp_h___
+#ifndef builtin_RegExp_h
+#define builtin_RegExp_h
 
 #include "jsprvtd.h"
 
 #include "vm/MatchPairs.h"
 #include "vm/RegExpObject.h"
 
 JSObject *
 js_InitRegExpClass(JSContext *cx, js::HandleObject obj);
@@ -53,9 +53,9 @@ regexp_exec(JSContext *cx, unsigned argc
 bool
 regexp_test_raw(JSContext *cx, HandleObject regexp, HandleString input, JSBool *result);
 
 extern JSBool
 regexp_test(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 
-#endif /* RegExp_h__ */
+#endif /* builtin_RegExp_h */
--- a/js/src/builtin/TestingFunctions.h
+++ b/js/src/builtin/TestingFunctions.h
@@ -1,22 +1,22 @@
 /* -*- 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 TestingFunctions_h__
-#define TestingFunctions_h__
+#ifndef builtin_TestingFunctions_h
+#define builtin_TestingFunctions_h
 
 #include "jsapi.h"
 
 namespace js {
 
 bool
 DefineTestingFunctions(JSContext *cx, JSHandleObject obj);
 
 JSBool
 testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp);
 
 } /* namespace js */
 
-#endif /* TestingFunctions_h__ */
+#endif /* builtin_TestingFunctions_h */
--- a/js/src/ctypes/CTypes.h
+++ b/js/src/ctypes/CTypes.h
@@ -1,15 +1,15 @@
 /* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* 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 CTYPES_H
-#define CTYPES_H
+#ifndef ctypes_CTypes_h
+#define ctypes_CTypes_h
 
 #include "jscntxt.h"
 #include "jsapi.h"
 #include "prlink.h"
 #include "ffi.h"
 
 #include "js/HashTable.h"
 
@@ -504,9 +504,9 @@ namespace Int64 {
 
 namespace UInt64 {
   bool IsUInt64(JSObject* obj);
 }
 
 }
 }
 
-#endif
+#endif /* ctypes_CTypes_h */
--- a/js/src/ctypes/Library.h
+++ b/js/src/ctypes/Library.h
@@ -1,15 +1,15 @@
 /* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* 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 LIBRARY_H
-#define LIBRARY_H
+#ifndef ctypes_Library_h
+#define ctypes_Library_h
 
 #include "jsapi.h"
 
 struct PRLibrary;
 
 namespace js {
 namespace ctypes {
 
@@ -28,9 +28,9 @@ namespace Library
   PRLibrary* GetLibrary(JSObject* obj);
 
   JSBool Open(JSContext* cx, unsigned argc, jsval* vp);
 }
 
 }
 }
 
-#endif
+#endif /* ctypes_Library_h */
--- a/js/src/ctypes/typedefs.h
+++ b/js/src/ctypes/typedefs.h
@@ -10,16 +10,19 @@
  *
  * DEFINE_X_TYPE(typename, ctype, ffitype)
  *
  * where 'typename' is the name of the type constructor (accessible as
  * ctypes.typename), 'ctype' is the corresponding C type declaration (from
  * which sizeof(ctype) and templated type conversions will be derived), and
  * 'ffitype' is the ffi_type to use. (Special types, such as 'void' and the
  * pointer, array, and struct types are handled separately.)
+ *
+ * This header lacks a #ifndef wrapper because it is deliberately #included
+ * multiple times in ctypes/CTypes.h.
  */
 
 // If we're not breaking the types out, combine them together under one
 // DEFINE_TYPE macro. Otherwise, turn off whichever ones we're not using.
 #if defined(DEFINE_TYPE)
 #  define DEFINE_CHAR_TYPE(x, y, z)         DEFINE_TYPE(x, y, z)
 #  define DEFINE_JSCHAR_TYPE(x, y, z)       DEFINE_TYPE(x, y, z)
 #  define DEFINE_BOOL_TYPE(x, y, z)         DEFINE_TYPE(x, y, z)
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.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 BytecodeCompiler_h__
-#define BytecodeCompiler_h__
+#ifndef frontend_BytecodeCompiler_h
+#define frontend_BytecodeCompiler_h
 
 #include "jsapi.h"
 
 class JSLinearString;
 
 namespace js {
 
 class AutoNameVector;
@@ -52,9 +52,9 @@ IsKeyword(JSLinearString *str);
 
 /* GC marking. Defined in Parser.cpp. */
 void
 MarkParser(JSTracer *trc, AutoGCRooter *parser);
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeCompiler_h__ */
+#endif /* frontend_BytecodeCompiler_h */
--- a/js/src/frontend/BytecodeEmitter-inl.h
+++ b/js/src/frontend/BytecodeEmitter-inl.h
@@ -1,25 +1,25 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BytecodeEmitter_inl_h__
-#define BytecodeEmitter_inl_h__
+#ifndef frontend_BytecodeEmitter_inl_h
+#define frontend_BytecodeEmitter_inl_h
 
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/Parser.h"
 
 namespace js {
 namespace frontend {
 
 inline TokenStream *
 BytecodeEmitter::tokenStream()
 {
     return &parser->tokenStream;
 }
 
 } // namespace frontend
 } // namespace js
 
-#endif // BytecodeEmitter_inl_h__
+#endif /* frontend_BytecodeEmitter_inl_h */
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.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 BytecodeEmitter_h__
-#define BytecodeEmitter_h__
+#ifndef frontend_BytecodeEmitter_h
+#define frontend_BytecodeEmitter_h
 
 /*
  * JS bytecode generation.
  */
 #include "jsatom.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jspubtd.h"
@@ -292,9 +292,9 @@ BytecodeEmitter::countFinalSourceNotes()
             cnt += JS_HOWMANY(diff, SN_XDELTA_MASK);
     }
     return cnt;
 }
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeEmitter_h__ */
+#endif /* frontend_BytecodeEmitter_h */
--- a/js/src/frontend/FoldConstants.h
+++ b/js/src/frontend/FoldConstants.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 FoldConstants_h__
-#define FoldConstants_h__
+#ifndef frontend_FoldConstants_h
+#define frontend_FoldConstants_h
 
 #include "jsprvtd.h"
 
 namespace js {
 namespace frontend {
 
 // Perform constant folding on the given AST. For example, the program
 // `print(2 + 2)` would become `print(4)`.
@@ -29,9 +29,9 @@ template <typename ParseHandler>
 bool
 FoldConstants(JSContext *cx, typename ParseHandler::Node *pnp,
               Parser<ParseHandler> *parser,
               bool inGenexpLambda = false, bool inCond = false);
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* FoldConstants_h__ */
+#endif /* frontend_FoldConstants_h */
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.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 FullParseHandler_h__
-#define FullParseHandler_h__
+#ifndef frontend_FullParseHandler_h
+#define frontend_FullParseHandler_h
 
 #include "mozilla/PodOperations.h"
 
 #include "ParseNode.h"
 #include "SharedContext.h"
 
 namespace js {
 namespace frontend {
@@ -537,9 +537,9 @@ FullParseHandler::makeAssignment(ParseNo
     pn->pn_right = rhs;
     pn->pn_pos.end = rhs->pn_pos.end;
     return lhs;
 }
 
 } // frontend
 } // js
 
-#endif /* FullParseHandler_h__ */
+#endif /* frontend_FullParseHandler_h */
--- a/js/src/frontend/NameFunctions.h
+++ b/js/src/frontend/NameFunctions.h
@@ -1,23 +1,23 @@
 /* -*- 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 NameFunctions_h__
-#define NameFunctions_h__
+#ifndef frontend_NameFunctions_h
+#define frontend_NameFunctions_h
 
 struct JSContext;
 
 namespace js {
 namespace frontend {
 
 struct ParseNode;
 
 bool
 NameFunctions(JSContext *cx, ParseNode *pn);
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* NameFunctions_h__ */
+#endif /* frontend_NameFunctions_h */
--- a/js/src/frontend/ParseMaps-inl.h
+++ b/js/src/frontend/ParseMaps-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseMapPool_inl_h__
-#define ParseMapPool_inl_h__
+#ifndef frontend_ParseMaps_inl_h
+#define frontend_ParseMaps_inl_h
 
 #include "jscntxt.h"
 
 #include "frontend/ParseMaps.h"
 
 namespace js {
 namespace frontend {
 
@@ -114,9 +114,9 @@ AtomDecls<ParseHandler>::~AtomDecls()
 {
     if (map)
         cx->runtime()->parseMapPool.release(map);
 }
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif
+#endif /* frontend_ParseMaps_inl_h */
--- a/js/src/frontend/ParseMaps.h
+++ b/js/src/frontend/ParseMaps.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 ParseMaps_h__
-#define ParseMaps_h__
+#ifndef frontend_ParseMaps_h
+#define frontend_ParseMaps_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
 
 #include "ds/InlineMap.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
 
@@ -463,9 +463,9 @@ namespace mozilla {
 template <>
 struct IsPod<js::frontend::DefinitionSingle> : TrueType {};
 
 template <>
 struct IsPod<js::frontend::DefinitionList> : TrueType {};
 
 } /* namespace mozilla */
 
-#endif
+#endif /* frontend_ParseMaps_h */
--- a/js/src/frontend/ParseNode-inl.h
+++ b/js/src/frontend/ParseNode-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseNode_inl_h__
-#define ParseNode_inl_h__
+#ifndef frontend_ParseNode_inl_h
+#define frontend_ParseNode_inl_h
 
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
 
 namespace js {
 namespace frontend {
 
 inline bool
@@ -42,9 +42,9 @@ ParseNode::atom() const
 {
     JS_ASSERT(isKind(PNK_MODULE) || isKind(PNK_STRING));
     return isKind(PNK_MODULE) ? pn_modulebox->module()->atom() : pn_atom;
 }
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_inl_h__ */
+#endif /* frontend_ParseNode_inl_h */
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.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 ParseNode_h__
-#define ParseNode_h__
+#ifndef frontend_ParseNode_h
+#define frontend_ParseNode_h
 
 #include "mozilla/Attributes.h"
 
 #include "jsscript.h"
 #include "builtin/Module.h"
 #include "frontend/TokenStream.h"
 
 namespace js {
@@ -1422,9 +1422,9 @@ enum ParseReportKind
     ParseStrictError
 };
 
 enum FunctionSyntaxKind { Expression, Statement, Arrow };
 
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_h__ */
+#endif /* frontend_ParseNode_h */
--- a/js/src/frontend/Parser-inl.h
+++ b/js/src/frontend/Parser-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Parser_inl_h__
-#define Parser_inl_h__
+#ifndef frontend_Parser_inl
+#define frontend_Parser_inl
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/Parser.h"
 
 #include "frontend/SharedContext-inl.h"
 
 namespace js {
 namespace frontend {
@@ -113,10 +113,9 @@ CheckStrictBinding(JSContext *cx, ParseH
     }
 
     return true;
 }
 
 } // namespace frontend
 } // namespace js
 
-#endif // Parser_inl_h__
-
+#endif /* frontend_Parser_inl */
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.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 Parser_h__
-#define Parser_h__
+#ifndef frontend_Parser_h
+#define frontend_Parser_h
 
 /*
  * JS parser definitions.
  */
 #include "jsprvtd.h"
 #include "jspubtd.h"
 
 #include "frontend/BytecodeCompiler.h"
@@ -561,9 +561,9 @@ Parser<SyntaxParseHandler>::setAssignmen
 } /* namespace frontend */
 } /* namespace js */
 
 /*
  * Convenience macro to access Parser.tokenStream as a pointer.
  */
 #define TS(p) (&(p)->tokenStream)
 
-#endif /* Parser_h__ */
+#endif /* frontend_Parser_h */
--- a/js/src/frontend/SharedContext-inl.h
+++ b/js/src/frontend/SharedContext-inl.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SharedContext_inl_h__
-#define SharedContext_inl_h__
+#ifndef frontend_SharedContext_inl_h
+#define frontend_SharedContext_inl_h
 
 #include "frontend/Parser.h"
 #include "frontend/SharedContext.h"
 
 namespace js {
 namespace frontend {
 
 inline
@@ -90,9 +90,9 @@ frontend::FinishPopStatement(ContextT *c
         ct->topScopeStmt = stmt->downScope;
         if (stmt->isBlockScope)
             ct->blockChain = stmt->blockObj->enclosingBlock();
     }
 }
 
 } // namespace js
 
-#endif // SharedContext_inl_h__
+#endif /* frontend_SharedContext_inl_h */
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.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 SharedContext_h__
-#define SharedContext_h__
+#ifndef frontend_SharedContext_h
+#define frontend_SharedContext_h
 
 #include "jstypes.h"
 #include "jsatom.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
 
@@ -379,9 +379,9 @@ FinishPopStatement(ContextT *ct);
 template <class ContextT>
 typename ContextT::StmtInfo *
 LexicalLookup(ContextT *ct, HandleAtom atom, int *slotp, typename ContextT::StmtInfo *stmt);
 
 } // namespace frontend
 
 } // namespace js
 
-#endif // SharedContext_h__
+#endif /* frontend_SharedContext_h */
--- a/js/src/frontend/SourceNotes.h
+++ b/js/src/frontend/SourceNotes.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 SourceNotes_h__
-#define SourceNotes_h__
+#ifndef frontend_SourceNotes_h
+#define frontend_SourceNotes_h
 
 #include "jsprvtd.h"
 
 namespace js {
 
 /*
  * Source notes generated along with bytecode for decompiling and debugging.
  * A source note is a uint8_t with 5 bits of type and 3 of offset from the pc
@@ -154,9 +154,9 @@ extern JS_FRIEND_DATA(const JSSrcNoteSpe
 extern JS_FRIEND_API(unsigned)         js_SrcNoteLength(jssrcnote *sn);
 
 /*
  * Get and set the offset operand identified by which (0 for the first, etc.).
  */
 extern JS_FRIEND_API(ptrdiff_t)
 js_GetSrcNoteOffset(jssrcnote *sn, unsigned which);
 
-#endif  // SourceNotes_h__
+#endif /* frontend_SourceNotes_h */
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.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 SyntaxParseHandler_h__
-#define SyntaxParseHandler_h__
+#ifndef frontend_SyntaxParseHandler_h
+#define frontend_SyntaxParseHandler_h
 
 namespace js {
 namespace frontend {
 
 // Parse handler used when processing the syntax in a block of code, to generate
 // the minimal information which is required to detect syntax errors and allow
 // bytecode to be emitted for outer functions.
 //
@@ -211,9 +211,9 @@ class SyntaxParseHandler
     }
     void disableSyntaxParser() {
     }
 };
 
 } // namespace frontend
 } // namespace js
 
-#endif /* SyntaxParseHandler_h__ */
+#endif /* frontend_SyntaxParseHandler_h */
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.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 TokenStream_h__
-#define TokenStream_h__
+#ifndef frontend_TokenStream_h
+#define frontend_TokenStream_h
 
 /*
  * JS lexical scanner interface.
  */
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
@@ -951,9 +951,9 @@ class MOZ_STACK_CLASS TokenStream
 extern JS_FRIEND_API(int)
 js_fgets(char *buf, int size, FILE *file);
 
 #ifdef DEBUG
 extern const char *
 TokenKindToString(js::frontend::TokenKind tt);
 #endif
 
-#endif /* TokenStream_h__ */
+#endif /* frontend_TokenStream_h */