This was SVN commit r18987.
The file name did not match the content. Also little cleanup of some unnecessary includes. This was SVN commit r16431.