More work cleaning up the BUILD files

Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index 82aaf16..8bd59b9 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -6,7 +6,7 @@
     'logging_impl_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     '//aos/common/logging',
   ],
 )
@@ -35,6 +35,7 @@
     'matrix_logging.h',
   ],
   deps = [
+    '//aos/common:generated_queue_headers',
     '//aos/common/logging',
     '//aos/common:die',
     '//aos/common:queue_types',
@@ -58,7 +59,6 @@
   name = 'logging',
   srcs = [
     'logging_impl.cc',
-    'linux_logging.cc',
   ],
   deps = [
     '//aos/linux_code/logging:linux_logging',
diff --git a/aos/common/logging/matrix_logging-tmpl.h b/aos/common/logging/matrix_logging-tmpl.h
index bfc3ce5..9e458fb 100644
--- a/aos/common/logging/matrix_logging-tmpl.h
+++ b/aos/common/logging/matrix_logging-tmpl.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "aos/queue_primitives.h"
+#include "aos/common/queue_primitives.h"
 
 namespace aos {
 namespace logging {