diff --git a/netwerk/dns/DNSPacket.cpp b/netwerk/dns/DNSPacket.cpp
index 46581225520a..d965312a83eb 100644
--- a/netwerk/dns/DNSPacket.cpp
+++ b/netwerk/dns/DNSPacket.cpp
@@ -11,6 +11,8 @@
 // Put DNSLogging.h at the end to avoid LOG being overwritten by other headers.
 #include "DNSLogging.h"
 
+#include "nsIInputStream.h"
+
 namespace mozilla {
 namespace net {
 
diff --git a/netwerk/dns/DNSPacket.h b/netwerk/dns/DNSPacket.h
index a440dfc39049..f07532d9e37c 100644
--- a/netwerk/dns/DNSPacket.h
+++ b/netwerk/dns/DNSPacket.h
@@ -11,6 +11,8 @@
 #include "ScopedNSSTypes.h"
 #include "nsClassHashtable.h"
 #include "nsIDNSService.h"
+#include "DNS.h"
+#include "DNSByTypeRecord.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/DNSRequestParent.cpp b/netwerk/dns/DNSRequestParent.cpp
index 7daa81530388..1247d2a0646a 100644
--- a/netwerk/dns/DNSRequestParent.cpp
+++ b/netwerk/dns/DNSRequestParent.cpp
@@ -14,6 +14,7 @@
 #include "nsHostResolver.h"
 #include "mozilla/Unused.h"
 #include "DNSResolverInfo.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::ipc;
 
diff --git a/netwerk/dns/DNSResolverInfo.h b/netwerk/dns/DNSResolverInfo.h
index dd4c9b1c8549..24d23dd285f4 100644
--- a/netwerk/dns/DNSResolverInfo.h
+++ b/netwerk/dns/DNSResolverInfo.h
@@ -6,6 +6,7 @@
 #define mozilla_net_DNSResolverInfo_h__
 
 #include "nsIDNSResolverInfo.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/HTTPSSVC.cpp b/netwerk/dns/HTTPSSVC.cpp
index 9fedba21c7fb..51ef394432bc 100644
--- a/netwerk/dns/HTTPSSVC.cpp
+++ b/netwerk/dns/HTTPSSVC.cpp
@@ -8,6 +8,7 @@
 #include "nsHttpHandler.h"
 #include "nsNetAddr.h"
 #include "nsNetUtil.h"
+#include "nsIDNSService.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/HostRecordQueue.cpp b/netwerk/dns/HostRecordQueue.cpp
index 698f75728721..9b256959e87f 100644
--- a/netwerk/dns/HostRecordQueue.cpp
+++ b/netwerk/dns/HostRecordQueue.cpp
@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "HostRecordQueue.h"
+#include "mozilla/Telemetry.h"
+#include "nsQueryObject.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/NativeDNSResolverOverrideParent.cpp b/netwerk/dns/NativeDNSResolverOverrideParent.cpp
index fc788f133a59..7be0c210a57e 100644
--- a/netwerk/dns/NativeDNSResolverOverrideParent.cpp
+++ b/netwerk/dns/NativeDNSResolverOverrideParent.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/net/SocketProcessParent.h"
 #include "nsIOService.h"
+#include "DNS.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/ODoH.cpp b/netwerk/dns/ODoH.cpp
index a7268e13194c..44d5ac0ed75c 100644
--- a/netwerk/dns/ODoH.cpp
+++ b/netwerk/dns/ODoH.cpp
@@ -12,6 +12,7 @@
 #include "TRRService.h"
 // Put DNSLogging.h at the end to avoid LOG being overwritten by other headers.
 #include "DNSLogging.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/dns/ODoHService.cpp b/netwerk/dns/ODoHService.cpp
index 93b8a23bd0ca..8e521e1b4e06 100644
--- a/netwerk/dns/ODoHService.cpp
+++ b/netwerk/dns/ODoHService.cpp
@@ -10,6 +10,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_network.h"
+#include "nsICancelable.h"
 #include "nsIDNSService.h"
 #include "nsIDNSByTypeRecord.h"
 #include "nsIOService.h"
diff --git a/netwerk/dns/ODoHService.h b/netwerk/dns/ODoHService.h
index cf958f0dabaf..3e80fbc2e7fd 100644
--- a/netwerk/dns/ODoHService.h
+++ b/netwerk/dns/ODoHService.h
@@ -9,6 +9,7 @@
 #include "DNS.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/Mutex.h"
 #include "nsString.h"
 #include "nsIDNSListener.h"
 #include "nsIObserver.h"
@@ -57,7 +58,7 @@ class ODoHService : public nsIDNSListener,
   nsresult UpdateODoHConfigFromHTTPSRR();
   nsresult UpdateODoHConfigFromURI();
 
-  Mutex mLock;
+  mozilla::Mutex mLock;
   Atomic<bool, Relaxed> mQueryODoHConfigInProgress;
   nsCString mODoHProxyURI;
   nsCString mODoHTargetHost;
diff --git a/netwerk/dns/TRR.cpp b/netwerk/dns/TRR.cpp
index e5c6484bf30a..7d6c7ea81af8 100644
--- a/netwerk/dns/TRR.cpp
+++ b/netwerk/dns/TRR.cpp
@@ -20,9 +20,11 @@
 #include "nsIUploadChannel2.h"
 #include "nsIURIMutator.h"
 #include "nsNetUtil.h"
+#include "nsQueryObject.h"
 #include "nsStringStream.h"
 #include "nsThreadUtils.h"
 #include "nsURLHelper.h"
+#include "ODoH.h"
 #include "TRR.h"
 #include "TRRService.h"
 #include "TRRServiceChannel.h"
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index 8de4f64777a2..1498dd2ceb9e 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -110,5 +110,3 @@ USE_LIBS += ["icu"]
 
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += ["-Wno-error=shadow"]
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/netwerk/dns/nsHostRecord.cpp b/netwerk/dns/nsHostRecord.cpp
index d0f5edf73053..3739b1a0521a 100644
--- a/netwerk/dns/nsHostRecord.cpp
+++ b/netwerk/dns/nsHostRecord.cpp
@@ -7,6 +7,8 @@
 #include "TRRQuery.h"
 // Put DNSLogging.h at the end to avoid LOG being overwritten by other headers.
 #include "DNSLogging.h"
+#include "mozilla/Telemetry.h"
+#include "TRRService.h"
 
 //----------------------------------------------------------------------------
 // this macro filters out any flags that are not used when constructing the
@@ -22,6 +24,9 @@
 
 //----------------------------------------------------------------------------
 
+using namespace mozilla;
+using namespace mozilla::net;
+
 nsHostKey::nsHostKey(const nsACString& aHost, const nsACString& aTrrServer,
                      uint16_t aType, uint16_t aFlags, uint16_t aAf, bool aPb,
                      const nsACString& aOriginsuffix)
diff --git a/netwerk/dns/nsHostRecord.h b/netwerk/dns/nsHostRecord.h
index d61f1ae9cfbe..92e83396bd4c 100644
--- a/netwerk/dns/nsHostRecord.h
+++ b/netwerk/dns/nsHostRecord.h
@@ -7,6 +7,7 @@
 #define nsHostRecord_h__
 
 #include "mozilla/AtomicBitfields.h"
+#include "mozilla/DataMutex.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/net/HTTPSSVC.h"
 #include "nsIDNSService.h"
diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp
index 2e8edc029f65..a245b38842b0 100644
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -49,6 +49,9 @@
 // Put DNSLogging.h at the end to avoid LOG being overwritten by other headers.
 #include "DNSLogging.h"
 
+#define IS_ADDR_TYPE(_type) ((_type) == nsIDNSService::RESOLVE_TYPE_DEFAULT)
+#define IS_OTHER_TYPE(_type) ((_type) != nsIDNSService::RESOLVE_TYPE_DEFAULT)
+
 using namespace mozilla;
 using namespace mozilla::net;
 
diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index 81887f8b61e9..09b67460fedd 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -16,6 +16,7 @@
 #include "nsString.h"
 #include "prio.h"
 #include "mozilla/net/DNS.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 
 namespace IPC {
 
diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.h b/netwerk/protocol/http/nsHttpConnectionInfo.h
index c56131487cb9..df78334e5873 100644
--- a/netwerk/protocol/http/nsHttpConnectionInfo.h
+++ b/netwerk/protocol/http/nsHttpConnectionInfo.h
@@ -15,6 +15,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "ARefBase.h"
+#include "nsIRequest.h"
 
 //-----------------------------------------------------------------------------
 // nsHttpConnectionInfo - holds the properties of a connection