diff --git a/aos/common/BUILD b/aos/common/BUILD
index 1691e22..e21a9fe 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -89,7 +89,8 @@
 )
 
 cc_library(
-  name = 'event',
+  name = 'real_event',
+  visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
   hdrs = [
     'event.h',
   ],
@@ -99,6 +100,15 @@
 )
 
 cc_library(
+  # Use this one!
+  # TODO(Brian): Remove this mess...
+  name = 'event',
+  deps = [
+    '//aos/linux_code/ipc_lib:event',
+  ],
+)
+
+cc_library(
   name = 'unique_malloc_ptr',
   hdrs = [
     'unique_malloc_ptr.h',
@@ -301,19 +311,29 @@
   ],
   deps = [
     '//aos/testing:googletest',
-    '//aos/linux_code/ipc_lib:event',
+    ':event',
     ':queue_testutils',
     ':time',
   ],
 )
 
 cc_library(
-  name = 'condition',
+  name = 'real_condition',
+  visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
   hdrs = [
     'condition.h',
   ],
 )
 
+cc_library(
+  # Use this one!
+  # TODO(Brian): Remove this mess...
+  name = 'condition',
+  deps = [
+    '//aos/linux_code/ipc_lib:condition',
+  ],
+)
+
 cc_test(
   name = 'condition_test',
   srcs = [
@@ -321,7 +341,7 @@
   ],
   deps = [
     '//aos/testing:googletest',
-    '//aos/linux_code/ipc_lib:condition',
+    ':condition',
     '//aos/common/util:thread',
     ':time',
     '//aos/linux_code/ipc_lib:mutex',