diff --git a/Source/WebCore/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations b/Source/WebCore/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations
index d7e6cb9b99bf8..894e2dd5f7e2a 100644
--- a/Source/WebCore/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations
+++ b/Source/WebCore/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations
@@ -596,6 +596,8 @@ page/VisitedLinkStore.cpp
 page/VisualViewport.cpp
 page/WindowOrWorkerGlobalScope.cpp
 page/WorkerNavigator.cpp
+page/cocoa/PageCocoa.mm
+page/cocoa/ResourceUsageOverlayCocoa.mm
 page/cocoa/ResourceUsageThreadCocoa.mm
 page/cocoa/WebTextIndicatorLayer.mm
 page/csp/ContentSecurityPolicy.cpp
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
index d7b8363854af1..eac4a184554fd 100644
--- a/Source/WebCore/SourcesCocoa.txt
+++ b/Source/WebCore/SourcesCocoa.txt
@@ -227,6 +227,7 @@ page/CaptionUserPreferencesMediaAF.cpp
 page/cocoa/CaptionUserPreferencesMediaAFCocoa.mm
 page/cocoa/EventHandlerCocoa.mm
 page/cocoa/MemoryReleaseCocoa.mm
+page/cocoa/PageCocoa.mm
 page/cocoa/PerformanceLoggingCocoa.mm
 page/cocoa/ResourceUsageOverlayCocoa.mm
 page/cocoa/ResourceUsageThreadCocoa.mm
@@ -242,7 +243,6 @@ page/mac/CorrectionIndicator.mm
 page/mac/DragControllerMac.mm
 page/mac/EventHandlerMac.mm
 page/mac/ImageOverlayControllerMac.mm
-page/mac/PageMac.mm
 page/mac/ServicesOverlayController.mm
 page/mac/TextIndicatorWindow.mm
 page/mac/WheelEventDeltaFilterMac.mm
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index f79f7115945ba..1fd13ec68d33f 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -14312,7 +14312,7 @@
 		834B86A91C56E93E00F3F0E3 /* JSHTMLDataElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDataElement.cpp; sourceTree = "<group>"; };
 		834CBFBF24DC785500C2A3D8 /* MediaStreamAudioSourceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSourceOptions.h; sourceTree = "<group>"; };
 		834CBFC124DC785600C2A3D8 /* MediaStreamAudioSourceOptions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaStreamAudioSourceOptions.idl; sourceTree = "<group>"; };
-		834DD4F31BE08989002C9C3E /* PageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageMac.mm; sourceTree = "<group>"; };
+		834DD4F31BE08989002C9C3E /* PageCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageCocoa.mm; sourceTree = "<group>"; };
 		834DFACC1F7DAE5600C2725B /* SharedStringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedStringHash.h; sourceTree = "<group>"; };
 		834DFACE1F7DAE5700C2725B /* SharedStringHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedStringHash.cpp; sourceTree = "<group>"; };
 		8350519E24F573AD009911D7 /* IIRFilterNode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = IIRFilterNode.cpp; sourceTree = "<group>"; };
@@ -27544,6 +27544,7 @@
 				443BFDC627BB372C0001245F /* EventHandlerCocoa.mm */,
 				F446EDE0265DB1E50031DA8F /* ImageOverlayDataDetectionResultIdentifier.h */,
 				413E007B1DB0E707002341D2 /* MemoryReleaseCocoa.mm */,
+				834DD4F31BE08989002C9C3E /* PageCocoa.mm */,
 				AD5A0C221DECA37E00707054 /* PerformanceLoggingCocoa.mm */,
 				ADFE2B541BD5F41200DAB457 /* ResourceUsageOverlayCocoa.mm */,
 				A5071E881C56D4FA009951BE /* ResourceUsageThreadCocoa.mm */,
@@ -30161,7 +30162,6 @@
 				A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */,
 				93C09A7E0B064EEF005ABD4D /* EventHandlerMac.mm */,
 				F4B2A90C265087E4009E7286 /* ImageOverlayControllerMac.mm */,
-				834DD4F31BE08989002C9C3E /* PageMac.mm */,
 				2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */,
 				2D93AEE219DF5641002A86C3 /* ServicesOverlayController.mm */,
 				2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */,
diff --git a/Source/WebCore/page/mac/PageMac.mm b/Source/WebCore/page/cocoa/PageCocoa.mm
similarity index 98%
rename from Source/WebCore/page/mac/PageMac.mm
rename to Source/WebCore/page/cocoa/PageCocoa.mm
index 6f288b8984fed..66891befc8496 100644
--- a/Source/WebCore/page/mac/PageMac.mm
+++ b/Source/WebCore/page/cocoa/PageCocoa.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2024 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/Source/WebCore/page/cocoa/WebTextIndicatorLayer.h b/Source/WebCore/page/cocoa/WebTextIndicatorLayer.h
index bebf93a36ed70..e7f7bb80d6d54 100644
--- a/Source/WebCore/page/cocoa/WebTextIndicatorLayer.h
+++ b/Source/WebCore/page/cocoa/WebTextIndicatorLayer.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #import "TextIndicator.h"
+#import <QuartzCore/CALayer.h>
 #import <wtf/Noncopyable.h>
 #import <wtf/RefPtr.h>
 #import <wtf/RetainPtr.h>
diff --git a/Source/WebCore/page/ios/EventHandlerIOS.mm b/Source/WebCore/page/ios/EventHandlerIOS.mm
index d579011015ebf..b19c0e84328c8 100644
--- a/Source/WebCore/page/ios/EventHandlerIOS.mm
+++ b/Source/WebCore/page/ios/EventHandlerIOS.mm
@@ -33,6 +33,7 @@
 #import "Chrome.h"
 #import "ChromeClient.h"
 #import "DataTransfer.h"
+#import "DocumentInlines.h"
 #import "DragState.h"
 #import "EventNames.h"
 #import "FocusController.h"
diff --git a/Source/WebCore/page/mac/ImageOverlayControllerMac.mm b/Source/WebCore/page/mac/ImageOverlayControllerMac.mm
index 15d88455edcd1..f49901f39798a 100644
--- a/Source/WebCore/page/mac/ImageOverlayControllerMac.mm
+++ b/Source/WebCore/page/mac/ImageOverlayControllerMac.mm
@@ -28,6 +28,8 @@
 
 #if PLATFORM(MAC)
 
+#import "Chrome.h"
+#import "ChromeClient.h"
 #import "DataDetection.h"
 #import "DataDetectionResultsStorage.h"
 #import "DataDetectorElementInfo.h"
@@ -42,6 +44,7 @@
 #import "LocalFrameView.h"
 #import "Page.h"
 #import "PlatformMouseEvent.h"
+#import "ShadowRoot.h"
 #import "SimpleRange.h"
 #import "TypedElementDescendantIteratorInlines.h"
 #import <QuartzCore/QuartzCore.h>