diff --git a/y2018/control_loops/drivetrain/BUILD b/y2018/control_loops/drivetrain/BUILD
index e446b22..64fa16f 100644
--- a/y2018/control_loops/drivetrain/BUILD
+++ b/y2018/control_loops/drivetrain/BUILD
@@ -70,7 +70,7 @@
   ],
   deps = [
     ':drivetrain_base',
-    '//aos/linux_code:init',
+    '//aos:init',
     '//frc971/control_loops/drivetrain:drivetrain_lib',
   ],
 )
diff --git a/y2018/control_loops/drivetrain/drivetrain_main.cc b/y2018/control_loops/drivetrain/drivetrain_main.cc
index 26d300b..15d99be 100644
--- a/y2018/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2018/control_loops/drivetrain/drivetrain_main.cc
@@ -1,4 +1,4 @@
-#include "aos/linux_code/init.h"
+#include "aos/init.h"
 
 #include "frc971/control_loops/drivetrain/drivetrain.h"
 #include "y2018/control_loops/drivetrain/drivetrain_base.h"
diff --git a/y2018/control_loops/python/BUILD b/y2018/control_loops/python/BUILD
index 925e7b6..3982722 100644
--- a/y2018/control_loops/python/BUILD
+++ b/y2018/control_loops/python/BUILD
@@ -96,13 +96,13 @@
 )
 
 cc_library(
-    name = "dlqr",
-    hdrs = [
-        "dlqr.h",
-    ],
+  name = 'dlqr',
+  hdrs = [
+    'dlqr.h',
+  ],
     deps = [
-        "@slycot_repo//:slicot",
-    ],
+        '@slycot_repo//:slicot',
+  ],
 )
 
 cc_binary(
@@ -110,15 +110,15 @@
     srcs = [
         "arm_mpc.cc",
     ],
-    restricted_to = ["//tools:k8"],
     deps = [
         ":arm_bounds",
-        ":dlqr",
+        ':dlqr',
         "//third_party/ct",
         "//third_party/gflags",
         "//third_party/matplotlib-cpp",
         "@cgal_repo//:cgal",
     ],
+    restricted_to = ["//tools:k8"],
 )
 
 cc_binary(
@@ -169,11 +169,9 @@
     ],
     default_python_version = "PY3",
     legacy_create_init = False,
-    restricted_to = ["//tools:k8"],
     srcs_version = "PY3",
     deps = [
         ":python_init",
-        "@python_gtk",
     ],
 )
 
@@ -212,15 +210,15 @@
 )
 
 py_binary(
-    name = "arm_mpc_py",
-    srcs = [
-        "arm_mpc.py",
-    ],
-    main = "arm_mpc.py",
-    restricted_to = ["//tools:k8"],
-    deps = [
-        "//external:python-gflags",
-        "//external:python-glog",
-        "//frc971/control_loops/python:controls",
-    ],
+  name = 'arm_mpc_py',
+  srcs = [
+    'arm_mpc.py',
+  ],
+  main = 'arm_mpc.py',
+  deps = [
+    '//external:python-gflags',
+    '//external:python-glog',
+    '//frc971/control_loops/python:controls',
+  ],
+  restricted_to = ['//tools:k8'],
 )
diff --git a/y2018/control_loops/superstructure/BUILD b/y2018/control_loops/superstructure/BUILD
index 569e3a1..efe0c1d 100644
--- a/y2018/control_loops/superstructure/BUILD
+++ b/y2018/control_loops/superstructure/BUILD
@@ -61,7 +61,7 @@
     deps = [
         ":superstructure_lib",
         ":superstructure_queue",
-        "//aos/linux_code:init",
+        "//aos:init",
     ],
 )
 
diff --git a/y2018/control_loops/superstructure/superstructure_main.cc b/y2018/control_loops/superstructure/superstructure_main.cc
index e8e1c7b..fca04e8 100644
--- a/y2018/control_loops/superstructure/superstructure_main.cc
+++ b/y2018/control_loops/superstructure/superstructure_main.cc
@@ -1,6 +1,6 @@
 #include "y2018/control_loops/superstructure/superstructure.h"
 
-#include "aos/linux_code/init.h"
+#include "aos/init.h"
 
 int main() {
   ::aos::InitNRT(true);