diff --git a/prelude/cxx/tools/BUCK.v2 b/prelude/cxx/tools/BUCK.v2
index 8c4f47914b8e8..9ca461987a2b4 100644
--- a/prelude/cxx/tools/BUCK.v2
+++ b/prelude/cxx/tools/BUCK.v2
@@ -24,11 +24,13 @@ prelude.command_alias(
     ],
     exe = ":hmap_wrapper.py",
     labels = ["buck2-only"],
+    visibility = ["PUBLIC"],
 )
 
 prelude.python_bootstrap_binary(
     name = "make_comp_db",
     main = "make_comp_db.py",
+    visibility = ["PUBLIC"],
 )
 
 prelude.python_bootstrap_binary(
@@ -59,6 +61,7 @@ prelude.python_bootstrap_binary(
 prelude.python_bootstrap_binary(
     name = "remap_cwd",
     main = "remap_cwd.py",
+    visibility = ["PUBLIC"],
 )
 
 prelude.python_bootstrap_binary(
diff --git a/prelude/cxx/tools/defs.bzl b/prelude/cxx/tools/defs.bzl
index aac498141d97e..11a5be9bc97af 100644
--- a/prelude/cxx/tools/defs.bzl
+++ b/prelude/cxx/tools/defs.bzl
@@ -24,13 +24,13 @@ def _cxx_internal_tools_impl(ctx: AnalysisContext) -> list[Provider]:
 cxx_internal_tools = rule(
     impl = _cxx_internal_tools_impl,
     attrs = {
-        "concatenate_diagnostics": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:concatenate_diagnostics")),
-        "dep_file_processor": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:dep_file_processor")),
-        "dist_lto": attrs.default_only(attrs.dep(providers = [DistLtoToolsInfo], default = "prelude//cxx/dist_lto/tools:dist_lto_tools")),
-        "hmap_wrapper": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:hmap_wrapper")),
-        "make_comp_db": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:make_comp_db")),
-        "remap_cwd": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:remap_cwd")),
-        "stderr_to_file": attrs.default_only(attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:stderr_to_file")),
+        "concatenate_diagnostics": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:concatenate_diagnostics"),
+        "dep_file_processor": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:dep_file_processor"),
+        "dist_lto": attrs.dep(providers = [DistLtoToolsInfo], default = "prelude//cxx/dist_lto/tools:dist_lto_tools"),
+        "hmap_wrapper": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:hmap_wrapper"),
+        "make_comp_db": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:make_comp_db"),
+        "remap_cwd": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:remap_cwd"),
+        "stderr_to_file": attrs.dep(providers = [RunInfo], default = "prelude//cxx/tools:stderr_to_file"),
     },
 )