diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index 8c6bfef..dced51a 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -19,6 +19,10 @@
   srcs = [
     'claw.q',
   ],
+  deps = [
+    '//aos/common/controls:control_loop_queues',
+    '//frc971/control_loops:queues',
+  ],
 )
 
 cc_library(
@@ -27,6 +31,10 @@
     'claw.cc',
     'claw_motor_plant.cc',
   ],
+  hdrs = [
+    'claw.h',
+    'claw_motor_plant.h',
+  ],
   deps = [
     ':claw_queue',
     '//aos/common/controls:control_loop',
@@ -39,7 +47,7 @@
   ],
 )
 
-cc_binary(
+cc_test(
   name = 'claw_lib_test',
   srcs = [
     'claw_lib_test.cc',
diff --git a/y2014/control_loops/drivetrain/BUILD b/y2014/control_loops/drivetrain/BUILD
index 1c70601..14003b1 100644
--- a/y2014/control_loops/drivetrain/BUILD
+++ b/y2014/control_loops/drivetrain/BUILD
@@ -19,6 +19,9 @@
   srcs = [
     'drivetrain.q',
   ],
+  deps = [
+    '//aos/common/controls:control_loop_queues',
+  ],
 )
 
 cc_library(
@@ -27,6 +30,10 @@
     'polydrivetrain_dog_motor_plant.cc',
     'drivetrain_dog_motor_plant.cc',
   ],
+  hdrs = [
+    'polydrivetrain_dog_motor_plant.h',
+    'drivetrain_dog_motor_plant.h',
+  ],
   deps = [
     '//frc971/control_loops:state_feedback_loop',
   ],
@@ -38,6 +45,10 @@
     'drivetrain.cc',
     'polydrivetrain_cim_plant.cc',
   ],
+  hdrs = [
+    'drivetrain.h',
+    'polydrivetrain_cim_plant.h',
+  ],
   deps = [
     ':drivetrain_queue',
     '//aos/common/controls:control_loop',
@@ -52,7 +63,7 @@
   ],
 )
 
-cc_binary(
+cc_test(
   name = 'drivetrain_lib_test',
   srcs = [
     'drivetrain_lib_test.cc',
diff --git a/y2014/control_loops/shooter/BUILD b/y2014/control_loops/shooter/BUILD
index dbc9c8f..aba74b9 100644
--- a/y2014/control_loops/shooter/BUILD
+++ b/y2014/control_loops/shooter/BUILD
@@ -19,6 +19,10 @@
   srcs = [
     'shooter.q',
   ],
+  deps = [
+    '//aos/common/controls:control_loop_queues',
+    '//frc971/control_loops:queues',
+  ],
 )
 
 cc_library(
@@ -28,6 +32,11 @@
     'shooter_motor_plant.cc',
     'unaugmented_shooter_motor_plant.cc',
   ],
+  hdrs = [
+    'shooter.h',
+    'shooter_motor_plant.h',
+    'unaugmented_shooter_motor_plant.h',
+  ],
   deps = [
     ':shooter_queue',
     '//aos/common/controls:control_loop',
@@ -37,7 +46,7 @@
   ],
 )
 
-cc_binary(
+cc_test(
   name = 'shooter_lib_test',
   srcs = [
     'shooter_lib_test.cc',