diff --git a/y2016/wpilib_interface.cc b/y2016/wpilib_interface.cc
index 9463b3f..320dd73 100644
--- a/y2016/wpilib_interface.cc
+++ b/y2016/wpilib_interface.cc
@@ -9,16 +9,14 @@
 #include <functional>
 #include <array>
 
-#include "Encoder.h"
-#include "Talon.h"
-#include "Relay.h"
-#include "DriverStation.h"
-#include "AnalogInput.h"
-#include "Compressor.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/Relay.h"
+#include "frc971/wpilib/ahal/Talon.h"
 #include "frc971/wpilib/wpilib_robot_base.h"
-#ifndef WPILIB2015
-#include "DigitalGlitchFilter.h"
-#endif
 #undef ERROR
 
 #include "aos/logging/logging.h"
@@ -63,6 +61,7 @@
 using ::frc971::control_loops::drivetrain_queue;
 using ::y2016::control_loops::shooter::shooter_queue;
 using ::y2016::control_loops::superstructure_queue;
+using namespace frc;
 
 namespace y2016 {
 namespace wpilib {