add header anti-multidef safeguards, etc.