Russell,

Here's the pull request for these header clean-up patches.

Tony