Bug 528863 - Use _h instead of _h__ in include guards in the HTML5 parser. r=hsivonen
authorCykesiopka <cykesiopka.bmo@gmail.com>
Fri, 23 Aug 2013 11:07:10 -0400
changeset 144068 e51ff50dea786501242d66a5d545f5ff8522aefc
parent 144067 0dad16fe66b2b057e5047d774b17cd2aeef19ad9
child 144069 266d672e8debe00673c2ee7f457bb31ea2b1cec9
push id32854
push userryanvm@gmail.com
push dateFri, 23 Aug 2013 15:07:01 +0000
treeherdermozilla-inbound@9409e2f9c885 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsivonen
bugs528863
milestone26.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 528863 - Use _h instead of _h__ in include guards in the HTML5 parser. r=hsivonen
parser/html/jArray.h
parser/html/nsAHtml5TreeBuilderState.h
parser/html/nsAHtml5TreeOpSink.h
parser/html/nsHtml5ArrayCopy.h
parser/html/nsHtml5Atom.h
parser/html/nsHtml5AtomTable.h
parser/html/nsHtml5Atoms.h
parser/html/nsHtml5AttributeName.h
parser/html/nsHtml5ByteReadable.h
parser/html/nsHtml5DependentUTF16Buffer.h
parser/html/nsHtml5DocumentMode.h
parser/html/nsHtml5ElementName.h
parser/html/nsHtml5Highlighter.h
parser/html/nsHtml5HtmlAttributes.h
parser/html/nsHtml5Macros.h
parser/html/nsHtml5MetaScanner.h
parser/html/nsHtml5Module.h
parser/html/nsHtml5NamedCharacters.h
parser/html/nsHtml5NamedCharactersAccel.h
parser/html/nsHtml5OwningUTF16Buffer.h
parser/html/nsHtml5Parser.h
parser/html/nsHtml5PendingNotification.h
parser/html/nsHtml5PlainTextUtils.h
parser/html/nsHtml5Portability.h
parser/html/nsHtml5RefPtr.h
parser/html/nsHtml5ReleasableAttributeName.h
parser/html/nsHtml5ReleasableElementName.h
parser/html/nsHtml5SVGLoadDispatcher.h
parser/html/nsHtml5Speculation.h
parser/html/nsHtml5SpeculativeLoad.h
parser/html/nsHtml5StackNode.h
parser/html/nsHtml5StateSnapshot.h
parser/html/nsHtml5StreamParser.h
parser/html/nsHtml5StringParser.h
parser/html/nsHtml5Tokenizer.h
parser/html/nsHtml5TokenizerLoopPolicies.h
parser/html/nsHtml5TreeBuilder.h
parser/html/nsHtml5TreeOpExecutor.h
parser/html/nsHtml5TreeOpStage.h
parser/html/nsHtml5TreeOperation.h
parser/html/nsHtml5UTF16Buffer.h
parser/html/nsHtml5ViewSourceUtils.h
parser/html/nsParserUtils.h
--- a/parser/html/jArray.h
+++ b/parser/html/jArray.h
@@ -15,18 +15,18 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef jArray_h_
-#define jArray_h_
+#ifndef jArray_h
+#define jArray_h
 
 #include "mozilla/NullPtr.h"
 #include "nsDebug.h"
 
 template<class T, class L>
 struct staticJArray {
   const T* arr;
   const L length;
@@ -119,9 +119,9 @@ class autoJArray {
       // Make assigning null to an array in Java delete the buffer in C++
       // MSVC10 does not allow asserting that zero is null.
       delete[] arr;
       arr = nullptr;
       length = 0;
     }
 };
 
