9 files changed, 16 insertions, 11 deletions
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',