diff --git a/accessible/windows/ia2/ia2AccessibleAction.h b/accessible/windows/ia2/ia2AccessibleAction.h
index 99f259083a92..ae3749a0398b 100644
--- a/accessible/windows/ia2/ia2AccessibleAction.h
+++ b/accessible/windows/ia2/ia2AccessibleAction.h
@@ -10,6 +10,7 @@
 
 #include "nsISupports.h"
 
+#include "mozilla/a11y/Accessible.h"
 #include "AccessibleAction.h"
 
 namespace mozilla {
diff --git a/accessible/windows/ia2/ia2AccessibleHypertext.cpp b/accessible/windows/ia2/ia2AccessibleHypertext.cpp
index 220071c8834d..c28fdefba6d9 100644
--- a/accessible/windows/ia2/ia2AccessibleHypertext.cpp
+++ b/accessible/windows/ia2/ia2AccessibleHypertext.cpp
@@ -9,6 +9,8 @@
 
 #include "AccessibleHypertext_i.c"
 
+#include "mozilla/a11y/HyperTextAccessibleBase.h"
+
 #include "IUnknownImpl.h"
 
 using namespace mozilla::a11y;
diff --git a/accessible/windows/ia2/ia2AccessibleRelation.h b/accessible/windows/ia2/ia2AccessibleRelation.h
index 63276b8e0084..88cc2f121117 100644
--- a/accessible/windows/ia2/ia2AccessibleRelation.h
+++ b/accessible/windows/ia2/ia2AccessibleRelation.h
@@ -14,6 +14,8 @@
 #include <utility>
 #include "nsTArray.h"
 
+#include "RelationType.h"
+#include "mozilla/a11y/Accessible.h"
 #include "AccessibleRelation.h"
 
 namespace mozilla {
diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp
index c94a3ee9421a..4e81ccd18dca 100644
--- a/accessible/windows/ia2/ia2AccessibleText.cpp
+++ b/accessible/windows/ia2/ia2AccessibleText.cpp
@@ -18,7 +18,7 @@
 using namespace mozilla::a11y;
 
 HyperTextAccessibleBase* ia2AccessibleText::sLastTextChangeAcc = nullptr;
-StaticAutoPtr<nsString> ia2AccessibleText::sLastTextChangeString;
+mozilla::StaticAutoPtr<nsString> ia2AccessibleText::sLastTextChangeString;
 uint32_t ia2AccessibleText::sLastTextChangeStart = 0;
 uint32_t ia2AccessibleText::sLastTextChangeEnd = 0;
 bool ia2AccessibleText::sLastTextChangeWasInsert = false;
diff --git a/accessible/windows/ia2/ia2AccessibleValue.h b/accessible/windows/ia2/ia2AccessibleValue.h
index 368dbef244e7..9238b827b590 100644
--- a/accessible/windows/ia2/ia2AccessibleValue.h
+++ b/accessible/windows/ia2/ia2AccessibleValue.h
@@ -8,6 +8,7 @@
 #ifndef _ACCESSIBLE_VALUE_H
 #define _ACCESSIBLE_VALUE_H
 
+#include "mozilla/a11y/Accessible.h"
 #include "AccessibleValue.h"
 
 namespace mozilla {
diff --git a/accessible/windows/ia2/moz.build b/accessible/windows/ia2/moz.build
index 8c6ffdc7e9fe..f8b31bc4b0f5 100644
--- a/accessible/windows/ia2/moz.build
+++ b/accessible/windows/ia2/moz.build
@@ -57,5 +57,3 @@ if CONFIG["CC_TYPE"] == "clang-cl":
     CXXFLAGS += ["-Wno-extra-tokens"]
 
 include("/ipc/chromium/chromium-config.mozbuild")
-
-REQUIRES_UNIFIED_BUILD = True