diff --git a/components/DataTable/src/Dependencies.props b/components/DataTable/src/Dependencies.props
index be4306195..502311afe 100644
--- a/components/DataTable/src/Dependencies.props
+++ b/components/DataTable/src/Dependencies.props
@@ -17,6 +17,7 @@
         <PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.0.0-beta.2"/>
+        <PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
     </ItemGroup>
 
     <!-- WinUI 3 / WinAppSdk / Uno -->
@@ -24,5 +25,6 @@
         <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.0-beta.2"/>
+        <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
     </ItemGroup>
 </Project>
diff --git a/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.cs b/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.cs
deleted file mode 100644
index ae194529e..000000000
--- a/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace CommunityToolkit.WinUI.Controls;
-
-/// <summary>
-/// Represents a control that contains multiple items and has a header.
-/// </summary>
-public partial class HeaderedItemsControl : ItemsControl
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HeaderedItemsControl"/> class.
-    /// </summary>
-    public HeaderedItemsControl()
-    {
-        DefaultStyleKey = typeof(HeaderedItemsControl);
-    }
-
-    /// <summary>
-    /// Identifies the <see cref="Footer"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
-        nameof(Footer),
-        typeof(object),
-        typeof(HeaderedItemsControl),
-        new PropertyMetadata(null, OnFooterChanged));
-
-    /// <summary>
-    /// Identifies the <see cref="FooterTemplate"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
-        nameof(FooterTemplate),
-        typeof(DataTemplate),
-        typeof(HeaderedItemsControl),
-        new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets the data used for the Footer of each control.
-    /// </summary>
-    public object Footer
-    {
-        get { return GetValue(FooterProperty); }
-        set { SetValue(FooterProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the template used to display the content of the control's Footer.
-    /// </summary>
-    public DataTemplate FooterTemplate
-    {
-        get { return (DataTemplate)GetValue(FooterTemplateProperty); }
-        set { SetValue(FooterTemplateProperty, value); }
-    }
-
-    /// <summary>
-    /// Identifies the <see cref="Header"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-        nameof(Header),
-        typeof(object),
-        typeof(HeaderedItemsControl),
-        new PropertyMetadata(null, OnHeaderChanged));
-
-    /// <summary>
-    /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-        nameof(HeaderTemplate),
-        typeof(DataTemplate),
-        typeof(HeaderedItemsControl),
-        new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets the data used for the header of each control.
-    /// </summary>
-    public object Header
-    {
-        get { return GetValue(HeaderProperty); }
-        set { SetValue(HeaderProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the template used to display the content of the control's header.
-    /// </summary>
-    public DataTemplate HeaderTemplate
-    {
-        get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-        set { SetValue(HeaderTemplateProperty, value); }
-    }
-
-    /// <summary>
-    /// Called when the <see cref="Footer"/> property changes.
-    /// </summary>
-    /// <param name="oldValue">The old value of the <see cref="Footer"/> property.</param>
-    /// <param name="newValue">The new value of the <see cref="Footer"/> property.</param>
-    protected virtual void OnFooterChanged(object oldValue, object newValue)
-    {
-    }
-
-    private static void OnFooterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var control = (HeaderedItemsControl)d;
-        control.OnFooterChanged(e.OldValue, e.NewValue);
-    }
-
-    /// <summary>
-    /// Called when the <see cref="Header"/> property changes.
-    /// </summary>
-    /// <param name="oldValue">The old value of the <see cref="Header"/> property.</param>
-    /// <param name="newValue">The new value of the <see cref="Header"/> property.</param>
-    protected virtual void OnHeaderChanged(object oldValue, object newValue)
-    {
-    }
-
-    private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var control = (HeaderedItemsControl)d;
-        control.OnHeaderChanged(e.OldValue, e.NewValue);
-    }
-}
diff --git a/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.xaml b/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.xaml
deleted file mode 100644
index 8085e90b7..000000000
--- a/components/DataTable/src/HeaderedItemsControl/HeaderedItemsControl.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
-    <Style TargetType="controls:HeaderedItemsControl">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:HeaderedItemsControl">
-                    <ItemsPresenter Margin="{TemplateBinding Margin}"
-                                    Padding="{TemplateBinding Padding}"
-                                    Footer="{TemplateBinding Footer}"
-                                    FooterTemplate="{TemplateBinding FooterTemplate}"
-                                    Header="{TemplateBinding Header}"
-                                    HeaderTemplate="{TemplateBinding HeaderTemplate}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.cs b/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.cs
deleted file mode 100644
index 4d4525f10..000000000
--- a/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using TreeView = Microsoft.UI.Xaml.Controls.TreeView;
-
-namespace CommunityToolkit.WinUI.Controls;
-
-/// <summary>
-/// Represents a <see cref="TreeView"/> and has a header.
-/// </summary>
-public partial class HeaderedTreeView : TreeView
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HeaderedTreeView"/> class.
-    /// </summary>
-    public HeaderedTreeView()
-    {
-        DefaultStyleKey = typeof(HeaderedTreeView);
-
-        // Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/3502
-        this.DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.Controls.DataTable/Themes/Generic.xaml");
-    }
-
-    /// <summary>
-    /// Identifies the <see cref="Footer"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
-        nameof(Footer),
-        typeof(object),
-        typeof(HeaderedTreeView),
-        new PropertyMetadata(null, OnFooterChanged));
-
-    /// <summary>
-    /// Identifies the <see cref="FooterTemplate"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
-        nameof(FooterTemplate),
-        typeof(DataTemplate),
-        typeof(HeaderedTreeView),
-        new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets the data used for the Footer of each control.
-    /// </summary>
-    public object Footer
-    {
-        get { return GetValue(FooterProperty); }
-        set { SetValue(FooterProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the template used to display the content of the control's Footer.
-    /// </summary>
-    public DataTemplate FooterTemplate
-    {
-        get { return (DataTemplate)GetValue(FooterTemplateProperty); }
-        set { SetValue(FooterTemplateProperty, value); }
-    }
-
-    /// <summary>
-    /// Identifies the <see cref="Header"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-        nameof(Header),
-        typeof(object),
-        typeof(HeaderedTreeView),
-        new PropertyMetadata(null, OnHeaderChanged));
-
-    /// <summary>
-    /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-    /// </summary>
-    public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-        nameof(HeaderTemplate),
-        typeof(DataTemplate),
-        typeof(HeaderedTreeView),
-        new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets the data used for the header of each control.
-    /// </summary>
-    public object Header
-    {
-        get { return GetValue(HeaderProperty); }
-        set { SetValue(HeaderProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the template used to display the content of the control's header.
-    /// </summary>
-    public DataTemplate HeaderTemplate
-    {
-        get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-        set { SetValue(HeaderTemplateProperty, value); }
-    }
-
-    /// <summary>
-    /// Called when the <see cref="Footer"/> property changes.
-    /// </summary>
-    /// <param name="oldValue">The old value of the <see cref="Footer"/> property.</param>
-    /// <param name="newValue">The new value of the <see cref="Footer"/> property.</param>
-    protected virtual void OnFooterChanged(object oldValue, object newValue)
-    {
-    }
-
-    private static void OnFooterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var control = (HeaderedTreeView)d;
-        control.OnFooterChanged(e.OldValue, e.NewValue);
-    }
-
-    /// <summary>
-    /// Called when the <see cref="Header"/> property changes.
-    /// </summary>
-    /// <param name="oldValue">The old value of the <see cref="Header"/> property.</param>
-    /// <param name="newValue">The new value of the <see cref="Header"/> property.</param>
-    protected virtual void OnHeaderChanged(object oldValue, object newValue)
-    {
-    }
-
-    private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var control = (HeaderedTreeView)d;
-        control.OnHeaderChanged(e.OldValue, e.NewValue);
-    }
-}
diff --git a/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.xaml b/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.xaml
deleted file mode 100644
index b8097f3ef..000000000
--- a/components/DataTable/src/HeaderedTreeView/HeaderedTreeView.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
-
-    <Style TargetType="controls:HeaderedTreeView">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="CanDragItems" Value="True" />
-        <Setter Property="CanReorderItems" Value="True" />
-        <Setter Property="AllowDrop" Value="True" />
-        <Setter Property="ItemContainerTransitions">
-            <Setter.Value>
-                <TransitionCollection>
-                    <ContentThemeTransition />
-                    <ReorderThemeTransition />
-                    <EntranceThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:HeaderedTreeView">
-                    <muxc:TreeViewList x:Name="ListControl"
-                                       AllowDrop="{TemplateBinding AllowDrop}"
-                                       Background="{TemplateBinding Background}"
-                                       CanDragItems="{TemplateBinding CanDragItems}"
-                                       CanReorderItems="{TemplateBinding CanReorderItems}"
-                                       Footer="{TemplateBinding Footer}"
-                                       Header="{TemplateBinding Header}"
-                                       ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                                       ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
-                                       ItemContainerTransitions="{TemplateBinding ItemContainerTransitions}"
-                                       ItemTemplate="{TemplateBinding ItemTemplate}"
-                                       ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>