Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/frc971/wpilib/encoder_and_potentiometer.h b/frc971/wpilib/encoder_and_potentiometer.h
index 3cce77d..ec45657 100644
--- a/frc971/wpilib/encoder_and_potentiometer.h
+++ b/frc971/wpilib/encoder_and_potentiometer.h
@@ -4,8 +4,8 @@
 #include <atomic>
 #include <thread>
 
-#include "aos/common/macros.h"
-#include "aos/common/mutex.h"
+#include "aos/macros.h"
+#include "aos/mutex/mutex.h"
 
 #include "Encoder.h"
 #include "DigitalSource.h"