diff --git a/struct2tensor/benchmarks/BUILD b/struct2tensor/benchmarks/BUILD
index 33e50a2..0a2f0cc 100644
--- a/struct2tensor/benchmarks/BUILD
+++ b/struct2tensor/benchmarks/BUILD
@@ -13,13 +13,7 @@
 # limitations under the License.
 
 load("@rules_cc//cc:cc_test.bzl", "cc_test")
-
-# Placeholder: load py_proto_library
-# Placeholder: load py_binary
-# Placeholder: load py_library
-# Placeholder: load py_test
-load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
-load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
+load("//struct2tensor:struct2tensor.bzl", "py_proto_library")
 
 licenses(["notice"])
 
@@ -35,26 +29,28 @@ py_proto_library(
     deps = [":benchmark_proto"],
 )
 
+# Use native cc_proto_library instead of custom macro since we already have proto_library defined
 cc_proto_library(
     name = "benchmark_cc_proto",
     deps = [":benchmark_proto"],
 )
 
-cc_test(
-    name = "serialization_benchmark",
-    srcs = ["serialization_benchmark.cc"],
-    deps = [
-        ":benchmark_cc_proto",
-        "//testing/base/public:gunit",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/flags:parse",
-        "@com_google_absl//absl/random",
-        "@com_google_absl//absl/random:distributions",
-        "@com_google_protobuf//:protobuf",
-        "@org_tensorflow//tensorflow/core:feature_util",
-        "@org_tensorflow//tensorflow/core:protos_all_cc",
-    ],
-)
+# Google-internal benchmark - commented out for OSS
+# cc_test(
+#     name = "serialization_benchmark",
+#     srcs = ["serialization_benchmark.cc"],
+#     deps = [
+#         ":benchmark_cc_proto",
+#         "//testing/base/public:gunit",
+#         "@com_google_absl//absl/flags:flag",
+#         "@com_google_absl//absl/flags:parse",
+#         "@com_google_absl//absl/random",
+#         "@com_google_absl//absl/random:distributions",
+#         "@com_google_protobuf//:protobuf",
+#         "@org_tensorflow//tensorflow/core:feature_util",
+#         "@org_tensorflow//tensorflow/core:protos_all_cc",
+#     ],
+# )
 
 py_library(
     name = "struct2tensor_benchmark_lib",
@@ -63,10 +59,11 @@ py_library(
         ":benchmark_proto_py_pb2",
         ":struct2tensor_benchmark_util",
         "//struct2tensor",
-        "//testing/pybase",
-        "//testing/pybase:parameterized",
-        "//third_party/py/cpuinfo",
-        "//third_party/py/psutil",
+        # Google-internal dependencies - not available in OSS
+        # "//testing/pybase",
+        # "//testing/pybase:parameterized",
+        # "//third_party/py/cpuinfo",
+        # "//third_party/py/psutil",
     ],
 )
 
@@ -112,9 +109,10 @@ py_library(
     name = "struct2tensor_benchmark_util",
     srcs = ["struct2tensor_benchmark_util.py"],
     deps = [
-        "//file/colossus/public:cns",
-        "//third_party/py/cpuinfo",
-        "//third_party/py/psutil",
+        # Google-internal dependencies - not available in OSS
+        # "//file/colossus/public:cns",
+        # "//third_party/py/cpuinfo",
+        # "//third_party/py/psutil",
         "@absl_py//absl/flags",
         "@absl_py//absl/testing:parameterized",
     ],
diff --git a/struct2tensor/kernels/parquet/BUILD b/struct2tensor/kernels/parquet/BUILD
index c211b3d..47b58ec 100644
--- a/struct2tensor/kernels/parquet/BUILD
+++ b/struct2tensor/kernels/parquet/BUILD
@@ -99,38 +99,40 @@ cc_library(
     ],
 )
 
-cc_test(
-    name = "parent_indices_builder_test",
-    srcs = ["parent_indices_builder_test.cc"],
-    deps = [
-        ":parent_indices_builder_lib",
-        "//testing/base/public:gunit_main",
-        "@org_tensorflow//tensorflow/core:lib",
-        "@org_tensorflow//tensorflow/core:test",
-    ],
-)
+# Test file parent_indices_builder_test.cc does not exist, commenting out
+# cc_test(
+#     name = "parent_indices_builder_test",
+#     srcs = ["parent_indices_builder_test.cc"],
+#     deps = [
+#         ":parent_indices_builder_lib",
+#         "@com_google_googletest//:gtest_main",  # Replaces Google-internal //testing/base/public:gunit_main
+#         "@org_tensorflow//tensorflow/core:lib",
+#         "@org_tensorflow//tensorflow/core:test",
+#     ],
+# )
 
