diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index 7adb3d6..0b76e2c 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -29,7 +29,7 @@
     'complex_thread_local.h',
   ],
   deps = [
-    '//aos/common:once',
+    '//aos:once',
     '//aos/common:die',
     '//debian:libpthread',
   ],
@@ -72,7 +72,7 @@
     'configuration.h',
   ],
   deps = [
-    '//aos/common:once',
+    '//aos:once',
     '//aos/common/logging',
     '//aos/common:unique_malloc_ptr',
   ],
diff --git a/aos/linux_code/complex_thread_local.cc b/aos/linux_code/complex_thread_local.cc
index d57323e..f5ddc9c 100644
--- a/aos/linux_code/complex_thread_local.cc
+++ b/aos/linux_code/complex_thread_local.cc
@@ -2,8 +2,8 @@
 
 #include <pthread.h>
 
-#include "aos/common/once.h"
 #include "aos/common/die.h"
+#include "aos/once.h"
 
 #define SIMPLE_CHECK(call)              \
   do {                                  \
diff --git a/aos/linux_code/configuration.cc b/aos/linux_code/configuration.cc
index e4d5d80..0536e25 100644
--- a/aos/linux_code/configuration.cc
+++ b/aos/linux_code/configuration.cc
@@ -10,7 +10,7 @@
 
 #include "aos/common/logging/logging.h"
 #include "aos/common/unique_malloc_ptr.h"
-#include "aos/common/once.h"
+#include "aos/once.h"
 
 namespace aos {
 namespace configuration {
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 95b30ce..b0b58ff 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -13,7 +13,7 @@
   ],
   deps = [
     '//aos/common/logging',
-    '//aos/common:once',
+    '//aos:once',
     '//aos/common:macros',
     '//aos/common/util:compiler_memory_barrier',
   ],
diff --git a/aos/linux_code/ipc_lib/aos_sync.cc b/aos/linux_code/ipc_lib/aos_sync.cc
index b0b560e..3c1debb 100644
--- a/aos/linux_code/ipc_lib/aos_sync.cc
+++ b/aos/linux_code/ipc_lib/aos_sync.cc
@@ -27,9 +27,9 @@
 #include <type_traits>
 
 #include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
 #include "aos/common/macros.h"
 #include "aos/common/util/compiler_memory_barrier.h"
+#include "aos/once.h"
 
 using ::aos::linux_code::ipc_lib::FutexAccessorObserver;
 
diff --git a/aos/linux_code/starter/BUILD b/aos/linux_code/starter/BUILD
index ec6ce7f..74af77d 100644
--- a/aos/linux_code/starter/BUILD
+++ b/aos/linux_code/starter/BUILD
@@ -18,7 +18,7 @@
     '//third_party/libevent',
     '//aos/common/logging',
     '//aos/common/logging:implementations',
-    '//aos/common:once',
+    '//aos:once',
     '//aos/common:time',
     '//aos/common/libc:aos_strsignal',
     '//aos/common/util:run_command',
diff --git a/aos/linux_code/starter/starter.cc b/aos/linux_code/starter/starter.cc
index 57d90dd..62e540b 100644
--- a/aos/linux_code/starter/starter.cc
+++ b/aos/linux_code/starter/starter.cc
@@ -29,14 +29,14 @@
 
 #include "third_party/libevent/event.h"
 
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/implementations.h"
-#include "aos/linux_code/init.h"
-#include "aos/common/unique_malloc_ptr.h"
-#include "aos/common/time.h"
-#include "aos/common/once.h"
 #include "aos/common/libc/aos_strsignal.h"
+#include "aos/common/logging/implementations.h"
+#include "aos/common/logging/logging.h"
+#include "aos/common/time.h"
+#include "aos/common/unique_malloc_ptr.h"
 #include "aos/common/util/run_command.h"
+#include "aos/linux_code/init.h"
+#include "aos/once.h"
 
 // This is the main piece of code that starts all of the rest of the code and
 // restarts it when the binaries are modified.