diff --git a/Dalamud/Game/AddonLifecycle/AddonArgs.cs b/Dalamud/Game/AddonLifecycle/AddonArgs.cs
new file mode 100644
index 000000000..50c995abb
--- /dev/null
+++ b/Dalamud/Game/AddonLifecycle/AddonArgs.cs
@@ -0,0 +1,22 @@
+using Dalamud.Memory;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+
+namespace Dalamud.Game.AddonLifecycle;
+
+/// <summary>
+/// Addon argument data for use in event subscribers.
+/// </summary>
+public unsafe class AddonArgs
+{
+    private string? addonName;
+        
+    /// <summary>
+    /// Gets the name of the addon this args referrers to.
+    /// </summary>
+    public string AddonName => this.Addon == nint.Zero ? "NullAddon" : this.addonName ??= MemoryHelper.ReadString((nint)((AtkUnitBase*)this.Addon)->Name, 0x20);
+
+    /// <summary>
+    /// Gets the pointer to the addons AtkUnitBase.
+    /// </summary>
+    required public nint Addon { get; init; }
+}
diff --git a/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs b/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
index c0e817f0d..5fc1c7d2b 100644
--- a/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
+++ b/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
@@ -127,7 +127,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
         this.onAddonRequestedUpdateHook.Enable();
     }
 
-    private void InvokeListeners(AddonEvent eventType, IAddonLifecycle.AddonArgs args)
+    private void InvokeListeners(AddonEvent eventType, AddonArgs args)
     {
         // Match on string.empty for listeners that want events for all addons.
         foreach (var listener in this.eventListeners.Where(listener => listener.EventType == eventType && (listener.AddonName == args.AddonName || listener.AddonName == string.Empty)))
@@ -140,7 +140,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreSetup, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PreSetup, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -151,7 +151,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
 
         try
         {
-            this.InvokeListeners(AddonEvent.PostSetup, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PostSetup, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -165,7 +165,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreFinalize, new IAddonLifecycle.AddonArgs { Addon = (nint)atkUnitBase[0] });
+            this.InvokeListeners(AddonEvent.PreFinalize, new AddonArgs { Addon = (nint)atkUnitBase[0] });
         }
         catch (Exception e)
         {
@@ -179,7 +179,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreDraw, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PreDraw, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -190,7 +190,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
 
         try
         {
-            this.InvokeListeners(AddonEvent.PostDraw, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PostDraw, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -202,7 +202,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreUpdate, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PreUpdate, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -213,7 +213,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
 
         try
         {
-            this.InvokeListeners(AddonEvent.PostUpdate, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PostUpdate, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -225,7 +225,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreRefresh, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PreRefresh, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -236,7 +236,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
 
         try
         {
-            this.InvokeListeners(AddonEvent.PostRefresh, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PostRefresh, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -248,7 +248,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     {
         try
         {
-            this.InvokeListeners(AddonEvent.PreRequestedUpdate, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PreRequestedUpdate, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
@@ -259,7 +259,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
 
         try
         {
-            this.InvokeListeners(AddonEvent.PostRequestedUpdate, new IAddonLifecycle.AddonArgs { Addon = (nint)addon });
+            this.InvokeListeners(AddonEvent.PostRequestedUpdate, new AddonArgs { Addon = (nint)addon });
         }
         catch (Exception e)
         {
diff --git a/Dalamud/Plugin/Services/IAddonLifecycle.cs b/Dalamud/Plugin/Services/IAddonLifecycle.cs
index cbb3d7c24..1dc792660 100644
--- a/Dalamud/Plugin/Services/IAddonLifecycle.cs
+++ b/Dalamud/Plugin/Services/IAddonLifecycle.cs
@@ -2,8 +2,6 @@
 using System.Runtime.InteropServices;
 
 using Dalamud.Game.AddonLifecycle;
-using Dalamud.Memory;
-using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace Dalamud.Plugin.Services;
 
@@ -79,22 +77,4 @@ public interface IAddonLifecycle
     /// </summary>
     /// <param name="handlers">Handlers to remove.</param>
     void UnregisterListener(params AddonEventDelegate[] handlers);
-    
-    /// <summary>
-    /// Addon argument data for use in event subscribers.
-    /// </summary>
-    public unsafe class AddonArgs
-    {
-        private string? addonName;
-        
-        /// <summary>
-        /// Gets the name of the addon this args referrers to.
-        /// </summary>
-        public string AddonName => this.Addon == nint.Zero ? "NullAddon" : this.addonName ??= MemoryHelper.ReadString((nint)((AtkUnitBase*)this.Addon)->Name, 0x20);
-
-        /// <summary>
-        /// Gets the pointer to the addons AtkUnitBase.
-        /// </summary>
-        required public nint Addon { get; init; }
-    }
 }