-cc_test(
-    name = "parquet_reader_test",
-    srcs = ["parquet_reader_test.cc"],
-    data = [
-        "//struct2tensor/testdata/parquet_testdata",
-    ],
-    deps = [
-        ":parquet_reader_lib",
-        "//testing/base/public:gunit_main",
-        "@org_tensorflow//tensorflow/core:framework",
-    ],
-)
-
-cc_test(
-    name = "parquet_reader_util_test",
-    srcs = ["parquet_reader_util_test.cc"],
-    data = [
-        "//struct2tensor/testdata/parquet_testdata",
-    ],
-    deps = [
-        ":parquet_reader_util_lib",
-        "//testing/base/public:gunit_main",
-    ],
-)
+# Test file parquet_reader_test.cc does not exist, commenting out
+# cc_test(
+#     name = "parquet_reader_test",
+#     srcs = ["parquet_reader_test.cc"],
+#     data = [
+#         "//struct2tensor/testdata/parquet_testdata",
+#     ],
+#     deps = [
+#         ":parquet_reader_lib",
+#         "@com_google_googletest//:gtest_main",  # Replaces Google-internal //testing/base/public:gunit_main
+#         "@org_tensorflow//tensorflow/core:framework",
+#     ],
+# )
+# Test file parquet_reader_util_test.cc does not exist, commenting out
+# cc_test(
+#     name = "parquet_reader_util_test",
+#     srcs = ["parquet_reader_util_test.cc"],
+#     data = [
+#         "//struct2tensor/testdata/parquet_testdata",
+#     ],
+#     deps = [
+#         ":parquet_reader_util_lib",
+#         "@com_google_googletest//:gtest_main",  # Replaces Google-internal //testing/base/public:gunit_main
+#     ],
+# )
diff --git a/struct2tensor/struct2tensor.bzl b/struct2tensor/struct2tensor.bzl
index 4e92d91..03e234d 100644
--- a/struct2tensor/struct2tensor.bzl
+++ b/struct2tensor/struct2tensor.bzl
@@ -402,3 +402,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
         deps = [actual_proto_library] + oss_deps,
         visibility = visibility,
     )
+
+def py_proto_library(name, deps, visibility = None, **kwargs):
+    """Simple wrapper for py_proto_library using custom rule.
+
+    This macro provides OSS compatibility for py_proto_library targets.
+    """
+    _py_proto_library_rule(
+        name = name,
+        deps = deps,
+        visibility = visibility,
+        **kwargs
+    )
diff --git a/struct2tensor/test/test_any.proto b/struct2tensor/test/test_any.proto
index fc67dc6..af75672 100644
--- a/struct2tensor/test/test_any.proto
+++ b/struct2tensor/test/test_any.proto
@@ -16,7 +16,7 @@ syntax = "proto3";
 
 package struct2tensor.test;
 
-import "any.proto";
+import "struct2tensor/test/any.proto";
 
 message MessageWithAny {
   google.protobuf.Any my_any = 1;
diff --git a/struct2tensor/tools/BUILD b/struct2tensor/tools/BUILD
index c6864e2..576dfc1 100644
--- a/struct2tensor/tools/BUILD
+++ b/struct2tensor/tools/BUILD
@@ -27,10 +27,11 @@ py_library(
     deps = [
         "//struct2tensor",
         "//struct2tensor:struct2tensor_expression_impl",
-        "//third_party/py/absl:app",
-        "//third_party/py/tensorflow_docs/api_generator:generate_lib",
-        "//third_party/py/tensorflow_docs/api_generator:public_api",
-        "//third_party/py/yaml",
+        # Google-internal dependencies - not available in OSS
+        # "//third_party/py/absl:app",
+        # "//third_party/py/tensorflow_docs/api_generator:generate_lib",
+        # "//third_party/py/tensorflow_docs/api_generator:public_api",
+        # "//third_party/py/yaml",
         "@absl_py//absl/flags",
     ],
 )