diff --git a/src/darwin/Framework/chip_xcode_build_connector.sh b/src/darwin/Framework/chip_xcode_build_connector.sh
index a6d9d1da0b..4f1a20dc75 100755
--- a/src/darwin/Framework/chip_xcode_build_connector.sh
+++ b/src/darwin/Framework/chip_xcode_build_connector.sh
@@ -208,5 +208,6 @@ find_in_ancestors() {
 
     # generate and build
     gn --root="$CHIP_ROOT" gen --check out --args="${args[*]}"
-    exec ninja -v -C out
+    ninja -C out -v
+    ninja -C out -t missingdeps
 }
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 654875cde5..6fe29585fe 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -422,7 +422,9 @@ if (chip_device_platform != "none") {
   source_set("platform_base") {
     public_deps = [
       ":platform_config_header",
+      "${chip_root}/src/app/icd/server:icd-server-config",
       "${chip_root}/src/ble",
+      "${chip_root}/src/credentials:build_time_header",
       "${chip_root}/src/inet",
       "${chip_root}/src/lib/core",
       "${chip_root}/src/lib/support",
@@ -511,10 +513,8 @@ if (chip_device_platform != "none") {
 
     public_deps = [
       ":platform_base",
-      "${chip_root}/src/app:app_config",
+      "${chip_root}/src/app:app_config",  # TODO: Move into platforms using it
       "${chip_root}/src/app/common:cluster-objects",
-      "${chip_root}/src/app/icd/server:icd-server-config",
-      "${chip_root}/src/credentials:build_time_header",
       "${chip_root}/src/crypto",
       "${chip_root}/src/lib/support",
     ]