Bug 2054311 - Sort includes in accessible/. r=accessibility-platform-reviewers,Jamie

Autogenerated with:

    cp dom/.clang-format accessible/ && mach format accessible/**.{cpp,h,mm}

Manual fixes:

  * Atk individual includes need to become atk/atk.h because otherwise some symbols incorrectly get hidden visibility.

Differential Revision: https://phabricator.services.mozilla.com/D311692

accessible/.clang-format

@@ -0,0 +1,2 @@
+BasedOnStyle: InheritParentConfig
+SortIncludes: true

accessible/android/AccessibleWrap.cpp

@@ -4,32 +4,31 @@
 
 #include "AccessibleWrap.h"
 
-#include "JavaBuiltins.h"
-#include "LocalAccessible-inl.h"
-#include "HyperTextAccessible-inl.h"
 #include "AccAttributes.h"
 #include "AccEvent.h"
 #include "AndroidInputType.h"
 #include "DocAccessibleWrap.h"
-#include "SessionAccessibility.h"
-#include "TextLeafAccessible.h"
-#include "TraversalRule.h"
+#include "HyperTextAccessible-inl.h"
+#include "JavaBuiltins.h"
+#include "LocalAccessible-inl.h"
 #include "Pivot.h"
 #include "Platform.h"
+#include "RootAccessible.h"
+#include "SessionAccessibility.h"
+#include "TextLeafAccessible.h"
+#include "TextLeafRange.h"
+#include "TraversalRule.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
+#include "mozilla/a11y/PDocAccessibleChild.h"
+#include "mozilla/jni/GeckoBundleUtils.h"
+#include "nsAccUtils.h"
 #include "nsAccessibilityService.h"
 #include "nsEventShell.h"
 #include "nsIAccessibleAnnouncementEvent.h"
 #include "nsIAccessiblePivot.h"
-#include "nsAccUtils.h"
 #include "nsTextEquivUtils.h"
 #include "nsWhitespaceTokenizer.h"
-#include "RootAccessible.h"
-#include "TextLeafRange.h"
-
-#include "mozilla/a11y/PDocAccessibleChild.h"
-#include "mozilla/jni/GeckoBundleUtils.h"
-#include "mozilla/a11y/DocAccessibleParent.h"
-#include "mozilla/Maybe.h"
 
 // icu TRUE conflicting with java::sdk::Boolean::TRUE()
 // https://searchfox.org/mozilla-central/rev/ce02064d8afc8673cef83c92896ee873bd35e7ae/intl/icu/source/common/unicode/umachine.h#265

accessible/android/AccessibleWrap.h

@@ -19,8 +19,7 @@ class AccessibleWrap : public LocalAccessible {
   virtual ~AccessibleWrap();
 
   MOZ_CAN_RUN_SCRIPT_BOUNDARY  // TODO: Mark this as MOZ_CAN_RUN_SCRIPT
-      virtual nsresult
-      HandleAccEvent(AccEvent* aEvent) override;
+      virtual nsresult HandleAccEvent(AccEvent* aEvent) override;
 
   virtual void Shutdown() override;
 

accessible/android/DocAccessibleWrap.cpp

@@ -2,18 +2,19 @@
  * 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 "LocalAccessible-inl.h"
+#include "DocAccessibleWrap.h"
+
 #include "AccAttributes.h"
 #include "DocAccessibleChild.h"
-#include "DocAccessibleWrap.h"
-#include "nsIDocShell.h"
-#include "nsLayoutUtils.h"
-#include "nsAccessibilityService.h"
-#include "nsAccUtils.h"
+#include "LocalAccessible-inl.h"
 #include "Pivot.h"
 #include "SessionAccessibility.h"
 #include "TraversalRule.h"
 #include "mozilla/PresShell.h"
+#include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
+#include "nsIDocShell.h"
+#include "nsLayoutUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/android/Platform.cpp

@@ -3,14 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Platform.h"
+
 #include "DocAccessibleWrap.h"
 #include "SessionAccessibility.h"
-#include "mozilla/a11y/RemoteAccessible.h"
+#include "TextLeafRange.h"
 #include "mozilla/Components.h"
+#include "mozilla/a11y/RemoteAccessible.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIAccessiblePivot.h"
 #include "nsIStringBundle.h"
-#include "TextLeafRange.h"
 
 #define ROLE_STRINGS_URL "chrome://global/locale/AccessFu.properties"
 

accessible/android/SessionAccessibility.cpp

@@ -3,33 +3,33 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SessionAccessibility.h"
-#include "LocalAccessible-inl.h"
-#include "AndroidUiThread.h"
-#include "AndroidBridge.h"
-#include "DocAccessibleParent.h"
-#include "IDSet.h"
-#include "nsThreadUtils.h"
+
 #include "AccAttributes.h"
 #include "AccessibilityEvent.h"
+#include "AndroidBridge.h"
+#include "AndroidUiThread.h"
+#include "DocAccessibleParent.h"
 #include "DocAccessibleWrap.h"
+#include "IDSet.h"
 #include "JavaBuiltins.h"
-#include "nsAccessibilityService.h"
-#include "nsAccUtils.h"
-
+#include "LocalAccessible-inl.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/PresShell.h"
-#include "mozilla/dom/BrowserParent.h"
-#include "mozilla/dom/CanonicalBrowsingContext.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/a11y/Accessible.h"
 #include "mozilla/a11y/DocAccessibleParent.h"
 #include "mozilla/a11y/DocManager.h"
 #include "mozilla/a11y/HyperTextAccessibleBase.h"
+#include "mozilla/dom/BrowserParent.h"
+#include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/jni/GeckoBundleUtils.h"
 #include "mozilla/jni/NativesInlines.h"
 #include "mozilla/widget/GeckoViewSupport.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/dom/MouseEventBinding.h"
+#include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
+#include "nsThreadUtils.h"
 
 #ifdef DEBUG
 #  include <android/log.h>

accessible/android/TraversalRule.cpp

@@ -4,11 +4,10 @@
 
 #include "TraversalRule.h"
 
-#include "mozilla/a11y/Accessible.h"
-
-#include "mozilla/a11y/Role.h"
 #include "HTMLListAccessible.h"
 #include "SessionAccessibility.h"
+#include "mozilla/a11y/Accessible.h"
+#include "mozilla/a11y/Role.h"
 #include "nsAccUtils.h"
 #include "nsIAccessiblePivot.h"
 

accessible/aom/AccessibleNode.cpp

@@ -3,17 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccessibleNode.h"
+
+#include "DocAccessible.h"
+#include "LocalAccessible-inl.h"
+#include "mozilla/StaticPrefs_accessibility.h"
 #include "mozilla/dom/AccessibleNodeBinding.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMStringList.h"
-#include "mozilla/StaticPrefs_accessibility.h"
-#include "nsContentUtils.h"
-
-#include "LocalAccessible-inl.h"
-#include "nsAccessibilityService.h"
-#include "DocAccessible.h"
-
 #include "mozilla/dom/ToJSValue.h"
+#include "nsAccessibilityService.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/aom/AccessibleNode.h

@@ -5,12 +5,12 @@
 #ifndef A11Y_AOM_ACCESSIBLENODE_H
 #define A11Y_AOM_ACCESSIBLENODE_H
 
-#include "nsTHashMap.h"
-#include "nsRefPtrHashtable.h"
-#include "nsWrapperCache.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/Nullable.h"
+#include "nsRefPtrHashtable.h"
+#include "nsTHashMap.h"
+#include "nsWrapperCache.h"
 
 class nsINode;
 

accessible/atk/AccessibleWrap.cpp

@@ -4,32 +4,30 @@
 
 #include "AccessibleWrap.h"
 
-#include "LocalAccessible-inl.h"
 #include "AccAttributes.h"
 #include "ApplicationAccessibleWrap.h"
-#include "InterfaceInitFuncs.h"
-#include "nsAccUtils.h"
-#include "mozilla/a11y/PDocAccessible.h"
-#include "OuterDocAccessible.h"
-#include "RemoteAccessible.h"
 #include "DocAccessibleParent.h"
-#include "RootAccessible.h"
-#include "mozilla/a11y/TableAccessible.h"
-#include "mozilla/a11y/TableCellAccessible.h"
-#include "nsMai.h"
-#include "nsMaiHyperlink.h"
-#include "nsString.h"
-#include "nsStateMap.h"
-#include "mozilla/a11y/Platform.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
+#include "OuterDocAccessible.h"
 #include "Relation.h"
+#include "RemoteAccessible.h"
 #include "RootAccessible.h"
 #include "States.h"
-#include "nsIAccessibleAnnouncementEvent.h"
-#include "nsISimpleEnumerator.h"
-
 #include "mozilla/Sprintf.h"
+#include "mozilla/a11y/PDocAccessible.h"
+#include "mozilla/a11y/Platform.h"
+#include "mozilla/a11y/TableAccessible.h"
+#include "mozilla/a11y/TableCellAccessible.h"
+#include "nsAccUtils.h"
 #include "nsAccessibilityService.h"
 #include "nsComponentManagerUtils.h"
+#include "nsIAccessibleAnnouncementEvent.h"
+#include "nsISimpleEnumerator.h"
+#include "nsMai.h"
+#include "nsMaiHyperlink.h"
+#include "nsStateMap.h"
+#include "nsString.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/atk/AccessibleWrap.h

@@ -5,8 +5,8 @@
 #ifndef NS_ACCESSIBLE_WRAP_H_
 #define NS_ACCESSIBLE_WRAP_H_
 
-#include "nsCOMPtr.h"
 #include "LocalAccessible.h"
+#include "nsCOMPtr.h"
 
 struct _AtkObject;
 typedef struct _AtkObject AtkObject;

accessible/atk/ApplicationAccessibleWrap.cpp

@@ -4,11 +4,11 @@
 
 #include "ApplicationAccessibleWrap.h"
 
-#include "nsMai.h"
-#include "nsAccessibilityService.h"
-
 #include <gtk/gtk.h>
+
 #include "atk/atkobject.h"
+#include "nsAccessibilityService.h"
+#include "nsMai.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/atk/DOMtoATK.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DOMtoATK.h"
+
 #include "nsUTF8Utils.h"
 
 namespace mozilla::a11y::DOMtoATK {

accessible/atk/DOMtoATK.h

@@ -6,8 +6,9 @@
 #define ACCESSIBLE_ATK_DOMTOATK_H_
 
 #include <glib.h>
-#include "mozilla/a11y/HyperTextAccessibleBase.h"
+
 #include "mozilla/Utf16.h"
+#include "mozilla/a11y/HyperTextAccessibleBase.h"
 #include "nsString.h"
 
 /**

accessible/atk/DocAccessibleWrap.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DocAccessibleWrap.h"
+
 #include "mozilla/PresShell.h"
 #include "nsIWidgetListener.h"
 #include "nsTArray.h"

accessible/atk/RootAccessibleWrap.cpp

@@ -4,11 +4,11 @@
 
 #include "RootAccessibleWrap.h"
 
+#include <glib-object.h>
+
 #include "atk/atkobject.h"
 #include "nsTArray.h"
 
-#include <glib-object.h>
-
 using namespace mozilla::a11y;
 
 GtkWindowAccessible::GtkWindowAccessible(AtkObject* aAccessible) {

accessible/atk/UtilInterface.cpp

@@ -2,16 +2,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/. */
 
