copying branch over from other 2013 repo
diff --git a/aos/common/control_loop/ControlLoop.h b/aos/common/control_loop/ControlLoop.h
index b69cf01..e866bb7 100644
--- a/aos/common/control_loop/ControlLoop.h
+++ b/aos/common/control_loop/ControlLoop.h
@@ -5,8 +5,8 @@
 
 #include "aos/aos_core.h"
 #include "aos/common/control_loop/Timing.h"
-#include "aos/common/messages/RobotState.q.h"
 #include "aos/common/type_traits.h"
+#include "aos/common/queue.h"
 
 namespace aos {
 namespace control_loops {