more conversion to Rcpp Attributes, and more header rearrangment