diff --git a/bazel/cc_resource.bzl b/bazel/cc_resource.bzl
index 05ea4b376d9..ccc82bc17d5 100644
--- a/bazel/cc_resource.bzl
+++ b/bazel/cc_resource.bzl
@@ -28,13 +28,17 @@ def pl_cc_resource(
 def pl_bpf_cc_resource(
         name,
         src,
-        hdrs,
-        syshdrs,
+        deps = [],
         defines = [],
-        tags = [],
         **kwargs):
-    out_file = pl_bpf_preprocess(name, src, hdrs, syshdrs, defines, tags = kwargs.get("tags", []))
-    _pl_cc_resource_with_cc_info(name, out_file, **kwargs)
+    pl_bpf_preprocess(
+        name = name + "_bpf_preprocess",
+        src = src,
+        deps = deps,
+        defines = defines,
+        **kwargs
+    )
+    _pl_cc_resource_with_cc_info(name, ":" + name + "_bpf_preprocess", **kwargs)
 
 def _sanitize_path(path):
     return "".join([c if c.isalnum() else "_" for c in path.elems()])
diff --git a/bazel/cc_toolchains/toolchain_features.bzl b/bazel/cc_toolchains/toolchain_features.bzl
index 0927bc76493..e8032a6f0a1 100644
--- a/bazel/cc_toolchains/toolchain_features.bzl
+++ b/bazel/cc_toolchains/toolchain_features.bzl
@@ -399,7 +399,17 @@ def _objcopy_action(ctx):
         ],
     )
 
+def _cpp_action(ctx):
+    return action_config(
+        action_name = "c-preprocess",
+        enabled = True,
+        tools = [
+            tool(path = ctx.attr.tool_paths["cpp"]),
+        ],
+    )
+
 def pl_action_configs(ctx):
     return [
         _objcopy_action(ctx),
+        _cpp_action(ctx),
     ]
diff --git a/bazel/pl_bpf_preprocess.bzl b/bazel/pl_bpf_preprocess.bzl
index 5e60bdfb44c..e9f8d088894 100644
--- a/bazel/pl_bpf_preprocess.bzl
+++ b/bazel/pl_bpf_preprocess.bzl
@@ -14,6 +14,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
+
 # This macro preprocesses BPF C files to include any user-includes.
 # It essentially does this by running the C preprocessor.
 # BPF source should not, however, have system includes inlined, as that
@@ -24,43 +26,73 @@
 # The mock system headers take the following form:
 # file: linux/sched.h
 # contents: include <linux/sched.h>
-#
-# @param src: The location of the BPF source code.
-# @param hdrs: Any user defined headers required by the BPF program (src).
-# @param syshdrs: The location of the fake system headers to bypass system includes.
-#                 The syshdrs variable must be a path directory (i.e. not a target with a colon).
-#                 For example, "//src/stirling/bpf_tools/bcc_bpf/system-headers",
-#                 instead of "//src/stirling/bpf_tools/bcc_bpf/system-headers:system-headers".
-#                 To make this work, the directory must have a BUILD.bazel with a target
-#                 that has the same name as the directory.
-#                 This enables automatic generation of the preprocessor -I flag internally.
-def pl_bpf_preprocess(
-        name,
-        src,
-        hdrs,
-        syshdrs,
-        defines = [],
-        tags = [],
-        *kwargs):
-    out_file = name + "_bpf_preprocess"
+def _pl_bpf_preprocess_impl(ctx):
+    if len(ctx.attr.src.files.to_list()) != 1:
+        fail("Must provide exactly one file to 'src' attr of pl_bpf_preprocess")
 
-    # Hacky: Extract the name of the directory by removing the leading "//".
-    # There might be Bazel-esque way of doing this, but since filegroups can't have $location
-    # applied to it, we use this hack instead.
-    # For more details, see note about syshdrs above.
-    syshdrs_dir = syshdrs[2:]
+    cc_toolchain = find_cpp_toolchain(ctx)
 
