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