Stop building /accessible unified and fix deprot.

Tag #80

Note: excludes changes to Mac-specific code because I can't build
for OS X to check and fix deprot there.

30 files changed, 45 insertions, 18 deletions

diff --git a/accessible/aom/moz.build b/accessible/aom/moz.build
index 700081215..3d7575b0c 100644
--- a/accessible/aom/moz.build
+++ b/accessible/aom/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
     'AccessibleNode.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AccessibleNode.cpp',
 ]
 
diff --git a/accessible/base/AccessibleOrProxy.cpp b/accessible/base/AccessibleOrProxy.cpp
index 77fb44a11..e43dd3264 100644
--- a/accessible/base/AccessibleOrProxy.cpp
+++ b/accessible/base/AccessibleOrProxy.cpp
@@ -5,6 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AccessibleOrProxy.h"
+#include "DocAccessible.h"
+
+using namespace mozilla::a11y;
 
 AccessibleOrProxy
 AccessibleOrProxy::Parent() const
diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp
index cd4a07ba8..84c4aafdd 100644
--- a/accessible/base/EventTree.cpp
+++ b/accessible/base/EventTree.cpp
@@ -8,6 +8,8 @@
 #include "Accessible-inl.h"
 #include "nsEventShell.h"
 #include "DocAccessible.h"
+#include "EmbeddedObjCollector.h"
+#include "NotificationController.h"
 #ifdef A11Y_LOG
 #include "Logging.h"
 #endif
diff --git a/accessible/base/EventTree.h b/accessible/base/EventTree.h
index 932ceaf4e..cdb5e8911 100644
--- a/accessible/base/EventTree.h
+++ b/accessible/base/EventTree.h
@@ -8,6 +8,7 @@
 
 #include "AccEvent.h"
 #include "Accessible.h"
+#include "DocAccessible.h"
 
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
diff --git a/accessible/base/FocusManager.h b/accessible/base/FocusManager.h
index 633f9ccb2..c32101372 100644
--- a/accessible/base/FocusManager.h
+++ b/accessible/base/FocusManager.h
@@ -5,6 +5,8 @@
 #ifndef mozilla_a11y_FocusManager_h_
 #define mozilla_a11y_FocusManager_h_
 
+#include "mozilla/RefPtr.h"
+
 class nsINode;
 class nsIDocument;
 class nsISupports;
diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp
index 3545ce6c1..3f1e5bcd3 100644
--- a/accessible/base/NotificationController.cpp
+++ b/accessible/base/NotificationController.cpp
@@ -7,6 +7,7 @@
 
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
+#include "nsEventShell.h"
 #include "TextLeafAccessible.h"
 #include "TextUpdater.h"
 
diff --git a/accessible/base/TreeWalker.cpp b/accessible/base/TreeWalker.cpp
index 8c04b5d6f..a5353510f 100644
--- a/accessible/base/TreeWalker.cpp
+++ b/accessible/base/TreeWalker.cpp
@@ -6,6 +6,7 @@
 #include "TreeWalker.h"
 
 #include "Accessible.h"
+#include "Accessible-inl.h"
 #include "AccIterator.h"
 #include "nsAccessibilityService.h"
 #include "DocAccessible.h"
diff --git a/accessible/base/moz.build b/accessible/base/moz.build
index dcccc4b54..e8e382e39 100644
--- a/accessible/base/moz.build
+++ b/accessible/base/moz.build
@@ -25,7 +25,7 @@ if CONFIG['MOZ_DEBUG']:
         'Logging.h',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AccessibleOrProxy.cpp',
     'AccEvent.cpp',
     'AccGroupInfo.cpp',
diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp
index 89823b223..effe66be2 100644
--- a/accessible/base/nsCoreUtils.cpp
+++ b/accessible/base/nsCoreUtils.cpp
@@ -23,6 +23,7 @@
 #include "nsISelectionPrivate.h"
 #include "nsISelectionController.h"
 #include "nsISimpleEnumerator.h"
+#include "nsXBLPrototypeBinding.h"
 #include "mozilla/dom/TouchEvent.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
diff --git a/accessible/base/nsTextEquivUtils.cpp b/accessible/base/nsTextEquivUtils.cpp
index bdf14d097..8f3f121ed 100644
--- a/accessible/base/nsTextEquivUtils.cpp
+++ b/accessible/base/nsTextEquivUtils.cpp
@@ -10,9 +10,11 @@
 #include "Accessible-inl.h"
 #include "AccIterator.h"
 #include "nsCoreUtils.h"
+#include "nsStyleConsts.h"
 #include "nsIDOMXULLabeledControlEl.h"
 
 using namespace mozilla::a11y;
