[build] Use static c++ stdlib in driver_module by default

Bug: 64400
Change-Id: I7a64716f2cf15ae48ef977ffef10174f9cdf7e99
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/450856
Fuchsia-Auto-Submit: Suraj Malhotra <surajmalhotra@google.com>
Commit-Queue: Suraj Malhotra <surajmalhotra@google.com>
Reviewed-by: Roland McGrath <mcgrathr@google.com>
diff --git a/build/config/fuchsia/rules.gni b/build/config/fuchsia/rules.gni
index 8de4949..1402f80 100644
--- a/build/config/fuchsia/rules.gni
+++ b/build/config/fuchsia/rules.gni
@@ -101,7 +101,7 @@
   # tells the linker to link against it statically. This is safe for drivers which
   # don't depend on the standard library as well as the linker will not have any
   # symbols to resolve.
-  configs += [ "//build/config/fuchsia:no_cpp_standard_library" ]
+  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 # TODO(64400): Temporary to allow out of tree users to soft migrate.
diff --git a/src/camera/drivers/bus/aml_mipicsi/BUILD.gn b/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
index 4a56b68..5c59af4 100644
--- a/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
+++ b/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
@@ -42,8 +42,6 @@
     "//zircon/public/lib/zx",
     "//zircon/system/ulib/fzl",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("driver_package") {
diff --git a/src/camera/drivers/controller/camera_controller_driver.gni b/src/camera/drivers/controller/camera_controller_driver.gni
index e0f9ca6..596f4c3 100644
--- a/src/camera/drivers/controller/camera_controller_driver.gni
+++ b/src/camera/drivers/controller/camera_controller_driver.gni
@@ -59,12 +59,7 @@
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [
-      "//build/config/fuchsia:static_cpp_standard_library",
-      "//build/config/fuchsia:enable_zircon_asserts",
-    ]
+    configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
   }
 
   driver_package(package_name) {
diff --git a/src/camera/drivers/hw_accel/gdc/BUILD.gn b/src/camera/drivers/hw_accel/gdc/BUILD.gn
index 45df66111..008ddd1 100644
--- a/src/camera/drivers/hw_accel/gdc/BUILD.gn
+++ b/src/camera/drivers/hw_accel/gdc/BUILD.gn
@@ -72,12 +72,7 @@
     ":source",
     "//sdk/lib/syslog/cpp:backend_legacy",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/config/fuchsia:enable_zircon_asserts",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 driver_package("gdc") {
diff --git a/src/camera/drivers/hw_accel/ge2d/BUILD.gn b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
index 8334865..5d28e48 100644
--- a/src/camera/drivers/hw_accel/ge2d/BUILD.gn
+++ b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
@@ -67,12 +67,7 @@
     "//sdk/lib/syslog/cpp:backend_legacy",
     "//zircon/system/ulib/driver-unit-test",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/config/fuchsia:enable_zircon_asserts",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 driver_package("ge2d") {
diff --git a/src/camera/drivers/sensors/imx227/BUILD.gn b/src/camera/drivers/sensors/imx227/BUILD.gn
index ccd9cf1..21d4c80 100644
--- a/src/camera/drivers/sensors/imx227/BUILD.gn
+++ b/src/camera/drivers/sensors/imx227/BUILD.gn
@@ -63,9 +63,6 @@
     "//sdk/fidl/fuchsia.driver.test",
     "//sdk/lib/syslog/cpp:backend_legacy",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("imx227") {
diff --git a/src/camera/drivers/usb_video/BUILD.gn b/src/camera/drivers/usb_video/BUILD.gn
index 5bbf2f2..c718694 100644
--- a/src/camera/drivers/usb_video/BUILD.gn
+++ b/src/camera/drivers/usb_video/BUILD.gn
@@ -54,9 +54,6 @@
     "//zircon/system/ulib/async-loop:async-loop-default",
     "//zircon/system/ulib/fzl",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("usb_video") {
diff --git a/src/connectivity/bluetooth/core/bt-host/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
index 79132de..18e7c1c 100644
--- a/src/connectivity/bluetooth/core/bt-host/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
@@ -18,9 +18,6 @@
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
     "//src/lib/ddk:ddk-deprecated-binding-headers",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 # Conversions between host FIDL and internal library types.
diff --git a/src/connectivity/bluetooth/hci/emulator/BUILD.gn b/src/connectivity/bluetooth/hci/emulator/BUILD.gn
index dc0a67f..3ccea81 100644
--- a/src/connectivity/bluetooth/hci/emulator/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/emulator/BUILD.gn
@@ -38,9 +38,6 @@
     "//zircon/public/lib/zx",
     "//zircon/system/ulib/async-default",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("emulator") {
diff --git a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
index 35644eb..821d5b1 100644
--- a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
@@ -23,9 +23,6 @@
   ]
 
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("passthrough") {
diff --git a/src/connectivity/bluetooth/hci/transport/uart/BUILD.gn b/src/connectivity/bluetooth/hci/transport/uart/BUILD.gn
index 9117a0f..5308159 100644
--- a/src/connectivity/bluetooth/hci/transport/uart/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/transport/uart/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bt-transport-uart.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.bt.hci",
diff --git a/src/connectivity/bluetooth/hci/transport/usb/BUILD.gn b/src/connectivity/bluetooth/hci/transport/usb/BUILD.gn
index a2f32f52..41e9f87 100644
--- a/src/connectivity/bluetooth/hci/transport/usb/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/transport/usb/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = []
   deps = [ ":common" ]
 }
diff --git a/src/connectivity/bluetooth/hci/vendor/atheros/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/atheros/BUILD.gn
index e2917c7..868922d 100644
--- a/src/connectivity/bluetooth/hci/vendor/atheros/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/atheros/BUILD.gn
@@ -34,11 +34,7 @@
     "//zircon/public/lib/zx",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 if (internal_access) {
diff --git a/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
index fa01478..e2ee553 100644
--- a/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
@@ -14,11 +14,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bt-hci-broadcom.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.bt.hci",
@@ -43,9 +39,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
   sources = [ "bt-hci-broadcom.c" ]
diff --git a/src/connectivity/bluetooth/hci/vendor/intel/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/intel/BUILD.gn
index 8c5b777..105be1d 100644
--- a/src/connectivity/bluetooth/hci/vendor/intel/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/intel/BUILD.gn
@@ -51,11 +51,7 @@
     "//zircon/public/lib/zx",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 
   # TODO(fxb/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
diff --git a/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
index 5962b8f..3071766 100644
--- a/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
@@ -23,11 +23,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bt-hci-mediatek.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.bt.hci",
diff --git a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
index cc8479b..2ec96df 100644
--- a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
@@ -25,9 +25,6 @@
     "//src/lib/ddk:ddk-deprecated-binding-headers",
     "//zircon/public/lib/zx",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_package("bt-hog") {
diff --git a/src/connectivity/ethernet/drivers/aml-ethernet-s912/BUILD.gn b/src/connectivity/ethernet/drivers/aml-ethernet-s912/BUILD.gn
index 7b35e08..99e6bcf 100644
--- a/src/connectivity/ethernet/drivers/aml-ethernet-s912/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/aml-ethernet-s912/BUILD.gn
@@ -20,11 +20,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-ethernet.cc" ]
   deps = [
     ":aml_eth_bind",
diff --git a/src/connectivity/ethernet/drivers/asix-88179/BUILD.gn b/src/connectivity/ethernet/drivers/asix-88179/BUILD.gn
index 4c1563a..325f8ff 100644
--- a/src/connectivity/ethernet/drivers/asix-88179/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/asix-88179/BUILD.gn
@@ -27,11 +27,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "asix-88179.cc" ]
   deps = [
     ":ethernet_ax88179_bind",
@@ -62,11 +58,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "asix-88179-function.cc" ]
   deps = [
     ":asix-88179-test-helper",
diff --git a/src/connectivity/ethernet/drivers/asix-88772b/BUILD.gn b/src/connectivity/ethernet/drivers/asix-88772b/BUILD.gn
index 94ee988..f2292e5 100644
--- a/src/connectivity/ethernet/drivers/asix-88772b/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/asix-88772b/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "asix-88772b.c" ]
   deps = [
     ":ethernet_ax88772b_bind",
diff --git a/src/connectivity/ethernet/drivers/dwmac/BUILD.gn b/src/connectivity/ethernet/drivers/dwmac/BUILD.gn
index 1827da4..3742876 100644
--- a/src/connectivity/ethernet/drivers/dwmac/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/dwmac/BUILD.gn
@@ -20,11 +20,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "dwmac-debug.cc",
     "dwmac.cc",
diff --git a/src/connectivity/ethernet/drivers/ethernet/BUILD.gn b/src/connectivity/ethernet/drivers/ethernet/BUILD.gn
index 6144e44..fb0e212 100644
--- a/src/connectivity/ethernet/drivers/ethernet/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/ethernet/BUILD.gn
@@ -20,11 +20,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ethernet.cc" ]
   deps = [
     ":ethernet_bind",
diff --git a/src/connectivity/ethernet/drivers/ethertap/BUILD.gn b/src/connectivity/ethernet/drivers/ethertap/BUILD.gn
index aab298e..80bbb2c 100644
--- a/src/connectivity/ethernet/drivers/ethertap/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/ethertap/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ethertap.cc" ]
   deps = [
     ":ethertap_bind",
diff --git a/src/connectivity/ethernet/drivers/realtek-8111/BUILD.gn b/src/connectivity/ethernet/drivers/realtek-8111/BUILD.gn
index 88df639..9440b0b 100644
--- a/src/connectivity/ethernet/drivers/realtek-8111/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/realtek-8111/BUILD.gn
@@ -18,11 +18,7 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [
-      "//build/config/fuchsia:static_cpp_standard_library",
-      "//build/unification/config:zircon-migrated",
-    ]
+    configs += [ "//build/unification/config:zircon-migrated" ]
     sources = [ "rtl8111.c" ]
     deps = [
       ":realtek_rtl8111_bind",
diff --git a/src/connectivity/ethernet/drivers/realtek-8211f/BUILD.gn b/src/connectivity/ethernet/drivers/realtek-8211f/BUILD.gn
index de95db9..254f978 100644
--- a/src/connectivity/ethernet/drivers/realtek-8211f/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/realtek-8211f/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "rtl8211f.cc" ]
   deps = [
     ":rtl8211f_bind",
diff --git a/src/connectivity/ethernet/drivers/rndis-function/BUILD.gn b/src/connectivity/ethernet/drivers/rndis-function/BUILD.gn
index a43473b..b6e02e0 100644
--- a/src/connectivity/ethernet/drivers/rndis-function/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/rndis-function/BUILD.gn
@@ -45,11 +45,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":rndis-function-lib",
     "//src/devices/lib/driver",
diff --git a/src/connectivity/ethernet/drivers/rndis-host/BUILD.gn b/src/connectivity/ethernet/drivers/rndis-host/BUILD.gn
index 6e17d6a3..eba0ceb 100644
--- a/src/connectivity/ethernet/drivers/rndis-host/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/rndis-host/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 
   sources = [
     "rndis_host.cc",
diff --git a/src/connectivity/ethernet/drivers/usb-cdc-ecm/BUILD.gn b/src/connectivity/ethernet/drivers/usb-cdc-ecm/BUILD.gn
index 00e2023..3114ec0 100644
--- a/src/connectivity/ethernet/drivers/usb-cdc-ecm/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/usb-cdc-ecm/BUILD.gn
@@ -21,11 +21,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-cdc-ecm.c" ]
   deps = [
     ":ethernet_usb_cdc_ecm_bind",
diff --git a/src/connectivity/ethernet/drivers/usb-cdc-function/BUILD.gn b/src/connectivity/ethernet/drivers/usb-cdc-function/BUILD.gn
index ed3b4ac..ea9943f 100644
--- a/src/connectivity/ethernet/drivers/usb-cdc-function/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/usb-cdc-function/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "cdc-eth-function.cc" ]
   deps = [
     ":usb_cdc_bind",
diff --git a/src/connectivity/ethernet/drivers/virtio/BUILD.gn b/src/connectivity/ethernet/drivers/virtio/BUILD.gn
index 5f964e1..fb19775a 100644
--- a/src/connectivity/ethernet/drivers/virtio/BUILD.gn
+++ b/src/connectivity/ethernet/drivers/virtio/BUILD.gn
@@ -34,8 +34,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/connectivity/network/drivers/network-device/BUILD.gn b/src/connectivity/network/drivers/network-device/BUILD.gn
index ac6e653..0e42977 100644
--- a/src/connectivity/network/drivers/network-device/BUILD.gn
+++ b/src/connectivity/network/drivers/network-device/BUILD.gn
@@ -30,8 +30,6 @@
 
 driver_module("network-device") {
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 
   deps = [
     ":src",
diff --git a/src/connectivity/openthread/drivers/ot-radio/config.gni b/src/connectivity/openthread/drivers/ot-radio/config.gni
index c10f1bc..31a481c 100644
--- a/src/connectivity/openthread/drivers/ot-radio/config.gni
+++ b/src/connectivity/openthread/drivers/ot-radio/config.gni
@@ -66,9 +66,6 @@
       deps += [ ":version-string-${driver_suffix}" ]
     }
 
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
     # TODO(fxb/58162): delete the below and fix compiler warnings
     configs += [ "//build/config:Wno-conversion" ]
   }
diff --git a/src/connectivity/openthread/tests/fake-drivers/fake-ot-radio/BUILD.gn b/src/connectivity/openthread/tests/fake-drivers/fake-ot-radio/BUILD.gn
index 795d8b8..62810e6 100644
--- a/src/connectivity/openthread/tests/fake-drivers/fake-ot-radio/BUILD.gn
+++ b/src/connectivity/openthread/tests/fake-drivers/fake-ot-radio/BUILD.gn
@@ -44,9 +44,6 @@
     "//zircon/system/ulib/fidl-async:fidl-async-cpp",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   # TODO(fxbug.dev/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
 }
diff --git a/src/connectivity/ppp/drivers/serial-ppp/BUILD.gn b/src/connectivity/ppp/drivers/serial-ppp/BUILD.gn
index 21ff28f..8f857ec 100644
--- a/src/connectivity/ppp/drivers/serial-ppp/BUILD.gn
+++ b/src/connectivity/ppp/drivers/serial-ppp/BUILD.gn
@@ -77,9 +77,6 @@
   include_dirs = [ "//src/connectivity/ppp" ]
 
   deps = [ ":driver" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 group("tests") {
diff --git a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
index af42ecd..1ab8ead 100644
--- a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
@@ -45,9 +45,6 @@
     "//zircon/system/ulib/async-default",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   # TODO(fxb/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
 }
diff --git a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
index f39f927..647d9ec 100644
--- a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
@@ -21,8 +21,6 @@
   deps = [ ":qmi_driver_src" ]
 
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 source_set("qmi_driver_src") {
diff --git a/src/connectivity/telephony/tests/fake-drivers/at-fake-transport/BUILD.gn b/src/connectivity/telephony/tests/fake-drivers/at-fake-transport/BUILD.gn
index 3701b64..2bc299f 100644
--- a/src/connectivity/telephony/tests/fake-drivers/at-fake-transport/BUILD.gn
+++ b/src/connectivity/telephony/tests/fake-drivers/at-fake-transport/BUILD.gn
@@ -45,9 +45,6 @@
     "//zircon/system/ulib/async-default",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   # TODO(fxb/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
 }
diff --git a/src/connectivity/telephony/tests/fake-drivers/fake-transport-base/BUILD.gn b/src/connectivity/telephony/tests/fake-drivers/fake-transport-base/BUILD.gn
index 8214a14..2ef9a41 100644
--- a/src/connectivity/telephony/tests/fake-drivers/fake-transport-base/BUILD.gn
+++ b/src/connectivity/telephony/tests/fake-drivers/fake-transport-base/BUILD.gn
@@ -23,6 +23,4 @@
     "//zircon/public/lib/zx",
     "//zircon/system/ulib/async-default",
   ]
-
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
diff --git a/src/connectivity/telephony/tests/fake-drivers/usb-qmi-function/BUILD.gn b/src/connectivity/telephony/tests/fake-drivers/usb-qmi-function/BUILD.gn
index 9ec35d3..9cfd52f 100644
--- a/src/connectivity/telephony/tests/fake-drivers/usb-qmi-function/BUILD.gn
+++ b/src/connectivity/telephony/tests/fake-drivers/usb-qmi-function/BUILD.gn
@@ -37,8 +37,6 @@
     "//zircon/public/lib/zx",
   ]
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 
   # TODO(fxb/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
diff --git a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
index c5866a2..6dfc61a 100644
--- a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
+++ b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
@@ -38,8 +38,6 @@
   ]
 
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 if (internal_access) {
diff --git a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
index d269b37..2194b8f 100644
--- a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
+++ b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
@@ -56,9 +56,6 @@
     "//zircon/system/public",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   # TODO(fxb/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
 }
diff --git a/src/connectivity/wlan/drivers/testing/BUILD.gn b/src/connectivity/wlan/drivers/testing/BUILD.gn
index c036f12..6249bab 100644
--- a/src/connectivity/wlan/drivers/testing/BUILD.gn
+++ b/src/connectivity/wlan/drivers/testing/BUILD.gn
@@ -43,6 +43,4 @@
   ]
 
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
diff --git a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
index 29e79a2..4d96bd2 100644
--- a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
@@ -100,9 +100,6 @@
   ]
 
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   configs += [ "//build/config:Wno-conversion" ]
 }
 
diff --git a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
index a6fc6aa..04f3853 100644
--- a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
@@ -233,8 +233,6 @@
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
     "//src/lib/ddk:ddk-deprecated-binding-headers",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   visibility += [ "//src/connectivity/wlan:drivers" ]
 }
 
@@ -255,8 +253,6 @@
     "pcie:pcie_driver_test",
   ]
   defines = [ "CONFIG_BRCMFMAC_DRIVER_TEST=1" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   visibility += [ "//src/connectivity/wlan:drivers" ]
 }
 
diff --git a/src/connectivity/wlan/drivers/third_party/intel/iwlwifi/BUILD.gn b/src/connectivity/wlan/drivers/third_party/intel/iwlwifi/BUILD.gn
index e9ffdf9..e144821 100644
--- a/src/connectivity/wlan/drivers/third_party/intel/iwlwifi/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/intel/iwlwifi/BUILD.gn
@@ -135,9 +135,6 @@
   output_name = "iwlwifi"
 
   deps = [ ":pcie" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 all_fw_files = [ "iwlwifi-7265D-29.ucode" ]
diff --git a/src/connectivity/wlan/drivers/wlan/BUILD.gn b/src/connectivity/wlan/drivers/wlan/BUILD.gn
index d1eca94..65a53a3 100644
--- a/src/connectivity/wlan/drivers/wlan/BUILD.gn
+++ b/src/connectivity/wlan/drivers/wlan/BUILD.gn
@@ -37,12 +37,7 @@
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/zx",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 executable("wlan_minstrel_unittest") {
diff --git a/src/connectivity/wlan/drivers/wlanif/BUILD.gn b/src/connectivity/wlan/drivers/wlanif/BUILD.gn
index 4fd22f1..14c171e 100644
--- a/src/connectivity/wlan/drivers/wlanif/BUILD.gn
+++ b/src/connectivity/wlan/drivers/wlanif/BUILD.gn
@@ -50,12 +50,7 @@
   output_name = "wlanif"
 
   deps = [ ":lib_source" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 driver_package("wlanif") {
diff --git a/src/connectivity/wlan/drivers/wlanphy/BUILD.gn b/src/connectivity/wlan/drivers/wlanphy/BUILD.gn
index a0ff853..00637c2 100644
--- a/src/connectivity/wlan/drivers/wlanphy/BUILD.gn
+++ b/src/connectivity/wlan/drivers/wlanphy/BUILD.gn
@@ -42,12 +42,7 @@
   sources = wlanphy_sources
 
   deps = wlanphy_deps
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 driver_package("wlanphy") {
diff --git a/src/connectivity/wlan/testing/wlantap-driver/BUILD.gn b/src/connectivity/wlan/testing/wlantap-driver/BUILD.gn
index 07244dd..76793bd 100644
--- a/src/connectivity/wlan/testing/wlantap-driver/BUILD.gn
+++ b/src/connectivity/wlan/testing/wlantap-driver/BUILD.gn
@@ -35,12 +35,7 @@
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
     "//src/lib/ddk:ddk-deprecated-binding-headers",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 
   # TODO(fxbug.dev/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
diff --git a/src/devices/bin/driver_host/BUILD.gn b/src/devices/bin/driver_host/BUILD.gn
index b5e2255..a112ce4 100644
--- a/src/devices/bin/driver_host/BUILD.gn
+++ b/src/devices/bin/driver_host/BUILD.gn
@@ -72,10 +72,7 @@
     "//zircon/system/ulib/zxio",
   ]
 
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
 }
 
 shared_library("driver") {
@@ -91,8 +88,6 @@
 }
 
 driver_module("driver-host-test-driver") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":test-devhost-parent-bind",
@@ -110,8 +105,6 @@
 }
 
 driver_module("driver-host-test-child-driver") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "test-driver-child.cc" ]
   deps = [
     ":test-devhost-child-bind",
@@ -153,8 +146,6 @@
 
 driver_module("unit-test-fail") {
   test = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "unit-test-fail.cc" ]
   deps = [
     ":unit-test-fail-bind",
@@ -172,8 +163,6 @@
 
 driver_module("unit-test-pass") {
   test = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "unit-test-pass.cc" ]
   deps = [
     ":unit-test-pass-bind",
diff --git a/src/devices/bin/driver_host2/BUILD.gn b/src/devices/bin/driver_host2/BUILD.gn
index 0b04d41..59c4141 100644
--- a/src/devices/bin/driver_host2/BUILD.gn
+++ b/src/devices/bin/driver_host2/BUILD.gn
@@ -51,16 +51,10 @@
     "//src/devices/lib/driver2:llcpp",
     "//zircon/system/ulib/svc",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_module("test_not_driver") {
   testonly = true
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 executable("unittests") {
diff --git a/src/devices/block/drivers/ahci/BUILD.gn b/src/devices/block/drivers/ahci/BUILD.gn
index a919ed8..f2fa8fa 100644
--- a/src/devices/block/drivers/ahci/BUILD.gn
+++ b/src/devices/block/drivers/ahci/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":shared",
     "//src/devices/lib/driver",
diff --git a/src/devices/block/drivers/aml-sdmmc/BUILD.gn b/src/devices/block/drivers/aml-sdmmc/BUILD.gn
index b7324e5..ce3331d 100644
--- a/src/devices/block/drivers/aml-sdmmc/BUILD.gn
+++ b/src/devices/block/drivers/aml-sdmmc/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-sdmmc.cc" ]
   deps = [
     ":aml-sdmmc-bind",
diff --git a/src/devices/block/drivers/as370-sdhci/BUILD.gn b/src/devices/block/drivers/as370-sdhci/BUILD.gn
index 390326e..6009a6d 100644
--- a/src/devices/block/drivers/as370-sdhci/BUILD.gn
+++ b/src/devices/block/drivers/as370-sdhci/BUILD.gn
@@ -20,11 +20,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "as370-sdhci.cc" ]
   deps = [
     ":as370-sdhci-bind",
diff --git a/src/devices/block/drivers/block-verity/BUILD.gn b/src/devices/block/drivers/block-verity/BUILD.gn
index 349d2e2..9987fc1 100644
--- a/src/devices/block/drivers/block-verity/BUILD.gn
+++ b/src/devices/block/drivers/block-verity/BUILD.gn
@@ -128,9 +128,6 @@
 driver_module("block-verity") {
   output_name = "block-verity"
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   sources = [
     "device-info.cc",
     "device-manager.cc",
diff --git a/src/devices/block/drivers/bootpart/BUILD.gn b/src/devices/block/drivers/bootpart/BUILD.gn
index 7ddcbce..6b88268 100644
--- a/src/devices/block/drivers/bootpart/BUILD.gn
+++ b/src/devices/block/drivers/bootpart/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bootpart.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.block",
diff --git a/src/devices/block/drivers/core/BUILD.gn b/src/devices/block/drivers/core/BUILD.gn
index e859188..e124451 100644
--- a/src/devices/block/drivers/core/BUILD.gn
+++ b/src/devices/block/drivers/core/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   output_name = "block.core"
   deps = [
     ":shared",
diff --git a/src/devices/block/drivers/ftl/BUILD.gn b/src/devices/block/drivers/ftl/BUILD.gn
index 7a6c5e5..ea758b9 100644
--- a/src/devices/block/drivers/ftl/BUILD.gn
+++ b/src/devices/block/drivers/ftl/BUILD.gn
@@ -14,8 +14,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/block/drivers/fvm/BUILD.gn b/src/devices/block/drivers/fvm/BUILD.gn
index 1228d9c..ad70ec8 100644
--- a/src/devices/block/drivers/fvm/BUILD.gn
+++ b/src/devices/block/drivers/fvm/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":shared",
     "//sdk/lib/syslog/cpp:backend_legacy",
diff --git a/src/devices/block/drivers/gpt/BUILD.gn b/src/devices/block/drivers/gpt/BUILD.gn
index 34d1525..5190b19 100644
--- a/src/devices/block/drivers/gpt/BUILD.gn
+++ b/src/devices/block/drivers/gpt/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "gpt.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.block",
diff --git a/src/devices/block/drivers/mbr/BUILD.gn b/src/devices/block/drivers/mbr/BUILD.gn
index cb6c662..b10fe2a 100644
--- a/src/devices/block/drivers/mbr/BUILD.gn
+++ b/src/devices/block/drivers/mbr/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "mbr-device.cc",
     "mbr-device.h",
diff --git a/src/devices/block/drivers/msm8x53-sdhci/BUILD.gn b/src/devices/block/drivers/msm8x53-sdhci/BUILD.gn
index 6ec7db3..ee18c57 100644
--- a/src/devices/block/drivers/msm8x53-sdhci/BUILD.gn
+++ b/src/devices/block/drivers/msm8x53-sdhci/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "msm8x53-sdhci.cc" ]
   deps = [
     ":msm8x53-sdhci-bind",
diff --git a/src/devices/block/drivers/mtk-sdmmc/BUILD.gn b/src/devices/block/drivers/mtk-sdmmc/BUILD.gn
index b92e5e8..a4577bf 100644
--- a/src/devices/block/drivers/mtk-sdmmc/BUILD.gn
+++ b/src/devices/block/drivers/mtk-sdmmc/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mtk-sdmmc.cc" ]
   deps = [
     ":mtk-sdmmc-bind",
diff --git a/src/devices/block/drivers/nvme/BUILD.gn b/src/devices/block/drivers/nvme/BUILD.gn
index 1abb51f..423bde6 100644
--- a/src/devices/block/drivers/nvme/BUILD.gn
+++ b/src/devices/block/drivers/nvme/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "nvme.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.block",
diff --git a/src/devices/block/drivers/pci-sdhci/BUILD.gn b/src/devices/block/drivers/pci-sdhci/BUILD.gn
index 5192301..223759f 100644
--- a/src/devices/block/drivers/pci-sdhci/BUILD.gn
+++ b/src/devices/block/drivers/pci-sdhci/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "pci-sdhci.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.block",
diff --git a/src/devices/block/drivers/ramdisk/BUILD.gn b/src/devices/block/drivers/ramdisk/BUILD.gn
index 751459f..3529403 100644
--- a/src/devices/block/drivers/ramdisk/BUILD.gn
+++ b/src/devices/block/drivers/ramdisk/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "ramdisk-controller.cc",
     "ramdisk.cc",
diff --git a/src/devices/block/drivers/sdhci/BUILD.gn b/src/devices/block/drivers/sdhci/BUILD.gn
index 8b23f6a..a029fbe 100644
--- a/src/devices/block/drivers/sdhci/BUILD.gn
+++ b/src/devices/block/drivers/sdhci/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "sdhci.cc" ]
   deps = [
     ":sdhci-bind",
diff --git a/src/devices/block/drivers/sdmmc/BUILD.gn b/src/devices/block/drivers/sdmmc/BUILD.gn
index e7a57e5..257b528 100644
--- a/src/devices/block/drivers/sdmmc/BUILD.gn
+++ b/src/devices/block/drivers/sdmmc/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "mmc.cc",
     "sd.cc",
diff --git a/src/devices/block/drivers/ums-function/BUILD.gn b/src/devices/block/drivers/ums-function/BUILD.gn
index ab29cc0..d9e99ba 100644
--- a/src/devices/block/drivers/ums-function/BUILD.gn
+++ b/src/devices/block/drivers/ums-function/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ums-function.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.block",
diff --git a/src/devices/block/drivers/usb-mass-storage/BUILD.gn b/src/devices/block/drivers/usb-mass-storage/BUILD.gn
index 6f068ec..cd1cc92 100644
--- a/src/devices/block/drivers/usb-mass-storage/BUILD.gn
+++ b/src/devices/block/drivers/usb-mass-storage/BUILD.gn
@@ -13,11 +13,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-mass-storage.cc" ]
   deps = [
     ":block",
diff --git a/src/devices/block/drivers/virtio/BUILD.gn b/src/devices/block/drivers/virtio/BUILD.gn
index 7da4f5e..2336abc 100644
--- a/src/devices/block/drivers/virtio/BUILD.gn
+++ b/src/devices/block/drivers/virtio/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
@@ -53,8 +51,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/block/drivers/zxcrypt/BUILD.gn b/src/devices/block/drivers/zxcrypt/BUILD.gn
index a94d86e..5dfab01 100644
--- a/src/devices/block/drivers/zxcrypt/BUILD.gn
+++ b/src/devices/block/drivers/zxcrypt/BUILD.gn
@@ -10,8 +10,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/as370/BUILD.gn b/src/devices/board/drivers/as370/BUILD.gn
index a58d789..2e372a7 100644
--- a/src/devices/board/drivers/as370/BUILD.gn
+++ b/src/devices/board/drivers/as370/BUILD.gn
@@ -17,8 +17,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/astro/BUILD.gn b/src/devices/board/drivers/astro/BUILD.gn
index 5bc879a..b0d14e2d 100644
--- a/src/devices/board/drivers/astro/BUILD.gn
+++ b/src/devices/board/drivers/astro/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/c18/BUILD.gn b/src/devices/board/drivers/c18/BUILD.gn
index 1007dd0..548028c 100644
--- a/src/devices/board/drivers/c18/BUILD.gn
+++ b/src/devices/board/drivers/c18/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/integration-test/BUILD.gn b/src/devices/board/drivers/integration-test/BUILD.gn
index 0d5216f..e3b94bd 100644
--- a/src/devices/board/drivers/integration-test/BUILD.gn
+++ b/src/devices/board/drivers/integration-test/BUILD.gn
@@ -16,8 +16,6 @@
 
 driver_module("integration-test") {
   configs += [ "//build/config:all_source" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 
   # TODO: testonly = true
   sources = [ "test.cc" ]
diff --git a/src/devices/board/drivers/machina/BUILD.gn b/src/devices/board/drivers/machina/BUILD.gn
index aae5e06..a629921 100644
--- a/src/devices/board/drivers/machina/BUILD.gn
+++ b/src/devices/board/drivers/machina/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/msm8998/BUILD.gn b/src/devices/board/drivers/msm8998/BUILD.gn
index d360a6f..d0a708b 100644
--- a/src/devices/board/drivers/msm8998/BUILD.gn
+++ b/src/devices/board/drivers/msm8998/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/msm8x53-som/BUILD.gn b/src/devices/board/drivers/msm8x53-som/BUILD.gn
index 781110b..2bf0b07 100644
--- a/src/devices/board/drivers/msm8x53-som/BUILD.gn
+++ b/src/devices/board/drivers/msm8x53-som/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/mt8167s_ref/BUILD.gn b/src/devices/board/drivers/mt8167s_ref/BUILD.gn
index efb0d45..bb03d16 100644
--- a/src/devices/board/drivers/mt8167s_ref/BUILD.gn
+++ b/src/devices/board/drivers/mt8167s_ref/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/nelson/BUILD.gn b/src/devices/board/drivers/nelson/BUILD.gn
index e05e9f7..748ba79 100644
--- a/src/devices/board/drivers/nelson/BUILD.gn
+++ b/src/devices/board/drivers/nelson/BUILD.gn
@@ -38,8 +38,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/qemu-arm64/BUILD.gn b/src/devices/board/drivers/qemu-arm64/BUILD.gn
index 6dee2a9..16d5b6a 100644
--- a/src/devices/board/drivers/qemu-arm64/BUILD.gn
+++ b/src/devices/board/drivers/qemu-arm64/BUILD.gn
@@ -10,8 +10,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/sherlock/BUILD.gn b/src/devices/board/drivers/sherlock/BUILD.gn
index 8490099..8b4b611 100644
--- a/src/devices/board/drivers/sherlock/BUILD.gn
+++ b/src/devices/board/drivers/sherlock/BUILD.gn
@@ -21,8 +21,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
diff --git a/src/devices/board/drivers/vim2/BUILD.gn b/src/devices/board/drivers/vim2/BUILD.gn
index 3f04014..b69c3da 100644
--- a/src/devices/board/drivers/vim2/BUILD.gn
+++ b/src/devices/board/drivers/vim2/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/vim3/BUILD.gn b/src/devices/board/drivers/vim3/BUILD.gn
index 8b28410..dcf22ee 100644
--- a/src/devices/board/drivers/vim3/BUILD.gn
+++ b/src/devices/board/drivers/vim3/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/vs680-evk/BUILD.gn b/src/devices/board/drivers/vs680-evk/BUILD.gn
index f4db76d..9557f84 100644
--- a/src/devices/board/drivers/vs680-evk/BUILD.gn
+++ b/src/devices/board/drivers/vs680-evk/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/board/drivers/x86/BUILD.gn b/src/devices/board/drivers/x86/BUILD.gn
index 93cea23..b4f21ed 100644
--- a/src/devices/board/drivers/x86/BUILD.gn
+++ b/src/devices/board/drivers/x86/BUILD.gn
@@ -69,8 +69,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/bus/drivers/pci/BUILD.gn b/src/devices/bus/drivers/pci/BUILD.gn
index a76283a..9fddfa5 100644
--- a/src/devices/bus/drivers/pci/BUILD.gn
+++ b/src/devices/bus/drivers/pci/BUILD.gn
@@ -80,8 +80,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
@@ -97,8 +95,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
@@ -110,8 +106,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
@@ -136,8 +130,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
diff --git a/src/devices/bus/drivers/pci/test/BUILD.gn b/src/devices/bus/drivers/pci/test/BUILD.gn
index 241f56a..00dfaad 100644
--- a/src/devices/bus/drivers/pci/test/BUILD.gn
+++ b/src/devices/bus/drivers/pci/test/BUILD.gn
@@ -68,8 +68,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
@@ -91,8 +89,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
@@ -104,8 +100,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/bus/drivers/platform/BUILD.gn b/src/devices/bus/drivers/platform/BUILD.gn
index 6cb9518..d23bf79 100644
--- a/src/devices/bus/drivers/platform/BUILD.gn
+++ b/src/devices/bus/drivers/platform/BUILD.gn
@@ -20,8 +20,6 @@
 }
 
 driver_module("platform-bus") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [
     "cpu-trace.cc",
     "device-resources.cc",
@@ -55,8 +53,6 @@
 }
 
 driver_module("platform-bus.proxy") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "platform-proxy.cc" ]
   deps = [
     ":platform-bus-bind",
diff --git a/src/devices/bus/drivers/platform/test/BUILD.gn b/src/devices/bus/drivers/platform/test/BUILD.gn
index c13ddb5..b34ed1f 100644
--- a/src/devices/bus/drivers/platform/test/BUILD.gn
+++ b/src/devices/bus/drivers/platform/test/BUILD.gn
@@ -36,11 +36,7 @@
 }
 
 driver_module("test-board") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [
     "test-board.cc",
     "test-clock.cc",
@@ -79,11 +75,7 @@
 }
 
 driver_module("test-gpio") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/gpio.cc" ]
   deps = [
     ":test-gpio-bind",
@@ -109,11 +101,7 @@
 }
 
 driver_module("test-power") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/power.cc" ]
   deps = [
     ":test-power-bind",
@@ -139,11 +127,7 @@
 }
 
 driver_module("test-goldfish-address-space") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/goldfish_address_space.cc" ]
   deps = [
     ":test-goldfish-address-space-bind",
@@ -168,11 +152,7 @@
 }
 
 driver_module("test-goldfish-pipe") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/goldfish_pipe.cc" ]
   deps = [
     ":test-goldfish-pipe-bind",
@@ -197,11 +177,7 @@
 }
 
 driver_module("test-clock") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/clock.cc" ]
   deps = [
     ":test-clock-bind",
@@ -227,11 +203,7 @@
 }
 
 driver_module("test-i2c") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/i2c.cc" ]
   deps = [
     ":test-i2c-bind",
@@ -257,11 +229,7 @@
 }
 
 driver_module("test-spi") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/spi.cc" ]
   deps = [
     ":test-spi-bind",
@@ -287,11 +255,7 @@
 }
 
 driver_module("test-pwm") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/pwm.cc" ]
   deps = [
     ":test-pwm-bind",
@@ -316,11 +280,7 @@
 }
 
 driver_module("test-rpmb") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/rpmb.cc" ]
   deps = [
     ":test-rpmb-bind",
@@ -345,11 +305,7 @@
 }
 
 driver_module("test-vreg") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/vreg.cc" ]
   deps = [
     ":test-vreg-bind",
@@ -375,11 +331,7 @@
 }
 
 driver_module("test-composite") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/composite.c" ]
   deps = [
     ":test-composite-bind",
@@ -411,11 +363,7 @@
 }
 
 driver_module("test-child-2.proxy") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test/child-2.proxy.c" ]
   deps = [
     ":test-child-2.proxy-bind",
@@ -439,11 +387,7 @@
   }
 
   driver_module("test-$driver") {
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [
-      "//build/config:all_source",
-      "//build/config/fuchsia:static_cpp_standard_library",
-    ]
+    configs += [ "//build/config:all_source" ]
     sources = [ "test/$driver.c" ]
     deps = [
       ":test-${driver}-bind",
@@ -502,11 +446,7 @@
 }
 
 driver_module("test-bti-board") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test-bti-board.cc" ]
   deps = [
     ":test-bti-board-bind",
@@ -527,11 +467,7 @@
   deps = [ "//src/devices/bind/test.platform" ]
 }
 driver_module("test-bti") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config:all_source" ]
   sources = [ "test-bti.cc" ]
   deps = [
     ":fuchsia.hardware.btitest_llcpp",
diff --git a/src/devices/clock/drivers/amlogic-clk/BUILD.gn b/src/devices/clock/drivers/amlogic-clk/BUILD.gn
index 2fcecbe..9d3e5c2 100644
--- a/src/devices/clock/drivers/amlogic-clk/BUILD.gn
+++ b/src/devices/clock/drivers/amlogic-clk/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aml-clk.cc",
     "aml-fclk-rates.cc",
diff --git a/src/devices/clock/drivers/as370-clk/BUILD.gn b/src/devices/clock/drivers/as370-clk/BUILD.gn
index 7f51009..0d74274 100644
--- a/src/devices/clock/drivers/as370-clk/BUILD.gn
+++ b/src/devices/clock/drivers/as370-clk/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "as370-clk.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/clock/drivers/clock/BUILD.gn b/src/devices/clock/drivers/clock/BUILD.gn
index 9e76397..e59c3d6 100644
--- a/src/devices/clock/drivers/clock/BUILD.gn
+++ b/src/devices/clock/drivers/clock/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "clock.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/clock/drivers/msm8x53-clk/BUILD.gn b/src/devices/clock/drivers/msm8x53-clk/BUILD.gn
index cc61547..cdd3ea8 100644
--- a/src/devices/clock/drivers/msm8x53-clk/BUILD.gn
+++ b/src/devices/clock/drivers/msm8x53-clk/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "msm8x53-clk.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/clock/drivers/mtk-clk/BUILD.gn b/src/devices/clock/drivers/mtk-clk/BUILD.gn
index a7048d4..8e679e9 100644
--- a/src/devices/clock/drivers/mtk-clk/BUILD.gn
+++ b/src/devices/clock/drivers/mtk-clk/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mtk-clk.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clockimpl",
diff --git a/src/devices/clock/drivers/vs680-clk/BUILD.gn b/src/devices/clock/drivers/vs680-clk/BUILD.gn
index 676fd3f..437d811 100644
--- a/src/devices/clock/drivers/vs680-clk/BUILD.gn
+++ b/src/devices/clock/drivers/vs680-clk/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "vs680-clk-types.cc",
     "vs680-clk.cc",
diff --git a/src/devices/cpu/drivers/aml-cpu-legacy/BUILD.gn b/src/devices/cpu/drivers/aml-cpu-legacy/BUILD.gn
index 903ba8a..0f46dbc 100644
--- a/src/devices/cpu/drivers/aml-cpu-legacy/BUILD.gn
+++ b/src/devices/cpu/drivers/aml-cpu-legacy/BUILD.gn
@@ -9,8 +9,6 @@
 driver_module("aml-cpu-legacy") {
   defines = [ "_ALL_SOURCE" ]
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/cpu/drivers/aml-cpu/BUILD.gn b/src/devices/cpu/drivers/aml-cpu/BUILD.gn
index 6a5616e..3456b26 100644
--- a/src/devices/cpu/drivers/aml-cpu/BUILD.gn
+++ b/src/devices/cpu/drivers/aml-cpu/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/fw/drivers/qcom-pil/BUILD.gn b/src/devices/fw/drivers/qcom-pil/BUILD.gn
index ac8a1af..0b2f2f3 100644
--- a/src/devices/fw/drivers/qcom-pil/BUILD.gn
+++ b/src/devices/fw/drivers/qcom-pil/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "qcom-pil.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/gpio/drivers/aml-axg-gpio/BUILD.gn b/src/devices/gpio/drivers/aml-axg-gpio/BUILD.gn
index f41a602..0364bd5 100644
--- a/src/devices/gpio/drivers/aml-axg-gpio/BUILD.gn
+++ b/src/devices/gpio/drivers/aml-axg-gpio/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-axg-gpio.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.gpio",
diff --git a/src/devices/gpio/drivers/aml-gxl-gpio/BUILD.gn b/src/devices/gpio/drivers/aml-gxl-gpio/BUILD.gn
index ebe36cf..9f66f19 100644
--- a/src/devices/gpio/drivers/aml-gxl-gpio/BUILD.gn
+++ b/src/devices/gpio/drivers/aml-gxl-gpio/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-gxl-gpio.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.gpio",
diff --git a/src/devices/gpio/drivers/as370-gpio/BUILD.gn b/src/devices/gpio/drivers/as370-gpio/BUILD.gn
index eb55af0..16dbde0 100644
--- a/src/devices/gpio/drivers/as370-gpio/BUILD.gn
+++ b/src/devices/gpio/drivers/as370-gpio/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "as370-gpio.cc" ]
   deps = [
     ":as370-gpio-bind",
diff --git a/src/devices/gpio/drivers/gpio-test/BUILD.gn b/src/devices/gpio/drivers/gpio-test/BUILD.gn
index 93757fb..2ac299a9 100644
--- a/src/devices/gpio/drivers/gpio-test/BUILD.gn
+++ b/src/devices/gpio/drivers/gpio-test/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
 
   # TODO: testonly = true
   sources = [ "gpio-test.cc" ]
diff --git a/src/devices/gpio/drivers/gpio/BUILD.gn b/src/devices/gpio/drivers/gpio/BUILD.gn
index 1701141..4455470 100644
--- a/src/devices/gpio/drivers/gpio/BUILD.gn
+++ b/src/devices/gpio/drivers/gpio/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "gpio.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.gpio",
diff --git a/src/devices/gpio/drivers/mt-8167/BUILD.gn b/src/devices/gpio/drivers/mt-8167/BUILD.gn
index ba1fe55..34e6c8e 100644
--- a/src/devices/gpio/drivers/mt-8167/BUILD.gn
+++ b/src/devices/gpio/drivers/mt-8167/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "binding.cc",
     "mt8167-gpio.cc",
diff --git a/src/devices/gpio/drivers/qcom-gpio/BUILD.gn b/src/devices/gpio/drivers/qcom-gpio/BUILD.gn
index 28dc852..d7c4d4e 100644
--- a/src/devices/gpio/drivers/qcom-gpio/BUILD.gn
+++ b/src/devices/gpio/drivers/qcom-gpio/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "binding.cc",
     "qcom-gpio.cc",
diff --git a/src/devices/i2c/drivers/aml-i2c/BUILD.gn b/src/devices/i2c/drivers/aml-i2c/BUILD.gn
index 102db3d..383b3fe 100644
--- a/src/devices/i2c/drivers/aml-i2c/BUILD.gn
+++ b/src/devices/i2c/drivers/aml-i2c/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-i2c.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.i2c",
diff --git a/src/devices/i2c/drivers/dw-i2c/BUILD.gn b/src/devices/i2c/drivers/dw-i2c/BUILD.gn
index 3fe767a..b6a6fd5 100644
--- a/src/devices/i2c/drivers/dw-i2c/BUILD.gn
+++ b/src/devices/i2c/drivers/dw-i2c/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "dw-i2c.cc" ]
   deps = [
     ":dw_i2c-bind",
diff --git a/src/devices/i2c/drivers/i2c/BUILD.gn b/src/devices/i2c/drivers/i2c/BUILD.gn
index f5bb479..99178d7 100644
--- a/src/devices/i2c/drivers/i2c/BUILD.gn
+++ b/src/devices/i2c/drivers/i2c/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "i2c-bus.cc",
     "i2c-child.cc",
diff --git a/src/devices/i2c/drivers/intel-i2c/BUILD.gn b/src/devices/i2c/drivers/intel-i2c/BUILD.gn
index 42e94f3..586defc 100644
--- a/src/devices/i2c/drivers/intel-i2c/BUILD.gn
+++ b/src/devices/i2c/drivers/intel-i2c/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "intel-i2c-controller.cc",
     "intel-i2c-subordinate.cc",
diff --git a/src/devices/i2c/drivers/mt8167-i2c/BUILD.gn b/src/devices/i2c/drivers/mt8167-i2c/BUILD.gn
index fe40c4f..d49305f 100644
--- a/src/devices/i2c/drivers/mt8167-i2c/BUILD.gn
+++ b/src/devices/i2c/drivers/mt8167-i2c/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mt8167-i2c.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/internal/drivers/fragment/BUILD.gn b/src/devices/internal/drivers/fragment/BUILD.gn
index bcf3f22..2a7463e 100644
--- a/src/devices/internal/drivers/fragment/BUILD.gn
+++ b/src/devices/internal/drivers/fragment/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
@@ -69,8 +67,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/light-sensor/drivers/ams-light/BUILD.gn b/src/devices/light-sensor/drivers/ams-light/BUILD.gn
index 3d56538..2b64243 100644
--- a/src/devices/light-sensor/drivers/ams-light/BUILD.gn
+++ b/src/devices/light-sensor/drivers/ams-light/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/light-sensor/drivers/lite-on/BUILD.gn b/src/devices/light-sensor/drivers/lite-on/BUILD.gn
index ba80240..aa35b87 100644
--- a/src/devices/light-sensor/drivers/lite-on/BUILD.gn
+++ b/src/devices/light-sensor/drivers/lite-on/BUILD.gn
@@ -22,8 +22,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/mcu/drivers/vim3-mcu/BUILD.gn b/src/devices/mcu/drivers/vim3-mcu/BUILD.gn
index bd164ec..75295e8 100644
--- a/src/devices/mcu/drivers/vim3-mcu/BUILD.gn
+++ b/src/devices/mcu/drivers/vim3-mcu/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "vim3-mcu.cc" ]
   deps = [
     "//src/devices/i2c/lib/device-protocol-i2c",
diff --git a/src/devices/misc/drivers/builtin/BUILD.gn b/src/devices/misc/drivers/builtin/BUILD.gn
index 18c2611..d70e1b2 100644
--- a/src/devices/misc/drivers/builtin/BUILD.gn
+++ b/src/devices/misc/drivers/builtin/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "null.c",
     "root.c",
diff --git a/src/devices/misc/drivers/cpu-trace/BUILD.gn b/src/devices/misc/drivers/cpu-trace/BUILD.gn
index 199fc41..572c249 100644
--- a/src/devices/misc/drivers/cpu-trace/BUILD.gn
+++ b/src/devices/misc/drivers/cpu-trace/BUILD.gn
@@ -38,11 +38,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "cpu-trace.cc" ]
 
   if (current_cpu == "x64") {
diff --git a/src/devices/misc/drivers/test/BUILD.gn b/src/devices/misc/drivers/test/BUILD.gn
index 9b90abb..52ecb4b2 100644
--- a/src/devices/misc/drivers/test/BUILD.gn
+++ b/src/devices/misc/drivers/test/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.test",
diff --git a/src/devices/misc/drivers/virtio-rng/BUILD.gn b/src/devices/misc/drivers/virtio-rng/BUILD.gn
index d238213..af98273 100644
--- a/src/devices/misc/drivers/virtio-rng/BUILD.gn
+++ b/src/devices/misc/drivers/virtio-rng/BUILD.gn
@@ -10,8 +10,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/misc/drivers/virtio-socket/BUILD.gn b/src/devices/misc/drivers/virtio-socket/BUILD.gn
index 836e0b1..83126a9 100644
--- a/src/devices/misc/drivers/virtio-socket/BUILD.gn
+++ b/src/devices/misc/drivers/virtio-socket/BUILD.gn
@@ -10,8 +10,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/ml/drivers/aml-nna/BUILD.gn b/src/devices/ml/drivers/aml-nna/BUILD.gn
index dd1a12c..2bc24c6 100644
--- a/src/devices/ml/drivers/aml-nna/BUILD.gn
+++ b/src/devices/ml/drivers/aml-nna/BUILD.gn
@@ -12,11 +12,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-nna.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.platform.bus",
diff --git a/src/devices/ml/drivers/usb-harriet/BUILD.gn b/src/devices/ml/drivers/usb-harriet/BUILD.gn
index 92bcca5..6c0d251 100644
--- a/src/devices/ml/drivers/usb-harriet/BUILD.gn
+++ b/src/devices/ml/drivers/usb-harriet/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-harriet.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.usb",
diff --git a/src/devices/nand/drivers/aml-rawnand/BUILD.gn b/src/devices/nand/drivers/aml-rawnand/BUILD.gn
index 2b34e4a..e65db88 100644
--- a/src/devices/nand/drivers/aml-rawnand/BUILD.gn
+++ b/src/devices/nand/drivers/aml-rawnand/BUILD.gn
@@ -6,9 +6,6 @@
 import("//build/config/fuchsia/rules.gni")
 
 driver_module("aml-rawnand") {
-  configs += [ "//build/config:all_source" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/nand/drivers/broker/BUILD.gn b/src/devices/nand/drivers/broker/BUILD.gn
index 5c683cc..7d9e5c8 100644
--- a/src/devices/nand/drivers/broker/BUILD.gn
+++ b/src/devices/nand/drivers/broker/BUILD.gn
@@ -13,8 +13,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/nand/drivers/cadence-hpnfc/BUILD.gn b/src/devices/nand/drivers/cadence-hpnfc/BUILD.gn
index ce46d0c..055924c 100644
--- a/src/devices/nand/drivers/cadence-hpnfc/BUILD.gn
+++ b/src/devices/nand/drivers/cadence-hpnfc/BUILD.gn
@@ -19,8 +19,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/nand/drivers/nand/BUILD.gn b/src/devices/nand/drivers/nand/BUILD.gn
index e952a54..77413b6 100644
--- a/src/devices/nand/drivers/nand/BUILD.gn
+++ b/src/devices/nand/drivers/nand/BUILD.gn
@@ -33,8 +33,6 @@
 }
 
 driver_module("nand") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/nand/drivers/nandpart/BUILD.gn b/src/devices/nand/drivers/nandpart/BUILD.gn
index 962e5ce..be508b1 100644
--- a/src/devices/nand/drivers/nandpart/BUILD.gn
+++ b/src/devices/nand/drivers/nandpart/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aml-bad-block.cc",
     "bad-block.cc",
diff --git a/src/devices/nand/drivers/ram-nand/BUILD.gn b/src/devices/nand/drivers/ram-nand/BUILD.gn
index ff57af1..d7ec109 100644
--- a/src/devices/nand/drivers/ram-nand/BUILD.gn
+++ b/src/devices/nand/drivers/ram-nand/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "bind.cc",
     "ram-nand-ctl.cc",
diff --git a/src/devices/nand/drivers/skip-block/BUILD.gn b/src/devices/nand/drivers/skip-block/BUILD.gn
index 6de533f..ef44e45 100644
--- a/src/devices/nand/drivers/skip-block/BUILD.gn
+++ b/src/devices/nand/drivers/skip-block/BUILD.gn
@@ -8,11 +8,6 @@
 import("//build/test/test_package.gni")
 
 driver_module("skip-block") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config:all_source",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/power/drivers/aml-meson-power/BUILD.gn b/src/devices/power/drivers/aml-meson-power/BUILD.gn
index 4a8db60..62aaa52 100644
--- a/src/devices/power/drivers/aml-meson-power/BUILD.gn
+++ b/src/devices/power/drivers/aml-meson-power/BUILD.gn
@@ -9,8 +9,6 @@
 driver_module("aml-meson-power") {
   defines = [ "_ALL_SOURCE" ]
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aml-power.cc",
diff --git a/src/devices/power/drivers/as370-power/BUILD.gn b/src/devices/power/drivers/as370-power/BUILD.gn
index df29fa8..52b1524 100644
--- a/src/devices/power/drivers/as370-power/BUILD.gn
+++ b/src/devices/power/drivers/as370-power/BUILD.gn
@@ -27,11 +27,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "as370-power.cc" ]
   deps = [
     ":as370_power-bind",
diff --git a/src/devices/power/drivers/msm8x53-power/BUILD.gn b/src/devices/power/drivers/msm8x53-power/BUILD.gn
index fc07bbb..ae9ae5e 100644
--- a/src/devices/power/drivers/msm8x53-power/BUILD.gn
+++ b/src/devices/power/drivers/msm8x53-power/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "msm8x53-power.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.platform.bus",
diff --git a/src/devices/power/drivers/mtk-power/BUILD.gn b/src/devices/power/drivers/mtk-power/BUILD.gn
index ab6cb83..8ac9f2a 100644
--- a/src/devices/power/drivers/mtk-power/BUILD.gn
+++ b/src/devices/power/drivers/mtk-power/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mtk-power.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.gpio",
diff --git a/src/devices/power/drivers/power/BUILD.gn b/src/devices/power/drivers/power/BUILD.gn
index fbd07a7..7593187 100644
--- a/src/devices/power/drivers/power/BUILD.gn
+++ b/src/devices/power/drivers/power/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "power.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/power/drivers/silergy/BUILD.gn b/src/devices/power/drivers/silergy/BUILD.gn
index d4344b2..606329e 100644
--- a/src/devices/power/drivers/silergy/BUILD.gn
+++ b/src/devices/power/drivers/silergy/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/power/drivers/ti-ina231/BUILD.gn b/src/devices/power/drivers/ti-ina231/BUILD.gn
index ca95746..ee3752d 100644
--- a/src/devices/power/drivers/ti-ina231/BUILD.gn
+++ b/src/devices/power/drivers/ti-ina231/BUILD.gn
@@ -37,8 +37,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "ti-ina231.cc" ]
   deps = [ ":common" ]
 }
diff --git a/src/devices/power/drivers/vs680-power/BUILD.gn b/src/devices/power/drivers/vs680-power/BUILD.gn
index a867ad1..f02fa4e 100644
--- a/src/devices/power/drivers/vs680-power/BUILD.gn
+++ b/src/devices/power/drivers/vs680-power/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "vs680-power.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/pwm/drivers/aml-pwm-init/BUILD.gn b/src/devices/pwm/drivers/aml-pwm-init/BUILD.gn
index d5477ed..2ae16ed 100644
--- a/src/devices/pwm/drivers/aml-pwm-init/BUILD.gn
+++ b/src/devices/pwm/drivers/aml-pwm-init/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-pwm-init.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/pwm/drivers/aml-pwm/BUILD.gn b/src/devices/pwm/drivers/aml-pwm/BUILD.gn
index 94c0c5a..2d3c714 100644
--- a/src/devices/pwm/drivers/aml-pwm/BUILD.gn
+++ b/src/devices/pwm/drivers/aml-pwm/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-pwm.cc" ]
   deps = [
     ":common",
diff --git a/src/devices/pwm/drivers/pwm/BUILD.gn b/src/devices/pwm/drivers/pwm/BUILD.gn
index 6ba6d69..45d0018 100644
--- a/src/devices/pwm/drivers/pwm/BUILD.gn
+++ b/src/devices/pwm/drivers/pwm/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "pwm.cc" ]
   deps = [
     ":common",
diff --git a/src/devices/ram/drivers/aml-ram/BUILD.gn b/src/devices/ram/drivers/aml-ram/BUILD.gn
index 6bb2590..8e258b6 100644
--- a/src/devices/ram/drivers/aml-ram/BUILD.gn
+++ b/src/devices/ram/drivers/aml-ram/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/registers/drivers/registers/BUILD.gn b/src/devices/registers/drivers/registers/BUILD.gn
index 3d9f34ae..328b054 100644
--- a/src/devices/registers/drivers/registers/BUILD.gn
+++ b/src/devices/registers/drivers/registers/BUILD.gn
@@ -18,10 +18,8 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   sources = [ "registers.cc" ]
   deps = [
     ":common",
diff --git a/src/devices/rtc/drivers/fallback/BUILD.gn b/src/devices/rtc/drivers/fallback/BUILD.gn
index 68ab9488..434247a 100644
--- a/src/devices/rtc/drivers/fallback/BUILD.gn
+++ b/src/devices/rtc/drivers/fallback/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "rtc-impl.cc" ]
   deps = [
     "//sdk/fidl/fuchsia.hardware.rtc:fuchsia.hardware.rtc_c",
diff --git a/src/devices/rtc/drivers/intel-rtc/BUILD.gn b/src/devices/rtc/drivers/intel-rtc/BUILD.gn
index 7caede2..c65f60e 100644
--- a/src/devices/rtc/drivers/intel-rtc/BUILD.gn
+++ b/src/devices/rtc/drivers/intel-rtc/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "intel-rtc.c" ]
   deps = [
     "//sdk/fidl/fuchsia.hardware.rtc:fuchsia.hardware.rtc_c",
diff --git a/src/devices/rtc/drivers/nxp/BUILD.gn b/src/devices/rtc/drivers/nxp/BUILD.gn
index 5ca19a3..2eef80e 100644
--- a/src/devices/rtc/drivers/nxp/BUILD.gn
+++ b/src/devices/rtc/drivers/nxp/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "pcf8563-rtc.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.i2c",
diff --git a/src/devices/rtc/drivers/pl031-rtc/BUILD.gn b/src/devices/rtc/drivers/pl031-rtc/BUILD.gn
index f6c649e..d960b73 100644
--- a/src/devices/rtc/drivers/pl031-rtc/BUILD.gn
+++ b/src/devices/rtc/drivers/pl031-rtc/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
 
   sources = [ "pl031-rtc.cc" ]
   deps = [
diff --git a/src/devices/scpi/drivers/aml-scpi-s912/BUILD.gn b/src/devices/scpi/drivers/aml-scpi-s912/BUILD.gn
index 624bcde..63eaa20 100644
--- a/src/devices/scpi/drivers/aml-scpi-s912/BUILD.gn
+++ b/src/devices/scpi/drivers/aml-scpi-s912/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
@@ -48,8 +46,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/securemem/drivers/aml-securemem/BUILD.gn b/src/devices/securemem/drivers/aml-securemem/BUILD.gn
index b2dc0c3..cd760730 100644
--- a/src/devices/securemem/drivers/aml-securemem/BUILD.gn
+++ b/src/devices/securemem/drivers/aml-securemem/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/serial/drivers/aml-uart/BUILD.gn b/src/devices/serial/drivers/aml-uart/BUILD.gn
index 7a323ab..a89bfc2 100644
--- a/src/devices/serial/drivers/aml-uart/BUILD.gn
+++ b/src/devices/serial/drivers/aml-uart/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-uart.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/serial/drivers/ftdi/BUILD.gn b/src/devices/serial/drivers/ftdi/BUILD.gn
index d19d520..cb925f1 100644
--- a/src/devices/serial/drivers/ftdi/BUILD.gn
+++ b/src/devices/serial/drivers/ftdi/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "ftdi-i2c.cc",
     "ftdi-mpsse.cc",
@@ -47,11 +43,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ftdi-function.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.usb",
diff --git a/src/devices/serial/drivers/intel-serialio/BUILD.gn b/src/devices/serial/drivers/intel-serialio/BUILD.gn
index 0ed68eb..70c2ec6 100644
--- a/src/devices/serial/drivers/intel-serialio/BUILD.gn
+++ b/src/devices/serial/drivers/intel-serialio/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "dma/dma.c",
     "sdio/sdio.c",
diff --git a/src/devices/serial/drivers/serial-async/BUILD.gn b/src/devices/serial/drivers/serial-async/BUILD.gn
index ae8fa2a..384c34e 100644
--- a/src/devices/serial/drivers/serial-async/BUILD.gn
+++ b/src/devices/serial/drivers/serial-async/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/serial/drivers/serial/BUILD.gn b/src/devices/serial/drivers/serial/BUILD.gn
index e6041c4..eaec617 100644
--- a/src/devices/serial/drivers/serial/BUILD.gn
+++ b/src/devices/serial/drivers/serial/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/serial/drivers/uart16550/BUILD.gn b/src/devices/serial/drivers/uart16550/BUILD.gn
index 523d366..1cc5bb2 100644
--- a/src/devices/serial/drivers/uart16550/BUILD.gn
+++ b/src/devices/serial/drivers/uart16550/BUILD.gn
@@ -68,11 +68,7 @@
 }
 
 driver_module("uart16550") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":uart16550_lib",
     "//src/devices/lib/driver",
diff --git a/src/devices/serial/drivers/usb-cdc-acm/BUILD.gn b/src/devices/serial/drivers/usb-cdc-acm/BUILD.gn
index e8e4d44..3241a57 100644
--- a/src/devices/serial/drivers/usb-cdc-acm/BUILD.gn
+++ b/src/devices/serial/drivers/usb-cdc-acm/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-cdc-acm.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.serial",
@@ -41,11 +37,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-cdc-acm-function.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.usb",
diff --git a/src/devices/serial/drivers/virtio-console/BUILD.gn b/src/devices/serial/drivers/virtio-console/BUILD.gn
index b25e5ce..5caa96e 100644
--- a/src/devices/serial/drivers/virtio-console/BUILD.gn
+++ b/src/devices/serial/drivers/virtio-console/BUILD.gn
@@ -10,8 +10,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/shareddma/drivers/syn-dma/BUILD.gn b/src/devices/shareddma/drivers/syn-dma/BUILD.gn
index 1133c99..66e7882 100644
--- a/src/devices/shareddma/drivers/syn-dma/BUILD.gn
+++ b/src/devices/shareddma/drivers/syn-dma/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
     fdio_config = [ "//build/config/fuchsia:fdio_config" ]
diff --git a/src/devices/spi/drivers/aml-spi/BUILD.gn b/src/devices/spi/drivers/aml-spi/BUILD.gn
index f4cdae4e..f727863 100644
--- a/src/devices/spi/drivers/aml-spi/BUILD.gn
+++ b/src/devices/spi/drivers/aml-spi/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/spi/drivers/dw-spi/BUILD.gn b/src/devices/spi/drivers/dw-spi/BUILD.gn
index b19ad94..8c265ee 100644
--- a/src/devices/spi/drivers/dw-spi/BUILD.gn
+++ b/src/devices/spi/drivers/dw-spi/BUILD.gn
@@ -17,8 +17,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/spi/drivers/mtk-spi/BUILD.gn b/src/devices/spi/drivers/mtk-spi/BUILD.gn
index 4e38f8f..30724d5 100644
--- a/src/devices/spi/drivers/mtk-spi/BUILD.gn
+++ b/src/devices/spi/drivers/mtk-spi/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/spi/drivers/spi/BUILD.gn b/src/devices/spi/drivers/spi/BUILD.gn
index ce415bc..e9d9d5c 100644
--- a/src/devices/spi/drivers/spi/BUILD.gn
+++ b/src/devices/spi/drivers/spi/BUILD.gn
@@ -16,11 +16,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "spi-child.cc",
     "spi.cc",
diff --git a/src/devices/sysmem/drivers/sysmem/BUILD.gn b/src/devices/sysmem/drivers/sysmem/BUILD.gn
index 5445709..eca2048 100644
--- a/src/devices/sysmem/drivers/sysmem/BUILD.gn
+++ b/src/devices/sysmem/drivers/sysmem/BUILD.gn
@@ -68,8 +68,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     fdio_config = [ "//build/config/fuchsia:fdio_config" ]
     if (configs + fdio_config - fdio_config != configs) {
diff --git a/src/devices/tee/drivers/optee/BUILD.gn b/src/devices/tee/drivers/optee/BUILD.gn
index 65b781a..55c4f98 100644
--- a/src/devices/tee/drivers/optee/BUILD.gn
+++ b/src/devices/tee/drivers/optee/BUILD.gn
@@ -53,8 +53,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/temperature/drivers/shtv3/BUILD.gn b/src/devices/temperature/drivers/shtv3/BUILD.gn
index 56e9eeb..cdd5203 100644
--- a/src/devices/temperature/drivers/shtv3/BUILD.gn
+++ b/src/devices/temperature/drivers/shtv3/BUILD.gn
@@ -25,8 +25,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "shtv3.cc" ]
   deps = [ ":common" ]
 }
diff --git a/src/devices/temperature/drivers/tmp112/BUILD.gn b/src/devices/temperature/drivers/tmp112/BUILD.gn
index 3708679..fffb166 100644
--- a/src/devices/temperature/drivers/tmp112/BUILD.gn
+++ b/src/devices/temperature/drivers/tmp112/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "tmp112.cc" ]
   deps = [
     "//sdk/fidl/fuchsia.hardware.temperature:fuchsia.hardware.temperature_llcpp",
diff --git a/src/devices/testing/fake-bti/test/BUILD.gn b/src/devices/testing/fake-bti/test/BUILD.gn
index 785a389..992660f 100644
--- a/src/devices/testing/fake-bti/test/BUILD.gn
+++ b/src/devices/testing/fake-bti/test/BUILD.gn
@@ -21,7 +21,6 @@
     "//zircon/public/lib/zxc",
     "//zircon/public/lib/zxtest",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 unittest_package("fake-bti-package") {
diff --git a/src/devices/testing/fake-msi/test/BUILD.gn b/src/devices/testing/fake-msi/test/BUILD.gn
index 38989ac..7ef9c89 100644
--- a/src/devices/testing/fake-msi/test/BUILD.gn
+++ b/src/devices/testing/fake-msi/test/BUILD.gn
@@ -21,7 +21,6 @@
     "//zircon/public/lib/zxc",
     "//zircon/public/lib/zxtest",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 unittest_package("fake-msi-package") {
diff --git a/src/devices/testing/fake-object/test/BUILD.gn b/src/devices/testing/fake-object/test/BUILD.gn
index 4f68323..bcedb16 100644
--- a/src/devices/testing/fake-object/test/BUILD.gn
+++ b/src/devices/testing/fake-object/test/BUILD.gn
@@ -21,7 +21,6 @@
     "//zircon/public/lib/zxc",
     "//zircon/public/lib/zxtest",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 unittest_package("fake-object-package") {
diff --git a/src/devices/testing/fake-resource/test/BUILD.gn b/src/devices/testing/fake-resource/test/BUILD.gn
index a039e39..4da350a 100644
--- a/src/devices/testing/fake-resource/test/BUILD.gn
+++ b/src/devices/testing/fake-resource/test/BUILD.gn
@@ -21,7 +21,6 @@
     "//zircon/public/lib/zxc",
     "//zircon/public/lib/zxtest",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 unittest_package("fake-resource-package") {
diff --git a/src/devices/testing/fake_ddk/test/BUILD.gn b/src/devices/testing/fake_ddk/test/BUILD.gn
index a6d13f3..b86fc8b6 100644
--- a/src/devices/testing/fake_ddk/test/BUILD.gn
+++ b/src/devices/testing/fake_ddk/test/BUILD.gn
@@ -17,7 +17,6 @@
     "//zircon/public/lib/zxc",
     "//zircon/public/lib/zxtest",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 unittest_package("fake-ddk-package") {
diff --git a/src/devices/tests/bind-debugger-test/BUILD.gn b/src/devices/tests/bind-debugger-test/BUILD.gn
index 6d81df3..c500916 100644
--- a/src/devices/tests/bind-debugger-test/BUILD.gn
+++ b/src/devices/tests/bind-debugger-test/BUILD.gn
@@ -53,8 +53,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/tests/bind-fail-test/BUILD.gn b/src/devices/tests/bind-fail-test/BUILD.gn
index 4005fe1..5da5d1b 100644
--- a/src/devices/tests/bind-fail-test/BUILD.gn
+++ b/src/devices/tests/bind-fail-test/BUILD.gn
@@ -13,8 +13,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "driver.cc" ]
   deps = [
     "//src/devices/lib/driver",
diff --git a/src/devices/tests/ddk-environment-test/BUILD.gn b/src/devices/tests/ddk-environment-test/BUILD.gn
index 8226894..3f91dcc 100644
--- a/src/devices/tests/ddk-environment-test/BUILD.gn
+++ b/src/devices/tests/ddk-environment-test/BUILD.gn
@@ -23,11 +23,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":fuchsia.device.environment.test_llcpp",
diff --git a/src/devices/tests/ddk-fidl-test/BUILD.gn b/src/devices/tests/ddk-fidl-test/BUILD.gn
index 7ea2ae9..06200e0 100644
--- a/src/devices/tests/ddk-fidl-test/BUILD.gn
+++ b/src/devices/tests/ddk-fidl-test/BUILD.gn
@@ -18,11 +18,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "fidl-llcpp-driver.cc" ]
 
   deps = [
@@ -49,11 +45,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "fidl-async-llcpp-driver.cc" ]
 
   deps = [
diff --git a/src/devices/tests/ddk-firmware-test/BUILD.gn b/src/devices/tests/ddk-firmware-test/BUILD.gn
index 83d3069..4d5948e 100644
--- a/src/devices/tests/ddk-firmware-test/BUILD.gn
+++ b/src/devices/tests/ddk-firmware-test/BUILD.gn
@@ -25,11 +25,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":ddk-firmware-test-bind",
diff --git a/src/devices/tests/ddk-instance-lifecycle-test/BUILD.gn b/src/devices/tests/ddk-instance-lifecycle-test/BUILD.gn
index 5e48f9b..2bd4dd8 100644
--- a/src/devices/tests/ddk-instance-lifecycle-test/BUILD.gn
+++ b/src/devices/tests/ddk-instance-lifecycle-test/BUILD.gn
@@ -25,8 +25,6 @@
   output_name = "ddk-instance-lifecycle-test"
 
   testonly = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [
     "test-driver-child.cc",
     "test-driver.cc",
diff --git a/src/devices/tests/ddk-lifecycle/BUILD.gn b/src/devices/tests/ddk-lifecycle/BUILD.gn
index 50672df..a04e1c81 100644
--- a/src/devices/tests/ddk-lifecycle/BUILD.gn
+++ b/src/devices/tests/ddk-lifecycle/BUILD.gn
@@ -24,11 +24,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "test-driver-child.cc",
     "test-driver.cc",
diff --git a/src/devices/tests/ddk-metadata-test/BUILD.gn b/src/devices/tests/ddk-metadata-test/BUILD.gn
index 476ffd6..35391ce 100644
--- a/src/devices/tests/ddk-metadata-test/BUILD.gn
+++ b/src/devices/tests/ddk-metadata-test/BUILD.gn
@@ -16,8 +16,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "metadata-test.cc" ]
   deps = [
     "//sdk/lib/fdio",
diff --git a/src/devices/tests/ddk-power/BUILD.gn b/src/devices/tests/ddk-power/BUILD.gn
index 73a999f..03662bf 100644
--- a/src/devices/tests/ddk-power/BUILD.gn
+++ b/src/devices/tests/ddk-power/BUILD.gn
@@ -24,11 +24,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":fuchsia.device.power.test_llcpp",
@@ -51,11 +47,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver-child.cc" ]
   deps = [
     ":fuchsia.device.power.test_llcpp",
diff --git a/src/devices/tests/ddk-runcompatibilityhook/BUILD.gn b/src/devices/tests/ddk-runcompatibilityhook/BUILD.gn
index 1bb80bc..1615261 100644
--- a/src/devices/tests/ddk-runcompatibilityhook/BUILD.gn
+++ b/src/devices/tests/ddk-runcompatibilityhook/BUILD.gn
@@ -18,11 +18,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":test-compatibility-hook-bind",
@@ -44,11 +40,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "test-driver-child.cc" ]
   deps = [
     ":test-compatibility-hook-child-bind",
diff --git a/src/devices/tests/driver-inspect-test/BUILD.gn b/src/devices/tests/driver-inspect-test/BUILD.gn
index 1f0ec47..f1db0fd0 100644
--- a/src/devices/tests/driver-inspect-test/BUILD.gn
+++ b/src/devices/tests/driver-inspect-test/BUILD.gn
@@ -17,8 +17,6 @@
 driver_module("driver") {
   output_name = "inspect-test"
   testonly = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 
   sources = [ "test-driver.cc" ]
   deps = [
diff --git a/src/devices/tests/isolateddevmgr/BUILD.gn b/src/devices/tests/isolateddevmgr/BUILD.gn
index fb3fa19..cd1b2a8 100644
--- a/src/devices/tests/isolateddevmgr/BUILD.gn
+++ b/src/devices/tests/isolateddevmgr/BUILD.gn
@@ -14,8 +14,6 @@
 }
 
 driver_module("isolateddevmgr-test-driver") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "test-driver.cc" ]
   deps = [
     ":metadata-test-bind",
diff --git a/src/devices/tests/mock-device/BUILD.gn b/src/devices/tests/mock-device/BUILD.gn
index 0bd28e4..4068a04 100644
--- a/src/devices/tests/mock-device/BUILD.gn
+++ b/src/devices/tests/mock-device/BUILD.gn
@@ -16,8 +16,6 @@
 driver_module("mock-device") {
   test = true
   testonly = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [
     "device.cc",
     "fidl.cc",
diff --git a/src/devices/tests/sysdev/BUILD.gn b/src/devices/tests/sysdev/BUILD.gn
index 6ec8787..5884ea7 100644
--- a/src/devices/tests/sysdev/BUILD.gn
+++ b/src/devices/tests/sysdev/BUILD.gn
@@ -12,8 +12,6 @@
 
 driver_module("sysdev") {
   test = true
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "sysdev.cc" ]
   deps = [
     ":sysdev-bind",
diff --git a/src/devices/thermal/drivers/aml-thermal-s905d2g-legacy/BUILD.gn b/src/devices/thermal/drivers/aml-thermal-s905d2g-legacy/BUILD.gn
index e178491..43afc93 100644
--- a/src/devices/thermal/drivers/aml-thermal-s905d2g-legacy/BUILD.gn
+++ b/src/devices/thermal/drivers/aml-thermal-s905d2g-legacy/BUILD.gn
@@ -18,11 +18,9 @@
 }
 
 driver_module("aml-thermal-s905d2g-legacy") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
   sources = [
diff --git a/src/devices/thermal/drivers/aml-thermal-s905d2g/BUILD.gn b/src/devices/thermal/drivers/aml-thermal-s905d2g/BUILD.gn
index d9fda1a3..fed72cc 100644
--- a/src/devices/thermal/drivers/aml-thermal-s905d2g/BUILD.gn
+++ b/src/devices/thermal/drivers/aml-thermal-s905d2g/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aml-thermal.cc",
     "aml-tsensor.cc",
diff --git a/src/devices/thermal/drivers/aml-thermal-s912/BUILD.gn b/src/devices/thermal/drivers/aml-thermal-s912/BUILD.gn
index 3557da9..d2aca40 100644
--- a/src/devices/thermal/drivers/aml-thermal-s912/BUILD.gn
+++ b/src/devices/thermal/drivers/aml-thermal-s912/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-thermal.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/thermal/drivers/as370-thermal/BUILD.gn b/src/devices/thermal/drivers/as370-thermal/BUILD.gn
index be4d075..bbf4909 100644
--- a/src/devices/thermal/drivers/as370-thermal/BUILD.gn
+++ b/src/devices/thermal/drivers/as370-thermal/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "as370-thermal.cc" ]
   deps = [
     ":as370-thermal-bind",
diff --git a/src/devices/thermal/drivers/astro-thermistor/BUILD.gn b/src/devices/thermal/drivers/astro-thermistor/BUILD.gn
index e1ec068..0a812bd 100644
--- a/src/devices/thermal/drivers/astro-thermistor/BUILD.gn
+++ b/src/devices/thermal/drivers/astro-thermistor/BUILD.gn
@@ -7,8 +7,6 @@
 driver_module("astro-thermistor") {
   defines = [ "_ALL_SOURCE" ]
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "thermistor-channel.cc",
diff --git a/src/devices/thermal/drivers/mtk-thermal/BUILD.gn b/src/devices/thermal/drivers/mtk-thermal/BUILD.gn
index 2ce9237..523d009 100644
--- a/src/devices/thermal/drivers/mtk-thermal/BUILD.gn
+++ b/src/devices/thermal/drivers/mtk-thermal/BUILD.gn
@@ -23,11 +23,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mtk-thermal.cc" ]
   deps = [
     ":mtk-thermal-bind",
diff --git a/src/devices/thermal/drivers/vs680-thermal/BUILD.gn b/src/devices/thermal/drivers/vs680-thermal/BUILD.gn
index 6382a454..4025d5d 100644
--- a/src/devices/thermal/drivers/vs680-thermal/BUILD.gn
+++ b/src/devices/thermal/drivers/vs680-thermal/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "vs680-thermal.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/usb/drivers/aml-usb-phy-v2/BUILD.gn b/src/devices/usb/drivers/aml-usb-phy-v2/BUILD.gn
index 2ce5692..1bc84e63 100644
--- a/src/devices/usb/drivers/aml-usb-phy-v2/BUILD.gn
+++ b/src/devices/usb/drivers/aml-usb-phy-v2/BUILD.gn
@@ -10,10 +10,8 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   sources = [ "aml-usb-phy.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.platform.device",
diff --git a/src/devices/usb/drivers/as370-usb-phy/BUILD.gn b/src/devices/usb/drivers/as370-usb-phy/BUILD.gn
index a34fe25..e08c354 100644
--- a/src/devices/usb/drivers/as370-usb-phy/BUILD.gn
+++ b/src/devices/usb/drivers/as370-usb-phy/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/usb/drivers/dwc2/BUILD.gn b/src/devices/usb/drivers/dwc2/BUILD.gn
index 72aa35d..1bb93a2 100644
--- a/src/devices/usb/drivers/dwc2/BUILD.gn
+++ b/src/devices/usb/drivers/dwc2/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "dwc2.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/devices/usb/drivers/mt-musb-host/BUILD.gn b/src/devices/usb/drivers/mt-musb-host/BUILD.gn
index 804b9bc..97b4c79 100644
--- a/src/devices/usb/drivers/mt-musb-host/BUILD.gn
+++ b/src/devices/usb/drivers/mt-musb-host/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
diff --git a/src/devices/usb/drivers/mt-musb-peripheral/BUILD.gn b/src/devices/usb/drivers/mt-musb-peripheral/BUILD.gn
index 32cd1596..96580e0 100644
--- a/src/devices/usb/drivers/mt-musb-peripheral/BUILD.gn
+++ b/src/devices/usb/drivers/mt-musb-peripheral/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "mt-usb.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/devices/usb/drivers/nelson-usb-phy/BUILD.gn b/src/devices/usb/drivers/nelson-usb-phy/BUILD.gn
index 3794c93..b5e5490 100644
--- a/src/devices/usb/drivers/nelson-usb-phy/BUILD.gn
+++ b/src/devices/usb/drivers/nelson-usb-phy/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "nelson-usb-phy.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.platform.device",
diff --git a/src/devices/usb/drivers/usb-bus/BUILD.gn b/src/devices/usb/drivers/usb-bus/BUILD.gn
index 048d497..e29dee3 100644
--- a/src/devices/usb/drivers/usb-bus/BUILD.gn
+++ b/src/devices/usb/drivers/usb-bus/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/usb/drivers/usb-composite/BUILD.gn b/src/devices/usb/drivers/usb-composite/BUILD.gn
index f34b872..f627398 100644
--- a/src/devices/usb/drivers/usb-composite/BUILD.gn
+++ b/src/devices/usb/drivers/usb-composite/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "usb-composite.cc",
     "usb-interface.cc",
diff --git a/src/devices/usb/drivers/usb-dfu/BUILD.gn b/src/devices/usb/drivers/usb-dfu/BUILD.gn
index 55b24ca..e6d19b7 100644
--- a/src/devices/usb/drivers/usb-dfu/BUILD.gn
+++ b/src/devices/usb/drivers/usb-dfu/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-dfu.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.usb",
diff --git a/src/devices/usb/drivers/usb-hub-rewrite/BUILD.gn b/src/devices/usb/drivers/usb-hub-rewrite/BUILD.gn
index fc98a3f..99f7e62 100644
--- a/src/devices/usb/drivers/usb-hub-rewrite/BUILD.gn
+++ b/src/devices/usb/drivers/usb-hub-rewrite/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-hub.cc" ]
   deps = [
     ":bind",
diff --git a/src/devices/usb/drivers/usb-hub/BUILD.gn b/src/devices/usb/drivers/usb-hub/BUILD.gn
index cbc1d764..aca9fe7 100644
--- a/src/devices/usb/drivers/usb-hub/BUILD.gn
+++ b/src/devices/usb/drivers/usb-hub/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-hub.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.usb",
diff --git a/src/devices/usb/drivers/usb-peripheral-test/BUILD.gn b/src/devices/usb/drivers/usb-peripheral-test/BUILD.gn
index 0c393a4..ddbac57 100644
--- a/src/devices/usb/drivers/usb-peripheral-test/BUILD.gn
+++ b/src/devices/usb/drivers/usb-peripheral-test/BUILD.gn
@@ -10,8 +10,6 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (is_fuchsia) {
       configs += [ "//build/unification/config:zircon-migrated" ]
     }
diff --git a/src/devices/usb/drivers/usb-peripheral/BUILD.gn b/src/devices/usb/drivers/usb-peripheral/BUILD.gn
index 00a4d6f..7398419 100644
--- a/src/devices/usb/drivers/usb-peripheral/BUILD.gn
+++ b/src/devices/usb/drivers/usb-peripheral/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "usb-function.cc",
     "usb-peripheral.cc",
diff --git a/src/devices/usb/drivers/usb-virtual-bus/BUILD.gn b/src/devices/usb/drivers/usb-virtual-bus/BUILD.gn
index 7225bc7..0c47908 100644
--- a/src/devices/usb/drivers/usb-virtual-bus/BUILD.gn
+++ b/src/devices/usb/drivers/usb-virtual-bus/BUILD.gn
@@ -39,8 +39,6 @@
 }
 
 driver_module("usb-virtual-bus") {
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   deps = [
     ":common",
     "//src/devices/lib/driver",
@@ -68,10 +66,8 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   sources = [ "host.cc" ]
   deps = [
     ":fuchsia.hardware.usb.virtualbustest_llcpp",
@@ -102,10 +98,8 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   sources = [ "peripheral.cc" ]
   deps = [
     ":usb-virtual-bus-tester-function-bind",
diff --git a/src/devices/usb/drivers/xhci-rewrite/BUILD.gn b/src/devices/usb/drivers/xhci-rewrite/BUILD.gn
index b3f3313..c516204 100644
--- a/src/devices/usb/drivers/xhci-rewrite/BUILD.gn
+++ b/src/devices/usb/drivers/xhci-rewrite/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/usb/drivers/xhci/BUILD.gn b/src/devices/usb/drivers/xhci/BUILD.gn
index 15797834..442e0576 100644
--- a/src/devices/usb/drivers/xhci/BUILD.gn
+++ b/src/devices/usb/drivers/xhci/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/devices/usb/tests/usb-hci-test/BUILD.gn b/src/devices/usb/tests/usb-hci-test/BUILD.gn
index db9c1fc..cdaf895 100644
--- a/src/devices/usb/tests/usb-hci-test/BUILD.gn
+++ b/src/devices/usb/tests/usb-hci-test/BUILD.gn
@@ -79,12 +79,7 @@
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zx",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 }
 
 package("usb-hci-test-driver") {
diff --git a/src/graphics/display/drivers/aml-canvas/BUILD.gn b/src/graphics/display/drivers/aml-canvas/BUILD.gn
index 1938747..a9e4e95 100644
--- a/src/graphics/display/drivers/aml-canvas/BUILD.gn
+++ b/src/graphics/display/drivers/aml-canvas/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-canvas.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.amlogiccanvas",
diff --git a/src/graphics/display/drivers/amlogic-display/BUILD.gn b/src/graphics/display/drivers/amlogic-display/BUILD.gn
index 82fcf91..afc6186 100644
--- a/src/graphics/display/drivers/amlogic-display/BUILD.gn
+++ b/src/graphics/display/drivers/amlogic-display/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aml-dsi-host.cc",
     "aml-mipi-phy.cc",
diff --git a/src/graphics/display/drivers/display/BUILD.gn b/src/graphics/display/drivers/display/BUILD.gn
index 5bfe3b7..651a34d 100644
--- a/src/graphics/display/drivers/display/BUILD.gn
+++ b/src/graphics/display/drivers/display/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":shared",
     "//sdk/lib/syslog/cpp:backend_legacy",
diff --git a/src/graphics/display/drivers/dsi-dw/BUILD.gn b/src/graphics/display/drivers/dsi-dw/BUILD.gn
index 0102051..10bd5ce 100644
--- a/src/graphics/display/drivers/dsi-dw/BUILD.gn
+++ b/src/graphics/display/drivers/dsi-dw/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "dsi-dw.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.dsi",
diff --git a/src/graphics/display/drivers/dsi-mt/BUILD.gn b/src/graphics/display/drivers/dsi-mt/BUILD.gn
index 4e33790..4ecfa56 100644
--- a/src/graphics/display/drivers/dsi-mt/BUILD.gn
+++ b/src/graphics/display/drivers/dsi-mt/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "dsi-mt.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.dsiimpl",
diff --git a/src/graphics/display/drivers/fake/BUILD.gn b/src/graphics/display/drivers/fake/BUILD.gn
index 8c21e70..6ed781e 100644
--- a/src/graphics/display/drivers/fake/BUILD.gn
+++ b/src/graphics/display/drivers/fake/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bind.cc" ]
   deps = [
     ":fake-lib",
diff --git a/src/graphics/display/drivers/goldfish-display/BUILD.gn b/src/graphics/display/drivers/goldfish-display/BUILD.gn
index ed25414..64b9073 100644
--- a/src/graphics/display/drivers/goldfish-display/BUILD.gn
+++ b/src/graphics/display/drivers/goldfish-display/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "display.cc" ]
   deps = [
     ":common",
diff --git a/src/graphics/display/drivers/intel-i915/BUILD.gn b/src/graphics/display/drivers/intel-i915/BUILD.gn
index 31c565d8..7ec899c 100644
--- a/src/graphics/display/drivers/intel-i915/BUILD.gn
+++ b/src/graphics/display/drivers/intel-i915/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "display-device.cc",
     "dp-display.cc",
diff --git a/src/graphics/display/drivers/mt8167s-display/BUILD.gn b/src/graphics/display/drivers/mt8167s-display/BUILD.gn
index 0bb7cfa..0076dea 100644
--- a/src/graphics/display/drivers/mt8167s-display/BUILD.gn
+++ b/src/graphics/display/drivers/mt8167s-display/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "aal.cc",
     "ccorr.cc",
diff --git a/src/graphics/display/drivers/simple/BUILD.gn b/src/graphics/display/drivers/simple/BUILD.gn
index 6e734e4..ac1ecd5 100644
--- a/src/graphics/display/drivers/simple/BUILD.gn
+++ b/src/graphics/display/drivers/simple/BUILD.gn
@@ -32,11 +32,7 @@
       "//build/config:all_source",
       "//build/config/fuchsia:enable_zircon_asserts",
     ]
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [
-      "//build/config/fuchsia:static_cpp_standard_library",
-      "//build/unification/config:zircon-migrated",
-    ]
+    configs += [ "//build/unification/config:zircon-migrated" ]
     sources = [ "simple-$driver.c" ]
     deps = [
       ":shared",
diff --git a/src/graphics/display/drivers/ssd1306/BUILD.gn b/src/graphics/display/drivers/ssd1306/BUILD.gn
index 3729345..a51943c 100644
--- a/src/graphics/display/drivers/ssd1306/BUILD.gn
+++ b/src/graphics/display/drivers/ssd1306/BUILD.gn
@@ -12,11 +12,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ssd1306.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.dotmatrixdisplay",
diff --git a/src/graphics/display/drivers/vim-display/BUILD.gn b/src/graphics/display/drivers/vim-display/BUILD.gn
index 7411b2e..e6ce467 100644
--- a/src/graphics/display/drivers/vim-display/BUILD.gn
+++ b/src/graphics/display/drivers/vim-display/BUILD.gn
@@ -44,11 +44,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "edid.cc",
     "hdmitx.cc",
diff --git a/src/graphics/drivers/aml-gpu/BUILD.gn b/src/graphics/drivers/aml-gpu/BUILD.gn
index 869d2f6..7a1df27 100644
--- a/src/graphics/drivers/aml-gpu/BUILD.gn
+++ b/src/graphics/drivers/aml-gpu/BUILD.gn
@@ -38,8 +38,6 @@
 }
 
 driver_module("aml-gpu") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   deps = [ ":sources" ]
 }
 
diff --git a/src/graphics/drivers/misc/goldfish/BUILD.gn b/src/graphics/drivers/misc/goldfish/BUILD.gn
index 6e68e09..95d025d 100644
--- a/src/graphics/drivers/misc/goldfish/BUILD.gn
+++ b/src/graphics/drivers/misc/goldfish/BUILD.gn
@@ -47,12 +47,7 @@
   ]
 
   deps = common_deps
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 
   configs += [ "//build/config:all_source" ]
 
diff --git a/src/graphics/drivers/misc/goldfish_address_space/BUILD.gn b/src/graphics/drivers/misc/goldfish_address_space/BUILD.gn
index d6842e8..3d384c5 100644
--- a/src/graphics/drivers/misc/goldfish_address_space/BUILD.gn
+++ b/src/graphics/drivers/misc/goldfish_address_space/BUILD.gn
@@ -41,12 +41,7 @@
   sources = [ "address_space_device.cc" ]
 
   deps = common_deps
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 
   configs += [ "//build/config:all_source" ]
 }
diff --git a/src/graphics/drivers/misc/goldfish_control/BUILD.gn b/src/graphics/drivers/misc/goldfish_control/BUILD.gn
index b1efa727..59345f5 100644
--- a/src/graphics/drivers/misc/goldfish_control/BUILD.gn
+++ b/src/graphics/drivers/misc/goldfish_control/BUILD.gn
@@ -57,12 +57,7 @@
     "//zircon/system/ulib/trace",
     "//zircon/system/ulib/trace:trace-driver",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
-  ]
+  configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
 
   configs += [ "//build/config:all_source" ]
 }
diff --git a/src/graphics/drivers/msd-arm-mali/BUILD.gn b/src/graphics/drivers/msd-arm-mali/BUILD.gn
index 98ee6b09..7007a2b 100644
--- a/src/graphics/drivers/msd-arm-mali/BUILD.gn
+++ b/src/graphics/drivers/msd-arm-mali/BUILD.gn
@@ -15,9 +15,6 @@
     "src",
     "//src/graphics/lib/magma/src/magma_util/platform:logger_for_system_drivers",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_module("msd_arm_test") {
@@ -32,9 +29,6 @@
     "//src/graphics/lib/magma/tests/unit_tests:magma_platform_hardware_tests",
     "//src/graphics/lib/magma/tests/unit_tests:msd_abi_conformance_tests",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 magma_pdev_entry("msd_arm_entry") {
diff --git a/src/graphics/drivers/msd-img-rgx/mtk/BUILD.gn b/src/graphics/drivers/msd-img-rgx/mtk/BUILD.gn
index c6ed5f5..affc59b 100644
--- a/src/graphics/drivers/msd-img-rgx/mtk/BUILD.gn
+++ b/src/graphics/drivers/msd-img-rgx/mtk/BUILD.gn
@@ -17,9 +17,6 @@
     deps = [ ":driver_sources" ]
   }
   deps += [ "//src/graphics/lib/magma/src/magma_util/platform:logger_for_system_drivers" ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 template("driver_source_template") {
@@ -65,8 +62,6 @@
       ]
       sources += [ "driver_test_gtest.cc" ]
     }
-
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
     if (defined(invoker.configs)) {
       configs += invoker.configs
     }
diff --git a/src/graphics/drivers/msd-img-rgx/no_hardware/BUILD.gn b/src/graphics/drivers/msd-img-rgx/no_hardware/BUILD.gn
index 57eae32..98ae1b9 100644
--- a/src/graphics/drivers/msd-img-rgx/no_hardware/BUILD.gn
+++ b/src/graphics/drivers/msd-img-rgx/no_hardware/BUILD.gn
@@ -12,9 +12,6 @@
     ":driver_sources",
     "//src/graphics/lib/magma/src/magma_util/platform:logger_for_system_drivers",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 source_set("driver_sources") {
@@ -39,5 +36,4 @@
     "//third_party/imgtec-pvr-rgx-km:src_no_hardware",
     "//zircon/system/ulib/fidl-utils",
   ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
diff --git a/src/graphics/drivers/msd-intel-gen/BUILD.gn b/src/graphics/drivers/msd-intel-gen/BUILD.gn
index a63e7b3..a965bb3 100644
--- a/src/graphics/drivers/msd-intel-gen/BUILD.gn
+++ b/src/graphics/drivers/msd-intel-gen/BUILD.gn
@@ -14,9 +14,6 @@
     "$magma_build_root/src/magma_util/platform:logger_for_system_drivers",
     "src",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 # The gpu device; runs gtests at startup
@@ -30,9 +27,6 @@
     "$magma_build_root/src/magma_util/platform:logger_for_system_drivers",
     "src",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 source_set("msd_intel_entry") {
diff --git a/src/graphics/drivers/msd-qcom-adreno/BUILD.gn b/src/graphics/drivers/msd-qcom-adreno/BUILD.gn
index 5997241..95f0bd0 100644
--- a/src/graphics/drivers/msd-qcom-adreno/BUILD.gn
+++ b/src/graphics/drivers/msd-qcom-adreno/BUILD.gn
@@ -32,9 +32,6 @@
   if (is_fuchsia) {
     output_name = "libmsd_qcom"
     deps += [ ":msd_qcom_entry" ]
-
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   }
 
   if (is_linux) {
@@ -58,9 +55,6 @@
   if (is_fuchsia) {
     output_name = "libmsd_qcom_test"
     deps += [ ":msd_qcom_entry_test" ]
-
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   }
 
   if (is_linux) {
diff --git a/src/graphics/drivers/msd-vsi-vip/BUILD.gn b/src/graphics/drivers/msd-vsi-vip/BUILD.gn
index 03d0b37..0d8a0fd 100644
--- a/src/graphics/drivers/msd-vsi-vip/BUILD.gn
+++ b/src/graphics/drivers/msd-vsi-vip/BUILD.gn
@@ -34,9 +34,6 @@
     "$magma_build_root/src/magma_util/platform:logger_for_system_drivers",
     "src",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 driver_module("msd_vsi_test") {
@@ -47,9 +44,6 @@
     "$magma_build_root/src/magma_util/platform:logger_for_system_drivers",
     "src",
   ]
-
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 magma_pdev_entry("msd_vsi_entry") {
diff --git a/src/graphics/drivers/virtio/BUILD.gn b/src/graphics/drivers/virtio/BUILD.gn
index 1bdffae..0843c9c 100644
--- a/src/graphics/drivers/virtio/BUILD.gn
+++ b/src/graphics/drivers/virtio/BUILD.gn
@@ -29,8 +29,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/lib/isolated_devmgr/BUILD.gn b/src/lib/isolated_devmgr/BUILD.gn
index c5880dd..cd6b51c 100644
--- a/src/lib/isolated_devmgr/BUILD.gn
+++ b/src/lib/isolated_devmgr/BUILD.gn
@@ -150,8 +150,6 @@
 
 # A device that causes a crash when it's operated on
 driver_module("crash-device") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   sources = [ "crash_device.cc" ]
   deps = [
     ":crash-device-bind",
diff --git a/src/media/audio/drivers/alc5514/BUILD.gn b/src/media/audio/drivers/alc5514/BUILD.gn
index e0961b8..5ddfaa2 100644
--- a/src/media/audio/drivers/alc5514/BUILD.gn
+++ b/src/media/audio/drivers/alc5514/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/media/audio/drivers/alc5663/BUILD.gn b/src/media/audio/drivers/alc5663/BUILD.gn
index 49a3b17..09db16a 100644
--- a/src/media/audio/drivers/alc5663/BUILD.gn
+++ b/src/media/audio/drivers/alc5663/BUILD.gn
@@ -30,11 +30,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   deps = [
     ":shared",
     "//src/devices/lib/driver",
diff --git a/src/media/audio/drivers/aml-g12-pdm/BUILD.gn b/src/media/audio/drivers/aml-g12-pdm/BUILD.gn
index e18366f..7f7ed7a 100644
--- a/src/media/audio/drivers/aml-g12-pdm/BUILD.gn
+++ b/src/media/audio/drivers/aml-g12-pdm/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-in.cc" ]
 
   deps = [
diff --git a/src/media/audio/drivers/aml-g12-tdm/BUILD.gn b/src/media/audio/drivers/aml-g12-tdm/BUILD.gn
index 7084a3d..5d30d2d 100644
--- a/src/media/audio/drivers/aml-g12-tdm/BUILD.gn
+++ b/src/media/audio/drivers/aml-g12-tdm/BUILD.gn
@@ -19,10 +19,6 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-  ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
   sources = [
@@ -68,10 +64,6 @@
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-  ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
     "//build/unification/config:zircon-migrated",
   ]
   sources = [
diff --git a/src/media/audio/drivers/as370-pdm-input/BUILD.gn b/src/media/audio/drivers/as370-pdm-input/BUILD.gn
index 2ef5c57..b2dc15d 100644
--- a/src/media/audio/drivers/as370-pdm-input/BUILD.gn
+++ b/src/media/audio/drivers/as370-pdm-input/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-in.cc" ]
 
   deps = [
diff --git a/src/media/audio/drivers/as370-tdm-output/BUILD.gn b/src/media/audio/drivers/as370-tdm-output/BUILD.gn
index fadbf3c..f7249bf 100644
--- a/src/media/audio/drivers/as370-tdm-output/BUILD.gn
+++ b/src/media/audio/drivers/as370-tdm-output/BUILD.gn
@@ -20,11 +20,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-out.cc" ]
   deps = [
     ":as370_audio_out_bind",
diff --git a/src/media/audio/drivers/astro-pdm-input/BUILD.gn b/src/media/audio/drivers/astro-pdm-input/BUILD.gn
index c0b16e0..8691420 100644
--- a/src/media/audio/drivers/astro-pdm-input/BUILD.gn
+++ b/src/media/audio/drivers/astro-pdm-input/BUILD.gn
@@ -17,11 +17,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-in.cc" ]
 
   deps = [
diff --git a/src/media/audio/drivers/codecs/max98373/BUILD.gn b/src/media/audio/drivers/codecs/max98373/BUILD.gn
index f0602de..c7aaf33 100644
--- a/src/media/audio/drivers/codecs/max98373/BUILD.gn
+++ b/src/media/audio/drivers/codecs/max98373/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "max98373.cc" ]
   deps = [
     ":max98373-bind",
diff --git a/src/media/audio/drivers/codecs/tas27xx/BUILD.gn b/src/media/audio/drivers/codecs/tas27xx/BUILD.gn
index be84905..79c88a6 100644
--- a/src/media/audio/drivers/codecs/tas27xx/BUILD.gn
+++ b/src/media/audio/drivers/codecs/tas27xx/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "tas27xx.cc" ]
   deps = [
     ":ti_tas27xx-bind",
diff --git a/src/media/audio/drivers/codecs/tas5720/BUILD.gn b/src/media/audio/drivers/codecs/tas5720/BUILD.gn
index 8e298ee..ec651fc 100644
--- a/src/media/audio/drivers/codecs/tas5720/BUILD.gn
+++ b/src/media/audio/drivers/codecs/tas5720/BUILD.gn
@@ -20,8 +20,6 @@
 driver_module("tas5720") {
   defines = [ "_ALL_SOURCE" ]
   configs += [ "//build/config/fuchsia:enable_zircon_asserts" ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "tas5720.cc" ]
   deps = [
diff --git a/src/media/audio/drivers/codecs/tas5782/BUILD.gn b/src/media/audio/drivers/codecs/tas5782/BUILD.gn
index ac9ad8d..923f2e1 100644
--- a/src/media/audio/drivers/codecs/tas5782/BUILD.gn
+++ b/src/media/audio/drivers/codecs/tas5782/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "tas5782.cc" ]
   deps = [
     ":ti_tas5782-bind",
diff --git a/src/media/audio/drivers/codecs/tas58xx/BUILD.gn b/src/media/audio/drivers/codecs/tas58xx/BUILD.gn
index cb1b2a3..d012137 100644
--- a/src/media/audio/drivers/codecs/tas58xx/BUILD.gn
+++ b/src/media/audio/drivers/codecs/tas58xx/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "tas58xx.cc" ]
   deps = [
     ":ti_tas58xx-bind",
diff --git a/src/media/audio/drivers/intel-hda/codecs/hdmi/BUILD.gn b/src/media/audio/drivers/intel-hda/codecs/hdmi/BUILD.gn
index 873a3ab..6e0dd17 100644
--- a/src/media/audio/drivers/intel-hda/codecs/hdmi/BUILD.gn
+++ b/src/media/audio/drivers/intel-hda/codecs/hdmi/BUILD.gn
@@ -21,11 +21,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "hdmi-codec.cc" ]
   deps = [
     ":ihda_codecs_hdmi_bind",
diff --git a/src/media/audio/drivers/intel-hda/codecs/qemu/BUILD.gn b/src/media/audio/drivers/intel-hda/codecs/qemu/BUILD.gn
index 2664768..4f7c13e 100644
--- a/src/media/audio/drivers/intel-hda/codecs/qemu/BUILD.gn
+++ b/src/media/audio/drivers/intel-hda/codecs/qemu/BUILD.gn
@@ -21,11 +21,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "qemu-codec.cc",
     "qemu-stream.cc",
diff --git a/src/media/audio/drivers/intel-hda/codecs/realtek/BUILD.gn b/src/media/audio/drivers/intel-hda/codecs/realtek/BUILD.gn
index c6e7225..76f12ff1 100644
--- a/src/media/audio/drivers/intel-hda/codecs/realtek/BUILD.gn
+++ b/src/media/audio/drivers/intel-hda/codecs/realtek/BUILD.gn
@@ -21,11 +21,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "realtek-codec.cc",
     "realtek-stream.cc",
diff --git a/src/media/audio/drivers/intel-hda/controller/BUILD.gn b/src/media/audio/drivers/intel-hda/controller/BUILD.gn
index eb38c30..3303c71 100644
--- a/src/media/audio/drivers/intel-hda/controller/BUILD.gn
+++ b/src/media/audio/drivers/intel-hda/controller/BUILD.gn
@@ -98,11 +98,9 @@
 }
 
 driver_module("intel-hda") {
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   configs += [
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
-    "//build/config/fuchsia:static_cpp_standard_library",
   ]
   deps = [ ":src" ]
   data_deps = [ ":firmware" ]
diff --git a/src/media/audio/drivers/max98927/BUILD.gn b/src/media/audio/drivers/max98927/BUILD.gn
index 0f2f620..cd471f2 100644
--- a/src/media/audio/drivers/max98927/BUILD.gn
+++ b/src/media/audio/drivers/max98927/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/media/audio/drivers/mt8167-tdm-input/BUILD.gn b/src/media/audio/drivers/mt8167-tdm-input/BUILD.gn
index 39ae7fa..35f913d 100644
--- a/src/media/audio/drivers/mt8167-tdm-input/BUILD.gn
+++ b/src/media/audio/drivers/mt8167-tdm-input/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "audio-stream-in.cc",
     "tlv320adc.cc",
diff --git a/src/media/audio/drivers/mt8167-tdm-output/BUILD.gn b/src/media/audio/drivers/mt8167-tdm-output/BUILD.gn
index 1e02584..e967647 100644
--- a/src/media/audio/drivers/mt8167-tdm-output/BUILD.gn
+++ b/src/media/audio/drivers/mt8167-tdm-output/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-out.cc" ]
 
   deps = [
diff --git a/src/media/audio/drivers/sherlock-pdm-input/BUILD.gn b/src/media/audio/drivers/sherlock-pdm-input/BUILD.gn
index 2cc1dd7..947a39e8 100644
--- a/src/media/audio/drivers/sherlock-pdm-input/BUILD.gn
+++ b/src/media/audio/drivers/sherlock-pdm-input/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "audio-stream-in.cc" ]
 
   deps = [
diff --git a/src/media/audio/drivers/usb-audio/BUILD.gn b/src/media/audio/drivers/usb-audio/BUILD.gn
index 35199e1..42e6814 100644
--- a/src/media/audio/drivers/usb-audio/BUILD.gn
+++ b/src/media/audio/drivers/usb-audio/BUILD.gn
@@ -9,8 +9,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/media/audio/drivers/virtual_audio/BUILD.gn b/src/media/audio/drivers/virtual_audio/BUILD.gn
index ac6be28..03314e28 100644
--- a/src/media/audio/drivers/virtual_audio/BUILD.gn
+++ b/src/media/audio/drivers/virtual_audio/BUILD.gn
@@ -47,9 +47,6 @@
     "//zircon/system/ulib/fzl",
   ]
 
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
-
   # TODO(fxbug.dev/58162): delete the below and fix compiler warnings
   configs += [ "//build/config:Wno-conversion" ]
 }
diff --git a/src/media/drivers/amlogic_decoder/BUILD.gn b/src/media/drivers/amlogic_decoder/BUILD.gn
index 2f63d91..86cb706 100644
--- a/src/media/drivers/amlogic_decoder/BUILD.gn
+++ b/src/media/drivers/amlogic_decoder/BUILD.gn
@@ -40,9 +40,6 @@
     ]
 
     sources = [ "binding.c" ]
-
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   }
 
   # This version of the driver runs tests on startup.
@@ -63,9 +60,6 @@
       "test_binding.c",
       "test_device_ctx.cc",
     ]
-
-    configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-    configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   }
 
   config("sources_include_config") {
diff --git a/src/ui/backlight/drivers/sg-micro/BUILD.gn b/src/ui/backlight/drivers/sg-micro/BUILD.gn
index 26562e2..743451b 100644
--- a/src/ui/backlight/drivers/sg-micro/BUILD.gn
+++ b/src/ui/backlight/drivers/sg-micro/BUILD.gn
@@ -23,11 +23,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "sgm37603a.cc" ]
   deps = [
     ":sgm37603a-bind",
diff --git a/src/ui/backlight/drivers/ti-lp8556/BUILD.gn b/src/ui/backlight/drivers/ti-lp8556/BUILD.gn
index 2b6f32a..2c47d42 100644
--- a/src/ui/backlight/drivers/ti-lp8556/BUILD.gn
+++ b/src/ui/backlight/drivers/ti-lp8556/BUILD.gn
@@ -23,11 +23,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ti-lp8556.cc" ]
   deps = [
     ":ti-lp8556-bind",
diff --git a/src/ui/input/drivers/bma253/BUILD.gn b/src/ui/input/drivers/bma253/BUILD.gn
index ac9f353..e4247af 100644
--- a/src/ui/input/drivers/bma253/BUILD.gn
+++ b/src/ui/input/drivers/bma253/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "bma253.cc" ]
   deps = [
     ":bma253-bind",
diff --git a/src/ui/input/drivers/cypress/BUILD.gn b/src/ui/input/drivers/cypress/BUILD.gn
index 558584b..d5abaacc 100644
--- a/src/ui/input/drivers/cypress/BUILD.gn
+++ b/src/ui/input/drivers/cypress/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "cy8cmbr3108.cc" ]
   deps = [
     ":cypress_cy8cmbr3108-bind",
diff --git a/src/ui/input/drivers/focaltech/BUILD.gn b/src/ui/input/drivers/focaltech/BUILD.gn
index 6e8957a..9ca5f88 100644
--- a/src/ui/input/drivers/focaltech/BUILD.gn
+++ b/src/ui/input/drivers/focaltech/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "ft_device.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/ui/input/drivers/ft8201/BUILD.gn b/src/ui/input/drivers/ft8201/BUILD.gn
index 5cda8a1..5d7a0ed 100644
--- a/src/ui/input/drivers/ft8201/BUILD.gn
+++ b/src/ui/input/drivers/ft8201/BUILD.gn
@@ -88,8 +88,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   deps = [ ":common" ]
   defines = [
     "FT8201_FIRMWARE_PATH=\"$firmware_path\"",
diff --git a/src/ui/input/drivers/goodix/BUILD.gn b/src/ui/input/drivers/goodix/BUILD.gn
index 5846369..9a64614 100644
--- a/src/ui/input/drivers/goodix/BUILD.gn
+++ b/src/ui/input/drivers/goodix/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "gt92xx.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.clock",
diff --git a/src/ui/input/drivers/gt6853/BUILD.gn b/src/ui/input/drivers/gt6853/BUILD.gn
index 8c23d76..4331e26 100644
--- a/src/ui/input/drivers/gt6853/BUILD.gn
+++ b/src/ui/input/drivers/gt6853/BUILD.gn
@@ -94,8 +94,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   deps = [ ":common" ]
   defines = [
     "GT6853_CONFIG_9364_PATH=\"$config_9364_path\"",
diff --git a/src/ui/input/drivers/hid-buttons/BUILD.gn b/src/ui/input/drivers/hid-buttons/BUILD.gn
index 58f9b73..282a9e48 100644
--- a/src/ui/input/drivers/hid-buttons/BUILD.gn
+++ b/src/ui/input/drivers/hid-buttons/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = []
   deps = [
     ":common",
diff --git a/src/ui/input/drivers/hid-input-report/BUILD.gn b/src/ui/input/drivers/hid-input-report/BUILD.gn
index a8eaa0f..be0a732 100644
--- a/src/ui/input/drivers/hid-input-report/BUILD.gn
+++ b/src/ui/input/drivers/hid-input-report/BUILD.gn
@@ -32,8 +32,6 @@
     "//zircon/system/ulib/hid-parser",
     "//zircon/system/ulib/trace:trace-driver",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
 }
 
 test("hid-input-report-test-bin") {
diff --git a/src/ui/input/drivers/hid/BUILD.gn b/src/ui/input/drivers/hid/BUILD.gn
index e032759..050366b 100644
--- a/src/ui/input/drivers/hid/BUILD.gn
+++ b/src/ui/input/drivers/hid/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "device-report-reader.cc",
     "hid-fifo.c",
diff --git a/src/ui/input/drivers/hidctl/BUILD.gn b/src/ui/input/drivers/hidctl/BUILD.gn
index 8169da0..425c40c 100644
--- a/src/ui/input/drivers/hidctl/BUILD.gn
+++ b/src/ui/input/drivers/hidctl/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "hidctl.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
diff --git a/src/ui/input/drivers/i2c-hid/BUILD.gn b/src/ui/input/drivers/i2c-hid/BUILD.gn
index 0553eea..a4bc763 100644
--- a/src/ui/input/drivers/i2c-hid/BUILD.gn
+++ b/src/ui/input/drivers/i2c-hid/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "i2c-hid.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
diff --git a/src/ui/input/drivers/pc-ps2/BUILD.gn b/src/ui/input/drivers/pc-ps2/BUILD.gn
index 3ded5e6..9073d49 100644
--- a/src/ui/input/drivers/pc-ps2/BUILD.gn
+++ b/src/ui/input/drivers/pc-ps2/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "i8042.c" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
diff --git a/src/ui/input/drivers/usb-hid/BUILD.gn b/src/ui/input/drivers/usb-hid/BUILD.gn
index 7796e21..0014b0b 100644
--- a/src/ui/input/drivers/usb-hid/BUILD.gn
+++ b/src/ui/input/drivers/usb-hid/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "usb-hid.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
@@ -40,11 +36,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "function/one-endpoint-hid-function.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
@@ -71,11 +63,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "function/two-endpoint-hid-function.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.hidbus",
diff --git a/src/ui/input/drivers/virtio/BUILD.gn b/src/ui/input/drivers/virtio/BUILD.gn
index 5d44eab..168dd3b 100644
--- a/src/ui/input/drivers/virtio/BUILD.gn
+++ b/src/ui/input/drivers/virtio/BUILD.gn
@@ -11,8 +11,6 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
   if (is_fuchsia) {
     configs += [ "//build/unification/config:zircon-migrated" ]
   }
diff --git a/src/ui/light/drivers/aml-light/BUILD.gn b/src/ui/light/drivers/aml-light/BUILD.gn
index 5f120c0..0433da5 100644
--- a/src/ui/light/drivers/aml-light/BUILD.gn
+++ b/src/ui/light/drivers/aml-light/BUILD.gn
@@ -11,11 +11,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "aml-light.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/ui/light/drivers/gpio-light/BUILD.gn b/src/ui/light/drivers/gpio-light/BUILD.gn
index 20df7c83..3a248fc 100644
--- a/src/ui/light/drivers/gpio-light/BUILD.gn
+++ b/src/ui/light/drivers/gpio-light/BUILD.gn
@@ -9,11 +9,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "gpio-light.cc" ]
   deps = [
     "//sdk/banjo/ddk.protocol.composite",
diff --git a/src/ui/light/drivers/lp50xx-light/BUILD.gn b/src/ui/light/drivers/lp50xx-light/BUILD.gn
index b169dca..832be7d 100644
--- a/src/ui/light/drivers/lp50xx-light/BUILD.gn
+++ b/src/ui/light/drivers/lp50xx-light/BUILD.gn
@@ -22,11 +22,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [ "lp50xx-light.cc" ]
   deps = [
     ":lp50xx_light-bind",
diff --git a/zircon/third_party/dev/ethernet/e1000/BUILD.gn b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
index 26886f9..7ebaff2 100644
--- a/zircon/third_party/dev/ethernet/e1000/BUILD.gn
+++ b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
@@ -19,11 +19,7 @@
     "//build/config:all_source",
     "//build/config/fuchsia:enable_zircon_asserts",
   ]
-  configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
-  configs += [
-    "//build/config/fuchsia:static_cpp_standard_library",
-    "//build/unification/config:zircon-migrated",
-  ]
+  configs += [ "//build/unification/config:zircon-migrated" ]
   sources = [
     "e1000_80003es2lan.c",
     "e1000_82540.c",