diff --git a/frc971/control_loops/angle_adjust/angle_adjust.cc b/frc971/control_loops/angle_adjust/angle_adjust.cc
index d4446f4..52baebb 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust.cc
+++ b/frc971/control_loops/angle_adjust/angle_adjust.cc
@@ -2,8 +2,6 @@
 
 #include <algorithm>
 
-#include "aos/aos_core.h"
-
 #include "aos/common/messages/RobotState.q.h"
 #include "aos/common/control_loop/control_loops.q.h"
 #include "aos/common/logging/logging.h"
diff --git a/frc971/control_loops/angle_adjust/angle_adjust_main.cc b/frc971/control_loops/angle_adjust/angle_adjust_main.cc
index b9f8189..c7f725b 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust_main.cc
+++ b/frc971/control_loops/angle_adjust/angle_adjust_main.cc
@@ -1,6 +1,6 @@
 #include "frc971/control_loops/angle_adjust/angle_adjust.h"
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 
 int main() {
   ::aos::Init();
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index 79e2864..cbb4225 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -5,7 +5,6 @@
 #include <cmath>
 #include <memory>
 
-#include "aos/aos_core.h"
 #include "aos/common/logging/logging.h"
 #include "aos/common/queue.h"
 #include "frc971/control_loops/state_feedback_loop.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain_main.cc b/frc971/control_loops/drivetrain/drivetrain_main.cc
index a6efbcd..e3fc306 100644
--- a/frc971/control_loops/drivetrain/drivetrain_main.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_main.cc
@@ -1,6 +1,6 @@
 #include "frc971/control_loops/drivetrain/drivetrain.h"
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 
 int main() {
   ::aos::Init();
diff --git a/frc971/control_loops/index/index.cc b/frc971/control_loops/index/index.cc
index 0e5270a..90eaf6e 100644
--- a/frc971/control_loops/index/index.cc
+++ b/frc971/control_loops/index/index.cc
@@ -4,8 +4,6 @@
 
 #include <algorithm>
 
-#include "aos/aos_core.h"
-
 #include "aos/common/control_loop/control_loops.q.h"
 #include "aos/common/logging/logging.h"
 #include "aos/common/inttypes.h"
diff --git a/frc971/control_loops/index/index.gyp b/frc971/control_loops/index/index.gyp
index f61da8c..9cfb019 100644
--- a/frc971/control_loops/index/index.gyp
+++ b/frc971/control_loops/index/index.gyp
@@ -8,12 +8,10 @@
         'header_path': 'frc971/control_loops/index',
       },
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
@@ -27,7 +25,6 @@
         'index_motor_plant.cc',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         'index_loop',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:common',
@@ -49,7 +46,6 @@
       ],
       'dependencies': [
         '<(EXTERNALS):gtest',
-        '<(AOS)/build/aos.gyp:libaos',
         'index_loop',
         'index_lib',
         '<(AOS)/common/common.gyp:queue_testutils',
diff --git a/frc971/control_loops/index/index_main.cc b/frc971/control_loops/index/index_main.cc
index 9ca3290..c542268 100644
--- a/frc971/control_loops/index/index_main.cc
+++ b/frc971/control_loops/index/index_main.cc
@@ -1,6 +1,6 @@
 #include "frc971/control_loops/index/index.h"
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 
 int main() {
   ::aos::Init();
diff --git a/frc971/control_loops/shooter/shooter.cc b/frc971/control_loops/shooter/shooter.cc
index ec08ec8..981df5d 100644
--- a/frc971/control_loops/shooter/shooter.cc
+++ b/frc971/control_loops/shooter/shooter.cc
@@ -1,7 +1,5 @@
 #include "frc971/control_loops/shooter/shooter.h"
 
-#include "aos/aos_core.h"
-
 #include "aos/common/control_loop/control_loops.q.h"
 #include "aos/common/logging/logging.h"
 
diff --git a/frc971/control_loops/shooter/shooter.gyp b/frc971/control_loops/shooter/shooter.gyp
index bf1cd67..b1371a4 100644
--- a/frc971/control_loops/shooter/shooter.gyp
+++ b/frc971/control_loops/shooter/shooter.gyp
@@ -8,12 +8,10 @@
         'header_path': 'frc971/control_loops/shooter',
       },
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
@@ -27,7 +25,6 @@
         'shooter_motor_plant.cc',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         'shooter_loop',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:common',
@@ -47,7 +44,6 @@
       ],
       'dependencies': [
         '<(EXTERNALS):gtest',
-        '<(AOS)/build/aos.gyp:libaos',
         'shooter_loop',
         'shooter_lib',
         '<(AOS)/common/common.gyp:queue_testutils',
@@ -61,7 +57,6 @@
         'shooter_csv.cc',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:time',
         '<(AOS)/common/common.gyp:timing',
         'shooter_loop',
diff --git a/frc971/control_loops/shooter/shooter_csv.cc b/frc971/control_loops/shooter/shooter_csv.cc
index de2b4ee..26f2866 100644
--- a/frc971/control_loops/shooter/shooter_csv.cc
+++ b/frc971/control_loops/shooter/shooter_csv.cc
@@ -1,6 +1,5 @@
 #include "stdio.h"
 
-#include "aos/aos_core.h"
 #include "aos/common/control_loop/Timing.h"
 #include "aos/common/time.h"
 #include "frc971/control_loops/shooter/shooter_motor.q.h"
diff --git a/frc971/control_loops/shooter/shooter_main.cc b/frc971/control_loops/shooter/shooter_main.cc
index 72b820e..c52db73 100644
--- a/frc971/control_loops/shooter/shooter_main.cc
+++ b/frc971/control_loops/shooter/shooter_main.cc
@@ -1,6 +1,6 @@
 #include "frc971/control_loops/shooter/shooter.h"
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 
 int main() {
   ::aos::Init();
diff --git a/frc971/control_loops/wrist/wrist.cc b/frc971/control_loops/wrist/wrist.cc
index 3c76ff8..d18e295 100644
--- a/frc971/control_loops/wrist/wrist.cc
+++ b/frc971/control_loops/wrist/wrist.cc
@@ -4,8 +4,6 @@
 
 #include <algorithm>
 
-#include "aos/aos_core.h"
-
 #include "aos/common/messages/RobotState.q.h"
 #include "aos/common/control_loop/control_loops.q.h"
 #include "aos/common/logging/logging.h"
diff --git a/frc971/control_loops/wrist/wrist.gyp b/frc971/control_loops/wrist/wrist.gyp
index bf3f906..0099265 100644
--- a/frc971/control_loops/wrist/wrist.gyp
+++ b/frc971/control_loops/wrist/wrist.gyp
@@ -8,12 +8,10 @@
         'header_path': 'frc971/control_loops/wrist',
       },
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
       'export_dependent_settings': [
-        '<(AOS)/build/aos.gyp:libaos',
         '<(AOS)/common/common.gyp:control_loop_queues',
         '<(AOS)/common/common.gyp:queues',
       ],
@@ -28,7 +26,6 @@
         'unaugmented_wrist_motor_plant.cc',
       ],
       'dependencies': [
-        '<(AOS)/build/aos.gyp:libaos',
         'wrist_loop',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:common',
diff --git a/frc971/control_loops/wrist/wrist_main.cc b/frc971/control_loops/wrist/wrist_main.cc
index 8585180..0aeec42 100644
--- a/frc971/control_loops/wrist/wrist_main.cc
+++ b/frc971/control_loops/wrist/wrist_main.cc
@@ -1,6 +1,6 @@
 #include "frc971/control_loops/wrist/wrist.h"
 
-#include "aos/aos_core.h"
+#include "aos/atom_code/init.h"
 
 int main() {
   ::aos::Init();