+#include <atk/atk.h>
+#include <gtk/gtk.h>
+#include <string.h>
+
 #include "ApplicationAccessible.h"
 #include "mozilla/Likely.h"
 #include "nsAccessibilityService.h"
 #include "nsMai.h"
 
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/atk/nsMai.h

@@ -6,8 +6,8 @@
 #define NS_MAI_H_
 
 #include <atk/atk.h>
-#include <glib.h>
 #include <glib-object.h>
+#include <glib.h>
 
 #include "AccessibleWrap.h"
 

accessible/atk/nsMaiHyperlink.cpp

@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsIURI.h"
 #include "nsMaiHyperlink.h"
+
 #include "mozilla/a11y/RemoteAccessible.h"
+#include "nsIURI.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiHyperlink.h

@@ -5,11 +5,11 @@
 #ifndef MAI_HYPERLINK_H_
 #define MAI_HYPERLINK_H_
 
-#include "nsMai.h"
 #include "mozilla/a11y/Accessible.h"
 #include "mozilla/a11y/LocalAccessible.h"
 #include "mozilla/a11y/RemoteAccessible.h"
 #include "nsDebug.h"
+#include "nsMai.h"
 
 struct _AtkHyperlink;
 typedef struct _AtkHyperlink AtkHyperlink;

accessible/atk/nsMaiInterfaceAction.cpp

@@ -3,13 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "InterfaceInitFuncs.h"
-
 #include "LocalAccessible-inl.h"
-#include "nsMai.h"
-#include "mozilla/Likely.h"
-#include "nsAccessibilityService.h"
 #include "Relation.h"
 #include "RemoteAccessible.h"
+#include "mozilla/Likely.h"
+#include "nsAccessibilityService.h"
+#include "nsMai.h"
 #include "nsString.h"
 
 using namespace mozilla;

accessible/atk/nsMaiInterfaceComponent.cpp

@@ -2,19 +2,18 @@
  * 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 "InterfaceInitFuncs.h"
-
-#include "LocalAccessible-inl.h"
 #include "AccessibleWrap.h"
-#include "nsAccUtils.h"
-#include "nsMai.h"
-#include "nsWindow.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
 #include "mozilla/Likely.h"
 #include "mozilla/a11y/DocAccessibleParent.h"
 #include "mozilla/a11y/RemoteAccessible.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/Document.h"
+#include "nsAccUtils.h"
 #include "nsAccessibilityService.h"
+#include "nsMai.h"
+#include "nsWindow.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/atk/nsMaiInterfaceDocument.cpp

@@ -2,16 +2,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/. */
 
-#include "InterfaceInitFuncs.h"
-
-#include "LocalAccessible-inl.h"
 #include "AccessibleWrap.h"
 #include "DocAccessible.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
+#include "RemoteAccessible.h"
+#include "mozilla/Likely.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
 #include "nsAccUtils.h"
 #include "nsMai.h"
-#include "RemoteAccessible.h"
-#include "mozilla/a11y/DocAccessibleParent.h"
-#include "mozilla/Likely.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceEditableText.cpp

@@ -2,14 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "InterfaceInitFuncs.h"
-
-#include "LocalAccessible-inl.h"
 #include "HyperTextAccessible-inl.h"
-#include "nsMai.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
 #include "RemoteAccessible.h"
-#include "nsString.h"
 #include "mozilla/Likely.h"
+#include "nsMai.h"
+#include "nsString.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp

@@ -3,9 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "InterfaceInitFuncs.h"
-
-#include "nsMaiHyperlink.h"
 #include "mozilla/Likely.h"
+#include "nsMaiHyperlink.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceHypertext.cpp

@@ -2,14 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "InterfaceInitFuncs.h"
-
-#include "LocalAccessible-inl.h"
 #include "HyperTextAccessible.h"
-#include "nsMai.h"
-#include "nsMaiHyperlink.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
 #include "RemoteAccessible.h"
 #include "mozilla/Likely.h"
+#include "nsMai.h"
+#include "nsMaiHyperlink.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceImage.cpp

@@ -2,13 +2,12 @@
  * 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 "InterfaceInitFuncs.h"
-
 #include "AccessibleWrap.h"
-#include "mozilla/a11y/Accessible.h"
+#include "InterfaceInitFuncs.h"
 #include "mozilla/Likely.h"
-#include "nsMai.h"
+#include "mozilla/a11y/Accessible.h"
 #include "nsIAccessibleTypes.h"
+#include "nsMai.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/atk/nsMaiInterfaceSelection.cpp

@@ -2,15 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "InterfaceInitFuncs.h"
+#include <atk/atk.h>
 
-#include "LocalAccessible-inl.h"
 #include "AccessibleWrap.h"
-#include "nsMai.h"
+#include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
 #include "mozilla/Likely.h"
-
-#include <atk/atkobject.h>
-#include <atk/atkselection.h>
+#include "nsMai.h"
 
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceTable.cpp

@@ -2,17 +2,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/. */
 
-#include "InterfaceInitFuncs.h"
-
 #include "AccessibleWrap.h"
+#include "InterfaceInitFuncs.h"
+#include "RemoteAccessible.h"
+#include "mozilla/Likely.h"
 #include "mozilla/a11y/TableAccessible.h"
 #include "nsAccessibilityService.h"
 #include "nsMai.h"
-#include "RemoteAccessible.h"
 #include "nsTArray.h"
 
-#include "mozilla/Likely.h"
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceTableCell.cpp

