diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
index 33e892080c7e8aa058a11ee7833a3104f44c25fc..8596e40e3a50d0c06adbca09f19be10ce0e550ee 100644
--- a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
+++ b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
@@ -490,6 +490,14 @@ PeerConnectionImpl* PeerConnectionCtx::GetPeerConnection(
   return iterator->second;
 }
 
+template <typename Function>
+void PeerConnectionCtx::ForEachPeerConnection(Function&& aFunction) const {
+  MOZ_ASSERT(NS_IsMainThread());
+  for (const auto& pair : mPeerConnections) {
+    aFunction(pair.second);
+  }
+}
+
 void PeerConnectionCtx::ClearClosedStats() {
   for (auto& [id, pc] : mPeerConnections) {
     Unused << id;
diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.h b/dom/media/webrtc/jsapi/PeerConnectionCtx.h
index e7393f786bd91d248e21dff5e437f0ec01fb652f..f48a3ae49e1c1ad81a409aba251ad55ebc3f6777 100644
--- a/dom/media/webrtc/jsapi/PeerConnectionCtx.h
+++ b/dom/media/webrtc/jsapi/PeerConnectionCtx.h
@@ -126,12 +126,7 @@ class PeerConnectionCtx {
                          PeerConnectionImpl* aPeerConnection);
   PeerConnectionImpl* GetPeerConnection(const std::string& aKey) const;
   template <typename Function>
-  void ForEachPeerConnection(Function&& aFunction) const {
-    MOZ_ASSERT(NS_IsMainThread());
-    for (const auto& pair : mPeerConnections) {
-      aFunction(pair.second);
-    }
-  }
+  void ForEachPeerConnection(Function&& aFunction) const;
 
   void ClearClosedStats();
 
diff --git a/dom/media/webrtc/jsapi/moz.build b/dom/media/webrtc/jsapi/moz.build
index fdfa4d8cf3c36297edf24478af7a2547020fa36c..93cf8798231557ef7039b1972b5e33e4f78f74a3 100644
--- a/dom/media/webrtc/jsapi/moz.build
+++ b/dom/media/webrtc/jsapi/moz.build
@@ -37,3 +37,5 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/dom/promise/PromiseNativeHandler.cpp b/dom/promise/PromiseNativeHandler.cpp
index 88f7edef3ae18ccf051edec1270689f51e2a2dea..ae6b112ee84fe4903edcab8ee62c6cf7468ec2f9 100644
--- a/dom/promise/PromiseNativeHandler.cpp
+++ b/dom/promise/PromiseNativeHandler.cpp
@@ -7,8 +7,6 @@
 #include "PromiseNativeHandler.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Promise.h"
-#include "mozilla/dom/DOMException.h"
-#include "mozilla/dom/DOMExceptionBinding.h"
 #include "nsISupportsImpl.h"
 
 namespace mozilla::dom {
diff --git a/dom/promise/moz.build b/dom/promise/moz.build
index c317f1fae0804cea234c21a65261f3558678daae..58285d13eea3f8850b9ca69485837b91ceece0b2 100644
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -40,3 +40,5 @@ MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]
 MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"]
 
 XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/intl/uconv/moz.build b/intl/uconv/moz.build
index f21e4055f94a3578ba68d629bb075af212478214..e83d8704d83f7b88a072baaf1b728ebb50d13b65 100644
--- a/intl/uconv/moz.build
+++ b/intl/uconv/moz.build
@@ -30,3 +30,5 @@ XPCOM_MANIFESTS += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/sandbox/linux/gtest/moz.build b/security/sandbox/linux/gtest/moz.build
index f80482aee3e276a9a1400f21ac6f4d4c9d2882ef..96fc4bd6695d1c8966d7ec7a59009106786ad9a6 100644
--- a/security/sandbox/linux/gtest/moz.build
+++ b/security/sandbox/linux/gtest/moz.build
@@ -24,3 +24,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = "xul-gtest"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/sandbox/linux/launch/moz.build b/security/sandbox/linux/launch/moz.build
index 09f483f5194c6a4b1180bc2a6711c6a5406dc094..50a017c18b86e7fff9a90760bdf4b5fa2b1152b9 100644
--- a/security/sandbox/linux/launch/moz.build
+++ b/security/sandbox/linux/launch/moz.build
@@ -31,3 +31,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build
index 2f9a4e548905fd7696be2467b986329de2f98aff..a751113054eb806f237eaa410bfd9014140c5d1e 100644
--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -35,3 +35,5 @@ FINAL_LIBRARY = "xul"
 
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Autocomplete")
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/browser/moz.build b/toolkit/components/browser/moz.build
index 903390a3c86bc6d4973867f6dd0113a4b9d8b2cf..a3cea2eddcd086e530f67d7bdd4de9aacc69781d 100644
--- a/toolkit/components/browser/moz.build
+++ b/toolkit/components/browser/moz.build
@@ -39,3 +39,5 @@ EXPORTS += [
     "nsEmbedCID.h",
     "nsWebBrowser.h",
 ]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build
index e4f3f396f93aa0c84c912a9ae85b11a609aeecec..13fea66b4473579e660586b1f9c9a05bb7183376 100644
--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -27,3 +27,5 @@ SOURCES += [
 MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/find/nsWebBrowserFind.cpp b/toolkit/components/find/nsWebBrowserFind.cpp
index 2e06f65fc88781863fdf44553860f24a01ed1f49..045b1dcf6235282ada92524c7bc2f8b55b625fe2 100644
--- a/toolkit/components/find/nsWebBrowserFind.cpp
+++ b/toolkit/components/find/nsWebBrowserFind.cpp
@@ -43,7 +43,6 @@
 #  include "nsString.h"
 #endif
 
-using namespace mozilla;
 using mozilla::dom::Document;
 using mozilla::dom::Element;
 using mozilla::dom::Selection;
diff --git a/toolkit/components/find/nsWebBrowserFind.h b/toolkit/components/find/nsWebBrowserFind.h
index 0c846d2f175ec2107b658081733520f0251a9c81..a3672908d8d91095c22c76c9663e6fa49eb237cf 100644
--- a/toolkit/components/find/nsWebBrowserFind.h
+++ b/toolkit/components/find/nsWebBrowserFind.h
@@ -11,7 +11,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsIWeakReferenceUtils.h"
-#include "nsPIDOMWindow.h"
 
 #include "nsString.h"
 
diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build
index 9f3d1354da62bad08cfcee72784a645c27843dca..b5293cf50ed48a8ff82c884aebcff6c633606557 100644
--- a/toolkit/components/resistfingerprinting/moz.build
+++ b/toolkit/components/resistfingerprinting/moz.build
@@ -24,3 +24,5 @@ EXPORTS.mozilla += [
 EXTRA_JS_MODULES += [
     "RFPHelper.jsm",
 ]
+
+REQUIRES_UNIFIED_BUILD = True