diff --git a/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja b/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja
index 3429248ba2..f5edead741 100644
--- a/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja
+++ b/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja
@@ -7,7 +7,8 @@
 {{ string[0]|capitalize + string[1:] }}
 {%- endmacro %}
 #pragma once
-#include <wpi/driverstation/{{ ConsoleName }}Controller.hpp>
+
+#include "wpi/driverstation/{{ ConsoleName }}Controller.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
diff --git a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp
index 27decaf701..73b05f69a5 100644
--- a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp
+++ b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp
@@ -5,7 +5,8 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <wpi/driverstation/PS4Controller.hpp>
+
+#include "wpi/driverstation/PS4Controller.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
diff --git a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp
index 916a7a362e..a697f642ce 100644
--- a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp
+++ b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp
@@ -5,7 +5,8 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <wpi/driverstation/PS5Controller.hpp>
+
+#include "wpi/driverstation/PS5Controller.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
diff --git a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp
index 43d85855b4..980f353df3 100644
--- a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp
+++ b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp
@@ -5,7 +5,8 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <wpi/driverstation/StadiaController.hpp>
+
+#include "wpi/driverstation/StadiaController.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
diff --git a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp
index 9fe07277b0..5f29e5d266 100644
--- a/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp
+++ b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp
@@ -5,7 +5,8 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <wpi/driverstation/XboxController.hpp>
+
+#include "wpi/driverstation/XboxController.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"