@@ -3,16 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "InterfaceInitFuncs.h"
-
+#include "RemoteAccessible.h"
+#include "mozilla/Likely.h"
 #include "mozilla/a11y/TableAccessible.h"
 #include "mozilla/a11y/TableCellAccessible.h"
 #include "nsAccessibilityService.h"
 #include "nsMai.h"
-#include "RemoteAccessible.h"
 #include "nsTArray.h"
 
-#include "mozilla/Likely.h"
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceText.cpp

@@ -2,23 +2,20 @@
  * 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 "AccAttributes.h"
+#include "DOMtoATK.h"
+#include "HyperTextAccessible-inl.h"
 #include "InterfaceInitFuncs.h"
+#include "LocalAccessible-inl.h"
+#include "RemoteAccessible.h"
+#include "mozilla/Likely.h"
 #include "mozilla/a11y/PDocAccessible.h"
 #include "nsAccessibilityService.h"
-#include "LocalAccessible-inl.h"
-#include "HyperTextAccessible-inl.h"
-#include "nsMai.h"
-#include "RemoteAccessible.h"
-#include "AccAttributes.h"
-
 #include "nsIAccessibleTypes.h"
 #include "nsISimpleEnumerator.h"
+#include "nsMai.h"
 #include "nsUTF8Utils.h"
 
-#include "mozilla/Likely.h"
-
-#include "DOMtoATK.h"
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/atk/nsMaiInterfaceValue.cpp

@@ -2,12 +2,11 @@
  * 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 "InterfaceInitFuncs.h"
-
 #include "AccessibleWrap.h"
-#include "nsMai.h"
+#include "InterfaceInitFuncs.h"
 #include "RemoteAccessible.h"
 #include "mozilla/Likely.h"
+#include "nsMai.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/atk/nsStateMap.h

@@ -6,10 +6,11 @@
 #define ACCESSIBLE_ATK_NSSTATEMAP_H_
 
 #include <atk/atk.h>
-#include "AccessibleWrap.h"
 
 #include <type_traits>
 
+#include "AccessibleWrap.h"
+
 // clang-format off
 /******************************************************************************
 The following accessible states aren't translated, just ignored:

accessible/base/ARIAMap.cpp

@@ -5,20 +5,17 @@
 #include "ARIAMap.h"
 
 #include "AccAttributes.h"
-#include "nsAccUtils.h"
-#include "nsCoreUtils.h"
-#include "mozilla/a11y/Role.h"
 #include "States.h"
-
-#include "nsAttrName.h"
-#include "nsGenericHTMLElement.h"
-#include "nsWhitespaceTokenizer.h"
-
 #include "mozilla/BinarySearch.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
-
+#include "nsAccUtils.h"
+#include "nsAttrName.h"
+#include "nsCoreUtils.h"
+#include "nsGenericHTMLElement.h"
 #include "nsUnicharUtils.h"
+#include "nsWhitespaceTokenizer.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/ARIAMap.h

@@ -9,7 +9,6 @@
 #include "mozilla/a11y/AccTypes.h"
 #include "mozilla/a11y/DocAccessible.h"
 #include "mozilla/a11y/Role.h"
-
 #include "nsAtom.h"
 #include "nsIContent.h"
 #include "nsTHashSet.h"

accessible/base/ARIAStateMap.cpp

@@ -3,10 +3,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ARIAMap.h"
-#include "nsAccUtils.h"
 #include "States.h"
-
 #include "mozilla/dom/Element.h"
+#include "nsAccUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/AccAttributes.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccAttributes.h"
+
 #include "StyleInfo.h"
 #include "mozilla/ToString.h"
 #include "nsAtom.h"

accessible/base/AccAttributes.h

@@ -5,12 +5,12 @@
 #ifndef AccAttributes_h_
 #define AccAttributes_h_
 
-#include "mozilla/a11y/AccGroupInfo.h"
 #include "mozilla/Variant.h"
-#include "nsTHashMap.h"
-#include "nsStringFwd.h"
-#include "mozilla/gfx/Matrix.h"
 #include "mozilla/WritingModes.h"
+#include "mozilla/a11y/AccGroupInfo.h"
+#include "mozilla/gfx/Matrix.h"
+#include "nsStringFwd.h"
+#include "nsTHashMap.h"
 
 class nsVariant;
 

accessible/base/AccEvent.cpp

@@ -4,18 +4,16 @@
 
 #include "AccEvent.h"
 
-#include "nsAccUtils.h"
-#include "xpcAccEvents.h"
 #include "States.h"
 #include "TextRange.h"
-#include "xpcAccessibleDocument.h"
-#include "xpcAccessibleTextRange.h"
-
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/UserActivation.h"
-
+#include "nsAccUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
+#include "xpcAccEvents.h"
+#include "xpcAccessibleDocument.h"
+#include "xpcAccessibleTextRange.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/AccEvent.h

@@ -5,9 +5,8 @@
 #ifndef AccEvent_H_
 #define AccEvent_H_
 
-#include "nsIAccessibleEvent.h"
-
 #include "mozilla/a11y/LocalAccessible.h"
+#include "nsIAccessibleEvent.h"
 
 class nsEventShell;
 namespace mozilla {

accessible/base/AccGroupInfo.cpp

@@ -3,14 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccGroupInfo.h"
-#include "mozilla/a11y/Accessible.h"
-#include "mozilla/a11y/TableAccessible.h"
-
-#include "nsAccUtils.h"
-#include "nsIAccessiblePivot.h"
 
 #include "Pivot.h"
 #include "States.h"
+#include "mozilla/a11y/Accessible.h"
+#include "mozilla/a11y/TableAccessible.h"
+#include "nsAccUtils.h"
+#include "nsIAccessiblePivot.h"
 
 using namespace mozilla::a11y;
 

accessible/base/AccGroupInfo.h

@@ -5,9 +5,9 @@
 #ifndef AccGroupInfo_h_
 #define AccGroupInfo_h_
 
-#include "nsISupportsImpl.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/a11y/Role.h"
+#include "nsISupportsImpl.h"
 
 namespace mozilla {
 namespace a11y {

accessible/base/AccIterator.cpp

@@ -4,19 +4,18 @@
 
 #include "AccIterator.h"
 
-#include "AccGroupInfo.h"
 #include "ARIAMap.h"
+#include "AccGroupInfo.h"
 #include "DocAccessible-inl.h"
 #include "LocalAccessible-inl.h"
-#include "nsAccUtils.h"
 #include "XULTreeAccessible.h"
-
 #include "mozilla/a11y/DocAccessibleParent.h"
 #include "mozilla/dom/DocumentOrShadowRoot.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementInternals.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/TreeOrderedArrayInlines.h"
+#include "nsAccUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/AccIterator.h

@@ -5,14 +5,14 @@
 #ifndef mozilla_a11y_AccIterator_h_
 #define mozilla_a11y_AccIterator_h_
 
+#include <memory>
+
 #include "Filters.h"
 #include "mozilla/a11y/DocAccessible.h"
 #include "mozilla/dom/Element.h"
-#include "nsTArray.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/TreeOrderedArray.h"
-
-#include <memory>
+#include "nsContentUtils.h"
+#include "nsTArray.h"
 
 class nsITreeView;
 

accessible/base/Asserts.cpp

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsIAccessibleRelation.h"
-#include "nsIAccessibleRole.h"
 #include "mozilla/a11y/RelationType.h"
 #include "mozilla/a11y/Role.h"
+#include "nsIAccessibleRelation.h"
+#include "nsIAccessibleRole.h"
 
 using namespace mozilla::a11y;
 

accessible/base/CacheConstants.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CacheConstants.h"
+
 #include "nsAccessibilityService.h"
 
 namespace mozilla::a11y {

accessible/base/CacheConstants.h

@@ -5,8 +5,8 @@
 #ifndef CacheConstants_h_
 #define CacheConstants_h_
 
-#include "nsGkAtoms.h"
 #include "mozilla/a11y/RelationType.h"
+#include "nsGkAtoms.h"
 
 namespace mozilla {
 namespace a11y {

accessible/base/CachedTableAccessible.cpp

@@ -6,15 +6,15 @@
 
 #include "AccIterator.h"
 #include "HTMLTableAccessible.h"
-#include "mozilla/a11y/DocAccessibleParent.h"
+#include "Pivot.h"
+#include "RemoteAccessible.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
 #include "nsAccUtils.h"
 #include "nsIAccessiblePivot.h"
 #include "nsThreadUtils.h"
-#include "Pivot.h"
-#include "RemoteAccessible.h"
 
 namespace mozilla::a11y {
 

accessible/base/CachedTableAccessible.h

@@ -5,9 +5,9 @@
 #ifndef CACHED_TABLE_ACCESSIBLE_H
 #define CACHED_TABLE_ACCESSIBLE_H
 
+#include "mozilla/UniquePtr.h"
 #include "mozilla/a11y/TableAccessible.h"
 #include "mozilla/a11y/TableCellAccessible.h"
-#include "mozilla/UniquePtr.h"
 #include "nsTHashMap.h"
 
 namespace mozilla::a11y {

accessible/base/CssAltContent.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CssAltContent.h"
+
 #include "DocAccessible-inl.h"
 #include "mozilla/a11y/DocManager.h"
 #include "mozilla/dom/Document.h"

accessible/base/DocManager.cpp

@@ -7,9 +7,9 @@
 #include "ApplicationAccessible.h"
 #include "DocAccessible-inl.h"
 #include "DocAccessibleParent.h"
-#include "nsAccessibilityService.h"
 #include "Platform.h"
 #include "RootAccessibleWrap.h"
+#include "nsAccessibilityService.h"
 
 #ifdef A11Y_LOG
 #  include "Logging.h"
@@ -26,12 +26,12 @@
 #include "mozilla/StaticPrefs_accessibility.h"
 #include "mozilla/dom/Event.h"  // for Event
 #include "nsContentUtils.h"
+#include "nsCoreUtils.h"
 #include "nsDocShellLoadTypes.h"
 #include "nsIChannel.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebNavigation.h"
 #include "nsIWebProgress.h"
-#include "nsCoreUtils.h"
 #include "xpcAccessibleDocument.h"
 
 using namespace mozilla;

accessible/base/DocManager.h

@@ -6,12 +6,12 @@
 #define mozilla_a11_DocManager_h_
 
 #include "mozilla/ClearOnShutdown.h"
-#include "nsIDOMEventListener.h"
-#include "nsRefPtrHashtable.h"
-#include "nsIWebProgressListener.h"
-#include "nsWeakReference.h"
 #include "mozilla/StaticPtr.h"
+#include "nsIDOMEventListener.h"
 #include "nsINode.h"
+#include "nsIWebProgressListener.h"
+#include "nsRefPtrHashtable.h"
+#include "nsWeakReference.h"
 
 namespace mozilla::dom {
 class Document;

accessible/base/EventQueue.cpp

@@ -4,12 +4,11 @@
 
 #include "EventQueue.h"
 
+#include "DocAccessibleChild.h"
+#include "LocalAccessible-inl.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/ProfilerMarkers.h"
-
-#include "LocalAccessible-inl.h"
 #include "nsEventShell.h"
-#include "DocAccessibleChild.h"
 #include "nsTextEquivUtils.h"
 #ifdef A11Y_LOG
 #  include "Logging.h"

accessible/base/EventTree.h

@@ -7,7 +7,6 @@
 
 #include "AccEvent.h"
 #include "LocalAccessible.h"
-
 #include "mozilla/a11y/DocAccessible.h"
 
 namespace mozilla {

accessible/base/FocusManager.cpp

@@ -4,17 +4,16 @@
 
 #include "FocusManager.h"
 
-#include "LocalAccessible-inl.h"
 #include "DocAccessible-inl.h"
+#include "LocalAccessible-inl.h"
+#include "mozilla/EventStateManager.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
+#include "mozilla/dom/BrowserParent.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/Element.h"
 #include "nsAccessibilityService.h"
 #include "nsEventShell.h"
-
 #include "nsFocusManager.h"
-#include "mozilla/a11y/DocAccessibleParent.h"
-#include "mozilla/EventStateManager.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/BrowserParent.h"
 
 namespace mozilla {
 namespace a11y {

accessible/base/Logging.cpp

@@ -4,20 +4,11 @@
 
 #include "Logging.h"
 
-#include "LocalAccessible-inl.h"
 #include "AccEvent.h"
-#include "DocAccessible.h"
 #include "DocAccessible-inl.h"
-#include "nsAccessibilityService.h"
-#include "nsCoreUtils.h"
+#include "DocAccessible.h"
+#include "LocalAccessible-inl.h"
 #include "OuterDocAccessible.h"
-
-#include "nsDocShellLoadTypes.h"
-#include "nsIChannel.h"
-#include "nsIWebProgress.h"
-#include "prenv.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsPIDOMWindowInlines.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"
@@ -28,6 +19,14 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLBodyElement.h"
 #include "mozilla/dom/Selection.h"
+#include "nsAccessibilityService.h"
+#include "nsCoreUtils.h"
+#include "nsDocShellLoadTypes.h"
+#include "nsIChannel.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebProgress.h"
+#include "nsPIDOMWindowInlines.h"
+#include "prenv.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/Logging.h

@@ -5,9 +5,9 @@
 #ifndef mozilla_a11y_logs_h_
 #define mozilla_a11y_logs_h_
 
-#include "nscore.h"
-#include "nsStringFwd.h"
 #include "mozilla/Attributes.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
 
 class nsINode;
 class nsIRequest;

accessible/base/NotificationController.cpp

@@ -8,20 +8,18 @@
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
 #include "LocalAccessible-inl.h"
-#include "nsEventShell.h"
 #include "TextLeafAccessible.h"
 #include "TextUpdater.h"
-
-#include "nsIContentInlines.h"
-
 #include "mozilla/AppShutdown.h"
-#include "mozilla/dom/BrowserChild.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ProfilerMarkers.h"
-#include "nsAccessibilityService.h"
+#include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/glean/AccessibleMetrics.h"
+#include "nsAccessibilityService.h"
+#include "nsEventShell.h"
+#include "nsIContentInlines.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/NotificationController.h

@@ -5,16 +5,15 @@
 #ifndef mozilla_a11y_NotificationController_h_
 #define mozilla_a11y_NotificationController_h_
 
-#include "EventQueue.h"
+#include <utility>
 
+#include "EventQueue.h"
 #include "nsClassHashtable.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIFrame.h"
 #include "nsRefreshObservers.h"
 #include "nsTHashSet.h"
 
-#include <utility>
-
 #ifdef A11Y_LOG
 #  include "Logging.h"
 #endif

accessible/base/Pivot.cpp

@@ -7,11 +7,10 @@
 #include "AccIterator.h"
 #include "LocalAccessible.h"
 #include "RemoteAccessible.h"
+#include "mozilla/a11y/Accessible.h"
 #include "nsAccUtils.h"
 #include "nsIAccessiblePivot.h"
 
-#include "mozilla/a11y/Accessible.h"
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/base/Pivot.h

@@ -6,6 +6,7 @@
 #define mozilla_a11y_Pivot_h_
 
 #include <stdint.h>
+
 #include "mozilla/a11y/Role.h"
 #include "mozilla/dom/ChildIterator.h"
 

accessible/base/Platform.h

@@ -6,8 +6,9 @@
 #define mozilla_a11y_Platform_h
 
 #include <stdint.h>
-#include "nsStringFwd.h"
+
 #include "Units.h"
+#include "nsStringFwd.h"
 
 #if defined(ANDROID)
 #  include "nsTArray.h"

accessible/base/Relation.h

@@ -5,10 +5,10 @@
 #ifndef mozilla_a11y_relation_h_
 #define mozilla_a11y_relation_h_
 
-#include "AccIterator.h"
-
 #include <memory>
 
+#include "AccIterator.h"
+
 namespace mozilla {
 namespace a11y {
 

accessible/base/SelectionManager.cpp

@@ -5,19 +5,18 @@
 #include "mozilla/a11y/SelectionManager.h"
 
 #include "DocAccessible-inl.h"
-#include "HyperTextAccessible.h"
 #include "HyperTextAccessible-inl.h"
-#include "nsAccessibilityService.h"
+#include "HyperTextAccessible.h"
+#include "TextLeafRange.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/a11y/DocAccessibleChild.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Selection.h"
 #include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
 #include "nsCoreUtils.h"
 #include "nsEventShell.h"
 #include "nsFrameSelection.h"
-#include "TextLeafRange.h"
-
-#include "mozilla/a11y/DocAccessibleChild.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/dom/Selection.h"
-#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/SelectionManager.h

@@ -5,9 +5,9 @@
 #ifndef mozilla_a11y_SelectionManager_h_
 #define mozilla_a11y_SelectionManager_h_
 
+#include "mozilla/WeakPtr.h"
 #include "nsISelectionController.h"
 #include "nsISelectionListener.h"
-#include "mozilla/WeakPtr.h"
 
 namespace mozilla {
 

accessible/base/StyleInfo.h

@@ -5,10 +5,10 @@
 #ifndef _mozilla_a11y_style_h_
 #define _mozilla_a11y_style_h_
 
-#include "mozilla/gfx/Types.h"
 #include "mozilla/AlreadyAddRefed.h"
-#include "nsStringFwd.h"
+#include "mozilla/gfx/Types.h"
 #include "nsColor.h"
+#include "nsStringFwd.h"
 
 class nsAtom;
 

accessible/base/TextAttrs.cpp

@@ -5,16 +5,15 @@
 #include "TextAttrs.h"
 
 #include "AccAttributes.h"
-#include "nsAccUtils.h"
-#include "nsCoreUtils.h"
+#include "HyperTextAccessible.h"
 #include "StyleInfo.h"
-
 #include "gfxTextRun.h"
+#include "mozilla/AppUnits.h"
+#include "nsAccUtils.h"
+#include "nsContainerFrame.h"
+#include "nsCoreUtils.h"
 #include "nsFontMetrics.h"
 #include "nsLayoutUtils.h"
-#include "nsContainerFrame.h"
-#include "HyperTextAccessible.h"
-#include "mozilla/AppUnits.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/TextLeafRange.cpp

@@ -5,21 +5,24 @@
 #include "TextLeafRange.h"
 
 #include "HyperTextAccessible-inl.h"
+#include "Pivot.h"
+#include "TextAttrs.h"
+#include "TextRange.h"
+#include "mozilla/BinarySearch.h"
+#include "mozilla/Casting.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_layout.h"
+#include "mozilla/TextEditor.h"
 #include "mozilla/a11y/Accessible.h"
 #include "mozilla/a11y/CacheConstants.h"
 #include "mozilla/a11y/DocAccessible.h"
 #include "mozilla/a11y/DocAccessibleParent.h"
 #include "mozilla/a11y/LocalAccessible.h"
-#include "mozilla/BinarySearch.h"
-#include "mozilla/Casting.h"
 #include "mozilla/dom/AbstractRange.h"
 #include "mozilla/dom/CharacterData.h"
 #include "mozilla/dom/HTMLInputElement.h"
-#include "mozilla/PresShell.h"
 #include "mozilla/intl/Segmenter.h"
 #include "mozilla/intl/WordBreaker.h"
-#include "mozilla/StaticPrefs_layout.h"
-#include "mozilla/TextEditor.h"
 #include "nsAccUtils.h"
 #include "nsBlockFrame.h"
 #include "nsFocusManager.h"
@@ -31,9 +34,6 @@
 #include "nsTArray.h"
 #include "nsTextFrame.h"
 #include "nsUnicharUtils.h"
-#include "Pivot.h"
-#include "TextAttrs.h"
-#include "TextRange.h"
 
 using mozilla::intl::WordBreaker;
 using FindWordOptions = mozilla::intl::WordBreaker::FindWordOptions;

accessible/base/TextLeafRange.h

@@ -8,9 +8,9 @@
 #include <stdint.h>
 
 #include "AccAttributes.h"
+#include "mozilla/FunctionRef.h"
 #include "nsDirection.h"
 #include "nsIAccessibleText.h"
-#include "mozilla/FunctionRef.h"
 
 namespace mozilla {
 namespace dom {

accessible/base/TextRange.cpp

@@ -2,10 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "TextRange-inl.h"
-
-#include "LocalAccessible-inl.h"
 #include "HyperTextAccessible-inl.h"
+#include "LocalAccessible-inl.h"
+#include "TextRange-inl.h"
 #include "mozilla/IntegerRange.h"
 #include "mozilla/dom/Selection.h"
 #include "nsAccUtils.h"

accessible/base/TextUpdater.cpp

@@ -4,10 +4,11 @@
 
 #include "TextUpdater.h"
 
+#include <algorithm>
+
 #include "CacheConstants.h"
 #include "DocAccessible-inl.h"
 #include "TextLeafAccessible.h"
-#include <algorithm>
 
 using namespace mozilla::a11y;
 

accessible/base/TreeWalker.cpp

@@ -5,12 +5,11 @@
 #include "TreeWalker.h"
 
 #include "ARIAMap.h"
-#include "nsAccessibilityService.h"
 #include "DocAccessible.h"
-
-#include "nsIContentInlines.h"
 #include "mozilla/dom/ChildIterator.h"
 #include "mozilla/dom/Element.h"
+#include "nsAccessibilityService.h"
+#include "nsIContentInlines.h"
 
 namespace mozilla::a11y {
 

accessible/base/TreeWalker.h

@@ -6,6 +6,7 @@
 #define mozilla_a11y_TreeWalker_h_
 
 #include <stdint.h>
+
 #include "mozilla/dom/ChildIterator.h"
 #include "nsCOMPtr.h"
 

accessible/base/nsAccUtils.cpp

@@ -4,26 +4,25 @@
 
 #include "nsAccUtils.h"
 
-#include "AccAttributes.h"
 #include "ARIAMap.h"
-#include "nsCoreUtils.h"
-#include "nsGenericHTMLElement.h"
+#include "AccAttributes.h"
 #include "DocAccessible.h"
 #include "DocAccessibleParent.h"
 #include "HyperTextAccessible.h"
-#include "nsIAccessibleTypes.h"
-#include "mozilla/a11y/Role.h"
 #include "States.h"
 #include "TextLeafAccessible.h"
-
-#include "nsIBaseWindow.h"
-#include "nsIDocShellTreeOwner.h"
-#include "nsIDOMXULContainerElement.h"
 #include "mozilla/a11y/RemoteAccessible.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementInternals.h"
 #include "nsAccessibilityService.h"
+#include "nsCoreUtils.h"
+#include "nsGenericHTMLElement.h"
+#include "nsIAccessibleTypes.h"
+#include "nsIBaseWindow.h"
+#include "nsIDOMXULContainerElement.h"
+#include "nsIDocShellTreeOwner.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/nsAccUtils.h

@@ -5,12 +5,10 @@
 #ifndef nsAccUtils_h_
 #define nsAccUtils_h_
 
-#include "mozilla/a11y/LocalAccessible.h"
 #include "mozilla/a11y/DocManager.h"
-
+#include "mozilla/a11y/LocalAccessible.h"
 #include "nsAccessibilityService.h"
 #include "nsCoreUtils.h"
-
 #include "nsIDocShell.h"
 #include "nsPoint.h"
 

accessible/base/nsAccessibilityService.cpp

@@ -5,14 +5,13 @@
 #include "nsAccessibilityService.h"
 
 // NOTE: alphabetically ordered
-#include "ApplicationAccessibleWrap.h"
 #include "ARIAGridAccessible.h"
 #include "ARIAMap.h"
+#include "ApplicationAccessibleWrap.h"
 #include "CssAltContent.h"
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
 #include "FocusManager.h"
-#include "mozilla/FocusModel.h"
 #include "HTMLCanvasAccessible.h"
 #include "HTMLElementAccessibles.h"
 #include "HTMLImageMapAccessible.h"
@@ -21,21 +20,22 @@
 #include "HTMLSelectAccessible.h"
 #include "HTMLTableAccessible.h"
 #include "HyperTextAccessible.h"
+#include "OuterDocAccessible.h"
+#include "Pivot.h"
 #include "RootAccessible.h"
+#include "mozilla/FocusModel.h"
+#include "mozilla/a11y/Role.h"
 #include "nsAccUtils.h"
 #include "nsArrayUtils.h"
 #include "nsAttrName.h"
-#include "nsDOMTokenList.h"
 #include "nsCRT.h"
+#include "nsDOMTokenList.h"
 #include "nsEventShell.h"
 #include "nsGkAtoms.h"
 #include "nsIAccessibleAnnouncementEvent.h"
 #include "nsIFrameInlines.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTextFormatter.h"
-#include "OuterDocAccessible.h"
-#include "Pivot.h"
-#include "mozilla/a11y/Role.h"
 #ifdef MOZ_ACCESSIBILITY_ATK
 #  include "RootAccessibleWrap.h"
 #endif
@@ -44,33 +44,14 @@
 #include "xpcAccessibleApplication.h"
 
 #ifdef XP_WIN
-#  include "mozilla/a11y/Compatibility.h"
 #  include "mozilla/StaticPtr.h"
+#  include "mozilla/a11y/Compatibility.h"
 #endif
 
 #ifdef A11Y_LOG
 #  include "Logging.h"
 #endif
 
-#include "nsExceptionHandler.h"
-#include "nsImageFrame.h"
-#include "nsIObserverService.h"
-#include "nsMenuPopupFrame.h"
-#include "nsLayoutUtils.h"
-#include "nsTreeBodyFrame.h"
-#include "nsTreeUtils.h"
-#include "mozilla/a11y/AccTypes.h"
-#include "mozilla/dom/ARIANotifyMixinBinding.h"
-#include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/DOMStringList.h"
-#include "mozilla/dom/EventTarget.h"
-#include "mozilla/dom/HTMLTableElement.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/ProfilerMarkers.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Services.h"
-
 #include "XULAlertAccessible.h"
 #include "XULComboboxAccessible.h"
 #include "XULElementAccessibles.h"
@@ -79,6 +60,24 @@
 #include "XULMenuAccessible.h"
 #include "XULTabAccessible.h"
 #include "XULTreeGridAccessible.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/ProfilerMarkers.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Services.h"
+#include "mozilla/a11y/AccTypes.h"
+#include "mozilla/dom/ARIANotifyMixinBinding.h"
+#include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/DOMStringList.h"
+#include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/HTMLTableElement.h"
+#include "nsExceptionHandler.h"
+#include "nsIObserverService.h"
+#include "nsImageFrame.h"
+#include "nsLayoutUtils.h"
+#include "nsMenuPopupFrame.h"
+#include "nsTreeBodyFrame.h"
+#include "nsTreeUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -1667,8 +1666,8 @@ LocalAccessible* nsAccessibilityService::CreateAccessible(
 }
 
 #if defined(ANDROID)
-#  include "mozilla/Monitor.h"
 #  include "mozilla/Maybe.h"
+#  include "mozilla/Monitor.h"
 
 constinit static Maybe<Monitor> sAndroidMonitor;
 

accessible/base/nsAccessibilityService.h

@@ -5,20 +5,19 @@
 #ifndef _nsAccessibilityService_h_
 #define _nsAccessibilityService_h_
 
+#include "mozilla/Preferences.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/a11y/CacheConstants.h"
 #include "mozilla/a11y/DocManager.h"
 #include "mozilla/a11y/FocusManager.h"
 #include "mozilla/a11y/Platform.h"
 #include "mozilla/a11y/Role.h"
 #include "mozilla/a11y/SelectionManager.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/StaticPtr.h"
-
 #include "nsAtomHashKeys.h"
-#include "nsIContent.h"
-#include "nsIObserver.h"
 #include "nsIAccessibleEvent.h"
+#include "nsIContent.h"
 #include "nsIEventListenerService.h"
+#include "nsIObserver.h"
 #include "nsXULAppAPI.h"
 #include "xpcAccessibilityService.h"
 

accessible/base/nsCoreUtils.cpp

@@ -4,19 +4,8 @@
 
 #include "nsCoreUtils.h"
 
-#include "nsAttrValue.h"
-#include "nsIAccessibleTypes.h"
-
-#include "mozilla/dom/Document.h"
-#include "nsAccUtils.h"
-#include "nsRange.h"
-#include "nsXULElement.h"
-#include "nsIDocShell.h"
-#include "nsIObserverService.h"
-#include "nsPresContext.h"
-#include "nsISelectionController.h"
-#include "nsISimpleEnumerator.h"
-#include "mozilla/dom/TouchEvent.h"
+#include "AnchorPositioningUtils.h"
+#include "XULTreeElement.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
@@ -24,24 +13,32 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/TouchEvents.h"
-#include "nsGkAtoms.h"
-
-#include "AnchorPositioningUtils.h"
-#include "nsComponentManagerUtils.h"
-
-#include "XULTreeElement.h"
-#include "nsIContentInlines.h"
-#include "nsTreeColumns.h"
+#include "mozilla/dom/AncestorIterator.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/ElementInternals.h"
+#include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/HTMLOptGroupElement.h"
 #include "mozilla/dom/HTMLOptionElement.h"
 #include "mozilla/dom/HTMLSelectElement.h"
-#include "mozilla/dom/AncestorIterator.h"
-#include "mozilla/dom/ElementInternals.h"
-#include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/Selection.h"
+#include "mozilla/dom/TouchEvent.h"
+#include "nsAccUtils.h"
+#include "nsAttrValue.h"
+#include "nsComponentManagerUtils.h"
+#include "nsGkAtoms.h"
+#include "nsIAccessibleTypes.h"
+#include "nsIContentInlines.h"
+#include "nsIDocShell.h"
+#include "nsIObserverService.h"
+#include "nsISelectionController.h"
+#include "nsISimpleEnumerator.h"
+#include "nsPresContext.h"
+#include "nsRange.h"
+#include "nsTreeColumns.h"
+#include "nsXULElement.h"
 
 using namespace mozilla;
 

accessible/base/nsCoreUtils.h

@@ -6,16 +6,15 @@
 #define nsCoreUtils_h_
 
 #include "AttrArray.h"
+#include "Units.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/PresShellForwards.h"
 #include "nsCaseTreatment.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIContent.h"
-#include "mozilla/FlushType.h"
-#include "mozilla/PresShellForwards.h"
-
 #include "nsPoint.h"
 #include "nsTArray.h"
-#include "Units.h"
 
 class nsAttrValue;
 class nsGenericHTMLElement;

accessible/base/nsEventShell.cpp

@@ -4,10 +4,9 @@
 
 #include "nsEventShell.h"
 
-#include "nsAccessibilityService.h"
 #include "Logging.h"
-
 #include "mozilla/dom/DOMStringList.h"
+#include "nsAccessibilityService.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/base/nsTextEquivUtils.cpp

@@ -4,13 +4,13 @@
 
 #include "nsTextEquivUtils.h"
 
-#include "LocalAccessible-inl.h"
 #include "AccIterator.h"
 #include "CssAltContent.h"
-#include "nsCoreUtils.h"
+#include "LocalAccessible-inl.h"
 #include "Relation.h"
 #include "mozilla/dom/ChildIterator.h"
 #include "mozilla/dom/Text.h"
+#include "nsCoreUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/basetypes/Accessible.cpp

@@ -3,18 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Accessible.h"
+
 #include "ARIAMap.h"
-#include "nsAccUtils.h"
-#include "nsIURI.h"
 #include "Pivot.h"
 #include "Relation.h"
 #include "States.h"
-#include "mozilla/a11y/FocusManager.h"
-#include "mozilla/a11y/HyperTextAccessibleBase.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/Components.h"
 #include "mozilla/ProfilerMarkers.h"
+#include "mozilla/a11y/FocusManager.h"
+#include "mozilla/a11y/HyperTextAccessibleBase.h"
+#include "nsAccUtils.h"
 #include "nsIStringBundle.h"
+#include "nsIURI.h"
 
 #ifdef A11Y_LOG
 #  include "nsAccessibilityService.h"

accessible/basetypes/Accessible.h

@@ -5,11 +5,11 @@
 #ifndef Accessible_H_
 #define Accessible_H_
 
-#include "mozilla/a11y/Role.h"
-#include "mozilla/a11y/AccTypes.h"
-#include "nsStringFwd.h"
-#include "nsRect.h"
 #include "Units.h"
+#include "mozilla/a11y/AccTypes.h"
+#include "mozilla/a11y/Role.h"
+#include "nsRect.h"
+#include "nsStringFwd.h"
 
 class nsAtom;
 class nsStaticAtom;

accessible/basetypes/HyperTextAccessibleBase.cpp

@@ -4,10 +4,10 @@
 
 #include "HyperTextAccessibleBase.h"
 
-#include "mozilla/a11y/Accessible.h"
-#include "nsAccUtils.h"
 #include "TextLeafRange.h"
 #include "TextRange.h"
+#include "mozilla/a11y/Accessible.h"
+#include "nsAccUtils.h"
 
 namespace mozilla::a11y {
 

accessible/basetypes/TableCellAccessible.h

@@ -5,9 +5,10 @@
 #ifndef mozilla_a11y_TableCellAccessible_h_
 #define mozilla_a11y_TableCellAccessible_h_
 
-#include "nsTArray.h"
 #include <stdint.h>
 
+#include "nsTArray.h"
+
 namespace mozilla {
 namespace a11y {
 

accessible/generic/ARIAGridAccessible.cpp

@@ -5,15 +5,16 @@
 #include "ARIAGridAccessible.h"
 
 #include <stdint.h>
-#include "LocalAccessible-inl.h"
+
 #include "AccAttributes.h"
+#include "LocalAccessible-inl.h"
+#include "States.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/a11y/TableAccessible.h"
 #include "mozilla/a11y/TableCellAccessible.h"
-#include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
 #include "nsGkAtoms.h"
-#include "mozilla/a11y/Role.h"
-#include "States.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/generic/ApplicationAccessible.cpp

@@ -5,17 +5,16 @@
 #include "ApplicationAccessible.h"
 
 #include "LocalAccessible-inl.h"
-#include "nsAccessibilityService.h"
 #include "Relation.h"
-#include "mozilla/a11y/Role.h"
 #include "States.h"
-
-#include "nsServiceManagerUtils.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/Components.h"
+#include "mozilla/a11y/Role.h"
+#include "mozilla/dom/Document.h"
+#include "nsAccessibilityService.h"
 #include "nsGlobalWindowOuter.h"
 #include "nsIStringBundle.h"
 #include "nsPIDOMWindowInlines.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::a11y;
 

accessible/generic/ApplicationAccessible.h

@@ -6,7 +6,6 @@
 #define mozilla_a11y_ApplicationAccessible_h_
 
 #include "AccessibleWrap.h"
-
 #include "nsIXULAppInfo.h"
 
 namespace mozilla {

accessible/generic/DocAccessible-inl.h

@@ -7,10 +7,10 @@
 
 #include "DocAccessible.h"
 #include "LocalAccessible-inl.h"
-#include "nsAccessibilityService.h"
 #include "NotificationController.h"
 #include "States.h"
 #include "mozilla/dom/DocumentInlines.h"
+#include "nsAccessibilityService.h"
 
 #ifdef A11Y_LOG
 #  include "Logging.h"

accessible/generic/DocAccessible.cpp

@@ -2,39 +2,17 @@
  * 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 "LocalAccessible-inl.h"
-#include "AccIterator.h"
-#include "AccAttributes.h"
 #include "ARIAMap.h"
+#include "AccAttributes.h"
+#include "AccIterator.h"
+#include "AnchorPositioningUtils.h"
 #include "CachedTableAccessible.h"
 #include "DocAccessible-inl.h"
 #include "EventTree.h"
 #include "HTMLImageMapAccessible.h"
+#include "LocalAccessible-inl.h"
 #include "Relation.h"
-#include "mozilla/ProfilerMarkers.h"
-#include "nsAccUtils.h"
-#include "nsEventShell.h"
-#include "nsIIOService.h"
-#include "nsLayoutUtils.h"
-#include "nsTextEquivUtils.h"
-#include "mozilla/a11y/Role.h"
 #include "TreeWalker.h"
-#include "xpcAccessibleDocument.h"
-
-#include "AnchorPositioningUtils.h"
-#include "nsIDocShell.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/Document.h"
-#include "nsPIDOMWindow.h"
-#include "nsIContentInlines.h"
-#include "nsIEditingSession.h"
-#include "nsIFrame.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsImageFrame.h"
-#include "nsIMutationObserver.h"
-#include "nsIURI.h"
-#include "nsIWebNavigation.h"
-#include "nsFocusManager.h"
 #include "mozilla/AppShutdown.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Components.h"  // for mozilla::components
@@ -42,16 +20,37 @@
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScrollContainerFrame.h"
-#include "nsAccessibilityService.h"
 #include "mozilla/a11y/DocAccessibleChild.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/AncestorIterator.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "mozilla/dom/HTMLSelectElement.h"
 #include "mozilla/dom/UserActivation.h"
+#include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
+#include "nsEventShell.h"
+#include "nsFocusManager.h"
+#include "nsIContentInlines.h"
+#include "nsIDocShell.h"
+#include "nsIEditingSession.h"
+#include "nsIFrame.h"
+#include "nsIIOService.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIMutationObserver.h"
+#include "nsIURI.h"
+#include "nsIWebNavigation.h"
+#include "nsImageFrame.h"
+#include "nsLayoutUtils.h"
+#include "nsPIDOMWindow.h"
+#include "nsTextEquivUtils.h"
+#include "xpcAccessibleDocument.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/generic/DocAccessible.h

@@ -5,15 +5,14 @@
 #ifndef mozilla_a11y_DocAccessible_h_
 #define mozilla_a11y_DocAccessible_h_
 
-#include "HyperTextAccessible.h"
 #include "AccEvent.h"
-#include "nsAccessibilityService.h"
-
-#include "nsClassHashtable.h"
-#include "nsTHashMap.h"
+#include "HyperTextAccessible.h"
 #include "mozilla/UniquePtr.h"
+#include "nsAccessibilityService.h"
+#include "nsClassHashtable.h"
 #include "nsIDocumentObserver.h"
 #include "nsITimer.h"
+#include "nsTHashMap.h"
 #include "nsTHashSet.h"
 #include "nsWeakReference.h"
 

accessible/generic/FormControlAccessible.cpp

@@ -6,8 +6,8 @@
 
 #include "FormControlAccessible.h"
 
-#include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/a11y/Role.h"
+#include "mozilla/dom/HTMLInputElement.h"
 
 using namespace mozilla::a11y;
 

accessible/generic/HyperTextAccessible-inl.h

@@ -6,14 +6,11 @@
 #define mozilla_a11y_HyperTextAccessible_inl_h_
 
 #include "HyperTextAccessible.h"
-
-#include "nsAccUtils.h"
-
-#include "nsIClipboard.h"
-#include "nsFrameSelection.h"
-
 #include "mozilla/CaretAssociationHint.h"
 #include "mozilla/EditorBase.h"
+#include "nsAccUtils.h"
+#include "nsFrameSelection.h"
+#include "nsIClipboard.h"
 
 namespace mozilla::a11y {
 

accessible/generic/HyperTextAccessible.cpp

@@ -2,42 +2,40 @@
  * 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 "HyperTextAccessible-inl.h"
-
-#include "nsAccessibilityService.h"
-#include "nsIAccessibleTypes.h"
 #include "AccAttributes.h"
 #include "HTMLListAccessible.h"
+#include "HyperTextAccessible-inl.h"
 #include "LocalAccessible-inl.h"
 #include "Relation.h"
-#include "mozilla/a11y/Role.h"
 #include "States.h"
 #include "TextAttrs.h"
 #include "TextLeafRange.h"
 #include "TextRange.h"
 #include "TreeWalker.h"
-
-#include "nsCaret.h"
-#include "nsContentUtils.h"
-#include "nsDebug.h"
-#include "nsFocusManager.h"
-#include "nsIEditingSession.h"
-#include "nsContainerFrame.h"
-#include "nsFrameSelection.h"
-#include "nsILineIterator.h"
-#include "nsIMathMLFrame.h"
-#include "nsLayoutUtils.h"
-#include "nsRange.h"
+#include "gfxSkipChars.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/EditorBase.h"
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/SelectionMovementUtils.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLBRElement.h"
 #include "mozilla/dom/Selection.h"
-#include "gfxSkipChars.h"
+#include "nsAccessibilityService.h"
+#include "nsCaret.h"
+#include "nsContainerFrame.h"
+#include "nsContentUtils.h"
+#include "nsDebug.h"
+#include "nsFocusManager.h"
+#include "nsFrameSelection.h"
+#include "nsIAccessibleTypes.h"
+#include "nsIEditingSession.h"
+#include "nsILineIterator.h"
+#include "nsIMathMLFrame.h"
+#include "nsLayoutUtils.h"
+#include "nsRange.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/generic/ImageAccessible.cpp

@@ -4,23 +4,22 @@
 
 #include "ImageAccessible.h"
 
-#include "DocAccessible-inl.h"
-#include "LocalAccessible-inl.h"
-#include "nsAccUtils.h"
-#include "mozilla/a11y/Role.h"
 #include "AccAttributes.h"
 #include "AccIterator.h"
 #include "CacheConstants.h"
+#include "DocAccessible-inl.h"
+#include "LocalAccessible-inl.h"
 #include "States.h"
-
 #include "imgIRequest.h"
-#include "nsGenericHTMLElement.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/Document.h"
+#include "nsAccUtils.h"
 #include "nsContentUtils.h"
+#include "nsGenericHTMLElement.h"
 #include "nsIImageLoadingContent.h"
-#include "nsPIDOMWindow.h"
 #include "nsIURI.h"
+#include "nsPIDOMWindow.h"
 
 namespace mozilla::a11y {
 

accessible/generic/LocalAccessible-inl.h

@@ -5,11 +5,11 @@
 #ifndef mozilla_a11y_Accessible_inl_h_
 #define mozilla_a11y_Accessible_inl_h_
 
-#include "DocAccessible.h"
 #include "ARIAMap.h"
-#include "nsCoreUtils.h"
-#include "mozilla/dom/Element.h"
+#include "DocAccessible.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/dom/Element.h"
+#include "nsCoreUtils.h"
 
 #ifdef A11Y_LOG
 #  include "Logging.h"

accessible/generic/LocalAccessible.cpp

@@ -3,77 +3,33 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccEvent.h"
-#include "LocalAccessible-inl.h"
-
-#include "EmbeddedObjCollector.h"
 #include "AccGroupInfo.h"
 #include "AccIterator.h"
+#include "ApplicationAccessible.h"
 #include "CachedTableAccessible.h"
 #include "CssAltContent.h"
 #include "DocAccessible-inl.h"
-#include "mozilla/a11y/AccAttributes.h"
-#include "mozilla/a11y/DocAccessibleChild.h"
-#include "mozilla/a11y/Platform.h"
-#include "mozilla/FocusModel.h"
-#include "nsAccUtils.h"
-#include "nsMenuPopupFrame.h"
-#include "nsAccessibilityService.h"
-#include "ApplicationAccessible.h"
-#include "mozilla/dom/ContentList.h"
-#include "nsGenericHTMLElement.h"
-#include "NotificationController.h"
-#include "nsEventShell.h"
-#include "nsTextEquivUtils.h"
+#include "EmbeddedObjCollector.h"
 #include "EventTree.h"
+#include "HTMLElementAccessibles.h"
+#include "HTMLSelectAccessible.h"
+#include "HTMLTableAccessible.h"
+#include "ImageAccessible.h"
+#include "LocalAccessible-inl.h"
+#include "NotificationController.h"
 #include "OuterDocAccessible.h"
 #include "Pivot.h"
 #include "Relation.h"
-#include "mozilla/a11y/Role.h"
 #include "RootAccessible.h"
 #include "States.h"
 #include "TextLeafAccessible.h"
 #include "TextLeafRange.h"
 #include "TextRange.h"
-#include "HTMLElementAccessibles.h"
-#include "HTMLSelectAccessible.h"
-#include "HTMLTableAccessible.h"
-#include "ImageAccessible.h"
-
-#include "nsComputedDOMStyle.h"
-#include "nsGkAtoms.h"
-#include "nsIDOMXULButtonElement.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsIMutationObserver.h"
-
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/HTMLAnchorElement.h"
-#include "mozilla/dom/HTMLFormElement.h"
-#include "mozilla/dom/HTMLHeadingElement.h"
-#include "mozilla/dom/HTMLInputElement.h"
-#include "mozilla/dom/NodeList.h"
-#include "mozilla/dom/PopoverData.h"
-#include "mozilla/gfx/Matrix.h"
-#include "nsIContent.h"
-#include "nsIFormControl.h"
-
-#include "nsDisplayList.h"
-#include "nsLayoutUtils.h"
-#include "nsPresContext.h"
-#include "nsIFrame.h"
-#include "nsTextFrame.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsStyleStructInlines.h"
-#include "nsFocusManager.h"
-
-#include "nsString.h"
-#include "nsAtom.h"
-#include "nsContainerFrame.h"
-
 #include "mozilla/Assertions.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/FocusModel.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ProfilerMarkers.h"
@@ -81,11 +37,49 @@
 #include "mozilla/StaticPrefs_accessibility.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_ui.h"
+#include "mozilla/a11y/AccAttributes.h"
+#include "mozilla/a11y/DocAccessibleChild.h"
+#include "mozilla/a11y/Platform.h"
+#include "mozilla/a11y/Role.h"
+#include "mozilla/dom/ContentList.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLAnchorElement.h"
+#include "mozilla/dom/HTMLFormElement.h"
+#include "mozilla/dom/HTMLHeadingElement.h"
+#include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/dom/NodeList.h"
+#include "mozilla/dom/PopoverData.h"
 #include "mozilla/dom/TreeWalker.h"
 #include "mozilla/dom/UserActivation.h"
+#include "mozilla/gfx/Matrix.h"
+#include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
+#include "nsAtom.h"
+#include "nsComputedDOMStyle.h"
+#include "nsContainerFrame.h"
+#include "nsDisplayList.h"
+#include "nsEventShell.h"
+#include "nsFocusManager.h"
+#include "nsGenericHTMLElement.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+#include "nsIDOMXULButtonElement.h"
+#include "nsIDOMXULSelectCntrlEl.h"
+#include "nsIDOMXULSelectCntrlItemEl.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIFormControl.h"
+#include "nsIFrame.h"
+#include "nsIMutationObserver.h"
+#include "nsLayoutUtils.h"
+#include "nsMenuPopupFrame.h"
+#include "nsPresContext.h"
+#include "nsString.h"
+#include "nsStyleStructInlines.h"
+#include "nsTextEquivUtils.h"
+#include "nsTextFrame.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/generic/LocalAccessible.h

@@ -6,18 +6,16 @@
 #define LocalAccessible_H_
 
 #include "mozilla/ComputedStyle.h"
-#include "mozilla/a11y/Accessible.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/a11y/AccTypes.h"
+#include "mozilla/a11y/Accessible.h"
 #include "mozilla/a11y/CacheConstants.h"
 #include "mozilla/a11y/RelationType.h"
 #include "mozilla/a11y/States.h"
-
-#include "mozilla/UniquePtr.h"
-
 #include "nsIContent.h"
-#include "nsTArray.h"
-#include "nsRefPtrHashtable.h"
 #include "nsRect.h"
+#include "nsRefPtrHashtable.h"
+#include "nsTArray.h"
 
 struct nsRoleMapEntry;
 

accessible/generic/OuterDocAccessible.cpp

@@ -4,13 +4,13 @@
 
 #include "OuterDocAccessible.h"
 
-#include "LocalAccessible-inl.h"
 #include "DocAccessible-inl.h"
+#include "LocalAccessible-inl.h"
 #include "mozilla/a11y/DocAccessibleChild.h"
 #include "mozilla/a11y/DocAccessibleParent.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/BrowserBridgeChild.h"
 #include "mozilla/dom/BrowserParent.h"
-#include "mozilla/a11y/Role.h"
 
 #ifdef A11Y_LOG
 #  include "Logging.h"

accessible/generic/RootAccessible.cpp

@@ -8,38 +8,35 @@
 
 #define CreateEvent CreateEventA
 
-#include "LocalAccessible-inl.h"
 #include "DocAccessible-inl.h"
-#include "mozilla/a11y/DocAccessibleParent.h"
-#include "nsAccessibilityService.h"
-#include "nsAccUtils.h"
-#include "nsCoreUtils.h"
-#include "nsEventShell.h"
+#include "LocalAccessible-inl.h"
 #include "Relation.h"
-#include "mozilla/a11y/Role.h"
 #include "States.h"
 #include "XULTreeAccessible.h"
-
+#include "mozilla/a11y/DocAccessibleParent.h"
+#include "mozilla/a11y/Role.h"
 #include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/CustomEvent.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/BrowserHost.h"
-#include "mozilla/dom/VisualViewport.h"
-
-#include "nsIDocShellTreeOwner.h"
+#include "mozilla/dom/CustomEvent.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/VisualViewport.h"
+#include "nsAccUtils.h"
+#include "nsAccessibilityService.h"
+#include "nsCoreUtils.h"
+#include "nsEventShell.h"
+#include "nsFocusManager.h"
 #include "nsGlobalWindowInner.h"
+#include "nsIAppWindow.h"
 #include "nsIDOMXULMultSelectCntrlEl.h"
-#include "mozilla/dom/Document.h"
+#include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIPropertyBag2.h"
-#include "nsPIDOMWindow.h"
 #include "nsIWebBrowserChrome.h"
-#include "nsFocusManager.h"
-
-#include "nsIAppWindow.h"
+#include "nsPIDOMWindow.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;