Merge "Remove unused headers."