diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs
index 2480a92e13..92bd8d4a6f 100644
--- a/src/AppKit/Enums.cs
+++ b/src/AppKit/Enums.cs
@@ -885,6 +885,7 @@ namespace AppKit {
 		Utility		       					= 1 << 4,
 		DocModal	       					= 1 << 6,
 		NonactivatingPanel     				= 1 << 7,
+		[Advice ("'TexturedBackground' should no longer be used.")]
 		TexturedBackground     				= 1 << 8,
 		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		Unscaled	       					= 1 << 11,
@@ -1977,6 +1978,7 @@ namespace AppKit {
 	}
 
 	[Native]
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSOpenGLContextParameter : ulong {
 		[Deprecated (PlatformName.MacOSX, 10, 7)]
 		SwapRectangle = 200,
@@ -2007,6 +2009,7 @@ namespace AppKit {
 		BelowWindow = -1
 	}
 
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSOpenGLPixelFormatAttribute : uint { // uint32_t NSOpenGLPixelFormatAttribute
 		AllRenderers       =   1,
 		DoubleBuffer       =   5,
@@ -2068,6 +2071,7 @@ namespace AppKit {
 
 #if XAMCORE_4_0
 	[Native]
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSOpenGLProfile : long {
 #else
 	public enum NSOpenGLProfile : int {
@@ -2088,6 +2092,7 @@ namespace AppKit {
 		Third = 1002,
 	}
 
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSOpenGLGlobalOption : uint {
 		FormatCacheSize = 501,
 		ClearFormatCache = 502,
@@ -2097,18 +2102,21 @@ namespace AppKit {
 		ResetLibrary = 504
 	}
 
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSGLTextureTarget : uint {
 		T2D = 0x0de1,
 		CubeMap = 0x8513,
 		RectangleExt = 0x84F5,
 	}
 
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSGLFormat : uint {
 		RGB = 0x1907,
 		RGBA = 0x1908,
 		DepthComponent = 0x1902,
 	}
 	
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSGLTextureCubeMap : uint {
 		None = 0,
 		PositiveX = 0x8515,
@@ -2119,6 +2127,7 @@ namespace AppKit {
 		NegativeZ = 0x851A
 	}
 
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	public enum NSGLColorBuffer : uint {
 		Front = 0x0404,
 		Back = 0x0405,
diff --git a/src/appkit.cs b/src/appkit.cs
index 65b67f1e94..6844a46b72 100644
--- a/src/appkit.cs
+++ b/src/appkit.cs
@@ -8462,6 +8462,7 @@ namespace AppKit {
 
 	[ThreadSafe]
 	[BaseType (typeof (NSObject))]
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	interface NSOpenGLPixelFormat : NSCoding {
 		[Export ("initWithData:")]
 		IntPtr Constructor (NSData attribs);
@@ -8478,6 +8479,7 @@ namespace AppKit {
 
 	[ThreadSafe]
 	[Availability (Deprecated = Platform.Mac_10_7)]
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	[BaseType (typeof (NSObject))]
 	interface NSOpenGLPixelBuffer {
 		[Export ("initWithTextureTarget:textureInternalFormat:textureMaxMipMapLevel:pixelsWide:pixelsHigh:")]
@@ -8509,6 +8511,7 @@ namespace AppKit {
 	[ThreadSafe] // single thread - but not restricted to the main thread
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor] // warns with "invalid context" at runtime
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	interface NSOpenGLContext {
 		[Export ("initWithFormat:shareContext:")]
 		IntPtr Constructor (NSOpenGLPixelFormat format, [NullAllowed] NSOpenGLContext shareContext);
@@ -8598,6 +8601,7 @@ namespace AppKit {
 	}
 
 	[BaseType (typeof (NSView))]
+	[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 	partial interface NSOpenGLView {
 		[Static]
 		[Export ("defaultPixelFormat")]
@@ -11027,6 +11031,10 @@ namespace AppKit {
 		[Mac (10,11)]
 		[Export ("enumerateEnclosingRectsForGlyphRange:withinSelectedGlyphRange:inTextContainer:usingBlock:")]
 		void EnumerateEnclosingRects (NSRange glyphRange, NSRange selectedRange, NSTextContainer textContainer, NSTextLayoutEnumerateEnclosingRects callback);
+
+		[Mac (10, 14, onlyOn64: true)]
+		[Export ("limitsLayoutForSuspiciousContents")]
+		bool LimitsLayoutForSuspiciousContents { get; set; }
 	}
 
 	[BaseType (typeof (NSObject))]
@@ -16372,6 +16380,7 @@ namespace AppKit {
 		[Export ("locationOfPrintRect:")]
 		CGPoint LocationOfPrintRect (CGRect aRect);
 
+		[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] 
 		[Mac (10, 7), Export ("wantsBestResolutionOpenGLSurface")]
 		bool WantsBestResolutionOpenGLSurface { get; set; }
 
@@ -18235,18 +18244,9 @@ namespace AppKit {
 		[Export ("cellSize")]
 		CGSize CellSize { get; }
 
-#if XAMCORE_4_0
-		[Export ("cellBaselineOffset")]
-		CGPoint CellBaselineOffset { get; [Mac (10, 14, onlyOn64: true)] set; }
-#else
 		[Export ("cellBaselineOffset")]
 		CGPoint CellBaselineOffset { get; }
 
-		[Mac (10, 14, onlyOn64: true)]
-		[Export ("setCellBaselineOffset:")]
-		void SetCellBaselineOffset (CGPoint point);
-#endif
-
 		[Export ("drawWithFrame:inView:characterIndex:")]
 		void DrawWithFrame (CGRect cellFrame, NSView controlView, nuint charIndex);
 
diff --git a/tests/xtro-sharpie/macOS-AppKit.todo b/tests/xtro-sharpie/macOS-AppKit.todo
index 4594c7ec00..54a798f8b4 100644
--- a/tests/xtro-sharpie/macOS-AppKit.todo
+++ b/tests/xtro-sharpie/macOS-AppKit.todo
@@ -4,8 +4,6 @@
 !missing-selector! +NSColor::findHighlightColor not bound
 !missing-selector! +NSColor::placeholderTextColor not bound
 !missing-selector! NSSliderCell::setImage: not bound
-!missing-selector! NSLayoutManager::limitsLayoutForSuspiciousContents not bound
-!missing-selector! NSLayoutManager::setLimitsLayoutForSuspiciousContents: not bound
 ## appended from unclassified file
 !missing-field! NSAppearanceDocumentAttribute not bound
 !missing-protocol! NSUserActivityRestoring not bound