Merge "Remove header symlinks"