diff --git a/backends/cadence/aot/TARGETS b/backends/cadence/aot/TARGETS
index 0c39fd3d38e..27f9c00f4ac 100644
--- a/backends/cadence/aot/TARGETS
+++ b/backends/cadence/aot/TARGETS
@@ -12,7 +12,6 @@ load(
     "CXX",
 )
 load("@fbsource//xplat/executorch/codegen:codegen.bzl", "executorch_generated_lib")
-load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 
 oncall("odai_jarvis")
 
diff --git a/codegen/tools/targets.bzl b/codegen/tools/targets.bzl
index 39de8fcb482..acea3370e7d 100644
--- a/codegen/tools/targets.bzl
+++ b/codegen/tools/targets.bzl
@@ -17,10 +17,10 @@ def define_common_targets(is_fbcode = False):
         ],
         deps = [
             "//executorch/codegen:gen_lib",
-        ] + select({
+        ] + ([] if runtime.is_oss else select({
             "DEFAULT": [],
-            "ovr_config//os:linux": [] if runtime.is_oss else ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
-        }),
+            "ovr_config//os:linux": ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
+        })),
     )
 
     runtime.python_binary(
diff --git a/exir/_serialize/TARGETS b/exir/_serialize/TARGETS
index 6671bf00334..83a2d4957ce 100644
--- a/exir/_serialize/TARGETS
+++ b/exir/_serialize/TARGETS
@@ -1,11 +1,10 @@
-load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 oncall("executorch")
 
 # TODO(T157145817): Update other flatbuffer serializers to use flatc like
 # _flatbuffer.py does, and remove this.
-cpp_python_extension(
+runtime.cxx_python_extension(
     name = "_bindings",
     srcs = [
         "bindings.cpp",
diff --git a/exir/verification/TARGETS b/exir/verification/TARGETS
index 8362d87a238..85251677b55 100644
--- a/exir/verification/TARGETS
+++ b/exir/verification/TARGETS
@@ -1,10 +1,9 @@
-load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 
 oncall("executorch")
 
-cpp_python_extension(
+runtime.cxx_python_extension(
     name = "bindings",
     srcs = [
         "bindings.cpp",
diff --git a/extension/pytree/TARGETS b/extension/pytree/TARGETS
index 32eea9b3bdb..5f09772ee38 100644
--- a/extension/pytree/TARGETS
+++ b/extension/pytree/TARGETS
@@ -1,7 +1,6 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
 # targets.bzl. This file can contain fbcode-only targets.
 
-load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load(":targets.bzl", "define_common_targets")
 
@@ -9,7 +8,7 @@ oncall("executorch")
 
 define_common_targets()
 
-cpp_python_extension(
+runtime.cxx_python_extension(
     name = "pybindings",
     srcs = [
         "pybindings.cpp",
@@ -21,7 +20,7 @@ cpp_python_extension(
     ],
 )
 
-cpp_python_extension(
+runtime.cxx_python_extension(
     name = "pybindings_debug",
     srcs = [
         "pybindings.cpp",
diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
index bbf4a0fe789..46101ab36db 100644
--- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl
+++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl
@@ -290,6 +290,7 @@ def _cxx_test(*args, **kwargs):
 
 def _cxx_python_extension(*args, **kwargs):
     _patch_kwargs_common(kwargs)
+    _remove_caffe2_deps(kwargs)
     kwargs["srcs"] = _patch_executorch_references(kwargs["srcs"])
     if "types" in kwargs:
         kwargs["types"] = _patch_executorch_references(kwargs["types"])
@@ -324,8 +325,19 @@ def _genrule(*args, **kwargs):
         kwargs["name"] += "_static"
         env.genrule(*args, **kwargs)
 
+def _remove_caffe2_deps(kwargs):
+    if not env.is_oss:
+        return
+    # We don't have Buckified PyTorch in OSS. At least let buck query work.
+    MISSING_BUCK_DIRS = ("//caffe2", "//pytorch", "fbsource//third-party")
+    for dep_type in ('deps', 'exported_deps'):
+        if dep_type not in kwargs:
+            continue
+        kwargs[dep_type] = [x for x in kwargs[dep_type] if not any([x.startswith(y) for y in MISSING_BUCK_DIRS])]
+
 def _python_library(*args, **kwargs):
     _patch_kwargs_common(kwargs)
+    _remove_caffe2_deps(kwargs)
     env.python_library(*args, **kwargs)
 
 def _python_binary(*args, **kwargs):