Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/aos/testing/BUILD b/aos/testing/BUILD
index 93cd4bb..4d1b6a4 100644
--- a/aos/testing/BUILD
+++ b/aos/testing/BUILD
@@ -26,8 +26,8 @@
     deps = [
         ":googletest",
         "//aos:once",
-        "//aos/common:mutex",
-        "//aos/common/logging:implementations",
+        "//aos/mutex:mutex",
+        "//aos/logging:implementations",
     ],
 )
 
@@ -39,7 +39,7 @@
     deps = [
         ":googletest",
         ":test_logging",
-        "//aos/common/logging",
+        "//aos/logging",
     ],
 )
 
@@ -54,7 +54,7 @@
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//aos/common/logging",
+        "//aos/logging",
     ],
 )
 
@@ -70,8 +70,8 @@
     visibility = ["//visibility:public"],
     deps = [
         ":test_logging",
-        "//aos/common:queues",
-        "//aos/common/logging",
+        "//aos:queues",
+        "//aos/logging",
         "//aos/linux_code/ipc_lib:shared_mem",
     ],
 )
diff --git a/aos/testing/prevent_exit.cc b/aos/testing/prevent_exit.cc
index 93d7c58..3190698 100644
--- a/aos/testing/prevent_exit.cc
+++ b/aos/testing/prevent_exit.cc
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index 617f02a..34af54d 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -6,8 +6,8 @@
 
 #include "gtest/gtest.h"
 
-#include "aos/common/logging/implementations.h"
-#include "aos/common/mutex.h"
+#include "aos/logging/implementations.h"
+#include "aos/mutex/mutex.h"
 #include "aos/once.h"
 
 using ::aos::logging::LogMessage;
diff --git a/aos/testing/test_logging_test.cc b/aos/testing/test_logging_test.cc
index 369f94d..9dd6eba 100644
--- a/aos/testing/test_logging_test.cc
+++ b/aos/testing/test_logging_test.cc
@@ -4,7 +4,7 @@
 
 #include "gtest/gtest.h"
 
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/testing/test_shm.cc b/aos/testing/test_shm.cc
index 92c3924..f7ddfcb 100644
--- a/aos/testing/test_shm.cc
+++ b/aos/testing/test_shm.cc
@@ -2,8 +2,8 @@
 
 #include <sys/mman.h>
 
-#include "aos/common/queue.h"
-#include "aos/common/logging/logging.h"
+#include "aos/queue.h"
+#include "aos/logging/logging.h"
 #include "aos/testing/test_logging.h"
 
 namespace aos {