#885: Clean up source headers