-    defines_str = ""
-    for d in defines:
-        defines_str += "-D" + d + " "
+    feature_configuration = cc_common.configure_features(
+        ctx = ctx,
+        cc_toolchain = cc_toolchain,
+        requested_features = ctx.features,
+        unsupported_features = ctx.disabled_features,
+    )
+
+    preprocessor_tool = cc_common.get_tool_for_action(
+        feature_configuration = feature_configuration,
+        action_name = "c-preprocess",
+    )
 
-    cmd = "cpp -U linux {} -Dinclude=#include -I. -I{} $(location {}) -o $@".format(defines_str, syshdrs_dir, src)
+    output = ctx.actions.declare_file(ctx.attr.name + ".c")
 
-    native.genrule(
-        name = name + "_bpf_preprocess_genrule",
-        outs = [out_file],
-        srcs = [src] + hdrs + [syshdrs],
-        tags = tags,
-        cmd = cmd,
+    merged_cc_info = cc_common.merge_cc_infos(direct_cc_infos = [dep[CcInfo] for dep in ctx.attr.deps])
+    compilation_ctx = merged_cc_info.compilation_context
+
+    includes = compilation_ctx.includes.to_list() + compilation_ctx.quote_includes.to_list() + compilation_ctx.system_includes.to_list()
+    defines = compilation_ctx.defines.to_list() + compilation_ctx.local_defines.to_list()
+    defines = defines + ctx.attr.defines
+
+    args = ctx.actions.args()
+    args.add("-U", "linux")
+    args.add_all(["-D" + d for d in defines])
+    args.add("-Dinclude=#include")
+    args.add("-I.")
+    args.add_all(["-I" + path for path in includes])
+    args.add(ctx.attr.src.files.to_list()[0].path)
+    args.add("-o", output.path)
+
+    ctx.actions.run(
+        outputs = [output],
+        inputs = depset(
+            transitive = [
+                ctx.attr.src.files,
+                compilation_ctx.headers,
+            ],
+        ),
+        tools = cc_toolchain.all_files,
+        executable = preprocessor_tool,
+        arguments = [args],
+        mnemonic = "CPreprocess",
     )
-    return out_file
+    return DefaultInfo(files = depset([output]))
+
+pl_bpf_preprocess = rule(
+    implementation = _pl_bpf_preprocess_impl,
+    attrs = dict(
+        src = attr.label(
+            mandatory = True,
+            doc = "bpf file to preprocess",
+            allow_files = True,
+        ),
+        deps = attr.label_list(
+            doc = "cc dependencies to take headers from",
+            providers = [CcInfo],
+        ),
+        defines = attr.string_list(
+            doc = "list of defines to preprocess with",
+        ),
+    ),
+    fragments = ["cpp"],
+    toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
+)
diff --git a/src/stirling/bpf_tools/bcc_bpf/BUILD.bazel b/src/stirling/bpf_tools/bcc_bpf/BUILD.bazel
index d659c2453d4..19ea949701b 100644
--- a/src/stirling/bpf_tools/bcc_bpf/BUILD.bazel
+++ b/src/stirling/bpf_tools/bcc_bpf/BUILD.bazel
@@ -21,6 +21,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:cc_resource.bzl", "pl_bpf_cc_resource")
 load("//bazel:pl_build_system.bzl", "pl_cc_test")
 
@@ -28,17 +29,19 @@ package(default_visibility = [
     "//src/stirling:__subpackages__",
 ])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
-# Build :task_struct_mem_read_bpf_preprocess_genrule to examine the preprocessing output.
+# Build :task_struct_mem_read_bpf_preprocess to examine the preprocessing output.
 pl_bpf_cc_resource(
     name = "task_struct_mem_read",
     src = "task_struct_mem_read.c",
-    hdrs = ["//src/stirling/bpf_tools/bcc_bpf_intf:headers"],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    deps = [
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+        "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
+    ],
 )
 
 pl_cc_test(
@@ -46,11 +49,11 @@ pl_cc_test(
     srcs = [
         "utils.h",
         "utils_test.cc",
+    ],
+    deps = [
         "//src/stirling/bpf_tools/bcc_bpf:headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
         "//src/stirling/source_connectors/socket_tracer/bcc_bpf_intf:headers",
-    ],
-    deps = [
         "//src/stirling/utils:cc_library",
     ],
 )
diff --git a/src/stirling/bpf_tools/bcc_bpf/system-headers/BUILD.bazel b/src/stirling/bpf_tools/bcc_bpf/system-headers/BUILD.bazel
index 9ac4387293f..f6230d94387 100644
--- a/src/stirling/bpf_tools/bcc_bpf/system-headers/BUILD.bazel
+++ b/src/stirling/bpf_tools/bcc_bpf/system-headers/BUILD.bazel
@@ -21,16 +21,16 @@
 #
 # SPDX-License-Identifier: MIT
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 package(default_visibility = [
     "//src/stirling:__subpackages__",
 ])
 
-# We use this as a directory target, so the name must be same name as the directory.
-# See bazel/pl_bpf_preprocess.bzl for a note about why this must be the case.
-filegroup(
+cc_library(
     name = "system-headers",
-    srcs = glob(
-        ["**"],
-        exclude = ["BUILD.bazel"],
+    hdrs = glob(
+        ["**/*.h"],
     ),
+    includes = ["."],
 )
diff --git a/src/stirling/bpf_tools/bcc_bpf_intf/BUILD.bazel b/src/stirling/bpf_tools/bcc_bpf_intf/BUILD.bazel
index f1584e8570e..b24966f4f6d 100644
--- a/src/stirling/bpf_tools/bcc_bpf_intf/BUILD.bazel
+++ b/src/stirling/bpf_tools/bcc_bpf_intf/BUILD.bazel
@@ -14,20 +14,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library")
 
 package(default_visibility = [
     "//src/stirling:__subpackages__",
 ])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [":headers"],
-    deps = ["//src/shared/upid:cc_library"],
+    deps = [
+        ":headers",
+        "//src/shared/upid:cc_library",
+    ],
 )
diff --git a/src/stirling/bpf_tools/testdata/BUILD.bazel b/src/stirling/bpf_tools/testdata/BUILD.bazel
index 4aca1d9c28e..17867a09cc4 100644
--- a/src/stirling/bpf_tools/testdata/BUILD.bazel
+++ b/src/stirling/bpf_tools/testdata/BUILD.bazel
@@ -21,10 +21,10 @@ package(default_visibility = ["//src/stirling/bpf_tools:__subpackages__"])
 pl_bpf_cc_resource(
     name = "get_tgid_start_time",
     src = "get_tgid_start_time.c",
-    hdrs = [
+    deps = [
         "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
     ],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
 )
 
 pl_cc_resource(
diff --git a/src/stirling/source_connectors/cpu_stat_bpftrace/bt/BUILD.bazel b/src/stirling/source_connectors/cpu_stat_bpftrace/bt/BUILD.bazel
index 64811a6973b..07a9bdf0978 100644
--- a/src/stirling/source_connectors/cpu_stat_bpftrace/bt/BUILD.bazel
+++ b/src/stirling/source_connectors/cpu_stat_bpftrace/bt/BUILD.bazel
@@ -21,6 +21,7 @@ package(default_visibility = ["//src/stirling/source_connectors/cpu_stat_bpftrac
 pl_bpf_cc_resource(
     name = "cpustat",
     src = "cpustat.bt",
-    hdrs = [],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    deps = [
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    ],
 )
diff --git a/src/stirling/source_connectors/perf_profiler/bcc_bpf/BUILD.bazel b/src/stirling/source_connectors/perf_profiler/bcc_bpf/BUILD.bazel
index 1b372895317..a9be279e9c1 100644
--- a/src/stirling/source_connectors/perf_profiler/bcc_bpf/BUILD.bazel
+++ b/src/stirling/source_connectors/perf_profiler/bcc_bpf/BUILD.bazel
@@ -25,15 +25,15 @@ load("//bazel:cc_resource.bzl", "pl_bpf_cc_resource")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-# Build :profiler_bpf_preprocess_genrule to examine the preprocessing output.
+# Build :profiler_bpf_preprocess to examine the preprocessing output.
 pl_bpf_cc_resource(
     name = "profiler",
     src = "profiler.c",
-    hdrs = [
+    deps = [
         "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
         "//src/stirling/source_connectors/perf_profiler/bcc_bpf_intf:headers",
         "//src/stirling/upid:headers",
     ],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
 )
diff --git a/src/stirling/source_connectors/perf_profiler/bcc_bpf_intf/BUILD.bazel b/src/stirling/source_connectors/perf_profiler/bcc_bpf_intf/BUILD.bazel
index 737ea1b1a30..ab441f5e143 100644
--- a/src/stirling/source_connectors/perf_profiler/bcc_bpf_intf/BUILD.bazel
+++ b/src/stirling/source_connectors/perf_profiler/bcc_bpf_intf/BUILD.bazel
@@ -14,19 +14,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [
+    deps = [
         ":headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
     ],
diff --git a/src/stirling/source_connectors/perf_profiler/testing/bpf/BUILD.bazel b/src/stirling/source_connectors/perf_profiler/testing/bpf/BUILD.bazel
index 0eba433b124..5b069f45297 100644
--- a/src/stirling/source_connectors/perf_profiler/testing/bpf/BUILD.bazel
+++ b/src/stirling/source_connectors/perf_profiler/testing/bpf/BUILD.bazel
@@ -28,11 +28,11 @@ package(default_visibility = ["//src/stirling:__subpackages__"])
 pl_bpf_cc_resource(
     name = "stringifier_test_bpf_text",
     src = "stringifier_test.c",
-    hdrs = [
+    deps = [
         "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
         "//src/stirling/source_connectors/perf_profiler/bcc_bpf_intf:headers",
         "//src/stirling/upid:headers",
     ],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
 )
diff --git a/src/stirling/source_connectors/pid_runtime/bcc_bpf/BUILD.bazel b/src/stirling/source_connectors/pid_runtime/bcc_bpf/BUILD.bazel
index ed6141d83df..5be50b89bd8 100644
--- a/src/stirling/source_connectors/pid_runtime/bcc_bpf/BUILD.bazel
+++ b/src/stirling/source_connectors/pid_runtime/bcc_bpf/BUILD.bazel
@@ -25,10 +25,12 @@ load("//bazel:cc_resource.bzl", "pl_bpf_cc_resource")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-# Build :pidruntime_bpf_preprocess_genrule to examine the preprocessing output.
+# Build :pidruntime_bpf_preprocess to examine the preprocessing output.
 pl_bpf_cc_resource(
     name = "pidruntime",
     src = "pidruntime.c",
-    hdrs = ["//src/stirling/source_connectors/pid_runtime/bcc_bpf_intf:headers"],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    deps = [
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+        "//src/stirling/source_connectors/pid_runtime/bcc_bpf_intf:headers",
+    ],
 )
diff --git a/src/stirling/source_connectors/pid_runtime/bcc_bpf_intf/BUILD.bazel b/src/stirling/source_connectors/pid_runtime/bcc_bpf_intf/BUILD.bazel
index 342695b7b4b..e6158879dfc 100644
--- a/src/stirling/source_connectors/pid_runtime/bcc_bpf_intf/BUILD.bazel
+++ b/src/stirling/source_connectors/pid_runtime/bcc_bpf_intf/BUILD.bazel
@@ -14,17 +14,18 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [":headers"],
+    deps = [":headers"],
 )
diff --git a/src/stirling/source_connectors/pid_runtime_bpftrace/bt/BUILD.bazel b/src/stirling/source_connectors/pid_runtime_bpftrace/bt/BUILD.bazel
index e10f36bd066..3fd26f697fb 100644
--- a/src/stirling/source_connectors/pid_runtime_bpftrace/bt/BUILD.bazel
+++ b/src/stirling/source_connectors/pid_runtime_bpftrace/bt/BUILD.bazel
@@ -21,6 +21,5 @@ package(default_visibility = ["//src/stirling/source_connectors/pid_runtime_bpft
 pl_bpf_cc_resource(
     name = "bpftrace_pidruntime",
     src = "pidruntime.bt",
-    hdrs = [],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    deps = ["//src/stirling/bpf_tools/bcc_bpf/system-headers"],
 )
diff --git a/src/stirling/source_connectors/proc_exit/bcc_bpf/BUILD.bazel b/src/stirling/source_connectors/proc_exit/bcc_bpf/BUILD.bazel
index f0bf541590c..0b6d71526d5 100644
--- a/src/stirling/source_connectors/proc_exit/bcc_bpf/BUILD.bazel
+++ b/src/stirling/source_connectors/proc_exit/bcc_bpf/BUILD.bazel
@@ -28,17 +28,15 @@ package(default_visibility = [
     "//src/stirling/source_connectors/proc_exit/bcc_bpf:__pkg__",
 ])
 
-proc_exit_trace_hdrs = [
-    "//src/stirling/upid:headers",
-    "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
-    "//src/stirling/bpf_tools/bcc_bpf:headers",
-    "//src/stirling/source_connectors/proc_exit/bcc_bpf_intf:headers",
-]
-
-# To examine the preprocessing output, build :socket_trace_bpf_preprocess_genrule.
+# To examine the preprocessing output, build :proc_exit_trace_bpf_preprocess.
 pl_bpf_cc_resource(
     name = "proc_exit_trace",
     src = "proc_exit_trace.c",
-    hdrs = proc_exit_trace_hdrs,
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    deps = [
+        "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+        "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
+        "//src/stirling/source_connectors/proc_exit/bcc_bpf_intf:headers",
+        "//src/stirling/upid:headers",
+    ],
 )
diff --git a/src/stirling/source_connectors/proc_exit/bcc_bpf_intf/BUILD.bazel b/src/stirling/source_connectors/proc_exit/bcc_bpf_intf/BUILD.bazel
index 655bdb604a4..1d0ab09bf4d 100644
--- a/src/stirling/source_connectors/proc_exit/bcc_bpf_intf/BUILD.bazel
+++ b/src/stirling/source_connectors/proc_exit/bcc_bpf_intf/BUILD.bazel
@@ -21,6 +21,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library")
 
 package(default_visibility = [
@@ -28,15 +29,15 @@ package(default_visibility = [
     "//src/stirling/source_connectors/proc_exit/bcc_bpf:__pkg__",
 ])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [
+    deps = [
         ":headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
     ],
diff --git a/src/stirling/source_connectors/socket_tracer/bcc_bpf/BUILD.bazel b/src/stirling/source_connectors/socket_tracer/bcc_bpf/BUILD.bazel
index fce882de975..a515c254033 100644
--- a/src/stirling/source_connectors/socket_tracer/bcc_bpf/BUILD.bazel
+++ b/src/stirling/source_connectors/socket_tracer/bcc_bpf/BUILD.bazel
@@ -21,34 +21,42 @@
 #
 # SPDX-License-Identifier: MIT
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:cc_resource.bzl", "pl_bpf_cc_resource")
 load("//bazel:pl_build_system.bzl", "pl_cc_test")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-socket_trace_hdrs = [
-    "grpc_c_trace.c",
-    "go_http2_trace.c",
-    "go_tls_trace.c",
-    "go_trace_common.h",
-    "openssl_trace.c",
-    "node_openssl_trace.c",
-    "macros.h",
-    "protocol_inference.h",
-    "//src/stirling/upid:headers",
-    "//src/stirling/bpf_tools/bcc_bpf:headers",
-    "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
-    "//src/stirling/source_connectors/socket_tracer/bcc_bpf_intf:headers",
-]
+cc_library(
+    name = "headers",
+    hdrs = [
+        "go_http2_trace.c",
+        "go_tls_trace.c",
+        "go_trace_common.h",
+        "grpc_c_trace.c",
+        "macros.h",
+        "node_openssl_trace.c",
+        "openssl_trace.c",
+        "protocol_inference.h",
+    ],
+    deps = [
+        "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
+        "//src/stirling/source_connectors/socket_tracer/bcc_bpf_intf:headers",
+        "//src/stirling/upid:headers",
+    ],
+)
 
-# To examine the preprocessing output, build :socket_trace_bpf_preprocess_genrule.
+# To examine the preprocessing output, build :socket_trace_bpf_preprocess.
 pl_bpf_cc_resource(
     name = "socket_trace",
     src = "socket_trace.c",
-    hdrs = socket_trace_hdrs,
+    deps = [
+        ":headers",
+        "//src/stirling/bpf_tools/bcc_bpf/system-headers",
+    ],
     # Uncomment to enable debug printks.
     # defines = ["BPF_DEBUG"],
-    syshdrs = "//src/stirling/bpf_tools/bcc_bpf/system-headers",
 )
 
 pl_cc_test(
@@ -56,9 +64,6 @@ pl_cc_test(
     srcs = [
         "protocol_inference.h",
         "protocol_inference_test.cc",
-        "//src/stirling/bpf_tools/bcc_bpf:headers",
-        "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
-        "//src/stirling/source_connectors/socket_tracer/bcc_bpf_intf:headers",
     ],
     # PROTOCOL_LIST: Requires update on new protocols.
     defines = [
@@ -75,6 +80,9 @@ pl_cc_test(
         "ENABLE_AMQP_TRACING=true",
     ],
     deps = [
+        "//src/stirling/bpf_tools/bcc_bpf:headers",
+        "//src/stirling/bpf_tools/bcc_bpf_intf:headers",
+        "//src/stirling/source_connectors/socket_tracer/bcc_bpf_intf:headers",
         "//src/stirling/utils:cc_library",
     ],
 )
diff --git a/src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/BUILD.bazel b/src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/BUILD.bazel
index eb4998a9fb1..3f2ac0adc71 100644
--- a/src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/BUILD.bazel
+++ b/src/stirling/source_connectors/socket_tracer/bcc_bpf_intf/BUILD.bazel
@@ -14,13 +14,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library", "pl_cc_test")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob([
+    hdrs = glob([
         "*.h",
         "*.hpp",
     ]),
@@ -29,10 +30,8 @@ filegroup(
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [
-        ":headers",
-    ],
     deps = [
+        ":headers",
         "//src/stirling/bpf_tools/bcc_bpf_intf:cc_library",
         "//src/stirling/upid:cc_library",
     ],
diff --git a/src/stirling/upid/BUILD.bazel b/src/stirling/upid/BUILD.bazel
index f07a42cbdcf..8bc92cb9f06 100644
--- a/src/stirling/upid/BUILD.bazel
+++ b/src/stirling/upid/BUILD.bazel
@@ -14,18 +14,21 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:pl_build_system.bzl", "pl_cc_library")
 
 package(default_visibility = ["//src/stirling:__subpackages__"])
 
-filegroup(
+cc_library(
     name = "headers",
-    srcs = glob(["*.h"]),
+    hdrs = glob(["*.h"]),
 )
 
 pl_cc_library(
     name = "cc_library",
     srcs = [],
-    hdrs = [":headers"],
-    deps = ["//src/shared/upid:cc_library"],
+    deps = [
+        ":headers",
+        "//src/shared/upid:cc_library",
+    ],
 )