-#endif // jArray_h_
+#endif // jArray_h
--- a/parser/html/nsAHtml5TreeBuilderState.h
+++ b/parser/html/nsAHtml5TreeBuilderState.h
@@ -1,14 +1,14 @@
 /* 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 nsAHtml5TreeBuilderState_h___
-#define nsAHtml5TreeBuilderState_h___
+#ifndef nsAHtml5TreeBuilderState_h
+#define nsAHtml5TreeBuilderState_h
 
 /**
  * Interface for exposing the internal state of the HTML5 tree builder.
  * For more documentation, please see
  * http://hg.mozilla.org/projects/htmlparser/file/tip/src/nu/validator/htmlparser/impl/StateSnapshot.java
  */
 class nsAHtml5TreeBuilderState {
   public:
@@ -40,9 +40,9 @@ class nsAHtml5TreeBuilderState {
     virtual bool isNeedToDropLF() = 0;
 
     virtual bool isQuirks() = 0;
     
     virtual ~nsAHtml5TreeBuilderState() {
     }
 };
 
-#endif /* nsAHtml5TreeBuilderState_h___ */
+#endif /* nsAHtml5TreeBuilderState_h */
--- a/parser/html/nsAHtml5TreeOpSink.h
+++ b/parser/html/nsAHtml5TreeOpSink.h
@@ -1,14 +1,14 @@
 /* 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 nsAHtml5TreeOpSink_h___
-#define nsAHtml5TreeOpSink_h___
+#ifndef nsAHtml5TreeOpSink_h
+#define nsAHtml5TreeOpSink_h
 
 /**
  * The purpose of this interface is to connect a tree op executor 
  * (main-thread case), a tree op stage (non-speculative off-the-main-thread
  * case) or a speculation (speculative case).
  */
 class nsAHtml5TreeOpSink {
   public:
@@ -16,9 +16,9 @@ class nsAHtml5TreeOpSink {
     /**
      * Flush the operations from the tree operations from the argument
      * queue into this sink unconditionally.
      */
     virtual void MoveOpsFrom(nsTArray<nsHtml5TreeOperation>& aOpQueue) = 0;
     
 };
 
-#endif /* nsAHtml5TreeOpSink_h___ */
+#endif /* nsAHtml5TreeOpSink_h */
--- a/parser/html/nsHtml5ArrayCopy.h
+++ b/parser/html/nsHtml5ArrayCopy.h
@@ -15,18 +15,18 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef nsHtml5ArrayCopy_h__
-#define nsHtml5ArrayCopy_h__
+#ifndef nsHtml5ArrayCopy_h
+#define nsHtml5ArrayCopy_h
 
 #include "prtypes.h"
 
 class nsString;
 class nsHtml5StackNode;
 class nsHtml5AttributeName;
 
 // Unfortunately, these don't work as template functions because the arguments
@@ -71,9 +71,9 @@ class nsHtml5ArrayCopy {
     }
 
     static inline void
     arraycopy(nsHtml5StackNode** arr, int32_t sourceOffset, int32_t targetOffset, int32_t length)
     {
       memmove(&(arr[targetOffset]), &(arr[sourceOffset]), length * sizeof(nsHtml5StackNode*));
     }
 };
-#endif // nsHtml5ArrayCopy_h__
+#endif // nsHtml5ArrayCopy_h
--- a/parser/html/nsHtml5Atom.h
+++ b/parser/html/nsHtml5Atom.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5Atom_h_
-#define nsHtml5Atom_h_
+#ifndef nsHtml5Atom_h
+#define nsHtml5Atom_h
 
 #include "nsIAtom.h"
 #include "mozilla/Attributes.h"
 
 /**
  * A dynamic atom implementation meant for use within the nsHtml5Tokenizer and 
  * nsHtml5TreeBuilder owned by one nsHtml5Parser or nsHtml5StreamParser 
  * instance.
@@ -20,9 +20,9 @@ class nsHtml5Atom MOZ_FINAL : public nsI
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIATOM
 
     nsHtml5Atom(const nsAString& aString);
     ~nsHtml5Atom();
 };
 
-#endif // nsHtml5Atom_h_
+#endif // nsHtml5Atom_h
--- a/parser/html/nsHtml5AtomTable.h
+++ b/parser/html/nsHtml5AtomTable.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5AtomTable_h_
-#define nsHtml5AtomTable_h_
+#ifndef nsHtml5AtomTable_h
+#define nsHtml5AtomTable_h
 
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
 #include "nsAutoPtr.h"
 #include "nsIAtom.h"
 #include "nsIThread.h"
 
 class nsHtml5Atom;
@@ -103,9 +103,9 @@ class nsHtml5AtomTable
   
   private:
     nsTHashtable<nsHtml5AtomEntry> mTable;
 #ifdef DEBUG
     nsCOMPtr<nsIThread>            mPermittedLookupThread;
 #endif
 };
 
-#endif // nsHtml5AtomTable_h_
+#endif // nsHtml5AtomTable_h
--- a/parser/html/nsHtml5Atoms.h
+++ b/parser/html/nsHtml5Atoms.h
@@ -4,27 +4,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
 /*
  * This class wraps up the creation (and destruction) of the standard
  * set of atoms used by gklayout; the atoms are created when gklayout
  * is loaded and they are destroyed when gklayout is unloaded.
  */
 
-#ifndef nsHtml5Atoms_h___
-#define nsHtml5Atoms_h___
+#ifndef nsHtml5Atoms_h
+#define nsHtml5Atoms_h
 
 #include "nsIAtom.h"
 
 class nsHtml5Atoms {
   public:
     static void AddRefAtoms();
     /* Declare all atoms
        The atom names and values are stored in nsGkAtomList.h and
        are brought to you by the magic of C preprocessing
        Add new atoms to nsGkAtomList and all support logic will be auto-generated
      */
 #define HTML5_ATOM(_name, _value) static nsIAtom* _name;
 #include "nsHtml5AtomList.h"
 #undef HTML5_ATOM
 };
 
-#endif /* nsHtml5Atoms_h___ */
+#endif /* nsHtml5Atoms_h */
--- a/parser/html/nsHtml5AttributeName.h
+++ b/parser/html/nsHtml5AttributeName.h
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit AttributeName.java instead and regenerate.
  */
 
-#ifndef nsHtml5AttributeName_h__
-#define nsHtml5AttributeName_h__
+#ifndef nsHtml5AttributeName_h
+#define nsHtml5AttributeName_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5ByteReadable.h
+++ b/parser/html/nsHtml5ByteReadable.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5ByteReadable_h__
-#define nsHtml5ByteReadable_h__
+#ifndef nsHtml5ByteReadable_h
+#define nsHtml5ByteReadable_h
 
 /**
  * A weak reference wrapper around a byte array.
  */
 class nsHtml5ByteReadable
 {
   public:
 
--- a/parser/html/nsHtml5DependentUTF16Buffer.h
+++ b/parser/html/nsHtml5DependentUTF16Buffer.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5DependentUTF16Buffer_h_
-#define nsHtml5DependentUTF16Buffer_h_
+#ifndef nsHtml5DependentUTF16Buffer_h
+#define nsHtml5DependentUTF16Buffer_h
 
 #include "nscore.h"
 #include "nsHtml5OwningUTF16Buffer.h"
 
 class MOZ_STACK_CLASS nsHtml5DependentUTF16Buffer : public nsHtml5UTF16Buffer
 {
   public:
     /**
@@ -23,9 +23,9 @@ class MOZ_STACK_CLASS nsHtml5DependentUT
      * Copies the currently unconsumed part of this buffer into a new
      * heap-allocated nsHtml5OwningUTF16Buffer. The new object is allocated
      * with a fallible allocator. If the allocation fails, nullptr is returned.
      * @return heap-allocated copy or nullptr if memory allocation failed
      */
     already_AddRefed<nsHtml5OwningUTF16Buffer> FalliblyCopyAsOwningBuffer();
 };
 
-#endif // nsHtml5DependentUTF16Buffer_h_
+#endif // nsHtml5DependentUTF16Buffer_h
--- a/parser/html/nsHtml5DocumentMode.h
+++ b/parser/html/nsHtml5DocumentMode.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5DocumentMode_h__
-#define nsHtml5DocumentMode_h__
+#ifndef nsHtml5DocumentMode_h
+#define nsHtml5DocumentMode_h
 
 enum nsHtml5DocumentMode {
     STANDARDS_MODE,
     ALMOST_STANDARDS_MODE,
     QUIRKS_MODE
 };
 
-#endif // nsHtml5DocumentMode_h__
+#endif // nsHtml5DocumentMode_h
--- a/parser/html/nsHtml5ElementName.h
+++ b/parser/html/nsHtml5ElementName.h
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit ElementName.java instead and regenerate.
  */
 
-#ifndef nsHtml5ElementName_h__
-#define nsHtml5ElementName_h__
+#ifndef nsHtml5ElementName_h
+#define nsHtml5ElementName_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5Highlighter.h
+++ b/parser/html/nsHtml5Highlighter.h
@@ -1,13 +1,13 @@
 /* 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 nsHtml5Highlighter_h_
-#define nsHtml5Highlighter_h_
+#ifndef nsHtml5Highlighter_h
+#define nsHtml5Highlighter_h
 
 #include "prtypes.h"
 #include "nsCOMPtr.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5UTF16Buffer.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsAHtml5TreeOpSink.h"
 
@@ -397,9 +397,9 @@ class nsHtml5Highlighter
     static PRUnichar sEntity[];
 
     /**
      * The string "pi"
      */
     static PRUnichar sPi[];
 };
 
-#endif // nsHtml5Highlighter_h_
+#endif // nsHtml5Highlighter_h
--- a/parser/html/nsHtml5HtmlAttributes.h
+++ b/parser/html/nsHtml5HtmlAttributes.h
@@ -21,18 +21,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit HtmlAttributes.java instead and regenerate.
  */
 
-#ifndef nsHtml5HtmlAttributes_h__
-#define nsHtml5HtmlAttributes_h__
+#ifndef nsHtml5HtmlAttributes_h
+#define nsHtml5HtmlAttributes_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5Macros.h
+++ b/parser/html/nsHtml5Macros.h
@@ -15,18 +15,18 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef nsHtml5Macros_h_
-#define nsHtml5Macros_h_
+#ifndef nsHtml5Macros_h
+#define nsHtml5Macros_h
 
 #define NS_HTML5_CONTINUE(target) \
   goto target
 
 #define NS_HTML5_BREAK(target) \
   goto target ## _end
 
-#endif /* nsHtml5Macros_h_ */
+#endif /* nsHtml5Macros_h */
--- a/parser/html/nsHtml5MetaScanner.h
+++ b/parser/html/nsHtml5MetaScanner.h
@@ -21,18 +21,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit MetaScanner.java instead and regenerate.
  */
 
-#ifndef nsHtml5MetaScanner_h__
-#define nsHtml5MetaScanner_h__
+#ifndef nsHtml5MetaScanner_h
+#define nsHtml5MetaScanner_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5Module.h
+++ b/parser/html/nsHtml5Module.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5Module_h__
-#define nsHtml5Module_h__
+#ifndef nsHtml5Module_h
+#define nsHtml5Module_h
 
 #include "nsIParser.h"
 #include "nsIThread.h"
 
 class nsHtml5Module
 {
   public:
     static void InitializeStatics();
@@ -20,9 +20,9 @@ class nsHtml5Module
   private:
 #ifdef DEBUG
     static bool sNsHtml5ModuleInitialized;
 #endif
     static nsIThread* sStreamParserThread;
     static nsIThread* sMainThread;
 };
 
-#endif // nsHtml5Module_h__
+#endif // nsHtml5Module_h
--- a/parser/html/nsHtml5NamedCharacters.h
+++ b/parser/html/nsHtml5NamedCharacters.h
@@ -15,18 +15,18 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef nsHtml5NamedCharacters_h_
-#define nsHtml5NamedCharacters_h_
+#ifndef nsHtml5NamedCharacters_h
+#define nsHtml5NamedCharacters_h
 
 #include "prtypes.h"
 #include "jArray.h"
 #include "nscore.h"
 #include "nsDebug.h"
 #include "prlog.h"
 #include "nsMemory.h"
 
@@ -45,9 +45,9 @@ class nsHtml5NamedCharacters
   public:
     static const nsHtml5CharacterName NAMES[];
     static const PRUnichar VALUES[][2];
     static PRUnichar** WINDOWS_1252;
     static void initializeStatics();
     static void releaseStatics();
 };
 
