diff --git a/y2016/constants.cc b/y2016/constants.cc
index 1f4ae9e..363ef26 100644
--- a/y2016/constants.cc
+++ b/y2016/constants.cc
@@ -1,9 +1,8 @@
 #include "y2016/constants.h"
 
-#include <inttypes.h>
-#include <math.h>
-#include <stdint.h>
-
+#include <cinttypes>
+#include <cmath>
+#include <cstdint>
 #include <map>
 
 #if __has_feature(address_sanitizer)
@@ -14,7 +13,6 @@
 #include "aos/logging/logging.h"
 #include "aos/network/team_number.h"
 #include "aos/stl_mutex/stl_mutex.h"
-
 #include "y2016/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
 #include "y2016/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"