diff --git a/y2012/wpilib_interface.cc b/y2012/wpilib_interface.cc
index 5cbb7f8..6d4fcff 100644
--- a/y2012/wpilib_interface.cc
+++ b/y2012/wpilib_interface.cc
@@ -8,17 +8,15 @@
 #include <mutex>
 #include <functional>
 
-#include "Encoder.h"
-#include "Talon.h"
-#include "DriverStation.h"
-#include "AnalogInput.h"
-#include "Compressor.h"
-#include "Relay.h"
+#include "frc971/wpilib/ahal/AnalogInput.h"
+#include "frc971/wpilib/ahal/Compressor.h"
+#include "frc971/wpilib/ahal/DigitalGlitchFilter.h"
+#include "frc971/wpilib/ahal/DriverStation.h"
+#include "frc971/wpilib/ahal/Encoder.h"
+#include "frc971/wpilib/ahal/PowerDistributionPanel.h"
+#include "frc971/wpilib/ahal/Relay.h"
+#include "frc971/wpilib/ahal/Talon.h"
 #include "frc971/wpilib/wpilib_robot_base.h"
-#ifndef WPILIB2015
-#include "DigitalGlitchFilter.h"
-#endif
-#include "PowerDistributionPanel.h"
 #undef ERROR
 
 #include "aos/logging/logging.h"
@@ -51,6 +49,7 @@
 
 using ::frc971::control_loops::drivetrain_queue;
 using ::y2012::control_loops::accessories_queue;
+using namespace frc;
 
 namespace y2012 {
 namespace wpilib {