Conversion to roxygne headers, 1