Merge "Link with actual headers instead of symlinks"