diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h
index 2610684b09..a8d7cadd0d 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h
@@ -7,7 +7,6 @@
 #include <concepts>
 #include <functional>
 #include <memory>
-#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
index 9e253fbffd..22e9759f2b 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
@@ -9,7 +9,6 @@
 #pragma warning(disable : 4521)
 #endif
 
-#include <concepts>
 #include <memory>
 #include <type_traits>
 #include <utility>
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h
index caefa48fa3..17db907dd4 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h
@@ -9,7 +9,6 @@
 #pragma warning(disable : 4521)
 #endif
 
-#include <concepts>
 #include <memory>
 #include <type_traits>
 #include <utility>
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h
index fdcd1bc22f..321118880b 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h
@@ -9,7 +9,6 @@
 #pragma warning(disable : 4521)
 #endif
 
-#include <concepts>
 #include <limits>
 #include <memory>
 #include <type_traits>
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
index 884d504346..7c342476fb 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
@@ -5,12 +5,9 @@
 #include <frc/simulation/SimHooks.h>
 
 #include "CommandTestBase.h"
-#include "frc2/command/ConditionalCommand.h"
 #include "frc2/command/FunctionalCommand.h"
 #include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelRaceGroup.h"
 #include "frc2/command/RunCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
 
 using namespace frc2;
 class CommandDecoratorTest : public CommandTestBase {};
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h
index 586432dff0..16d0cdc8b2 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <functional>
-#include <memory>
 #include <utility>
 
 #include <frc/simulation/DriverStationSim.h>
@@ -16,14 +15,13 @@
 #include "frc2/command/Requirements.h"
 #include "frc2/command/SubsystemBase.h"
 #include "gmock/gmock.h"
-#include "make_vector.h"
 
 namespace frc2 {
 
 class TestSubsystem : public SubsystemBase {
  public:
   explicit TestSubsystem(std::function<void()> periodic = [] {})
-      : m_periodic{periodic} {}
+      : m_periodic{std::move(periodic)} {}
   void Periodic() override { m_periodic(); }
 
  private: