diff --git a/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.inc b/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.inc
index 3440efe81e5..471e700100c 100644
--- a/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.inc
+++ b/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.inc
@@ -6,16 +6,13 @@
 
 #include "frc/controller/struct/SimpleMotorFeedforwardStruct.h"
 
-namespace {
-constexpr size_t kKsOff = 0;
-constexpr size_t kKvOff = kKsOff + 8;
-constexpr size_t kKaOff = kKvOff + 8;
-}  // namespace
-
 template <class Distance>
 frc::SimpleMotorFeedforward<Distance>
 wpi::Struct<frc::SimpleMotorFeedforward<Distance>>::Unpack(
     std::span<const uint8_t> data) {
+  constexpr size_t kKsOff = 0;
+  constexpr size_t kKvOff = kKsOff + 8;
+  constexpr size_t kKaOff = kKvOff + 8;
   return {units::volt_t{wpi::UnpackStruct<double, kKsOff>(data)},
           units::unit_t<frc::SimpleMotorFeedforward<units::meters>::kv_unit>{
               wpi::UnpackStruct<double, kKvOff>(data)},
@@ -27,6 +24,9 @@ template <class Distance>
 void wpi::Struct<frc::SimpleMotorFeedforward<Distance>>::Pack(
     std::span<uint8_t> data,
     const frc::SimpleMotorFeedforward<Distance>& value) {
+  constexpr size_t kKsOff = 0;
+  constexpr size_t kKvOff = kKsOff + 8;
+  constexpr size_t kKaOff = kKvOff + 8;
   wpi::PackStruct<kKsOff>(data, value.kS.value());
   wpi::PackStruct<kKvOff>(
       data,
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.inc b/wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.inc
index 3c22ca8c529..5e4dee13eeb 100644
--- a/wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.inc
+++ b/wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.inc
@@ -6,14 +6,11 @@
 
 #include "frc/kinematics/struct/SwerveDriveKinematicsStruct.h"
 
-namespace {
-constexpr size_t kModulesOff = 0;
-}  // namespace
-
 template <size_t NumModules>
 frc::SwerveDriveKinematics<NumModules>
 wpi::Struct<frc::SwerveDriveKinematics<NumModules>>::Unpack(
     std::span<const uint8_t> data) {
+  constexpr size_t kModulesOff = 0;
   return frc::SwerveDriveKinematics<NumModules>{
       wpi::UnpackStructArray<frc::Translation2d, kModulesOff, NumModules>(
           data)};
@@ -23,5 +20,6 @@ template <size_t NumModules>
 void wpi::Struct<frc::SwerveDriveKinematics<NumModules>>::Pack(
     std::span<uint8_t> data,
     const frc::SwerveDriveKinematics<NumModules>& value) {
+  constexpr size_t kModulesOff = 0;
   wpi::PackStructArray<kModulesOff, NumModules>(data, value.GetModules());
 }
diff --git a/wpimath/src/main/native/include/frc/struct/MatrixStruct.inc b/wpimath/src/main/native/include/frc/struct/MatrixStruct.inc
index 2c8e23c2300..4efda8a41de 100644
--- a/wpimath/src/main/native/include/frc/struct/MatrixStruct.inc
+++ b/wpimath/src/main/native/include/frc/struct/MatrixStruct.inc
@@ -6,15 +6,12 @@
 
 #include "frc/struct/MatrixStruct.h"
 
-namespace {
-constexpr size_t kDataOff = 0;
-}  // namespace
-
 template <int Rows, int Cols, int Options, int MaxRows, int MaxCols>
   requires(Cols != 1)
 frc::Matrixd<Rows, Cols, Options, MaxRows, MaxCols>
 wpi::Struct<frc::Matrixd<Rows, Cols, Options, MaxRows, MaxCols>>::Unpack(
     std::span<const uint8_t> data) {
+  constexpr size_t kDataOff = 0;
   wpi::array<double, Rows * Cols> mat_data =
       wpi::UnpackStructArray<double, kDataOff, Rows * Cols>(data);
   frc::Matrixd<Rows, Cols, Options, MaxRows, MaxCols> mat;
@@ -29,6 +26,7 @@ template <int Rows, int Cols, int Options, int MaxRows, int MaxCols>
 void wpi::Struct<frc::Matrixd<Rows, Cols, Options, MaxRows, MaxCols>>::Pack(
     std::span<uint8_t> data,
     const frc::Matrixd<Rows, Cols, Options, MaxRows, MaxCols>& value) {
+  constexpr size_t kDataOff = 0;
   wpi::array<double, Rows * Cols> mat_data(wpi::empty_array);
   for (int i = 0; i < Rows * Cols; i++) {
     mat_data[i] = value(i);
diff --git a/wpimath/src/main/native/include/frc/struct/VectorStruct.inc b/wpimath/src/main/native/include/frc/struct/VectorStruct.inc
index ee2a81893f5..4fcfbb009dd 100644
--- a/wpimath/src/main/native/include/frc/struct/VectorStruct.inc
+++ b/wpimath/src/main/native/include/frc/struct/VectorStruct.inc
@@ -6,14 +6,11 @@
 
 #include "frc/struct/VectorStruct.h"
 
-namespace {
-constexpr size_t kDataOff = 0;
-}  // namespace
-
 template <int Size, int Options, int MaxRows, int MaxCols>
 frc::Matrixd<Size, 1, Options, MaxRows, MaxCols>
 wpi::Struct<frc::Matrixd<Size, 1, Options, MaxRows, MaxCols>>::Unpack(
     std::span<const uint8_t> data) {
+  constexpr size_t kDataOff = 0;
   wpi::array<double, Size> vec_data =
       wpi::UnpackStructArray<double, kDataOff, Size>(data);
   frc::Matrixd<Size, 1, Options, MaxRows, MaxCols> vec;
@@ -27,6 +24,7 @@ template <int Size, int Options, int MaxRows, int MaxCols>
 void wpi::Struct<frc::Matrixd<Size, 1, Options, MaxRows, MaxCols>>::Pack(
     std::span<uint8_t> data,
     const frc::Matrixd<Size, 1, Options, MaxRows, MaxCols>& value) {
+  constexpr size_t kDataOff = 0;
   wpi::array<double, Size> vec_data(wpi::empty_array);
   for (int i = 0; i < Size; i++) {
     vec_data[i] = value(i);