-#endif // nsHtml5NamedCharacters_h_
+#endif // nsHtml5NamedCharacters_h
--- a/parser/html/nsHtml5NamedCharactersAccel.h
+++ b/parser/html/nsHtml5NamedCharactersAccel.h
@@ -1,25 +1,25 @@
 /*
  * Copyright 2004-2010 Apple Computer, Inc., Mozilla Foundation, and Opera 
  * Software ASA.
  * 
  * You are granted a license to use, reproduce and create derivative works of 
  * this document.
  */
 
-#ifndef nsHtml5NamedCharactersAccel_h_
-#define nsHtml5NamedCharactersAccel_h_
+#ifndef nsHtml5NamedCharactersAccel_h
+#define nsHtml5NamedCharactersAccel_h
 
 #include "prtypes.h"
 #include "jArray.h"
 #include "nscore.h"
 #include "nsDebug.h"
 #include "prlog.h"
 #include "nsMemory.h"
 
 class nsHtml5NamedCharactersAccel
 {
   public:
     static const int32_t* const HILO_ACCEL[];
 };
 
-#endif // nsHtml5NamedCharactersAccel_h_
+#endif // nsHtml5NamedCharactersAccel_h
--- a/parser/html/nsHtml5OwningUTF16Buffer.h
+++ b/parser/html/nsHtml5OwningUTF16Buffer.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5OwningUTF16Buffer_h_
-#define nsHtml5OwningUTF16Buffer_h_
+#ifndef nsHtml5OwningUTF16Buffer_h
+#define nsHtml5OwningUTF16Buffer_h
 
 #include "nsHtml5UTF16Buffer.h"
 
 class nsHtml5OwningUTF16Buffer : public nsHtml5UTF16Buffer
 {
   private:
 
     /**
@@ -48,9 +48,9 @@ class nsHtml5OwningUTF16Buffer : public 
     void Swap(nsHtml5OwningUTF16Buffer* aOther);
 
     nsrefcnt AddRef();
     nsrefcnt Release();
   private:
     nsAutoRefCnt mRefCnt;
 };
 
-#endif // nsHtml5OwningUTF16Buffer_h_
+#endif // nsHtml5OwningUTF16Buffer_h
--- a/parser/html/nsHtml5Parser.h
+++ b/parser/html/nsHtml5Parser.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; 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 NS_HTML5_PARSER__
-#define NS_HTML5_PARSER__
+#ifndef NS_HTML5_PARSER
+#define NS_HTML5_PARSER
 
 #include "nsAutoPtr.h"
 #include "nsIParser.h"
 #include "nsDeque.h"
 #include "nsIURL.h"
 #include "nsParserCIID.h"
 #include "nsITokenizer.h"
 #include "nsThreadUtils.h"
--- a/parser/html/nsHtml5PendingNotification.h
+++ b/parser/html/nsHtml5PendingNotification.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5PendingNotification_h__
-#define nsHtml5PendingNotification_h__
+#ifndef nsHtml5PendingNotification_h
+#define nsHtml5PendingNotification_h
 
 #include "nsNodeUtils.h"
 
 class nsHtml5TreeBuilder;
 
 class nsHtml5PendingNotification {
   public:
 
@@ -43,9 +43,9 @@ class nsHtml5PendingNotification {
     nsIContent* mParent;
 
     /**
      * Child count at start of notification deferring
      */
     uint32_t    mChildCount;
 };
 
