42a47d9491
Ensure class and module headers from the current version are properly matched to existing ones to avoid duplication. Reviewed-by: jjg