catch up with R 3.1.1 changes

git-svn-id: https://svn.r-project.org/R/trunk@66112 00db46b3-68df-0310-9c12-caf00c1e9a41
update

git-svn-id: https://svn.r-project.org/R/trunk@66114 00db46b3-68df-0310-9c12-caf00c1e9a41
clean up

git-svn-id: https://svn.r-project.org/R/trunk@66118 00db46b3-68df-0310-9c12-caf00c1e9a41
more use of headers

git-svn-id: https://svn.r-project.org/R/trunk@66119 00db46b3-68df-0310-9c12-caf00c1e9a41
more use of headers

git-svn-id: https://svn.r-project.org/R/trunk@66120 00db46b3-68df-0310-9c12-caf00c1e9a41
more use of headers

git-svn-id: https://svn.r-project.org/R/trunk@66122 00db46b3-68df-0310-9c12-caf00c1e9a41