-#endif // nsHtml5PendingNotification_h__
+#endif // nsHtml5PendingNotification_h
--- a/parser/html/nsHtml5PlainTextUtils.h
+++ b/parser/html/nsHtml5PlainTextUtils.h
@@ -1,16 +1,16 @@
 /* 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 nsHtml5PlainTextUtils_h_
-#define nsHtml5PlainTextUtils_h_
+#ifndef nsHtml5PlainTextUtils_h
+#define nsHtml5PlainTextUtils_h
 
 #include "nsHtml5HtmlAttributes.h"
 
 class nsHtml5PlainTextUtils
 {
   public:
     static nsHtml5HtmlAttributes* NewLinkAttributes();
 };
 
-#endif // nsHtml5PlainTextUtils_h_
+#endif // nsHtml5PlainTextUtils_h
--- a/parser/html/nsHtml5Portability.h
+++ b/parser/html/nsHtml5Portability.h
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit Portability.java instead and regenerate.
  */
 
-#ifndef nsHtml5Portability_h__
-#define nsHtml5Portability_h__
+#ifndef nsHtml5Portability_h
+#define nsHtml5Portability_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5RefPtr.h
+++ b/parser/html/nsHtml5RefPtr.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 nsHtml5RefPtr_h___
-#define nsHtml5RefPtr_h___
+#ifndef nsHtml5RefPtr_h
+#define nsHtml5RefPtr_h
 
 #include "nsIThread.h"
 
 template <class T>
 class nsHtml5RefPtrReleaser : public nsRunnable
   {
     private:
       T* mPtr;
@@ -480,9 +480,9 @@ bool
 operator==( int lhs, const nsHtml5RefPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
     return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 #endif // !defined(HAVE_CPP_TROUBLE_COMPARING_TO_ZERO)
 
-#endif // !defined(nsHtml5RefPtr_h___)
+#endif // !defined(nsHtml5RefPtr_h)
--- a/parser/html/nsHtml5ReleasableAttributeName.h
+++ b/parser/html/nsHtml5ReleasableAttributeName.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 nsHtml5ReleasableAttributeName_h__
-#define nsHtml5ReleasableAttributeName_h__
+#ifndef nsHtml5ReleasableAttributeName_h
+#define nsHtml5ReleasableAttributeName_h
 
 #include "nsHtml5AttributeName.h"
 #include "mozilla/Attributes.h"
 
 class nsHtml5AtomTable;
 
 class nsHtml5ReleasableAttributeName MOZ_FINAL : public nsHtml5AttributeName
 {
   public:
     nsHtml5ReleasableAttributeName(int32_t* uri, nsIAtom** local, nsIAtom** prefix);
     virtual nsHtml5AttributeName* cloneAttributeName(nsHtml5AtomTable* aInterner);
     virtual void release();
 };
 
-#endif // nsHtml5ReleasableAttributeName_h__
+#endif // nsHtml5ReleasableAttributeName_h
--- a/parser/html/nsHtml5ReleasableElementName.h
+++ b/parser/html/nsHtml5ReleasableElementName.h
@@ -1,19 +1,19 @@
 /* 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 nsHtml5ReleasableElementName_h__
-#define nsHtml5ReleasableElementName_h__
+#ifndef nsHtml5ReleasableElementName_h
+#define nsHtml5ReleasableElementName_h
 
 #include "nsHtml5ElementName.h"
 #include "mozilla/Attributes.h"
 
 class nsHtml5ReleasableElementName MOZ_FINAL : public nsHtml5ElementName
 {
   public:
     nsHtml5ReleasableElementName(nsIAtom* name);
     virtual void release();
     virtual nsHtml5ElementName* cloneElementName(nsHtml5AtomTable* interner);
 };
 
-#endif // nsHtml5ReleasableElementName_h__
+#endif // nsHtml5ReleasableElementName_h
--- a/parser/html/nsHtml5SVGLoadDispatcher.h
+++ b/parser/html/nsHtml5SVGLoadDispatcher.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 nsHtml5SVGLoadDispatcher_h_
-#define nsHtml5SVGLoadDispatcher_h_
+#ifndef nsHtml5SVGLoadDispatcher_h
+#define nsHtml5SVGLoadDispatcher_h
 
 #include "nsThreadUtils.h"
 #include "nsIContent.h"
 
 class nsHtml5SVGLoadDispatcher : public nsRunnable
 {
   private:
     nsCOMPtr<nsIContent> mElement;
     nsCOMPtr<nsIDocument> mDocument;
   public:
     nsHtml5SVGLoadDispatcher(nsIContent* aElement);
     NS_IMETHOD Run();
 };
 
-#endif // nsHtml5SVGLoadDispatcher_h_
+#endif // nsHtml5SVGLoadDispatcher_h
--- a/parser/html/nsHtml5Speculation.h
+++ b/parser/html/nsHtml5Speculation.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5Speculation_h__
-#define nsHtml5Speculation_h__
+#ifndef nsHtml5Speculation_h
+#define nsHtml5Speculation_h
 
 #include "nsHtml5OwningUTF16Buffer.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsAHtml5TreeOpSink.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
@@ -63,9 +63,9 @@ class nsHtml5Speculation MOZ_FINAL : pub
      */
     int32_t                             mStartLineNumber;
     
     nsAutoPtr<nsAHtml5TreeBuilderState> mSnapshot;
 
     nsTArray<nsHtml5TreeOperation>      mOpQueue;
 };
 
-#endif // nsHtml5Speculation_h__
+#endif // nsHtml5Speculation_h
--- a/parser/html/nsHtml5SpeculativeLoad.h
+++ b/parser/html/nsHtml5SpeculativeLoad.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5SpeculativeLoad_h_
-#define nsHtml5SpeculativeLoad_h_
+#ifndef nsHtml5SpeculativeLoad_h
+#define nsHtml5SpeculativeLoad_h
 
 #include "nsString.h"
 
 class nsHtml5TreeOpExecutor;
 
 enum eHtml5SpeculativeLoad {
 #ifdef DEBUG
   eSpeculativeLoadUninitialized,
@@ -127,9 +127,9 @@ class nsHtml5SpeculativeLoad {
     /**
      * If mOpCode is eSpeculativeLoadImage or eSpeculativeLoadScript[FromHead],
      * this is the value of the "crossorigin" attribute.  If the
      * attribute is not set, this will be a void string.
      */
     nsString mCrossOrigin;
 };
 
-#endif // nsHtml5SpeculativeLoad_h_
+#endif // nsHtml5SpeculativeLoad_h
--- a/parser/html/nsHtml5StackNode.h
+++ b/parser/html/nsHtml5StackNode.h
@@ -21,18 +21,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit StackNode.java instead and regenerate.
  */
 
-#ifndef nsHtml5StackNode_h__
-#define nsHtml5StackNode_h__
+#ifndef nsHtml5StackNode_h
+#define nsHtml5StackNode_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5StateSnapshot.h
+++ b/parser/html/nsHtml5StateSnapshot.h
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit StateSnapshot.java instead and regenerate.
  */
 
-#ifndef nsHtml5StateSnapshot_h__
-#define nsHtml5StateSnapshot_h__
+#ifndef nsHtml5StateSnapshot_h
+#define nsHtml5StateSnapshot_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5StreamParser.h
+++ b/parser/html/nsHtml5StreamParser.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; 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 nsHtml5StreamParser_h__
-#define nsHtml5StreamParser_h__
+#ifndef nsHtml5StreamParser_h
+#define nsHtml5StreamParser_h
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIStreamListener.h"
 #include "nsICharsetDetectionObserver.h"
 #include "nsHtml5MetaScanner.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5TreeOpExecutor.h"
@@ -556,9 +556,9 @@ class nsHtml5StreamParser : public nsISt
     /**
      * The pref html5.flushtimer.subsequentdelay: Time in milliseconds between
      * the time a network buffer is seen and the timer firing when the
      * timer has already fired previously in this parse.
      */
     static int32_t                sTimerSubsequentDelay;
 };
 
-#endif // nsHtml5StreamParser_h__
+#endif // nsHtml5StreamParser_h
--- a/parser/html/nsHtml5StringParser.h
+++ b/parser/html/nsHtml5StringParser.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5StringParser_h_
-#define nsHtml5StringParser_h_
+#ifndef nsHtml5StringParser_h
+#define nsHtml5StringParser_h
 
 #include "nsHtml5AtomTable.h"
 #include "nsParserBase.h"
 
 class nsHtml5TreeOpExecutor;
 class nsHtml5TreeBuilder;
 class nsHtml5Tokenizer;
 class nsIContent;
@@ -79,9 +79,9 @@ class nsHtml5StringParser : public nsPar
 
     /**
      * The scoped atom table
      */
     nsHtml5AtomTable                    mAtomTable;
 
 };
 
