diff --git a/y2017/wpilib_interface.cc b/y2017/wpilib_interface.cc
index 14029e3..e43bdb1 100644
--- a/y2017/wpilib_interface.cc
+++ b/y2017/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/Compressor.h"
@@ -25,7 +26,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/compiler_memory_barrier.h"
@@ -65,7 +65,7 @@
 using ::y2017::constants::Values;
 namespace chrono = ::std::chrono;
 using namespace frc;
-using aos::make_unique;
+using std::make_unique;
 
 namespace y2017 {
 namespace wpilib {