diff --git a/src/Uno.CrossTargetting.targets b/src/Uno.CrossTargetting.targets
index d20e707a5cd1..c1b3175683ce 100644
--- a/src/Uno.CrossTargetting.targets
+++ b/src/Uno.CrossTargetting.targets
@@ -67,7 +67,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoRuntimeIdentifier)'=='Skia'">
-		<DefineConstants>$(DefineConstants);__SKIA__;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_MANAGED_SCROLL_PRESENTER;UNO_HAS_MANAGED_POINTERS;SUPPORTS_RTL;UNO_HAS_ENHANCED_LIFECYCLE</DefineConstants>
+		<DefineConstants>$(DefineConstants);__SKIA__;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_MANAGED_SCROLL_PRESENTER;UNO_HAS_MANAGED_POINTERS;SUPPORTS_RTL;UNO_HAS_ENHANCED_LIFECYCLE;UNO_HAS_BORDER_VISUAL</DefineConstants>
 		<DefineConstants>$(DefineConstants);UNO_SUPPORTS_NATIVEHOST;HAS_INPUT_INJECTOR</DefineConstants>
 	</PropertyGroup>
 
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.Uno.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.Uno.cs
index c17980dabb89..3f535c47194e 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.Uno.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.Uno.cs
@@ -1,5 +1,4 @@
-#if __SKIA__
-using System;
+using System;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml.Media;
 using Uno.Disposables;
@@ -9,18 +8,18 @@ namespace Microsoft.UI.Xaml.Controls.Primitives;
 
 partial class ScrollPresenter : IBorderInfoProvider
 {
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private BorderLayerRenderer _borderRenderer;
 #endif
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	partial void InitializePartial()
 	{
 		_borderRenderer = new BorderLayerRenderer(this);
 	}
 #endif
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
@@ -34,11 +33,10 @@ partial class ScrollPresenter : IBorderInfoProvider
 
 	CornerRadius IBorderInfoProvider.CornerRadius => default;
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
 	SerialDisposable IBorderInfoProvider.BackgroundBrushSubscriptionDisposable { get; set; } = new();
 #endif
 }
