Minor update of common headers.