diff --git a/y2012/wpilib_interface.cc b/y2012/wpilib_interface.cc
index 959e198..15e1bbb 100644
--- a/y2012/wpilib_interface.cc
+++ b/y2012/wpilib_interface.cc
@@ -7,6 +7,7 @@
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <memory>
 
 #include "frc971/wpilib/ahal/AnalogInput.h"
 #include "frc971/wpilib/ahal/Compressor.h"
@@ -22,7 +23,6 @@
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
 #include "aos/logging/logging.h"
-#include "aos/make_unique.h"
 #include "aos/stl_mutex/stl_mutex.h"
 #include "aos/time/time.h"
 #include "aos/util/log_interval.h"
@@ -47,7 +47,7 @@
 
 namespace accessories = ::y2012::control_loops::accessories;
 using namespace frc;
-using aos::make_unique;
+using std::make_unique;
 
 namespace y2012 {
 namespace wpilib {