1 files changed, 9 insertions, 48 deletions
diff --git a/pw_polyfill/BUILD.gn b/pw_polyfill/BUILD.gn
index 0302de39a..a99e98de3 100644
--- a/pw_polyfill/BUILD.gn
+++ b/pw_polyfill/BUILD.gn
@@ -26,52 +26,15 @@ config("public_include_path") {
 pw_source_set("pw_polyfill") {
   public_configs = [ ":public_include_path" ]
   remove_public_deps = [ "*" ]
-  public_deps = [ ":standard_library" ]
   public = [
     "public/pw_polyfill/language_feature_macros.h",
     "public/pw_polyfill/standard.h",
   ]
 }
 
-config("cstddef_overrides_config") {
-  include_dirs = [ "cstddef_public_overrides" ]
-  cflags = [ "-Wno-gnu-include-next" ]
-  visibility = [ ":*" ]
-}
-
-config("iterator_overrides_config") {
-  include_dirs = [ "iterator_public_overrides" ]
-  cflags = [ "-Wno-gnu-include-next" ]
-  visibility = [ ":*" ]
-}
-
 config("standard_library_public") {
   include_dirs = [ "standard_library_public" ]
-}
-
-# Provides <cstddef>'s std::byte for C++14.
-pw_source_set("cstddef") {
-  public_configs = [
-    ":standard_library_public",
-    ":cstddef_overrides_config",
-  ]
-  public_deps = [ ":standard_library" ]
-  remove_public_deps = [ "*" ]
-  public = [ "cstddef_public_overrides/cstddef" ]
-  sources = [ "standard_library_public/pw_polyfill/standard_library/cstddef.h" ]
-}
-
-# Provides <iterator>'s std::data and std::size for C++14.
-pw_source_set("iterator") {
-  public_configs = [
-    ":standard_library_public",
-    ":iterator_overrides_config",
-  ]
-  public_deps = [ ":standard_library" ]
-  remove_public_deps = [ "*" ]
-  public = [ "iterator_public_overrides/iterator" ]
-  sources =
-      [ "standard_library_public/pw_polyfill/standard_library/iterator.h" ]
+  visibility = [ ":*" ]
 }
 
 pw_source_set("standard_library") {
@@ -79,7 +42,10 @@ pw_source_set("standard_library") {
   remove_public_deps = [ "*" ]
   public =
       [ "standard_library_public/pw_polyfill/standard_library/namespace.h" ]
-  visibility = [ ":*" ]
+  visibility = [
+    ":*",
+    "$dir_pw_minimal_cpp_stdlib:*",
+  ]
 }
 
 pw_test_group("tests") {
@@ -88,16 +54,11 @@ pw_test_group("tests") {
 }
 
 pw_test("test") {
-  deps = [ ":pw_polyfill" ]
-
-  # Do not depend on :cstddef and :iterator since they override library headers.
-  # Instead, add their include path and list them as sources.
-  configs = [ ":standard_library_public" ]
-  sources = [
-    "standard_library_public/pw_polyfill/standard_library/cstddef.h",
-    "standard_library_public/pw_polyfill/standard_library/iterator.h",
-    "test.cc",
+  deps = [
+    ":pw_polyfill",
+    ":standard_library",
   ]
+  sources = [ "test.cc" ]
 }
 
 pw_doc_group("docs") {