Merge "Cleanup includes for rs/cpp to not expose internal details."