diff --git a/Dalamud/Configuration/PluginConfigurations.cs b/Dalamud/Configuration/PluginConfigurations.cs
index 7ce4697cb..c01ab2af0 100644
--- a/Dalamud/Configuration/PluginConfigurations.cs
+++ b/Dalamud/Configuration/PluginConfigurations.cs
@@ -11,7 +11,7 @@ namespace Dalamud.Configuration;
 /// <summary>
 /// Configuration to store settings for a dalamud plugin.
 /// </summary>
-[Api15ToDo("Make this a service. We need to be able to dispose it reliably to write configs asynchronously. Maybe also let people write files with vfs.")]
+[Api14ToDo("Make this a service. We need to be able to dispose it reliably to write configs asynchronously. Maybe also let people write files with vfs.")]
 public sealed class PluginConfigurations
 {
     private readonly DirectoryInfo configDirectory;
diff --git a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRefreshArgs.cs b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRefreshArgs.cs
index d81d262bf..4fc81632a 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRefreshArgs.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonRefreshArgs.cs
@@ -55,9 +55,7 @@ public class AddonRefreshArgs : AddonArgs
                 AtkValuePtr ptr;
                 unsafe
                 {
-#pragma warning disable CS0618 // Type or member is obsolete
                     ptr = new AtkValuePtr((nint)this.AtkValueSpan.GetPointer(i));
-#pragma warning restore CS0618 // Type or member is obsolete
                 }
 
                 yield return ptr;
diff --git a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonSetupArgs.cs b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonSetupArgs.cs
index 1cc0eacf3..e0b2defbf 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonSetupArgs.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonSetupArgs.cs
@@ -55,9 +55,7 @@ public class AddonSetupArgs : AddonArgs
                 AtkValuePtr ptr;
                 unsafe
                 {
-#pragma warning disable CS0618 // Type or member is obsolete
                     ptr = new AtkValuePtr((nint)this.AtkValueSpan.GetPointer(i));
-#pragma warning restore CS0618 // Type or member is obsolete
                 }
 
                 yield return ptr;
diff --git a/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs b/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
index 138484580..af85f9228 100644
--- a/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
+++ b/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
@@ -150,7 +150,7 @@ internal sealed unsafe class DtrBarEntry : IDisposable, IDtrBarEntry
     }
 
     /// <inheritdoc/>
-    [Api15ToDo("Maybe make this config scoped to internal name?")]
+    [Api14ToDo("Maybe make this config scoped to internal name?")]
     public bool UserHidden => this.configuration.DtrIgnore?.Contains(this.Title) ?? false;
 
     /// <inheritdoc/>
diff --git a/Dalamud/Interface/Animation/Easing.cs b/Dalamud/Interface/Animation/Easing.cs
index a9dfad1f0..cc1f48ce7 100644
--- a/Dalamud/Interface/Animation/Easing.cs
+++ b/Dalamud/Interface/Animation/Easing.cs
@@ -48,7 +48,7 @@ public abstract class Easing
     /// Gets the current value of the animation, following unclamped logic.
     /// </summary>
     [Obsolete($"This field has been deprecated. Use either {nameof(ValueClamped)} or {nameof(ValueUnclamped)} instead.", true)]
-    [Api15ToDo("Map this field to ValueClamped, probably.")]
+    [Api14ToDo("Map this field to ValueClamped, probably.")]
     public double Value => this.ValueUnclamped;
 
     /// <summary>
diff --git a/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs b/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
index 8bd631b0e..e177abab7 100644
--- a/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
+++ b/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
@@ -149,27 +149,16 @@ internal class CallGateChannel
         return (TRet)result;
     }
 
-    /// <summary>
-    /// Set the context for the invocations through this channel.
-    /// </summary>
-    /// <param name="ipcContext">The context to set.</param>
     internal void SetInvocationContext(IpcContext ipcContext)
     {
         this.ipcExecutionContext.Value = ipcContext;
     }
 
-    /// <summary>
-    /// Get the context for invocations through this channel.
-    /// </summary>
-    /// <returns>The context, if one was set.</returns>
     internal IpcContext? GetInvocationContext()
     {
         return this.ipcExecutionContext.IsValueCreated ? this.ipcExecutionContext.Value : null;
     }
 
-    /// <summary>
-    /// Clear the context for this channel.
-    /// </summary>
     internal void ClearInvocationContext()
     {
         this.ipcExecutionContext.Value = null;
diff --git a/Dalamud/Plugin/Services/IClientState.cs b/Dalamud/Plugin/Services/IClientState.cs
index 9e7453c25..2555b3b30 100644
--- a/Dalamud/Plugin/Services/IClientState.cs
+++ b/Dalamud/Plugin/Services/IClientState.cs
@@ -2,7 +2,6 @@ using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Utility;
 
 namespace Dalamud.Plugin.Services;
 
@@ -110,14 +109,12 @@ public interface IClientState : IDalamudService
     /// <summary>
     /// Gets the local player character, if one is present.
     /// </summary>
-    [Api15ToDo("Remove")]
     [Obsolete($"Use {nameof(IPlayerState)} or {nameof(IObjectTable)}.{nameof(IObjectTable.LocalPlayer)} if necessary.")]
     public IPlayerCharacter? LocalPlayer { get; }
 
     /// <summary>
     /// Gets the content ID of the local character.
     /// </summary>
-    [Api15ToDo("Remove")]
     [Obsolete($"Use {nameof(IPlayerState)}.{nameof(IPlayerState.ContentId)}")]
     public ulong LocalContentId { get; }
 
diff --git a/Dalamud/Utility/Api14ToDoAttribute.cs b/Dalamud/Utility/Api14ToDoAttribute.cs
new file mode 100644
index 000000000..945b6e4db
--- /dev/null
+++ b/Dalamud/Utility/Api14ToDoAttribute.cs
@@ -0,0 +1,24 @@
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Utility class for marking something to be changed for API 13, for ease of lookup.
+/// </summary>
+[AttributeUsage(AttributeTargets.All, Inherited = false)]
+internal sealed class Api14ToDoAttribute : Attribute
+{
+    /// <summary>
+    /// Marks that this should be made internal.
+    /// </summary>
+    public const string MakeInternal = "Make internal.";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Api14ToDoAttribute"/> class.
+    /// </summary>
+    /// <param name="what">The explanation.</param>
+    /// <param name="what2">The explanation 2.</param>
+    public Api14ToDoAttribute(string what, string what2 = "")
+    {
+        _ = what;
+        _ = what2;
+    }
+}
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index f60c282d6..b309d1ee1 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit f60c282d63b4157a8f8fb7cbb7e0b35361cdaa12
+Subproject commit b309d1ee1f5445678a9ffffc51555a3a089f72d8