Fix include names and update copyright header