Update common headers, bump version to 6