Remove all references to now defunct (and removed) header.

[SVN r86438]