SCRIPT Run cc include replacements

wpimath/src/main/native/cpp/controller/ArmFeedforward.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/ArmFeedforward.h"
+#include "wpi/math/controller/ArmFeedforward.hpp"
 
 #include <algorithm>
 #include <limits>
@@ -10,8 +10,8 @@
 #include <sleipnir/autodiff/gradient.hpp>
 #include <sleipnir/autodiff/hessian.hpp>
 
-#include "frc/EigenCore.h"
-#include "frc/system/NumericalIntegration.h"
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/system/NumericalIntegration.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/BangBangController.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/BangBangController.h"
+#include "wpi/math/controller/BangBangController.hpp"
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/DifferentialDriveAccelerationLimiter.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/DifferentialDriveAccelerationLimiter.h"
+#include "wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp"
 
 #include <Eigen/QR>
 

wpimath/src/main/native/cpp/controller/DifferentialDriveFeedforward.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/DifferentialDriveFeedforward.h"
+#include "wpi/math/controller/DifferentialDriveFeedforward.hpp"
 
 #include <Eigen/Core>
 
-#include "frc/controller/LinearPlantInversionFeedforward.h"
+#include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/LTVDifferentialDriveController.h"
+#include "wpi/math/controller/LTVDifferentialDriveController.hpp"
 
 #include <cmath>
 
-#include "frc/DARE.h"
-#include "frc/MathUtil.h"
-#include "frc/system/Discretization.h"
+#include "wpi/math/linalg/DARE.hpp"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/math/system/Discretization.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/LTVUnicycleController.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/LTVUnicycleController.h"
+#include "wpi/math/controller/LTVUnicycleController.hpp"
 
