Fix C++23 build. libc++ is stricter about transitive includes for C++23. Change-Id: Ic293a7ba8d5e8f9e515edf294eaeb6fe47cf3422