Add missing variable values to headers #1570