diff --git a/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs
deleted file mode 100644
index 5ed1bf4a6cd..00000000000
--- a/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Numerics;
-using Content.Client.Movement.Systems;
-using Content.Shared.Movement.Components;
-
-namespace Content.Client.Movement.Components;
-
-[RegisterComponent]
-public sealed partial class EyeCursorOffsetComponent : SharedEyeCursorOffsetComponent
-{
-    /// <summary>
-    /// The location the offset will attempt to pan towards; based on the cursor's position in the game window.
-    /// </summary>
-    public Vector2 TargetPosition = Vector2.Zero;
-
-    /// <summary>
-    /// The current positional offset being applied. Used to enable gradual panning.
-    /// </summary>
-    public Vector2 CurrentPosition = Vector2.Zero;
-}
diff --git a/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
index d9f7feb1463..96a04710974 100644
--- a/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
+++ b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Movement.Components;
+using Content.Shared.Movement.Components; // DeltaV - make EyeCursorOffsetComponent entirely Shared
 using Content.Shared.Camera;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
diff --git a/Content.Client/Wieldable/WieldableSystem.cs b/Content.Client/Wieldable/WieldableSystem.cs
index 2de837923c8..cdf9bc486dd 100644
--- a/Content.Client/Wieldable/WieldableSystem.cs
+++ b/Content.Client/Wieldable/WieldableSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Movement.Components;
+using Content.Shared.Movement.Components; // DeltaV - make EyeCursorOffsetComponent entirely Shared
 using Content.Client.Movement.Systems;
 using Content.Shared.Camera;
 using Content.Shared.Hands;
diff --git a/Content.Client/_DV/Movement/CursorOffsetActionSystem.cs b/Content.Client/_DV/Movement/CursorOffsetActionSystem.cs
index 6c0f77b6d13..31c903ff942 100644
--- a/Content.Client/_DV/Movement/CursorOffsetActionSystem.cs
+++ b/Content.Client/_DV/Movement/CursorOffsetActionSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Movement.Components;
+using Content.Shared.Movement.Components; // DeltaV - make EyeCursorOffsetComponent entirely Shared
 using Content.Shared._DV.Movement;
 using Robust.Client.Timing;
 
diff --git a/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs
deleted file mode 100644
index b3809fe794b..00000000000
--- a/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Numerics;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Movement.Components;
-
-[RegisterComponent]
-public sealed partial class EyeCursorOffsetComponent : SharedEyeCursorOffsetComponent
-{
-
-}
diff --git a/Content.Server/_DV/Movement/CursorOffsetActionSystem.cs b/Content.Server/_DV/Movement/CursorOffsetActionSystem.cs
index 67336841846..7a58ae02bbf 100644
--- a/Content.Server/_DV/Movement/CursorOffsetActionSystem.cs
+++ b/Content.Server/_DV/Movement/CursorOffsetActionSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.Movement.Components;
 using Content.Shared._DV.Movement;
 using Content.Shared.Camera;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 
 namespace Content.Server._DV.Movement;
diff --git a/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs
index 333d58e3877..c5e0256d8f2 100644
--- a/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs
+++ b/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs
@@ -7,14 +7,14 @@ namespace Content.Shared.Movement.Components;
 /// <summary>
 /// Displaces SS14 eye data when given to an entity.
 /// </summary>
-[ComponentProtoName("EyeCursorOffset"), NetworkedComponent]
-public abstract partial class SharedEyeCursorOffsetComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] // DeltaV - remove ComponentProtoName, add AutoGenerateComponentState
+public sealed partial class EyeCursorOffsetComponent : Component // DeltaV - make component entirely Shared, was SharedEyeCursorOffsetComponent and abstract
 {
     /// <summary>
     /// The amount the view will be displaced when the cursor is positioned at/beyond the max offset distance.
     /// Measured in tiles.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField] // DeltaV - make AutoNetworkedField
     public float MaxOffset = 3f;
 
     /// <summary>
@@ -27,9 +27,21 @@ public abstract partial class SharedEyeCursorOffsetComponent : Component
     /// The amount the PVS should increase to account for the max offset.
     /// Should be 1/10 of MaxOffset most of the time.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField] // DeltaV - make AutoNetworkedField
     public float PvsIncrease = 0.3f;
 
+    // Begin DeltaV additions - make component entirely Shared
+    /// <summary>
+    /// The location the offset will attempt to pan towards; based on the cursor's position in the game window.
+    /// </summary>
+    public Vector2 TargetPosition = Vector2.Zero;
+
+    /// <summary>
+    /// The current positional offset being applied. Used to enable gradual panning.
+    /// </summary>
+    public Vector2 CurrentPosition = Vector2.Zero;
+    // End DeltaV additions - make component entirely Shared
+
     [DataField]
     public bool Enabled = true; // DeltaV - enable/disable
 }