Merge "Cleanup some docs (includes/[m-r])"