diff --git a/y2021_bot3/actors/autonomous_actor.cc b/y2021_bot3/actors/autonomous_actor.cc
index 39174d3..c6ea7c5 100644
--- a/y2021_bot3/actors/autonomous_actor.cc
+++ b/y2021_bot3/actors/autonomous_actor.cc
@@ -1,8 +1,7 @@
 #include "y2021_bot3/actors/autonomous_actor.h"
 
-#include <inttypes.h>
-
 #include <chrono>
+#include <cinttypes>
 #include <cmath>
 
 #include "aos/logging/logging.h"
diff --git a/y2021_bot3/actors/autonomous_actor_main.cc b/y2021_bot3/actors/autonomous_actor_main.cc
index cd71dc8..daf68e0 100644
--- a/y2021_bot3/actors/autonomous_actor_main.cc
+++ b/y2021_bot3/actors/autonomous_actor_main.cc
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
diff --git a/y2021_bot3/constants.cc b/y2021_bot3/constants.cc
index 984b844..707ecd6 100644
--- a/y2021_bot3/constants.cc
+++ b/y2021_bot3/constants.cc
@@ -1,7 +1,6 @@
 #include "y2021_bot3/constants.h"
 
-#include <inttypes.h>
-
+#include <cinttypes>
 #include <map>
 
 #if __has_feature(address_sanitizer)
diff --git a/y2021_bot3/constants.h b/y2021_bot3/constants.h
index fa95550..02c08bc 100644
--- a/y2021_bot3/constants.h
+++ b/y2021_bot3/constants.h
@@ -1,10 +1,9 @@
 #ifndef Y2021_BOT3_CONSTANTS_H_
 #define Y2021_BOT3_CONSTANTS_H_
 
-#include <math.h>
-#include <stdint.h>
-
 #include <array>
+#include <cmath>
+#include <cstdint>
 
 #include "frc971/constants.h"
 #include "frc971/control_loops/pose.h"
diff --git a/y2021_bot3/joystick_reader.cc b/y2021_bot3/joystick_reader.cc
index 88d16b2..7cdb296 100644
--- a/y2021_bot3/joystick_reader.cc
+++ b/y2021_bot3/joystick_reader.cc
@@ -1,8 +1,9 @@
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+
 #include "aos/actions/actions.h"
 #include "aos/init.h"
 #include "aos/logging/logging.h"
diff --git a/y2021_bot3/wpilib_interface.cc b/y2021_bot3/wpilib_interface.cc
index 6f427ce..3b6b691 100644
--- a/y2021_bot3/wpilib_interface.cc
+++ b/y2021_bot3/wpilib_interface.cc
@@ -1,15 +1,15 @@
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <array>
 #include <chrono>
+#include <cinttypes>
 #include <cmath>
+#include <cstdio>
+#include <cstring>
 #include <functional>
+#include <memory>
 #include <mutex>
 #include <thread>
-#include <memory>
 
 #include "ctre/phoenix/CANifier.h"
 #include "frc971/wpilib/ahal/AnalogInput.h"