diff --git a/build/non-unified-compat b/build/non-unified-compat
index a1acb49646468..ad35849e46b81 100644
--- a/build/non-unified-compat
+++ b/build/non-unified-compat
@@ -16,4 +16,5 @@ dom/crypto/
 dom/debugger/
 dom/docs/
 dom/encoding/
-dom/events/
\ No newline at end of file
+dom/events/
+dom/fetch/
\ No newline at end of file
diff --git a/dom/fetch/EmptyBody.cpp b/dom/fetch/EmptyBody.cpp
index 063888f1047bc..b0239c6e7b50a 100644
--- a/dom/fetch/EmptyBody.cpp
+++ b/dom/fetch/EmptyBody.cpp
@@ -6,6 +6,9 @@
 
 #include "EmptyBody.h"
 
+#include "mozilla/ipc/PBackgroundSharedTypes.h"
+#include "nsStringStream.h"
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/fetch/FetchDriver.cpp b/dom/fetch/FetchDriver.cpp
index 5a366bf929a57..a49c9dbf7e313 100644
--- a/dom/fetch/FetchDriver.cpp
+++ b/dom/fetch/FetchDriver.cpp
@@ -9,6 +9,7 @@
 
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/dom/Document.h"
+#include "nsICookieJarSettings.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsIFileChannel.h"
diff --git a/dom/fetch/FetchStreamReader.cpp b/dom/fetch/FetchStreamReader.cpp
index 00a52c94d01b9..c2f212a337a30 100644
--- a/dom/fetch/FetchStreamReader.cpp
+++ b/dom/fetch/FetchStreamReader.cpp
@@ -6,9 +6,16 @@
 
 #include "FetchStreamReader.h"
 #include "InternalResponse.h"
+#include "js/Stream.h"
+#include "mozilla/ConsoleReportCollector.h"
+#include "mozilla/dom/DOMException.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseBinding.h"
+#include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/TaskCategory.h"
 #include "nsContentUtils.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIPipe.h"
 #include "nsIScriptError.h"
 #include "nsPIDOMWindow.h"
 #include "jsapi.h"
diff --git a/dom/fetch/FetchStreamReader.h b/dom/fetch/FetchStreamReader.h
index 9a9f1cca91cd3..26ee0b8564646 100644
--- a/dom/fetch/FetchStreamReader.h
+++ b/dom/fetch/FetchStreamReader.h
@@ -11,6 +11,7 @@
 #include "mozilla/dom/FetchBinding.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "nsIAsyncOutputStream.h"
+#include "nsIGlobalObject.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/fetch/FetchUtil.cpp b/dom/fetch/FetchUtil.cpp
index cbc3e5231bb96..0d51eaed77e26 100644
--- a/dom/fetch/FetchUtil.cpp
+++ b/dom/fetch/FetchUtil.cpp
@@ -6,11 +6,16 @@
 
 #include "FetchUtil.h"
 
+#include "nsCRT.h"
 #include "nsError.h"
+#include "nsIAsyncInputStream.h"
+#include "nsStreamUtils.h"
 #include "nsString.h"
 #include "mozilla/dom/Document.h"
 
+#include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/InternalRequest.h"
+#include "mozilla/dom/Response.h"
 #include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp
index 0c781a5e0dd1d..2c7e797bcc169 100644
--- a/dom/fetch/InternalRequest.cpp
+++ b/dom/fetch/InternalRequest.cpp
@@ -6,6 +6,7 @@
 
 #include "InternalRequest.h"
 
+#include "InternalResponse.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/FetchTypes.h"
diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp
index 269986e628c48..06a31f6e5ca57 100644
--- a/dom/fetch/Request.cpp
+++ b/dom/fetch/Request.cpp
@@ -16,6 +16,7 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/URL.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/WindowContext.h"
 #include "mozilla/Unused.h"