diff --git a/frc971/wpilib/wpilib_interface.cc b/frc971/wpilib/wpilib_interface.cc
index 68e0771..2129ec3 100644
--- a/frc971/wpilib/wpilib_interface.cc
+++ b/frc971/wpilib/wpilib_interface.cc
@@ -1,11 +1,12 @@
 #include "frc971/wpilib/wpilib_interface.h"
 
-#include "DriverStation.h"
-#include "ControllerPower.h"
-
 #include "aos/common/messages/robot_state.q.h"
 #include "aos/common/logging/queue_logging.h"
 
+#include "DriverStation.h"
+#include "ControllerPower.h"
+#undef ERROR
+
 namespace frc971 {
 namespace wpilib {