-#include "frc/DARE.h"
-#include "frc/system/Discretization.h"
-#include "units/math.h"
+#include "wpi/math/linalg/DARE.hpp"
+#include "wpi/math/system/Discretization.hpp"
+#include "wpi/units/math.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/LinearQuadraticRegulator.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/LinearQuadraticRegulator.h"
+#include "wpi/math/controller/LinearQuadraticRegulator.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/controller/PIDController.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/PIDController.h"
+#include "wpi/math/controller/PIDController.hpp"
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/controller/ProfiledPIDController.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/ProfiledPIDController.h"
+#include "wpi/math/controller/ProfiledPIDController.hpp"
 
 int frc::detail::IncrementAndGetProfiledPIDControllerInstances() {
   static int instances = 0;

wpimath/src/main/native/cpp/controller/proto/ArmFeedforwardProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/proto/ArmFeedforwardProto.h"
+#include "wpi/math/controller/proto/ArmFeedforwardProto.hpp"
 
 #include <optional>
 

wpimath/src/main/native/cpp/controller/proto/DifferentialDriveFeedforwardProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/proto/DifferentialDriveFeedforwardProto.h"
+#include "wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp"
 
 #include "wpimath/protobuf/controller.npb.h"
 

wpimath/src/main/native/cpp/controller/proto/DifferentialDriveWheelVoltagesProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/proto/DifferentialDriveWheelVoltagesProto.h"
+#include "wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp"
 
 #include <optional>
 

wpimath/src/main/native/cpp/controller/proto/ElevatorFeedforwardProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/proto/ElevatorFeedforwardProto.h"
+#include "wpi/math/controller/proto/ElevatorFeedforwardProto.hpp"
 
 #include <optional>
 

wpimath/src/main/native/cpp/controller/struct/ArmFeedforwardStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/struct/ArmFeedforwardStruct.h"
+#include "wpi/math/controller/struct/ArmFeedforwardStruct.hpp"
 
 namespace {
 constexpr size_t kKsOff = 0;

wpimath/src/main/native/cpp/controller/struct/DifferentialDriveFeedforwardStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/struct/DifferentialDriveFeedforwardStruct.h"
+#include "wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp"
 
 namespace {
 constexpr size_t kKvLinearOff = 0;

wpimath/src/main/native/cpp/controller/struct/DifferentialDriveWheelVoltagesStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h"
+#include "wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp"
 
 namespace {
 constexpr size_t kLeftOff = 0;

wpimath/src/main/native/cpp/controller/struct/ElevatorFeedforwardStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/controller/struct/ElevatorFeedforwardStruct.h"
+#include "wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp"
 
 namespace {
 constexpr size_t kKsOff = 0;

wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/DifferentialDrivePoseEstimator.h"
+#include "wpi/math/estimator/DifferentialDrivePoseEstimator.hpp"
 
 #include <vector>
 

wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator3d.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/DifferentialDrivePoseEstimator3d.h"
+#include "wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/estimator/KalmanFilter.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/KalmanFilter.h"
+#include "wpi/math/estimator/KalmanFilter.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/MecanumDrivePoseEstimator.h"
+#include "wpi/math/estimator/MecanumDrivePoseEstimator.hpp"
 
-#include <wpi/timestamp.h>
+#include "wpi/util/timestamp.h"
 
-#include "frc/StateSpaceUtil.h"
-#include "frc/estimator/AngleStatistics.h"
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/math/estimator/AngleStatistics.hpp"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/MecanumDrivePoseEstimator3d.h"
+#include "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp"
 
-#include <wpi/timestamp.h>
+#include "wpi/util/timestamp.h"
 
-#include "frc/StateSpaceUtil.h"
-#include "frc/estimator/AngleStatistics.h"
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/math/estimator/AngleStatistics.hpp"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/estimator/MerweUKF.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/MerweUKF.h"
+#include "wpi/math/estimator/MerweUKF.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/estimator/S3UKF.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/S3UKF.h"
+#include "wpi/math/estimator/S3UKF.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/estimator/SteadyStateKalmanFilter.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/SteadyStateKalmanFilter.h"
+#include "wpi/math/estimator/SteadyStateKalmanFilter.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/estimator/SwerveDrivePoseEstimator.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/SwerveDrivePoseEstimator.h"
+#include "wpi/math/estimator/SwerveDrivePoseEstimator.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/estimator/SwerveDrivePoseEstimator3d.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/estimator/SwerveDrivePoseEstimator3d.h"
+#include "wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/filter/Debouncer.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/filter/Debouncer.h"
+#include "wpi/math/filter/Debouncer.hpp"
 
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/geometry/Ellipse2d.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Ellipse2d.h"
+#include "wpi/math/geometry/Ellipse2d.hpp"
 
 #include <sleipnir/optimization/problem.hpp>
 

wpimath/src/main/native/cpp/geometry/Pose2d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Pose2d.h"
+#include "wpi/math/geometry/Pose2d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Pose2d& pose) {
   json = wpi::json{{"translation", pose.Translation()},

wpimath/src/main/native/cpp/geometry/Pose3d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Pose3d.h"
+#include "wpi/math/geometry/Pose3d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Pose3d& pose) {
   json = wpi::json{{"translation", pose.Translation()},

wpimath/src/main/native/cpp/geometry/Quaternion.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Quaternion.h"
+#include "wpi/math/geometry/Quaternion.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Quaternion& quaternion) {
   json = wpi::json{{"W", quaternion.W()},

wpimath/src/main/native/cpp/geometry/Rotation2d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Rotation2d.h"
+#include "wpi/math/geometry/Rotation2d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Rotation2d& rotation) {
   json = wpi::json{{"radians", rotation.Radians().value()}};

wpimath/src/main/native/cpp/geometry/Rotation3d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Rotation3d.h"
+#include "wpi/math/geometry/Rotation3d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Rotation3d& rotation) {
   json = wpi::json{{"quaternion", rotation.GetQuaternion()}};

wpimath/src/main/native/cpp/geometry/Translation2d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Translation2d.h"
+#include "wpi/math/geometry/Translation2d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Translation2d& translation) {
   json =

wpimath/src/main/native/cpp/geometry/Translation3d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/Translation3d.h"
+#include "wpi/math/geometry/Translation3d.hpp"
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 void frc::to_json(wpi::json& json, const Translation3d& translation) {
   json = wpi::json{{"x", translation.X().value()},

wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Ellipse2dProto.h"
+#include "wpi/math/geometry/proto/Ellipse2dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Pose2dProto.h"
+#include "wpi/math/geometry/proto/Pose2dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Pose3dProto.h"
+#include "wpi/math/geometry/proto/Pose3dProto.hpp"
 
-#include <wpi/protobuf/Protobuf.h>
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "frc/geometry/Pose3d.h"
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Pose3d> wpi::Protobuf<frc::Pose3d>::Unpack(

wpimath/src/main/native/cpp/geometry/proto/QuaternionProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/QuaternionProto.h"
+#include "wpi/math/geometry/proto/QuaternionProto.hpp"
 
 #include "wpimath/protobuf/geometry3d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Rectangle2dProto.h"
+#include "wpi/math/geometry/proto/Rectangle2dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Rotation2dProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Rotation2dProto.h"
+#include "wpi/math/geometry/proto/Rotation2dProto.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Rotation3dProto.h"
+#include "wpi/math/geometry/proto/Rotation3dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry3d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Transform2dProto.h"
+#include "wpi/math/geometry/proto/Transform2dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Transform3dProto.h"
+#include "wpi/math/geometry/proto/Transform3dProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/geometry3d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Translation2dProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Translation2dProto.h"
+#include "wpi/math/geometry/proto/Translation2dProto.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Translation3dProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Translation3dProto.h"
+#include "wpi/math/geometry/proto/Translation3dProto.hpp"
 
 #include "wpimath/protobuf/geometry3d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Twist2dProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Twist2dProto.h"
+#include "wpi/math/geometry/proto/Twist2dProto.hpp"
 
 #include "wpimath/protobuf/geometry2d.npb.h"
 

wpimath/src/main/native/cpp/geometry/proto/Twist3dProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/proto/Twist3dProto.h"
+#include "wpi/math/geometry/proto/Twist3dProto.hpp"
 
 #include "wpimath/protobuf/geometry3d.npb.h"
 

wpimath/src/main/native/cpp/geometry/struct/Ellipse2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Ellipse2dStruct.h"
+#include "wpi/math/geometry/struct/Ellipse2dStruct.hpp"
 
 namespace {
 constexpr size_t kCenterOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Pose2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Pose2dStruct.h"
+#include "wpi/math/geometry/struct/Pose2dStruct.hpp"
 
 namespace {
 constexpr size_t kTranslationOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Pose3dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Pose3dStruct.h"
+#include "wpi/math/geometry/struct/Pose3dStruct.hpp"
 
 namespace {
 constexpr size_t kTranslationOff = 0;

wpimath/src/main/native/cpp/geometry/struct/QuaternionStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/QuaternionStruct.h"
+#include "wpi/math/geometry/struct/QuaternionStruct.hpp"
 
 namespace {
 constexpr size_t kWOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Rectangle2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Rectangle2dStruct.h"
+#include "wpi/math/geometry/struct/Rectangle2dStruct.hpp"
 
 namespace {
 constexpr size_t kCenterOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Rotation2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Rotation2dStruct.h"
+#include "wpi/math/geometry/struct/Rotation2dStruct.hpp"
 
 namespace {
 constexpr size_t kValueOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Rotation3dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Rotation3dStruct.h"
+#include "wpi/math/geometry/struct/Rotation3dStruct.hpp"
 
 namespace {
 constexpr size_t kQOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Transform2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Transform2dStruct.h"
+#include "wpi/math/geometry/struct/Transform2dStruct.hpp"
 
 namespace {
 constexpr size_t kTranslationOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Transform3dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Transform3dStruct.h"
+#include "wpi/math/geometry/struct/Transform3dStruct.hpp"
 
 namespace {
 constexpr size_t kTranslationOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Translation2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Translation2dStruct.h"
+#include "wpi/math/geometry/struct/Translation2dStruct.hpp"
 
 namespace {
 constexpr size_t kXOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Translation3dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Translation3dStruct.h"
+#include "wpi/math/geometry/struct/Translation3dStruct.hpp"
 
 namespace {
 constexpr size_t kXOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Twist2dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Twist2dStruct.h"
+#include "wpi/math/geometry/struct/Twist2dStruct.hpp"
 
 namespace {
 constexpr size_t kDxOff = 0;

wpimath/src/main/native/cpp/geometry/struct/Twist3dStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/geometry/struct/Twist3dStruct.h"
+#include "wpi/math/geometry/struct/Twist3dStruct.hpp"
 
 namespace {
 constexpr size_t kDxOff = 0;

wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp

@@ -4,10 +4,10 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_ArmFeedforwardJNI.h"
-#include "frc/controller/ArmFeedforward.h"
+#include "wpi/math/controller/ArmFeedforward.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/DAREJNI.cpp

@@ -7,12 +7,12 @@
 #include <stdexcept>
 #include <string>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
-#include "Exceptions.h"
+#include "Exceptions.hpp"
 #include "org_wpilib_math_jni_DAREJNI.h"
-#include "frc/DARE.h"
-#include "frc/fmt/Eigen.h"
+#include "wpi/math/linalg/DARE.hpp"
+#include "wpi/math/fmt/Eigen.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/EigenJNI.cpp

@@ -8,7 +8,7 @@
 #include <Eigen/Core>
 #include <Eigen/QR>
 #include <unsupported/Eigen/MatrixFunctions>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_EigenJNI.h"
 

wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp

@@ -4,11 +4,11 @@
 
 #include <jni.h>
 
-#include <wpi/array.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/array.hpp"
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_Ellipse2dJNI.h"
-#include "frc/geometry/Ellipse2d.h"
+#include "wpi/math/geometry/Ellipse2d.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Exceptions.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "Exceptions.h"
+#include "Exceptions.hpp"
 
 #include <jni.h>
 

wpimath/src/main/native/cpp/jni/Exceptions.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 extern wpi::java::JException illegalArgEx;
 extern wpi::java::JException ioEx;

wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp

@@ -5,10 +5,10 @@
 #include <jni.h>
 
 #include <Eigen/Core>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_StateSpaceUtilJNI.h"
-#include "frc/StateSpaceUtil.h"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp

@@ -4,15 +4,15 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_Transform3dJNI.h"
-#include "frc/geometry/Quaternion.h"
-#include "frc/geometry/Rotation3d.h"
-#include "frc/geometry/Transform3d.h"
-#include "frc/geometry/Twist3d.h"
-#include "units/angle.h"
-#include "units/length.h"
+#include "wpi/math/geometry/Quaternion.hpp"
+#include "wpi/math/geometry/Rotation3d.hpp"
+#include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/math/geometry/Twist3d.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp

@@ -4,13 +4,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_Twist3dJNI.h"
-#include "frc/geometry/Transform3d.h"
-#include "frc/geometry/Twist3d.h"
-#include "units/angle.h"
-#include "units/length.h"
+#include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/math/geometry/Twist3d.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
 
 using namespace wpi::java;
 

wpimath/src/main/native/cpp/kinematics/DifferentialDriveOdometry.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/DifferentialDriveOdometry.h"
+#include "wpi/math/kinematics/DifferentialDriveOdometry.hpp"
 
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/kinematics/DifferentialDriveOdometry3d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/DifferentialDriveOdometry3d.h"
+#include "wpi/math/kinematics/DifferentialDriveOdometry3d.hpp"
 
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/kinematics/MecanumDriveKinematics.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/MecanumDriveKinematics.h"
+#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/kinematics/MecanumDriveOdometry.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/MecanumDriveOdometry.h"
+#include "wpi/math/kinematics/MecanumDriveOdometry.hpp"
 
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/kinematics/MecanumDriveOdometry3d.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/MecanumDriveOdometry3d.h"
+#include "wpi/math/kinematics/MecanumDriveOdometry3d.hpp"
 
-#include "wpimath/MathShared.h"
+#include "wpi/math/util/MathShared.hpp"
 
 using namespace frc;
 

wpimath/src/main/native/cpp/kinematics/SwerveDriveKinematics.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/SwerveDriveKinematics.h"
+#include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/kinematics/SwerveDriveOdometry.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/SwerveDriveOdometry.h"
+#include "wpi/math/kinematics/SwerveDriveOdometry.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/kinematics/SwerveDriveOdometry3d.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/SwerveDriveOdometry3d.h"
+#include "wpi/math/kinematics/SwerveDriveOdometry3d.hpp"
 
 namespace frc {
 

wpimath/src/main/native/cpp/kinematics/proto/ChassisSpeedsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/ChassisSpeedsProto.h"
+#include "wpi/math/kinematics/proto/ChassisSpeedsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/DifferentialDriveKinematicsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/DifferentialDriveKinematicsProto.h"
+#include "wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/DifferentialDriveWheelPositionsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/DifferentialDriveWheelPositionsProto.h"
+#include "wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/DifferentialDriveWheelSpeedsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/DifferentialDriveWheelSpeedsProto.h"
+#include "wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/MecanumDriveKinematicsProto.h"
+#include "wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveWheelPositionsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/MecanumDriveWheelPositionsProto.h"
+#include "wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveWheelSpeedsProto.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/MecanumDriveWheelSpeedsProto.h"
+#include "wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/SwerveModulePositionProto.h"
+#include "wpi/math/kinematics/proto/SwerveModulePositionProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/proto/SwerveModuleStateProto.h"
+#include "wpi/math/kinematics/proto/SwerveModuleStateProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/kinematics.npb.h"
 

wpimath/src/main/native/cpp/kinematics/struct/ChassisSpeedsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/ChassisSpeedsStruct.h"
+#include "wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp"
 
 namespace {
 constexpr size_t kVxOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/DifferentialDriveKinematicsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/DifferentialDriveKinematicsStruct.h"
+#include "wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp"
 
 namespace {
 constexpr size_t kTrackwidthOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/DifferentialDriveWheelPositionsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/DifferentialDriveWheelPositionsStruct.h"
+#include "wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp"
 
 namespace {
 constexpr size_t kLeftOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/DifferentialDriveWheelSpeedsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/DifferentialDriveWheelSpeedsStruct.h"
+#include "wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp"
 
 namespace {
 constexpr size_t kLeftOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/MecanumDriveKinematicsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/MecanumDriveKinematicsStruct.h"
+#include "wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp"
 
 namespace {
 constexpr size_t kFrontLeftOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/MecanumDriveWheelPositionsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/MecanumDriveWheelPositionsStruct.h"
+#include "wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp"
 
 namespace {
 constexpr size_t kFrontLeftOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/MecanumDriveWheelSpeedsStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/MecanumDriveWheelSpeedsStruct.h"
+#include "wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp"
 
 namespace {
 constexpr size_t kFrontLeftOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/SwerveModulePositionStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/SwerveModulePositionStruct.h"
+#include "wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp"
 
 namespace {
 constexpr size_t kDistanceOff = 0;

wpimath/src/main/native/cpp/kinematics/struct/SwerveModuleStateStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/kinematics/struct/SwerveModuleStateStruct.h"
+#include "wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp"
 
 namespace {
 constexpr size_t kSpeedOff = 0;

wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/spline/proto/CubicHermiteSplineProto.h"
+#include "wpi/math/spline/proto/CubicHermiteSplineProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/spline.npb.h"
 

wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/spline/proto/QuinticHermiteSplineProto.h"
+#include "wpi/math/spline/proto/QuinticHermiteSplineProto.hpp"
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpimath/protobuf/spline.npb.h"
 

wpimath/src/main/native/cpp/spline/struct/CubicHermiteSplineStruct.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/spline/struct/CubicHermiteSplineStruct.h"
+#include "wpi/math/spline/struct/CubicHermiteSplineStruct.hpp"
 
 namespace {
 constexpr size_t kXInitialOff = 0;