diff --git a/y2017/joystick_reader.cc b/y2017/joystick_reader.cc
index b47c733..b9bbe3d 100644
--- a/y2017/joystick_reader.cc
+++ b/y2017/joystick_reader.cc
@@ -3,11 +3,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "aos/common/actions/actions.h"
-#include "aos/common/input/driver_station_data.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
-#include "aos/common/util/log_interval.h"
+#include "aos/actions/actions.h"
+#include "aos/input/driver_station_data.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/util/log_interval.h"
 #include "aos/input/drivetrain_input.h"
 #include "aos/input/joystick_input.h"
 #include "aos/linux_code/init.h"