Remove another ifdef from the headers.
Resync with trunk