Remove global y2016.control_loops.superstructure_queue object

Change-Id: I6cbce87055ead432e53732066b3f2d2f7693df06
diff --git a/y2016/actors/superstructure_actor.h b/y2016/actors/superstructure_actor.h
index be02a33..ab84db5 100644
--- a/y2016/actors/superstructure_actor.h
+++ b/y2016/actors/superstructure_actor.h
@@ -3,9 +3,10 @@
 
 #include <memory>
 
-#include "aos/actions/actor.h"
 #include "aos/actions/actions.h"
+#include "aos/actions/actor.h"
 #include "y2016/actors/superstructure_action.q.h"
+#include "y2016/control_loops/superstructure/superstructure.q.h"
 
 namespace y2016 {
 namespace actors {
@@ -23,6 +24,11 @@
     return Factory(event_loop, ".y2016.actors.superstructure_action");
   }
 
+ private:
+  ::aos::Sender<::y2016::control_loops::SuperstructureQueue::Goal>
+      superstructure_goal_sender_;
+  ::aos::Fetcher<::y2016::control_loops::SuperstructureQueue::Status>
+      superstructure_status_fetcher_;
   // Internal struct holding superstructure goals sent by autonomous to the
   // loop.
   struct SuperstructureGoal {