diff --git a/y2020/wpilib_interface.cc b/y2020/wpilib_interface.cc
index e0f6f6b..4e623d6 100644
--- a/y2020/wpilib_interface.cc
+++ b/y2020/wpilib_interface.cc
@@ -9,6 +9,7 @@
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <memory>
 
 #include "frc971/wpilib/ahal/AnalogInput.h"
 #include "frc971/wpilib/ahal/Counter.h"
@@ -24,7 +25,6 @@
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
 #include "aos/logging/logging.h"
-#include "aos/make_unique.h"
 #include "aos/network/team_number.h"
 #include "aos/realtime.h"
 #include "aos/time/time.h"
@@ -56,7 +56,7 @@
 using ::y2020::constants::Values;
 namespace superstructure = ::y2020::control_loops::superstructure;
 namespace chrono = ::std::chrono;
-using aos::make_unique;
+using std::make_unique;
 
 namespace y2020 {
 namespace wpilib {