diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c9f823aa83ac..d9f1016f6681 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-29  Diego Pino Garcia  <dpino@igalia.com>
+
+        [macOS] Unreviewed, non-unified build fixes
+        https://bugs.webkit.org/show_bug.cgi?id=239889
+
+        * UIProcess/API/Cocoa/_WKDataTask.h:
+        * UIProcess/API/Cocoa/_WKDataTask.mm:
+        * UIProcess/API/Cocoa/_WKInspectorConfigurationInternal.h:
+        * UIProcess/Cocoa/ModalContainerControlClassifier.h:
+        * UIProcess/Cocoa/ModalContainerControlClassifier.mm:
+
 2022-04-28  Brent Fulgham  <bfulgham@apple.com>
 
         Remove the AVFoundationNSURLSessionEnabled preference
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.h b/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.h
index 76cf868a591d..eb06387c103a 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.h
@@ -25,6 +25,8 @@
 
 #import <WebKit/WKFoundation.h>
 
+#import <WebKit/WKWebView.h>
+
 @protocol _WKDataTaskDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.mm
index 4cf7f72aea41..a9fc1fcce9df 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKDataTask.mm
@@ -34,6 +34,8 @@
 #import "_WKDataTaskDelegate.h"
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/Credential.h>
+#import <WebCore/WebCoreObjCExtras.h>
+#import <wtf/BlockPtr.h>
 
 class WKDataTaskClient final : public API::DataTaskClient {
 public:
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorConfigurationInternal.h b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorConfigurationInternal.h
index 83b8fe2950d1..a952ee8a8d17 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorConfigurationInternal.h
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorConfigurationInternal.h
@@ -25,6 +25,8 @@
 
 #import "_WKInspectorConfiguration.h"
 
+#import <WebKit/WKWebViewConfiguration.h>
+
 #import "APIInspectorConfiguration.h"
 #import "WKObject.h"
 
diff --git a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.h b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.h
index ec4387707cd6..177a205f5fb3 100644
--- a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.h
+++ b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #import <wtf/Forward.h>
+#include <wtf/WorkQueue.h>
 
 @class MLModel;
 
diff --git a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm
index 94121e7cf1de..94690e2744bf 100644
--- a/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm
+++ b/Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm
@@ -29,6 +29,10 @@
 #import <WebCore/ModalContainerTypes.h>
 #import <unicode/uspoof.h>
 
+#import <wtf/CompletionHandler.h>
+#import <wtf/CrossThreadCopier.h>
+#import <wtf/RunLoop.h>
+
 #import <pal/cocoa/CoreMLSoftLink.h>
 #import <pal/cocoa/NaturalLanguageSoftLink.h>