diff --git a/src/coreimage.cs b/src/coreimage.cs
index d786f8c94d41..6fb6b636e519 100644
--- a/src/coreimage.cs
+++ b/src/coreimage.cs
@@ -1531,8 +1531,17 @@ interface CIFilterApply {
 		NSString OptionColorSpace { get; }
 	}
 
+#if XAMCORE_5_0
+	[NoiOS]
+	[NoMacCatalyst]
+#else
+#if __IOS__ || __MACCATALYST__
+	[EditorBrowsable (EditorBrowsableState.Never)]
+	[Obsolete ("Do not use; this type does not exist on this platform.")]
+#endif
 	[iOS (17, 0)]
 	[MacCatalyst (17, 0)]
+#endif
 	[NoWatch]
 	[NoTV]
 	[BaseType (typeof (NSObject))]
@@ -6517,6 +6526,10 @@ partial interface CIImageRepresentationKeys {
 		[Field ("kCIImageContentHeadroom")]
 		NSString ContentHeadroom { get; }
 
+		[TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+		[Field ("kCIImageRepresentationHDRGainMapImage")]
+		NSString HdrGainMapImage { get; }
+
 	}
 
 	[MacCatalyst (13, 1)]
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore
new file mode 100644
index 000000000000..c0280351bfe4
--- /dev/null
+++ b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore
@@ -0,0 +1,2 @@
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.todo
deleted file mode 100644
index 83f25969a598..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.todo
+++ /dev/null
@@ -1,6 +0,0 @@
-!unknown-type! CIFilterGenerator bound
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore
index 606c7b7ff26e..715c8d745b4b 100644
--- a/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore
+++ b/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore
@@ -259,3 +259,8 @@
 !incorrect-protocol-member! CIPhotoEffect::extrapolate is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileCount is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileIndex is REQUIRED and should be abstract
+# xcode 16
+!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
+!missing-selector! +CIFilter::areaBoundsRedFilter not bound
+!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
+!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore
index 704f52f5418b..03cc1b262fdd 100644
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore
+++ b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore
@@ -1,3 +1,5 @@
 ## OSX-only API, rdar #22524785
 ## see https://trello.com/c/kpksFWto/6-22524785-coreimage-headers-discrepancies
 !missing-selector! CIKernel::setROISelector: not bound
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.todo
deleted file mode 100644
index 83f25969a598..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.todo
+++ /dev/null
@@ -1,6 +0,0 @@
-!unknown-type! CIFilterGenerator bound
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreImage.todo
deleted file mode 100644
index 8d04066e74d2..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreImage.todo
+++ /dev/null
@@ -1,5 +0,0 @@
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreImage.todo
deleted file mode 100644
index 8d04066e74d2..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreImage.todo
+++ /dev/null
@@ -1,5 +0,0 @@
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/common-CoreImage.ignore b/tests/xtro-sharpie/common-CoreImage.ignore
index 593b6f2299bc..1a0a8518bcb6 100644
--- a/tests/xtro-sharpie/common-CoreImage.ignore
+++ b/tests/xtro-sharpie/common-CoreImage.ignore
@@ -261,3 +261,8 @@
 !incorrect-protocol-member! CIPhotoEffect::extrapolate is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileCount is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileIndex is REQUIRED and should be abstract
+# xcode 16
+!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
+!missing-selector! +CIFilter::areaBoundsRedFilter not bound
+!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
+!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
diff --git a/tests/xtro-sharpie/iOS-CoreImage.ignore b/tests/xtro-sharpie/iOS-CoreImage.ignore
index 704f52f5418b..03cc1b262fdd 100644
--- a/tests/xtro-sharpie/iOS-CoreImage.ignore
+++ b/tests/xtro-sharpie/iOS-CoreImage.ignore
@@ -1,3 +1,5 @@
 ## OSX-only API, rdar #22524785
 ## see https://trello.com/c/kpksFWto/6-22524785-coreimage-headers-discrepancies
 !missing-selector! CIKernel::setROISelector: not bound
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/iOS-CoreImage.todo b/tests/xtro-sharpie/iOS-CoreImage.todo
deleted file mode 100644
index 83f25969a598..000000000000
--- a/tests/xtro-sharpie/iOS-CoreImage.todo
+++ /dev/null
@@ -1,6 +0,0 @@
-!unknown-type! CIFilterGenerator bound
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/macOS-CoreImage.todo b/tests/xtro-sharpie/macOS-CoreImage.todo
deleted file mode 100644
index 8d04066e74d2..000000000000
--- a/tests/xtro-sharpie/macOS-CoreImage.todo
+++ /dev/null
@@ -1,5 +0,0 @@
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound
diff --git a/tests/xtro-sharpie/tvOS-CoreImage.todo b/tests/xtro-sharpie/tvOS-CoreImage.todo
deleted file mode 100644
index 8d04066e74d2..000000000000
--- a/tests/xtro-sharpie/tvOS-CoreImage.todo
+++ /dev/null
@@ -1,5 +0,0 @@
-!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
-!missing-selector! +CIFilter::areaBoundsRedFilter not bound
-!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
-!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
-!missing-field! kCIImageRepresentationHDRGainMapImage not bound