Fix headers use