diff --git a/src/AVKit/Enums.cs b/src/AVKit/Enums.cs
index 95326a54ef..e035996382 100644
--- a/src/AVKit/Enums.cs
+++ b/src/AVKit/Enums.cs
@@ -18,13 +18,13 @@ namespace AVKit {
 	}
 #endif
 
-#if !MONOMAC || !XAMCORE_4_0
-#if NET
-	[SupportedOSPlatform ("ios9.0")]
-	[SupportedOSPlatform ("tvos13.0")]
-#else
+	// The version of the AVError.h header file in the tvOS SDK is much newer than in the iOS SDKs,
+	// (copyright 2016 vs 2019), so this is reflecting the tvOS SDK.
 	[iOS (9,0)]
 	[TV (13,0)]
+#if NET
+	[NoMac]
+	[NoWatch]
 #endif
 	[Native]
 	[ErrorDomain ("AVKitErrorDomain")]
@@ -36,7 +36,6 @@ namespace AVKit {
 		ContentDisallowedByPasscode = -1101,
 		ContentDisallowedByProfile = -1102,
 	}
-#endif
 
 #if NET
 	[SupportedOSPlatform ("ios13.0")]
diff --git a/src/avkit.cs b/src/avkit.cs
index 2be9e1367c..5cae4cb4ba 100644
--- a/src/avkit.cs
+++ b/src/avkit.cs
@@ -46,7 +46,7 @@ namespace AVKit {
 	[Mac (10,15)]
 	[BaseType (typeof(NSObject))]
 	[DisableDefaultCtor]
-#if XAMCORE_4_0
+#if NET
 	[Sealed] // Apple docs: Do not subclass AVPictureInPictureController. Overriding this class’s methods is unsupported and results in undefined behavior.
 #endif
 	interface AVPictureInPictureController
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.ignore b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.ignore
deleted file mode 100644
index dd53db8ed2..0000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-## Extra API fixed in XAMCORE_4_0
-!unknown-field! AVKitErrorDomain bound
-!unknown-native-enum! AVKitError bound