diff --git a/BUILD b/BUILD
index 69fa5788..09fd269b 100644
--- a/BUILD
+++ b/BUILD
@@ -18,7 +18,7 @@ genrule(
 )
 
 cc_library(
-    name = "headers",
+    name = "c-toxcore",
     hdrs = [
         "tox/tox.h",
         "tox/toxav.h",
@@ -26,4 +26,9 @@ cc_library(
     ],
     includes = ["."],
     visibility = ["//visibility:public"],
+    deps = [
+        "//c-toxcore/toxav",
+        "//c-toxcore/toxcore",
+        "//c-toxcore/toxencryptsave",
+    ],
 )
diff --git a/testing/BUILD b/testing/BUILD
index cee2e6eb..3c8f8293 100644
--- a/testing/BUILD
+++ b/testing/BUILD
@@ -5,7 +5,7 @@ cc_library(
     hdrs = [
         "misc_tools.c",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//c-toxcore:__subpackages__"],
 )
 
 cc_binary(
diff --git a/toxav/BUILD b/toxav/BUILD
index 7ebb16ad..38bdaeba 100644
--- a/toxav/BUILD
+++ b/toxav/BUILD
@@ -84,11 +84,10 @@ cc_library(
         "toxav.api.h",
         "toxav.h",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//c-toxcore:__subpackages__"],
     deps = [
         ":groupav",
         ":video",
-        "//c-toxcore/toxcore",
     ],
 )
 
@@ -103,7 +102,7 @@ cc_library(
         "//c-toxcore/testing:__pkg__",
     ],
     deps = [
-        "//c-toxcore/toxcore",
+        "//c-toxcore/toxcore:group",
         "@libvpx",
         "@opus",
     ],
diff --git a/toxcore/BUILD b/toxcore/BUILD
index f7dc5861..f59e55fc 100644
--- a/toxcore/BUILD
+++ b/toxcore/BUILD
@@ -188,7 +188,7 @@ cc_library(
     copts = [
         "-Wno-parentheses",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//c-toxcore:__subpackages__"],
     deps = [
         ":group",
         "//c-toxcore/toxencryptsave:defines",
diff --git a/toxencryptsave/BUILD b/toxencryptsave/BUILD
index bdb0031e..9554f013 100644
--- a/toxencryptsave/BUILD
+++ b/toxencryptsave/BUILD
@@ -16,7 +16,7 @@ cc_library(
     name = "toxencryptsave",
     srcs = ["toxencryptsave.c"],
     hdrs = ["toxencryptsave.h"],
-    visibility = ["//visibility:public"],
+    visibility = ["//c-toxcore:__subpackages__"],
     deps = [
         ":defines",
         "//c-toxcore/toxcore:crypto_core",