Fix possible header duplicates when using additional headers (#1489033)