9 files changed, 14 insertions, 1 deletions
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