Merge "Add missing headers when Building with libstdc++" into main