diff --git a/y2012/wpilib_interface.cc b/y2012/wpilib_interface.cc
index 59e715d..3f74fc1 100644
--- a/y2012/wpilib_interface.cc
+++ b/y2012/wpilib_interface.cc
@@ -21,15 +21,15 @@
 #include "PowerDistributionPanel.h"
 #undef ERROR
 
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/time.h"
-#include "aos/common/util/log_interval.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/util/wrapping_counter.h"
-#include "aos/common/stl_mutex.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/time/time.h"
+#include "aos/util/log_interval.h"
+#include "aos/util/phased_loop.h"
+#include "aos/util/wrapping_counter.h"
+#include "aos/stl_mutex/stl_mutex.h"
 #include "aos/linux_code/init.h"
-#include "aos/common/messages/robot_state.q.h"
+#include "aos/robot_state/robot_state.q.h"
 
 #include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/wpilib/buffered_pcm.h"