Merge "Use exported headers instead of copying"