diff --git a/MODULE.bazel b/MODULE.bazel
index 20efc539039..020d5b0fbae 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -60,6 +60,7 @@ r.from_cargo(
         "//:Cargo.toml",
         "//ruby/extractor:Cargo.toml",
         "//rust/extractor:Cargo.toml",
+        "//rust/extractor/macros:Cargo.toml",
         "//shared/tree-sitter-extractor:Cargo.toml",
     ],
 )
diff --git a/ruby/extractor/BUILD.bazel b/ruby/extractor/BUILD.bazel
index 203f90310fa..158f1c91e4c 100644
--- a/ruby/extractor/BUILD.bazel
+++ b/ruby/extractor/BUILD.bazel
@@ -12,6 +12,6 @@ codeql_rust_binary(
     deps = all_crate_deps(
         normal = True,
     ) + [
-        "//shared/tree-sitter-extractor:codeql-extractor",
+        "//shared/tree-sitter-extractor",
     ],
 )
diff --git a/rust/extractor/BUILD.bazel b/rust/extractor/BUILD.bazel
index 924d5e01497..a5d99e82584 100644
--- a/rust/extractor/BUILD.bazel
+++ b/rust/extractor/BUILD.bazel
@@ -7,11 +7,13 @@ codeql_rust_binary(
     aliases = aliases(),
     proc_macro_deps = all_crate_deps(
         proc_macro = True,
-    ),
+    ) + [
+        "//rust/extractor/macros",
+    ],
     visibility = ["//rust:__subpackages__"],
     deps = all_crate_deps(
         normal = True,
     ) + [
-        "//shared/tree-sitter-extractor:codeql-extractor",
+        "//shared/tree-sitter-extractor",
     ],
 )
diff --git a/rust/extractor/macros/BUILD.bazel b/rust/extractor/macros/BUILD.bazel
new file mode 100644
index 00000000000..4ddfb14a171
--- /dev/null
+++ b/rust/extractor/macros/BUILD.bazel
@@ -0,0 +1,20 @@
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
+
+rust_proc_macro(
+    name = "rust_extractor_macros",
+    srcs = glob(["src/**/*.rs"]),
+    aliases = aliases(),
+    proc_macro_deps = all_crate_deps(
+        proc_macro = True,
+    ),
+    deps = all_crate_deps(
+        normal = True,
+    ),
+)
+
+alias(
+    name = "macros",
+    actual = "rust_extractor_macros",
+    visibility = ["//rust:__subpackages__"],
+)
diff --git a/shared/tree-sitter-extractor/BUILD.bazel b/shared/tree-sitter-extractor/BUILD.bazel
index dc9001a32d2..0ebc189954b 100644
--- a/shared/tree-sitter-extractor/BUILD.bazel
+++ b/shared/tree-sitter-extractor/BUILD.bazel
@@ -1,8 +1,6 @@
 load("@rules_rust//rust:defs.bzl", "rust_library")
 load("@tree_sitter_extractors_deps//:defs.bzl", "aliases", "all_crate_deps")
 
-package(default_visibility = ["//visibility:public"])
-
 rust_library(
     name = "codeql-extractor",
     srcs = glob([
@@ -14,3 +12,9 @@ rust_library(
     ],
     deps = all_crate_deps(),
 )
+
+alias(
+    name = "tree-sitter-extractor",
+    actual = ":codeql-extractor",
+    visibility = ["//visibility:public"],
+)