-#endif // nsHtml5StringParser_h_
+#endif // nsHtml5StringParser_h
--- a/parser/html/nsHtml5Tokenizer.h
+++ b/parser/html/nsHtml5Tokenizer.h
@@ -23,18 +23,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit Tokenizer.java instead and regenerate.
  */
 
-#ifndef nsHtml5Tokenizer_h__
-#define nsHtml5Tokenizer_h__
+#ifndef nsHtml5Tokenizer_h
+#define nsHtml5Tokenizer_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5DocumentMode.h"
--- a/parser/html/nsHtml5TokenizerLoopPolicies.h
+++ b/parser/html/nsHtml5TokenizerLoopPolicies.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5TokenizerLoopPolicies_h_
-#define nsHtml5TokenizerLoopPolicies_h_
+#ifndef nsHtml5TokenizerLoopPolicies_h
+#define nsHtml5TokenizerLoopPolicies_h
 
 /**
  * This policy does not report tokenizer transitions anywhere. To be used
  * when _not_ viewing source.
  */
 struct nsHtml5SilentPolicy
 {
   static const bool reportErrors = false;
@@ -35,9 +35,9 @@ struct nsHtml5ViewSourcePolicy
                             int32_t aPos) {
     return aHighlighter->Transition(aState, aReconsume, aPos);
   }
   static void completedNamedCharacterReference(nsHtml5Highlighter* aHighlighter) {
     aHighlighter->CompletedNamedCharacterReference();
   }
 };
 