+using namespace mozilla;
 
 /**
  * The accessible for which we are computing a text equivalent. It is useful
diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp
index 7ff2f8283..505a4f68e 100644
--- a/accessible/generic/Accessible.cpp
+++ b/accessible/generic/Accessible.cpp
@@ -47,6 +47,7 @@
 
 #include "nsDeckFrame.h"
 #include "nsLayoutUtils.h"
+#include "nsIPersistentProperties2.h"
 #include "nsIPresShell.h"
 #include "nsIStringBundle.h"
 #include "nsPresContext.h"
diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp
index 059c27372..85f71db00 100644
--- a/accessible/generic/HyperTextAccessible.cpp
+++ b/accessible/generic/HyperTextAccessible.cpp
@@ -11,6 +11,7 @@
 #include "nsIAccessibleTypes.h"
 #include "DocAccessible.h"
 #include "HTMLListAccessible.h"
+#include "Relation.h"
 #include "Role.h"
 #include "States.h"
 #include "TextAttrs.h"
diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp
index 5817f2da9..8ca9b8c9c 100644
--- a/accessible/generic/RootAccessible.cpp
+++ b/accessible/generic/RootAccessible.cpp
@@ -27,8 +27,10 @@
 
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/TabParent.h"
 #include "nsIDOMCustomEvent.h"
 #include "nsIDOMXULMultSelectCntrlEl.h"
 #include "nsIDocument.h"
diff --git a/accessible/generic/moz.build b/accessible/generic/moz.build
index a9e97acf0..d64e22a64 100644
--- a/accessible/generic/moz.build
+++ b/accessible/generic/moz.build
@@ -10,7 +10,7 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessible.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'Accessible.cpp',
     'ApplicationAccessible.cpp',
     'ARIAGridAccessible.cpp',
diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp
index d5de25718..9e00a648a 100644
--- a/accessible/html/HTMLListAccessible.cpp
+++ b/accessible/html/HTMLListAccessible.cpp
@@ -10,6 +10,7 @@
 #include "nsAccUtils.h"
 #include "Role.h"
 #include "States.h"
+#include "EventTree.h"
 
 #include "nsBlockFrame.h"
 #include "nsBulletFrame.h"
diff --git a/accessible/html/moz.build b/accessible/html/moz.build
index 8d92332cd..6b2a06851 100644
--- a/accessible/html/moz.build
+++ b/accessible/html/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'HTMLCanvasAccessible.cpp',
     'HTMLElementAccessibles.cpp',
     'HTMLFormControlAccessible.cpp',
diff --git a/accessible/ipc/moz.build b/accessible/ipc/moz.build
index bb0632cd2..f90844eb1 100644
--- a/accessible/ipc/moz.build
+++ b/accessible/ipc/moz.build
@@ -44,7 +44,7 @@ if CONFIG['ACCESSIBILITY']:
         'ProxyAccessibleShared.h',
     ]
 
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'DocAccessibleChildBase.cpp',
         'DocAccessibleParent.cpp',
         'ProxyAccessibleBase.cpp',
diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp
index 97cd0d788..ba56235ea 100644
--- a/accessible/windows/ia2/ia2Accessible.cpp
+++ b/accessible/windows/ia2/ia2Accessible.cpp
@@ -6,6 +6,9 @@
 
 #include "AccessibleWrap.h"
 
+#include "Accessible.h"
+#include "Accessible-inl.h"
+
 #include "Accessible2_i.c"
 #include "Accessible2_2_i.c"
 #include "Accessible2_3_i.c"
diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp
index 86b3abdf6..451ac4f9b 100644
--- a/accessible/windows/ia2/ia2AccessibleText.cpp
+++ b/accessible/windows/ia2/ia2AccessibleText.cpp
@@ -15,6 +15,7 @@
 #include "ProxyWrappers.h"
 #include "mozilla/ClearOnShutdown.h"
 
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 StaticRefPtr<HyperTextAccessibleWrap> ia2AccessibleText::sLastTextChangeAcc;
diff --git a/accessible/windows/ia2/ia2AccessibleText.h b/accessible/windows/ia2/ia2AccessibleText.h
index a513e44a2..26382df76 100644
--- a/accessible/windows/ia2/ia2AccessibleText.h
+++ b/accessible/windows/ia2/ia2AccessibleText.h
@@ -11,6 +11,8 @@
 #include "nsIAccessibleText.h"
 
 #include "AccessibleText.h"
+#include "nsString.h"
+#include "mozilla/StaticPtr.h"
 
 namespace mozilla {
 namespace a11y {
diff --git a/accessible/windows/ia2/moz.build b/accessible/windows/ia2/moz.build
index 443e87663..dc763bcfd 100644
--- a/accessible/windows/ia2/moz.build
+++ b/accessible/windows/ia2/moz.build
@@ -15,7 +15,7 @@ EXPORTS += [
     'ia2AccessibleValue.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ia2Accessible.cpp',
     'ia2AccessibleAction.cpp',
     'ia2AccessibleComponent.cpp',
diff --git a/accessible/windows/msaa/MsaaIdGenerator.cpp b/accessible/windows/msaa/MsaaIdGenerator.cpp
index 5f4b333fa..3cc2e7aaf 100644
--- a/accessible/windows/msaa/MsaaIdGenerator.cpp
+++ b/accessible/windows/msaa/MsaaIdGenerator.cpp
@@ -83,7 +83,7 @@ private:
 
 } // namespace detail
 
-constexpr MsaaIdGenerator::MsaaIdGenerator()
+MsaaIdGenerator::MsaaIdGenerator()
   : mIDSet(kNumUniqueIDBits)
 {}
 
diff --git a/accessible/windows/msaa/MsaaIdGenerator.h b/accessible/windows/msaa/MsaaIdGenerator.h
index b845e8473..db667b51a 100644
--- a/accessible/windows/msaa/MsaaIdGenerator.h
+++ b/accessible/windows/msaa/MsaaIdGenerator.h
@@ -30,7 +30,7 @@ class AccessibleWrap;
 class MsaaIdGenerator
 {
 public:
-  constexpr MsaaIdGenerator();
+  MsaaIdGenerator();
 
   uint32_t GetID();
   void ReleaseID(AccessibleWrap* aAccWrap);
diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp
index dc6acd3ad..fb6a7d862 100644
--- a/accessible/windows/msaa/Platform.cpp
+++ b/accessible/windows/msaa/Platform.cpp
@@ -6,6 +6,9 @@
 
 #include "Platform.h"
 
+#include "Accessible.h"
+#include "Accessible-inl.h"
+
 #include "AccEvent.h"
 #include "Compatibility.h"
 #include "HyperTextAccessibleWrap.h"
diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build
index 54c8c6686..799f7930f 100644
--- a/accessible/windows/msaa/moz.build
+++ b/accessible/windows/msaa/moz.build
@@ -16,7 +16,7 @@ EXPORTS.mozilla.a11y += [
     'MsaaIdGenerator.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AccessibleWrap.cpp',
     'ApplicationAccessibleWrap.cpp',
     'ARIAGridAccessibleWrap.cpp',
@@ -32,16 +32,12 @@ UNIFIED_SOURCES += [
     'nsWinUtils.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
-    'TextLeafAccessibleWrap.cpp',
-]
-
-# This file cannot be built in unified mode because it includes ISimpleDOMNode_i.c.
-SOURCES += [
     'ServiceProvider.cpp',
+    'TextLeafAccessibleWrap.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
diff --git a/accessible/windows/sdn/moz.build b/accessible/windows/sdn/moz.build
index ae0d5e20d..474612bc3 100644
--- a/accessible/windows/sdn/moz.build
+++ b/accessible/windows/sdn/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'sdnAccessible.cpp',
     'sdnDocAccessible.cpp',
     'sdnTextAccessible.cpp',
diff --git a/accessible/xpcom/moz.build b/accessible/xpcom/moz.build
index ec54a197a..7d7715ec6 100644
--- a/accessible/xpcom/moz.build
+++ b/accessible/xpcom/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsAccessibleRelation.cpp',
     'xpcAccessibilityService.cpp',
     'xpcAccessible.cpp',
diff --git a/accessible/xpcom/xpcAccessibilityService.cpp b/accessible/xpcom/xpcAccessibilityService.cpp
index 97c0d0e72..79040afbf 100644
--- a/accessible/xpcom/xpcAccessibilityService.cpp
+++ b/accessible/xpcom/xpcAccessibilityService.cpp
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "xpcAccessibilityService.h"
+#include "xpcAccessibleDocument.h"
 
 #include "nsAccessiblePivot.h"
 #include "nsAccessibilityService.h"
diff --git a/accessible/xpcom/xpcAccessibilityService.h b/accessible/xpcom/xpcAccessibilityService.h
index 76389a8a5..94498ed5c 100644
--- a/accessible/xpcom/xpcAccessibilityService.h
+++ b/accessible/xpcom/xpcAccessibilityService.h
@@ -7,6 +7,9 @@
 
 #include "nsIAccessibilityService.h"
 
+#include "nsCOMPtr.h"
+#include "nsITimer.h"
+
 class xpcAccessibilityService : public nsIAccessibleRetrieval
 {
 
diff --git a/accessible/xul/moz.build b/accessible/xul/moz.build
index df159b274..8ca9f68f4 100644
--- a/accessible/xul/moz.build
+++ b/accessible/xul/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'XULAlertAccessible.cpp',
     'XULColorPickerAccessible.cpp',
     'XULComboboxAccessible.cpp',