Use global avs+ headers instead of the included one