Remove any non-system #includes from the installed headers.
Resync with trunk