trunk
Drop "diagnostic" from some filenames in the "diagnostics" folder (#6686)
Add missing standard library header inclusions (#5316)