-#endif // nsHtml5TokenizerLoopPolicies_h_
+#endif // nsHtml5TokenizerLoopPolicies_h
--- a/parser/html/nsHtml5TreeBuilder.h
+++ b/parser/html/nsHtml5TreeBuilder.h
@@ -23,18 +23,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit TreeBuilder.java instead and regenerate.
  */
 
-#ifndef nsHtml5TreeBuilder_h__
-#define nsHtml5TreeBuilder_h__
+#ifndef nsHtml5TreeBuilder_h
+#define nsHtml5TreeBuilder_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsITimer.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
--- a/parser/html/nsHtml5TreeOpExecutor.h
+++ b/parser/html/nsHtml5TreeOpExecutor.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5TreeOpExecutor_h__
-#define nsHtml5TreeOpExecutor_h__
+#ifndef nsHtml5TreeOpExecutor_h
+#define nsHtml5TreeOpExecutor_h
 
 #include "nsIAtom.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsTraceRefcnt.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5SpeculativeLoad.h"
@@ -410,9 +410,9 @@ class nsHtml5TreeOpExecutor : public nsC
 
     /**
      * Get a nsIURI for an nsString if the URL hasn't been preloaded yet.
      */
     already_AddRefed<nsIURI> ConvertIfNotPreloadedYet(const nsAString& aURL);
 
 };
 
