Include now-missing headers.