Bring headers closer to Mutopia standards