-#endif // nsHtml5TreeOpExecutor_h__
+#endif // nsHtml5TreeOpExecutor_h
--- a/parser/html/nsHtml5TreeOpStage.h
+++ b/parser/html/nsHtml5TreeOpStage.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5TreeOpStage_h___
-#define nsHtml5TreeOpStage_h___
+#ifndef nsHtml5TreeOpStage_h
+#define nsHtml5TreeOpStage_h
 
 #include "mozilla/Mutex.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsTArray.h"
 #include "nsAHtml5TreeOpSink.h"
 #include "nsHtml5SpeculativeLoad.h"
 
 class nsHtml5TreeOpStage : public nsAHtml5TreeOpSink {
@@ -46,9 +46,9 @@ class nsHtml5TreeOpStage : public nsAHtm
 
   private:
     nsTArray<nsHtml5TreeOperation> mOpQueue;
     nsTArray<nsHtml5SpeculativeLoad> mSpeculativeLoadQueue;
     mozilla::Mutex mMutex;
     
 };
 
-#endif /* nsHtml5TreeOpStage_h___ */
+#endif /* nsHtml5TreeOpStage_h */
--- a/parser/html/nsHtml5TreeOperation.h
+++ b/parser/html/nsHtml5TreeOperation.h
@@ -1,14 +1,14 @@
 /* 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 nsHtml5TreeOperation_h__
-#define nsHtml5TreeOperation_h__
+#ifndef nsHtml5TreeOperation_h
+#define nsHtml5TreeOperation_h
 
 #include "nsHtml5DocumentMode.h"
 #include "nsHtml5HtmlAttributes.h"
 #include "nsXPCOMStrings.h"
 
 class nsIContent;
 class nsHtml5TreeOpExecutor;
 class nsHtml5StateSnapshot;
@@ -389,9 +389,9 @@ class nsHtml5TreeOperation {
       PRUnichar*                      unicharPtr;
       char*                           charPtr;
       nsHtml5TreeOperationStringPair* stringPair;
       nsAHtml5TreeBuilderState*       state;
       int32_t                         integer;
     }                   mOne, mTwo, mThree, mFour;
 };
 
-#endif // nsHtml5TreeOperation_h__
+#endif // nsHtml5TreeOperation_h
--- a/parser/html/nsHtml5UTF16Buffer.h
+++ b/parser/html/nsHtml5UTF16Buffer.h
@@ -20,18 +20,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
 /*
  * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT.
  * Please edit UTF16Buffer.java instead and regenerate.
  */
 
