diff --git a/accessible/src/base/TextUpdater.h b/accessible/src/base/TextUpdater.h
index 3d6e24c11f5..18feda4efd1 100644
--- a/accessible/src/base/TextUpdater.h
+++ b/accessible/src/base/TextUpdater.h
@@ -3,12 +3,15 @@
  * 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 TextUpdater_h_
-#define TextUpdater_h_
+#ifndef mozilla_a11y_TextUpdater_h__
+#define mozilla_a11y_TextUpdater_h__
 
 #include "AccEvent.h"
 #include "HyperTextAccessible.h"
 
+namespace mozilla {
+namespace a11y {
+
 /**
  * Used to find a difference between old and new text and fire text change
  * events.
@@ -19,13 +22,11 @@ public:
   /**
    * Start text of the text leaf update.
    */
-  static void Run(DocAccessible* aDocument,
-                  mozilla::a11y::TextLeafAccessible* aTextLeaf,
+  static void Run(DocAccessible* aDocument, TextLeafAccessible* aTextLeaf,
                   const nsAString& aNewText);
 
 private:
-  TextUpdater(DocAccessible* aDocument,
-              mozilla::a11y::TextLeafAccessible* aTextLeaf) :
+  TextUpdater(DocAccessible* aDocument, TextLeafAccessible* aTextLeaf) :
     mDocument(aDocument), mTextLeaf(aTextLeaf), mHyperText(nsnull),
     mTextOffset(-1) { }
 
@@ -84,9 +85,12 @@ private:
 
 private:
   DocAccessible* mDocument;
-  mozilla::a11y::TextLeafAccessible* mTextLeaf;
+  TextLeafAccessible* mTextLeaf;
   HyperTextAccessible* mHyperText;
   PRInt32 mTextOffset;
 };
 
+} // namespace a11y
+} // namespace mozilla
+
 #endif
diff --git a/accessible/src/xul/XULSelectControlAccessible.h b/accessible/src/xul/XULSelectControlAccessible.h
index 8720eec800b..e9fa5c45b00 100644
--- a/accessible/src/xul/XULSelectControlAccessible.h
+++ b/accessible/src/xul/XULSelectControlAccessible.h
@@ -4,12 +4,15 @@
  * 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 _XULSelectControlAccessible_H_
-#define _XULSelectControlAccessible_H_
+#ifndef mozilla_a11y_XULSelectControlAccessible_h__
+#define mozilla_a11y_XULSelectControlAccessible_h__
 
 #include "AccessibleWrap.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 
+namespace mozilla {
+namespace a11y {
+
 /**
  * The basic implementation of accessible selection for XUL select controls.
  */
@@ -43,5 +46,8 @@ protected:
   nsCOMPtr<nsIDOMXULSelectControlElement> mSelectControl;
 };
 
+} // namespace a11y
+} // namespace mozilla
+
 #endif