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