-#ifndef nsHtml5UTF16Buffer_h__
-#define nsHtml5UTF16Buffer_h__
+#ifndef nsHtml5UTF16Buffer_h
+#define nsHtml5UTF16Buffer_h
 
 #include "nsIAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
--- a/parser/html/nsHtml5ViewSourceUtils.h
+++ b/parser/html/nsHtml5ViewSourceUtils.h
@@ -1,17 +1,17 @@
 /* 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 nsHtml5ViewSourceUtils_h_
-#define nsHtml5ViewSourceUtils_h_
+#ifndef nsHtml5ViewSourceUtils_h
+#define nsHtml5ViewSourceUtils_h
 
 #include "nsHtml5HtmlAttributes.h"
 
 class nsHtml5ViewSourceUtils
 {
   public:
     static nsHtml5HtmlAttributes* NewBodyAttributes();
     static nsHtml5HtmlAttributes* NewLinkAttributes();
 };
 
-#endif // nsHtml5ViewSourceUtils_h_
+#endif // nsHtml5ViewSourceUtils_h
--- a/parser/html/nsParserUtils.h
+++ b/parser/html/nsParserUtils.h
@@ -1,22 +1,22 @@
 /* -*- Mode: C++; tab-width: 8; 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 nsParserUtils_h_
-#define nsParserUtils_h_
+#ifndef nsParserUtils_h
+#define nsParserUtils_h
 
 #include "nsIScriptableUnescapeHTML.h"
 #include "nsIParserUtils.h"
 #include "mozilla/Attributes.h"
 
 class nsParserUtils MOZ_FINAL : public nsIScriptableUnescapeHTML,
                                 public nsIParserUtils
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISCRIPTABLEUNESCAPEHTML
   NS_DECL_NSIPARSERUTILS
 };
 
-#endif // nsParserUtils_h_
+#endif // nsParserUtils_h