diff --git a/build/non-unified-compat b/build/non-unified-compat
index a6d861e6eaf3..e42566d6356d 100644
--- a/build/non-unified-compat
+++ b/build/non-unified-compat
@@ -52,4 +52,5 @@ dom/reporting/
 dom/res/
 dom/script/
 dom/security/
+dom/serviceworkers/
 dom/simpledb/
diff --git a/dom/serviceworkers/FetchEventOpProxyParent.cpp b/dom/serviceworkers/FetchEventOpProxyParent.cpp
index d3a04572b8a7..90569bf97d5f 100644
--- a/dom/serviceworkers/FetchEventOpProxyParent.cpp
+++ b/dom/serviceworkers/FetchEventOpProxyParent.cpp
@@ -18,6 +18,9 @@
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
+#include "mozilla/dom/InternalResponse.h"
+#include "mozilla/dom/PRemoteWorkerParent.h"
+#include "mozilla/dom/PRemoteWorkerControllerParent.h"
 #include "mozilla/dom/FetchEventOpParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
diff --git a/dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.cpp b/dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.cpp
index f885b441a629..399ca87519fe 100644
--- a/dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.cpp
+++ b/dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.cpp
@@ -7,6 +7,8 @@
 #include "RemoteServiceWorkerRegistrationImpl.h"
 
 #include "ServiceWorkerRegistrationChild.h"
+#include "mozilla/ipc/PBackgroundChild.h"
+#include "mozilla/ipc/BackgroundChild.h"
 
 namespace mozilla {
 namespace dom {
@@ -109,8 +111,8 @@ void RemoteServiceWorkerRegistrationImpl::Unregister(
 RemoteServiceWorkerRegistrationImpl::RemoteServiceWorkerRegistrationImpl(
     const ServiceWorkerRegistrationDescriptor& aDescriptor)
     : mOuter(nullptr), mShutdown(false) {
-  PBackgroundChild* parentActor =
-      BackgroundChild::GetOrCreateForCurrentThread();
+  ::mozilla::ipc::PBackgroundChild* parentActor =
+      ::mozilla::ipc::BackgroundChild::GetOrCreateForCurrentThread();
   if (NS_WARN_IF(!parentActor)) {
     Shutdown();
     return;
diff --git a/dom/serviceworkers/ServiceWorker.cpp b/dom/serviceworkers/ServiceWorker.cpp
index ee5c09b6e949..2245316dc67e 100644
--- a/dom/serviceworkers/ServiceWorker.cpp
+++ b/dom/serviceworkers/ServiceWorker.cpp
@@ -24,6 +24,7 @@
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StorageAccess.h"
+#include "nsGlobalWindowInner.h"
 
 #ifdef XP_WIN
 #  undef PostMessage
diff --git a/dom/serviceworkers/ServiceWorkerActors.cpp b/dom/serviceworkers/ServiceWorkerActors.cpp
index 11723d574bd7..c9625fcbe245 100644
--- a/dom/serviceworkers/ServiceWorkerActors.cpp
+++ b/dom/serviceworkers/ServiceWorkerActors.cpp
@@ -12,6 +12,7 @@
 #include "ServiceWorkerParent.h"
 #include "ServiceWorkerRegistrationChild.h"
 #include "ServiceWorkerRegistrationParent.h"
+#include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/serviceworkers/ServiceWorkerChild.cpp b/dom/serviceworkers/ServiceWorkerChild.cpp
index e164fbccb317..b5c14cc13279 100644
--- a/dom/serviceworkers/ServiceWorkerChild.cpp
+++ b/dom/serviceworkers/ServiceWorkerChild.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ServiceWorkerChild.h"
+#include "RemoteServiceWorkerImpl.h"
 #include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
diff --git a/dom/serviceworkers/ServiceWorkerCloneData.cpp b/dom/serviceworkers/ServiceWorkerCloneData.cpp
index 6072c047ef52..3a0a7e600781 100644
--- a/dom/serviceworkers/ServiceWorkerCloneData.cpp
+++ b/dom/serviceworkers/ServiceWorkerCloneData.cpp
@@ -6,6 +6,7 @@
 
 #include "ServiceWorkerCloneData.h"
 
+#include "mozilla/dom/DOMTypes.h"
 #include "nsProxyRelease.h"
 
 namespace mozilla {
diff --git a/dom/serviceworkers/ServiceWorkerCloneData.h b/dom/serviceworkers/ServiceWorkerCloneData.h
index bc2d5c69aeec..8532cf92231c 100644
--- a/dom/serviceworkers/ServiceWorkerCloneData.h
+++ b/dom/serviceworkers/ServiceWorkerCloneData.h
@@ -9,9 +9,18 @@
 
 #include "mozilla/dom/ipc/StructuredCloneData.h"
 
+class nsISerialEventTarget;
+
 namespace mozilla {
+namespace ipc {
+    class PBackgroundChild;
+    class PBackgroundParent;
+} // namespace ipc
+
 namespace dom {
 
+class ClonedOrErrorMessageData;
+
 // Helper class used to pack structured clone data so that it can be
 // passed across thread and process boundaries.  Currently the raw
 // StructuredCloneData and StructureCloneHolder APIs both make it
diff --git a/dom/serviceworkers/ServiceWorkerContainerChild.cpp b/dom/serviceworkers/ServiceWorkerContainerChild.cpp
index 77fc499ab577..ccd0600d420f 100644
--- a/dom/serviceworkers/ServiceWorkerContainerChild.cpp
+++ b/dom/serviceworkers/ServiceWorkerContainerChild.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/dom/WorkerRef.h"
 
 #include "RemoteServiceWorkerContainerImpl.h"
+#include "ServiceWorkerContainerChild.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/serviceworkers/ServiceWorkerContainerImpl.cpp b/dom/serviceworkers/ServiceWorkerContainerImpl.cpp
index aa9dd87ce6bc..160826b11385 100644
--- a/dom/serviceworkers/ServiceWorkerContainerImpl.cpp
+++ b/dom/serviceworkers/ServiceWorkerContainerImpl.cpp
@@ -6,8 +6,11 @@
 
 #include "ServiceWorkerContainerImpl.h"
 
+#include "ServiceWorkerManager.h"
 #include "ServiceWorkerRegistration.h"
 
+#include "mozilla/dom/DOMMozPromiseRequestHolder.h"
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/serviceworkers/ServiceWorkerContainerProxy.cpp b/dom/serviceworkers/ServiceWorkerContainerProxy.cpp
index f652edd97583..289faecc7333 100644
--- a/dom/serviceworkers/ServiceWorkerContainerProxy.cpp
+++ b/dom/serviceworkers/ServiceWorkerContainerProxy.cpp
@@ -6,7 +6,10 @@
 
 #include "ServiceWorkerContainerProxy.h"
 
+#include "mozilla/dom/ServiceWorkerContainerParent.h"
+#include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/SchedulerGroup.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/serviceworkers/ServiceWorkerContainerProxy.h b/dom/serviceworkers/ServiceWorkerContainerProxy.h
index c04b81cf2b01..7eaee6fbacec 100644
--- a/dom/serviceworkers/ServiceWorkerContainerProxy.h
+++ b/dom/serviceworkers/ServiceWorkerContainerProxy.h
@@ -7,6 +7,9 @@
 #ifndef moz_dom_ServiceWorkerContainerProxy_h
 #define moz_dom_ServiceWorkerContainerProxy_h
 
+#include "mozilla/dom/ServiceWorkerUtils.h"
+#include "mozilla/RefPtr.h"
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/serviceworkers/ServiceWorkerImpl.cpp b/dom/serviceworkers/ServiceWorkerImpl.cpp
index 9587134bb288..b01f3fba5cb5 100644
--- a/dom/serviceworkers/ServiceWorkerImpl.cpp
+++ b/dom/serviceworkers/ServiceWorkerImpl.cpp
@@ -7,6 +7,7 @@
 #include "ServiceWorkerImpl.h"
 
 #include "ServiceWorkerInfo.h"
+#include "ServiceWorkerRegistrationInfo.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/serviceworkers/ServiceWorkerInfo.cpp b/dom/serviceworkers/ServiceWorkerInfo.cpp
index 251816189c56..4310ebdc4cd8 100644
--- a/dom/serviceworkers/ServiceWorkerInfo.cpp
+++ b/dom/serviceworkers/ServiceWorkerInfo.cpp
@@ -6,6 +6,7 @@
 
 #include "ServiceWorkerInfo.h"
 
+#include "ServiceWorkerUtils.h"
 #include "ServiceWorkerPrivate.h"
 #include "ServiceWorkerScriptCache.h"
 #include "mozilla/dom/ClientIPCTypes.h"
diff --git a/dom/serviceworkers/ServiceWorkerManagerParent.cpp b/dom/serviceworkers/ServiceWorkerManagerParent.cpp
index 0f1d6b1cf88c..49b9a4511ca7 100644
--- a/dom/serviceworkers/ServiceWorkerManagerParent.cpp
+++ b/dom/serviceworkers/ServiceWorkerManagerParent.cpp
@@ -7,6 +7,7 @@
 #include "ServiceWorkerManagerParent.h"
 #include "ServiceWorkerManagerService.h"
 #include "ServiceWorkerUpdaterParent.h"
+#include "ServiceWorkerUtils.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ServiceWorkerRegistrar.h"
 #include "mozilla/ipc/BackgroundParent.h"
diff --git a/dom/serviceworkers/ServiceWorkerManagerService.cpp b/dom/serviceworkers/ServiceWorkerManagerService.cpp
index 90c1defec685..8539897e0030 100644
--- a/dom/serviceworkers/ServiceWorkerManagerService.cpp
+++ b/dom/serviceworkers/ServiceWorkerManagerService.cpp
@@ -8,6 +8,7 @@
 #include "ServiceWorkerManagerParent.h"
 #include "ServiceWorkerRegistrar.h"
 #include "ServiceWorkerUpdaterParent.h"
+#include "ServiceWorkerUtils.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/Unused.h"
diff --git a/dom/serviceworkers/ServiceWorkerPrivate.cpp b/dom/serviceworkers/ServiceWorkerPrivate.cpp
index 5360b9f5b74e..dbbd677f11e1 100644
--- a/dom/serviceworkers/ServiceWorkerPrivate.cpp
+++ b/dom/serviceworkers/ServiceWorkerPrivate.cpp
@@ -47,6 +47,7 @@
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/net/NeckoChannelParams.h"
 #include "mozilla/Services.h"
+#include "mozilla/Telemetry.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Unused.h"
diff --git a/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp b/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp
index ce7c9fe4e442..b3b8e23fb36e 100644
--- a/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp
+++ b/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp
@@ -22,11 +22,14 @@
 #include "nsIURI.h"
 #include "nsIUploadChannel2.h"
 #include "nsThreadUtils.h"
+#include "nsICacheInfoChannel.h"
 
+#include "ServiceWorkerCloneData.h"
 #include "ServiceWorkerManager.h"
 #include "ServiceWorkerRegistrationInfo.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Result.h"
 #include "mozilla/ResultExtensions.h"
diff --git a/dom/serviceworkers/ServiceWorkerProxy.cpp b/dom/serviceworkers/ServiceWorkerProxy.cpp
index 3f94be6db7e0..90944d04ba55 100644
--- a/dom/serviceworkers/ServiceWorkerProxy.cpp
+++ b/dom/serviceworkers/ServiceWorkerProxy.cpp
@@ -5,8 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ServiceWorkerProxy.h"
+#include "ServiceWorkerCloneData.h"
+#include "ServiceWorkerManager.h"
+#include "ServiceWorkerParent.h"
 
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/dom/ClientState.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "ServiceWorkerInfo.h"
 
diff --git a/dom/serviceworkers/ServiceWorkerProxy.h b/dom/serviceworkers/ServiceWorkerProxy.h
index c596c794777e..86eeeeead832 100644
--- a/dom/serviceworkers/ServiceWorkerProxy.h
+++ b/dom/serviceworkers/ServiceWorkerProxy.h
@@ -13,6 +13,7 @@
 namespace mozilla {
 namespace dom {
 
+class ClientState;
 class ServiceWorkerCloneData;
 class ServiceWorkerInfo;
 class ServiceWorkerParent;
diff --git a/dom/serviceworkers/ServiceWorkerRegistrationImpl.cpp b/dom/serviceworkers/ServiceWorkerRegistrationImpl.cpp
index 173868439f74..803ee4ab7640 100644
--- a/dom/serviceworkers/ServiceWorkerRegistrationImpl.cpp
+++ b/dom/serviceworkers/ServiceWorkerRegistrationImpl.cpp
@@ -7,6 +7,7 @@
 #include "ServiceWorkerRegistrationImpl.h"
 
 #include "ipc/ErrorIPCUtils.h"
+#include "mozilla/dom/DOMMozPromiseRequestHolder.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/PushManagerBinding.h"
diff --git a/dom/serviceworkers/ServiceWorkerScriptCache.h b/dom/serviceworkers/ServiceWorkerScriptCache.h
index a9d6699b7bfe..034f2a10223e 100644
--- a/dom/serviceworkers/ServiceWorkerScriptCache.h
+++ b/dom/serviceworkers/ServiceWorkerScriptCache.h
@@ -7,6 +7,8 @@
 #ifndef mozilla_dom_ServiceWorkerScriptCache_h
 #define mozilla_dom_ServiceWorkerScriptCache_h
 
+#include "nsIRequest.h"
+#include "nsISupportsImpl.h"
 #include "nsString.h"
 
 class nsILoadGroup;
diff --git a/dom/serviceworkers/ServiceWorkerUpdateJob.cpp b/dom/serviceworkers/ServiceWorkerUpdateJob.cpp
index 11fb1363f975..993e63694dd2 100644
--- a/dom/serviceworkers/ServiceWorkerUpdateJob.cpp
+++ b/dom/serviceworkers/ServiceWorkerUpdateJob.cpp
@@ -6,6 +6,7 @@
 
 #include "ServiceWorkerUpdateJob.h"
 
+#include "mozilla/Telemetry.h"
 #include "nsIScriptError.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
diff --git a/dom/serviceworkers/ServiceWorkerUpdaterChild.cpp b/dom/serviceworkers/ServiceWorkerUpdaterChild.cpp
index 36244cfca75d..4c12dad11a15 100644
--- a/dom/serviceworkers/ServiceWorkerUpdaterChild.cpp
+++ b/dom/serviceworkers/ServiceWorkerUpdaterChild.cpp
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ServiceWorkerUpdaterChild.h"
+#include "ServiceWorkerUtils.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {