Further removal of the introspective AttributeWithIndex thing. Also fix the #includes. llvm-svn: 173599