diff --git a/y2014/wpilib_interface.cc b/y2014/wpilib_interface.cc
index 8f53ee2..ea87a18 100644
--- a/y2014/wpilib_interface.cc
+++ b/y2014/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"
@@ -21,7 +22,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"
@@ -53,7 +53,7 @@
 
 namespace claw = ::y2014::control_loops::claw;
 namespace shooter = ::y2014::control_loops::shooter;
-using aos::make_unique;
+using std::make_unique;
 
 namespace y2014 {
 namespace wpilib {