Merge changes Iffac254c,Iad1f93d1 into main

* changes:
  C++23 fixes: add missing #includes (mainline)
  C++23 fixes: add missing #includes (non-mainline)