Add some missing headers, and make some header more consistent.