Merge "Start refactoring RS headerfiles for docs."