-#endif
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.cs
index 76514f1d657d..e2ccdc3a32ad 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ScrollPresenter/ScrollPresenter.cs
@@ -3685,8 +3685,10 @@ internal SnapPointWrapper<ZoomSnapPointBase> GetZoomSnapPointWrapper(ZoomSnapPoi
 			// So, they can just cast ScrollPresenter to Panel and set the Background.
 			// In our case, we can't do that as there is no multi inheritance in C#.
 			// We use BorderLayerRenderer to draw the background.
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateBackground();
+#else
+			_borderRenderer.Update();
 #endif
 
 			//Panel thisAsPanel = this;
diff --git a/src/Uno.UI/UI/Xaml/BorderHelper.skia.cs b/src/Uno.UI/UI/Xaml/BorderHelper.skia.cs
index 1bdd1e162bee..5186e6f71ae1 100644
--- a/src/Uno.UI/UI/Xaml/BorderHelper.skia.cs
+++ b/src/Uno.UI/UI/Xaml/BorderHelper.skia.cs
@@ -1,3 +1,4 @@
+#if UNO_HAS_BORDER_VISUAL
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Uno.UI.Xaml.Controls;
@@ -45,3 +46,4 @@ public static void UpdateAllBorderProperties(this IBorderInfoProvider @this)
 		@this.UpdateBorderThickness();
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/Border.IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/Border/Border.IBorderInfoProvider.cs
index f7a987629671..93413db4c519 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Border/Border.IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/Border.IBorderInfoProvider.cs
@@ -18,7 +18,7 @@ partial class Border : IBorderInfoProvider
 
 	CornerRadius IBorderInfoProvider.CornerRadius => CornerRadius;
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs b/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs
index 42058c6bc7dd..773cd7e58e8d 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs
@@ -38,18 +38,18 @@ namespace Microsoft.UI.Xaml.Controls
 	[ContentProperty(Name = nameof(Child))]
 	public partial class Border : FrameworkElement
 	{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		private readonly BorderLayerRenderer _borderRenderer;
 #endif
 
 		public Border()
 		{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 			_borderRenderer = new BorderLayerRenderer(this);
 #endif
 		}
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
@@ -124,7 +124,7 @@ public CornerRadius CornerRadius
 
 		private void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
 		{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateCornerRadius();
 #else
 			UpdateBorder();
@@ -193,7 +193,7 @@ public Thickness Padding
 
 		private void OnPaddingChanged(Thickness oldValue, Thickness newValue)
 		{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			// TODO: https://github.com/unoplatform/uno/issues/16705
 #else
 			UpdateBorder();
@@ -213,7 +213,7 @@ public BackgroundSizing BackgroundSizing
 		}
 		private void OnBackgroundSizingChanged(DependencyPropertyChangedEventArgs e)
 		{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateBackgroundSizing();
 #else
 			UpdateBorder();
@@ -236,7 +236,7 @@ public Thickness BorderThickness
 
 		private void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
 		{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateBorderThickness();
 #else
 			UpdateBorder();
@@ -276,7 +276,7 @@ private void OnBorderBrushChanged(Brush oldValue, Brush newValue)
 		{
 			Brush.SetupBrushChanged(oldValue, newValue, ref _borderBrushChanged, _borderBrushChanged ?? (() =>
 			{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 				this.UpdateBorderBrush();
 #else
 				UpdateBorder();
@@ -295,7 +295,7 @@ private void OnBorderBrushChanged(Brush oldValue, Brush newValue)
 
 		protected override void OnBackgroundChanged(DependencyPropertyChangedEventArgs e)
 		{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateBackground();
 #else
 			UpdateBorder();
@@ -319,7 +319,7 @@ internal static bool IsViewHitImpl(FrameworkElement element)
 			return element.Background != null;
 		}
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		private void UpdateBorder()
 		{
 			_borderRenderer.Update();
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.cs b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.cs
index e15671e43397..92b154707e3e 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.cs
@@ -1,4 +1,4 @@
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 using System;
 using Microsoft.UI.Xaml;
 using Uno.Disposables;
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/Border/IBorderInfoProvider.cs
index 7dd554daebff..eb335801cac3 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Border/IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/IBorderInfoProvider.cs
@@ -38,7 +38,7 @@ internal partial interface IBorderInfoProvider
 	/// </summary>
 	CornerRadius CornerRadius { get; }
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual BorderVisual { get; }
 
 	SerialDisposable BorderBrushSubscriptionDisposable { get; set; }
diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.IBorderInfoProvider.cs
index a92a89562c62..b0781dbc14cf 100644
--- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.IBorderInfoProvider.cs
@@ -67,7 +67,7 @@ Brush IBorderInfoProvider.BorderBrush
 
 	CornerRadius IBorderInfoProvider.CornerRadius => GetItemCornerRadius();
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.h.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.h.cs
index 578d71009607..9143b344e5e5 100644
--- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.h.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItem.h.cs
@@ -27,7 +27,7 @@ public partial class CalendarViewBaseItem : Control
 #if !__NETSTD_REFERENCE__
 			this.Loaded += (_, _) =>
 			{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 				_borderRenderer ??= new(this);
 #endif
 #if !UNO_HAS_ENHANCED_LIFECYCLE
diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.uno.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.uno.cs
index defa9eb0cd15..1b86ca74bf85 100644
--- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.uno.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.uno.cs
@@ -11,7 +11,7 @@ namespace Microsoft.UI.Xaml.Controls
 {
 	partial class CalendarViewBaseItem
 	{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		private BorderLayerRenderer _borderRenderer;
 #endif
 
@@ -54,7 +54,9 @@ internal override void OnArrangeVisual(Rect rect, Rect? clip)
 
 			base.OnArrangeVisual(rect, clip);
 		}
+#endif
 
+#if UNO_HAS_BORDER_VISUAL
 		private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
@@ -69,7 +71,7 @@ private void UpdateChromeIfNeeded(Rect rect)
 
 		private void UpdateChrome()
 		{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 			_borderRenderer ??= new BorderLayerRenderer(this);
 #endif
 
@@ -94,7 +96,7 @@ private void UpdateChrome()
 			}
 #endif
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 			this.UpdateAllBorderProperties();
 #else
 			_borderRenderer.Update();
diff --git a/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.IBorderInfoProvider.cs
index ebd6c3bca8d2..ce4657702fbf 100644
--- a/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.IBorderInfoProvider.cs
@@ -20,7 +20,7 @@ partial class ContentPresenter : IBorderInfoProvider
 
 	CornerRadius IBorderInfoProvider.CornerRadius => CornerRadius;
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
diff --git a/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs
index b56114fde5f9..319af21cf584 100644
--- a/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs
@@ -57,7 +57,7 @@ public partial class ContentPresenter : FrameworkElement, IFrameworkTemplatePool
 	, ICustomClippingElement
 #endif
 {
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private readonly BorderLayerRenderer _borderRenderer;
 #endif
 
@@ -71,7 +71,7 @@ public partial class ContentPresenter : FrameworkElement, IFrameworkTemplatePool
 
 	public ContentPresenter()
 	{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		_borderRenderer = new BorderLayerRenderer(this);
 #endif
 		SetDefaultForeground(ForegroundProperty);
@@ -79,7 +79,7 @@ public ContentPresenter()
 		InitializePlatform();
 	}
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
@@ -205,7 +205,7 @@ public BackgroundSizing BackgroundSizing
 	}
 	private void OnBackgroundSizingChanged(DependencyPropertyChangedEventArgs e)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBackgroundSizing();
 #else
 		UpdateBorder();
@@ -523,7 +523,7 @@ public Thickness Padding
 
 	private void OnPaddingChanged(Thickness oldValue, Thickness newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		// TODO: https://github.com/unoplatform/uno/issues/16705
 #else
 		UpdateBorder();
@@ -554,7 +554,7 @@ public Thickness BorderThickness
 
 	private void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBorderThickness();
 #else
 		UpdateBorder();
@@ -591,7 +591,7 @@ private void OnBorderBrushChanged(Brush oldValue, Brush newValue)
 			(Content as UIElement)?.InvalidateArrange();
 		}
 #endif
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBorderBrush();
 #else
 		UpdateBorder();
@@ -615,7 +615,7 @@ public CornerRadius CornerRadius
 
 	private void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateCornerRadius();
 #else
 		UpdateBorder();
@@ -848,7 +848,7 @@ internal override void Enter(EnterParams @params, int depth)
 		// as it may have been reset during the last unload.
 		SynchronizeContentTemplatedParent();
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		UpdateBorder();
 #endif
 
@@ -1062,7 +1062,7 @@ void ClearImplicitBindinds()
 	/// </remarks>
 	protected override void OnBackgroundChanged(DependencyPropertyChangedEventArgs e)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBackground();
 #else
 		UpdateBorder();
@@ -1236,7 +1236,7 @@ protected override Size MeasureOverride(Size size)
 	/// </summary>
 	partial void ArrangeNativeElement(Rect arrangeRect);
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private void UpdateBorder() => _borderRenderer.Update();
 #endif
 
diff --git a/src/Uno.UI/UI/Xaml/Controls/Page/Page.IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/Page/Page.IBorderInfoProvider.cs
index a2c477fb02d2..a5c099191332 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Page/Page.IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Page/Page.IBorderInfoProvider.cs
@@ -20,7 +20,7 @@ public partial class Page : IBorderInfoProvider
 
 	CornerRadius IBorderInfoProvider.CornerRadius => CornerRadius.None;
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
diff --git a/src/Uno.UI/UI/Xaml/Controls/Page/Page.cs b/src/Uno.UI/UI/Xaml/Controls/Page/Page.cs
index 12a1685cd8e1..14f2e19ed004 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Page/Page.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Page/Page.cs
@@ -10,22 +10,22 @@ namespace Microsoft.UI.Xaml.Controls;
 
 public partial class Page : UserControl
 {
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private readonly BorderLayerRenderer _borderRenderer;
 #endif
 
 	public Page()
 	{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		_borderRenderer = new BorderLayerRenderer(this);
 #endif
 	}
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private void UpdateBorder()
 	{
 		_borderRenderer.Update();
@@ -109,7 +109,7 @@ Frame Frame
 
 	protected override void OnBackgroundChanged(DependencyPropertyChangedEventArgs e)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBackground();
 #else
 		UpdateBorder();
diff --git a/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.IBorderInfoProvider.cs b/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.IBorderInfoProvider.cs
index 811f957c3f98..21a716b7b5a9 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.IBorderInfoProvider.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.IBorderInfoProvider.cs
@@ -20,7 +20,7 @@ partial class Panel : IBorderInfoProvider
 
 	CornerRadius IBorderInfoProvider.CornerRadius => CornerRadiusInternal;
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	BorderVisual IBorderInfoProvider.BorderVisual => Visual as BorderVisual ?? throw new InvalidCastException($"{nameof(IBorderInfoProvider)}s should use a {nameof(BorderVisual)}.");
 
 	SerialDisposable IBorderInfoProvider.BorderBrushSubscriptionDisposable { get; set; } = new();
diff --git a/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.cs b/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.cs
index 2247021f064b..f1bd44abe910 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Panel/Panel.cs
@@ -29,7 +29,7 @@ public partial class Panel : FrameworkElement, IPanel
 	, ICustomClippingElement
 #endif
 {
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private readonly BorderLayerRenderer _borderRenderer;
 #endif
 
@@ -43,13 +43,13 @@ public partial class Panel : FrameworkElement, IPanel
 
 	public Panel()
 	{
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 		_borderRenderer = new BorderLayerRenderer(this);
 #endif
 		_children = new UIElementCollection(this);
 	}
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 	private protected override ShapeVisual CreateElementVisual() => Compositor.GetSharedCompositor().CreateBorderVisual();
 #endif
 
@@ -192,7 +192,7 @@ internal void SetItemsOwner(ItemsControl itemsOwner)
 
 	protected virtual void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateCornerRadius();
 #else
 		UpdateBorder();
@@ -201,7 +201,7 @@ protected virtual void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius
 
 	protected virtual void OnPaddingChanged(Thickness oldValue, Thickness newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		// TODO: https://github.com/unoplatform/uno/issues/16705
 #else
 		UpdateBorder();
@@ -210,7 +210,7 @@ protected virtual void OnPaddingChanged(Thickness oldValue, Thickness newValue)
 
 	protected virtual void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBorderThickness();
 #else
 		UpdateBorder();
@@ -219,7 +219,7 @@ protected virtual void OnBorderThicknessChanged(Thickness oldValue, Thickness ne
 
 	protected virtual void OnBorderBrushChanged(Brush oldValue, Brush newValue)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBorderBrush();
 #else
 		UpdateBorder();
@@ -232,7 +232,7 @@ protected virtual void OnBorderBrushChanged(Brush oldValue, Brush newValue)
 
 	protected override void OnBackgroundChanged(DependencyPropertyChangedEventArgs e)
 	{
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBackground();
 #else
 		UpdateBorder();
@@ -246,7 +246,7 @@ private protected void OnBackgroundSizingChangedInnerPanel(DependencyPropertyCha
 	{
 		base.OnBackgroundSizingChangedInner(e);
 
-#if __SKIA__
+#if UNO_HAS_BORDER_VISUAL
 		this.UpdateBackgroundSizing();
 #else
 		UpdateBorder();
@@ -255,7 +255,7 @@ private protected void OnBackgroundSizingChangedInnerPanel(DependencyPropertyCha
 
 	internal override bool IsViewHit() => Border.IsViewHitImpl(this);
 
-#if !__SKIA__
+#if !UNO_HAS_BORDER_VISUAL
 	private void UpdateBorder() => _borderRenderer.Update();
 #endif