diff --git a/y2018/wpilib_interface.cc b/y2018/wpilib_interface.cc
index ec54da8..4cb6de0 100644
--- a/y2018/wpilib_interface.cc
+++ b/y2018/wpilib_interface.cc
@@ -21,16 +21,16 @@
 #include "ctre/phoenix/CANifier.h"
 #undef ERROR
 
-#include "aos/common/commonmath.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/messages/robot_state.q.h"
-#include "aos/common/stl_mutex.h"
-#include "aos/common/time.h"
-#include "aos/common/util/compiler_memory_barrier.h"
-#include "aos/common/util/log_interval.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/util/wrapping_counter.h"
+#include "aos/commonmath.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/stl_mutex/stl_mutex.h"
+#include "aos/time/time.h"
+#include "aos/util/compiler_memory_barrier.h"
+#include "aos/util/log_interval.h"
+#include "aos/util/phased_loop.h"
+#include "aos/util/wrapping_counter.h"
 #include "aos/linux_code/init.h"
 
 #include "frc971/autonomous/auto.q.h"