Non-unified build fixes, October 2021 edition.
Created attachment 441030 [details] Patch
Created attachment 441031 [details] Patch
Committed r284078 (242906@main): <https://commits.webkit.org/242906@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441031 [details].
<rdar://problem/84182260>